Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1212654

[PATCH 07/20] ACPICA: Tables: Cleanup to reduce FACS globals.

From Lv Zheng <lv.zheng@intel.com>
Newsgroups linux.kernel
Subject [PATCH 07/20] ACPICA: Tables: Cleanup to reduce FACS globals.
Date 2015-08-25 04:30 +0200
Message-ID <q1c9Q-1tt-27@gated-at.bofh.it> (permalink)
References <q1c9P-1tt-1@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw

ACPICA commit 3f42ba76e2a0453976d3108296d5f656fdf2bd6e

In this patch, FACS table mapping is also tuned a bit so that only the
selected FACS table will be mapped by the OSPM (mapped on demand) and the
FACS related global variables can be reduced. Lv Zheng.

Link: https://github.com/acpica/acpica/commit/3f42ba76
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
---
 drivers/acpi/acpica/acglobal.h  |    2 --
 drivers/acpi/acpica/hwxfsleep.c |   15 ++-------------
 drivers/acpi/acpica/tbutils.c   |    9 +++++----
 3 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/drivers/acpi/acpica/acglobal.h b/drivers/acpi/acpica/acglobal.h
index e78667e..95ed861 100644
--- a/drivers/acpi/acpica/acglobal.h
+++ b/drivers/acpi/acpica/acglobal.h
@@ -64,8 +64,6 @@ ACPI_INIT_GLOBAL(u32, acpi_gbl_xfacs_index, ACPI_INVALID_TABLE_INDEX);
 
 #if (!ACPI_REDUCED_HARDWARE)
 ACPI_GLOBAL(struct acpi_table_facs *, acpi_gbl_FACS);
-ACPI_GLOBAL(struct acpi_table_facs *, acpi_gbl_facs32);
-ACPI_GLOBAL(struct acpi_table_facs *, acpi_gbl_facs64);
 
 #endif				/* !ACPI_REDUCED_HARDWARE */
 
diff --git a/drivers/acpi/acpica/hwxfsleep.c b/drivers/acpi/acpica/hwxfsleep.c
index 52dfd0d..d62a616 100644
--- a/drivers/acpi/acpica/hwxfsleep.c
+++ b/drivers/acpi/acpica/hwxfsleep.c
@@ -160,19 +160,8 @@ acpi_set_firmware_waking_vectors(acpi_physical_address physical_address,
 
 	ACPI_FUNCTION_TRACE(acpi_set_firmware_waking_vectors);
 
-	/* If Hardware Reduced flag is set, there is no FACS */
-
-	if (acpi_gbl_reduced_hardware) {
-		return_ACPI_STATUS (AE_OK);
-	}
-
-	if (acpi_gbl_facs32) {
-		(void)acpi_hw_set_firmware_waking_vectors(acpi_gbl_facs32,
-							  physical_address,
-							  physical_address64);
-	}
-	if (acpi_gbl_facs64) {
-		(void)acpi_hw_set_firmware_waking_vectors(acpi_gbl_facs64,
+	if (acpi_gbl_FACS) {
+		(void)acpi_hw_set_firmware_waking_vectors(acpi_gbl_FACS,
 							  physical_address,
 							  physical_address64);
 	}
diff --git a/drivers/acpi/acpica/tbutils.c b/drivers/acpi/acpica/tbutils.c
index b1d500e..4337990 100644
--- a/drivers/acpi/acpica/tbutils.c
+++ b/drivers/acpi/acpica/tbutils.c
@@ -68,6 +68,7 @@ acpi_tb_get_root_table_entry(u8 *table_entry, u32 table_entry_size);
 
 acpi_status acpi_tb_initialize_facs(void)
 {
+	struct acpi_table_facs *facs;
 
 	/* If Hardware Reduced flag is set, there is no FACS */
 
@@ -80,14 +81,14 @@ acpi_status acpi_tb_initialize_facs(void)
 		(void)acpi_get_table_by_index(acpi_gbl_xfacs_index,
 					      ACPI_CAST_INDIRECT_PTR(struct
 								     acpi_table_header,
-								     &acpi_gbl_facs32));
-		acpi_gbl_FACS = acpi_gbl_facs32;
+								     &facs));
+		acpi_gbl_FACS = facs;
 	} else if (acpi_gbl_FADT.facs) {
 		(void)acpi_get_table_by_index(acpi_gbl_facs_index,
 					      ACPI_CAST_INDIRECT_PTR(struct
 								     acpi_table_header,
-								     &acpi_gbl_facs64));
-		acpi_gbl_FACS = acpi_gbl_facs64;
+								     &facs));
+		acpi_gbl_FACS = facs;
 	}
 
 	/* If there is no FACS, just continue. There was already an error msg */
