From: Lv Zheng <lv.zheng@intel.com>
To: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
Len Brown <len.brown@intel.com>
Cc: Lv Zheng <lv.zheng@intel.com>, Lv Zheng <zetalog@gmail.com>,
<linux-kernel@vger.kernel.org>,
linux-acpi@vger.kernel.org, Bob Moore <robert.moore@intel.com>
Subject: [PATCH 07/20] ACPICA: Tables: Cleanup to reduce FACS globals.
Date: Tue, 25 Aug 2015 10:29:08 +0800 [thread overview]
Message-ID: <89dfc4c9bd9f39f2cf79f09c2ffa9628604ec15f.1440402549.git.lv.zheng@intel.com> (raw)
In-Reply-To: <cover.1440402549.git.lv.zheng@intel.com>
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
next prev parent reply other threads:[~2015-08-25 2:29 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-25 2:28 [PATCH 00/20] ACPICA: 20150818 Release Lv Zheng
2015-08-25 2:28 ` [PATCH 01/20] ACPICA: Correctly cleanup after a ACPI table load failure Lv Zheng
2015-08-25 2:28 ` [PATCH 02/20] ACPICA: Disassembler: Remove duplicate code in _PLD processing Lv Zheng
2015-08-25 2:28 ` [PATCH 03/20] ACPICA: Update parameter validation for data_table_region and load_table Lv Zheng
2015-08-25 2:28 ` [PATCH 04/20] ACPICA: Disassembler: Update for new listing mode Lv Zheng
2015-08-25 2:28 ` [PATCH 05/20] ACPICA: Update info messages during ACPICA init Lv Zheng
2015-08-25 2:29 ` [PATCH 06/20] ACPICA: Tables: Fix global table list issues by removing fixed table indexes Lv Zheng
2015-08-25 2:29 ` Lv Zheng [this message]
2015-08-25 2:29 ` [PATCH 08/20] ACPICA: Headers: Fix some comments, no functional change Lv Zheng
2015-08-25 2:29 ` [PATCH 09/20] ACPICA: acpinames: Add new options and wildcard support Lv Zheng
2015-08-25 2:29 ` [PATCH 10/20] ACPICA: acpiexec/acpinames: Support very large number of ACPI tables Lv Zheng
2015-08-25 2:29 ` [PATCH 11/20] ACPICA: Table handling: Cleanup and update debug output for tools Lv Zheng
2015-08-25 2:29 ` [PATCH 12/20] ACPICA: Add additional debug info/statements Lv Zheng
2015-08-25 2:29 ` [PATCH 13/20] ACPICA: Debugger: Add option to display namespace summary/counts Lv Zheng
2015-08-25 2:30 ` [PATCH 14/20] ACPICA: Make the max-number-of-loops runtime configurable Lv Zheng
2015-08-25 2:30 ` [PATCH 15/20] ACPICA: Header support to improve compatibility with MSVC Lv Zheng
2015-08-25 2:30 ` [PATCH 16/20] ACPICA: Debugger: Split debugger initialization/termination APIs Lv Zheng
2015-08-25 2:30 ` [PATCH 17/20] ACPICA: Disassembler: Cleanup acpi_gbl_db_opt_disasm Lv Zheng
2015-08-25 2:30 ` [PATCH 18/20] ACPICA: Disassembler: Cleanup acpi_gbl_db_opt_verbose acpiexec usage Lv Zheng
2015-08-25 2:30 ` [PATCH 19/20] ACPICA: Debugger: Cleanup debugging outputs to dump name path without trailing underscores Lv Zheng
2015-08-25 2:30 ` [PATCH 20/20] ACPICA: Update version to 20150818 Lv Zheng
2015-08-25 23:49 ` [PATCH 00/20] ACPICA: 20150818 Release Rafael J. Wysocki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=89dfc4c9bd9f39f2cf79f09c2ffa9628604ec15f.1440402549.git.lv.zheng@intel.com \
--to=lv.zheng@intel.com \
--cc=len.brown@intel.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rafael.j.wysocki@intel.com \
--cc=robert.moore@intel.com \
--cc=zetalog@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®