-- 
1.7.10

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 00/20] ACPICA: 20150818 Release Lv Zheng <lv.zheng@intel.com> - 2015-08-25 04:30 +0200
  [PATCH 08/20] ACPICA: Headers: Fix some comments, no functional change. Lv Zheng <lv.zheng@intel.com> - 2015-08-25 04:30 +0200
  [PATCH 02/20] ACPICA: Disassembler: Remove duplicate code in _PLD processing. Lv Zheng <lv.zheng@intel.com> - 2015-08-25 04:30 +0200
  [PATCH 06/20] ACPICA: Tables: Fix global table list issues by removing fixed table indexes. Lv Zheng <lv.zheng@intel.com> - 2015-08-25 04:30 +0200
  [PATCH 12/20] ACPICA: Add additional debug info/statements. Lv Zheng <lv.zheng@intel.com> - 2015-08-25 04:30 +0200
  [PATCH 04/20] ACPICA: Disassembler: Update for new listing mode. Lv Zheng <lv.zheng@intel.com> - 2015-08-25 04:30 +0200
  [PATCH 07/20] ACPICA: Tables: Cleanup to reduce FACS globals. Lv Zheng <lv.zheng@intel.com> - 2015-08-25 04:30 +0200
  [PATCH 09/20] ACPICA: acpinames: Add new options and wildcard support. Lv Zheng <lv.zheng@intel.com> - 2015-08-25 04:30 +0200
  [PATCH 05/20] ACPICA: Update info messages during ACPICA init. Lv Zheng <lv.zheng@intel.com> - 2015-08-25 04:30 +0200
  [PATCH 11/20] ACPICA: Table handling: Cleanup and update debug output for tools. Lv Zheng <lv.zheng@intel.com> - 2015-08-25 04:30 +0200
  [PATCH 10/20] ACPICA: acpiexec/acpinames: Support very large number of ACPI tables. Lv Zheng <lv.zheng@intel.com> - 2015-08-25 04:30 +0200
  [PATCH 01/20] ACPICA: Correctly cleanup after a ACPI table load failure. Lv Zheng <lv.zheng@intel.com> - 2015-08-25 04:30 +0200
  [PATCH 19/20] ACPICA: Debugger: Cleanup debugging outputs to dump name path without trailing underscores. Lv Zheng <lv.zheng@intel.com> - 2015-08-25 04:40 +0200
  [PATCH 03/20] ACPICA: Update parameter validation for data_table_region and load_table. Lv Zheng <lv.zheng@intel.com> - 2015-08-25 04:40 +0200
  [PATCH 16/20] ACPICA: Debugger: Split debugger initialization/termination APIs. Lv Zheng <lv.zheng@intel.com> - 2015-08-25 04:40 +0200
  [PATCH 14/20] ACPICA: Make the max-number-of-loops runtime configurable. Lv Zheng <lv.zheng@intel.com> - 2015-08-25 04:40 +0200
  [PATCH 20/20] ACPICA: Update version to 20150818. Lv Zheng <lv.zheng@intel.com> - 2015-08-25 04:40 +0200
  [PATCH 17/20] ACPICA: Disassembler: Cleanup acpi_gbl_db_opt_disasm. Lv Zheng <lv.zheng@intel.com> - 2015-08-25 04:40 +0200
  [PATCH 13/20] ACPICA: Debugger: Add option to display namespace summary/counts. Lv Zheng <lv.zheng@intel.com> - 2015-08-25 04:40 +0200
  [PATCH 18/20] ACPICA: Disassembler: Cleanup acpi_gbl_db_opt_verbose acpiexec usage. Lv Zheng <lv.zheng@intel.com> - 2015-08-25 04:40 +0200
  [PATCH 15/20] ACPICA: Header support to improve compatibility with MSVC. Lv Zheng <lv.zheng@intel.com> - 2015-08-25 04:40 +0200
  Re: [PATCH 00/20] ACPICA: 20150818 Release "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2015-08-26 01:30 +0200

csiph-web