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, Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>,
x86@kernel.org, Tony Luck <tony.luck@intel.com>,
Fenghua Yu <fenghua.yu@intel.com>,
linux-ia64@vger.kernel.org
Subject: [PATCH 04/32] ACPI: sleep: Update acpi_set_firmware_waking_vector() invocations to favor 32-bit firmware waking vector.
Date: Fri, 19 Jun 2015 11:38:34 +0800 [thread overview]
Message-ID: <2f708d4ee4100bd1b64ca1ea00b678d5f5b2135a.1434684719.git.lv.zheng@intel.com> (raw)
In-Reply-To: <cover.1434684719.git.lv.zheng@intel.com>
This patch updates acpi_set_firmware_waking_vector() invocations in order
to keep 32-bit firmware waking vector favor for Linux.
64-bit firmware waking vector has never been enabled by Linux. The
(acpi_physical_address)0 for 64-bit address can be used to force ACPICA to
set only 32-bit firmware waking vector for Linux.
Reference: https://bugzilla.kernel.org/show_bug.cgi?id=74021
Reported-and-tested-by: Oswald Buddenhagen <ossi@kde.org>
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: linux-ia64@vger.kernel.org
---
arch/ia64/include/asm/acpi.h | 3 ++-
arch/ia64/kernel/acpi.c | 2 --
arch/x86/include/asm/acpi.h | 3 ++-
drivers/acpi/sleep.c | 8 ++++++--
4 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/arch/ia64/include/asm/acpi.h b/arch/ia64/include/asm/acpi.h
index aa0fdf1..0ac4fab 100644
--- a/arch/ia64/include/asm/acpi.h
+++ b/arch/ia64/include/asm/acpi.h
@@ -79,7 +79,8 @@ int acpi_gsi_to_irq (u32 gsi, unsigned int *irq);
/* Low-level suspend routine. */
extern int acpi_suspend_lowlevel(void);
-extern unsigned long acpi_wakeup_address;
+#define acpi_wakeup_address ((acpi_physical_address)0)
+#define acpi_wakeup_address64 ((acpi_physical_address)0)
/*
* Record the cpei override flag and current logical cpu. This is
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index b1698bc..1b08d6f 100644
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -60,8 +60,6 @@ int acpi_lapic;
unsigned int acpi_cpei_override;
unsigned int acpi_cpei_phys_cpuid;
-unsigned long acpi_wakeup_address = 0;
-
#ifdef CONFIG_IA64_GENERIC
static unsigned long __init acpi_find_rsdp(void)
{
diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h
index 3a45668..fc9608d 100644
--- a/arch/x86/include/asm/acpi.h
+++ b/arch/x86/include/asm/acpi.h
@@ -72,7 +72,8 @@ static inline void acpi_disable_pci(void)
extern int (*acpi_suspend_lowlevel)(void);
/* Physical address to resume after wakeup */
-#define acpi_wakeup_address ((unsigned long)(real_mode_header->wakeup_start))
+#define acpi_wakeup_address ((acpi_physical_address)(real_mode_header->wakeup_start))
+#define acpi_wakeup_address64 ((acpi_physical_address)(0))
/*
* Check if the CPU can handle C2 and deeper
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index 2f0d4db..3a6a2eb 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -25,6 +25,8 @@
#include "internal.h"
#include "sleep.h"
+#define ACPI_NO_WAKING_VECTOR ((acpi_physical_address)0)
+
static u8 sleep_states[ACPI_S_STATE_COUNT];
static void acpi_sleep_tts_switch(u32 acpi_state)
@@ -61,7 +63,8 @@ static int acpi_sleep_prepare(u32 acpi_state)
if (acpi_state == ACPI_STATE_S3) {
if (!acpi_wakeup_address)
return -EFAULT;
- acpi_set_firmware_waking_vector(acpi_wakeup_address);
+ acpi_set_firmware_waking_vector(acpi_wakeup_address,
+ acpi_wakeup_address64);
}
ACPI_FLUSH_CPU_CACHE();
@@ -410,7 +413,8 @@ static void acpi_pm_finish(void)
acpi_leave_sleep_state(acpi_state);
/* reset firmware waking vector */
- acpi_set_firmware_waking_vector((acpi_physical_address) 0);
+ acpi_set_firmware_waking_vector(ACPI_NO_WAKING_VECTOR,
+ ACPI_NO_WAKING_VECTOR);
acpi_target_sleep_state = ACPI_STATE_S0;
--
1.7.10
next prev parent reply other threads:[~2015-06-19 3:39 UTC|newest]
Thread overview: 118+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-19 3:38 [PATCH 00/32] ACPICA: 20150619 Release Lv Zheng
2015-06-19 3:38 ` [PATCH 01/32] ACPICA: Linuxize: Reduce divergences for 20150616 release Lv Zheng
2015-06-19 3:38 ` [PATCH 02/32] ACPICA: Linuxize: Replace __FUNCTION__ with __func__ Lv Zheng
2015-06-19 3:38 ` [PATCH 03/32] ACPICA: Hardware: Enable 64-bit firmware waking vector for selected FACS Lv Zheng
2015-06-19 23:40 ` Rafael J. Wysocki
2015-06-19 23:46 ` Rafael J. Wysocki
2015-06-23 15:20 ` Rafael J. Wysocki
2015-06-24 0:13 ` Zheng, Lv
2015-06-24 0:30 ` Rafael J. Wysocki
2015-06-24 0:15 ` Zheng, Lv
2015-06-19 3:38 ` Lv Zheng [this message]
2015-06-19 6:26 ` [PATCH 04/32] ACPI: sleep: Update acpi_set_firmware_waking_vector() invocations to favor 32-bit firmware waking vector Ingo Molnar
2015-06-19 23:42 ` Rafael J. Wysocki
2015-06-19 3:38 ` [PATCH 06/32] ACPICA: Hardware: Enable firmware waking vector for both 32-bit and 64-bit FACS Lv Zheng
2015-06-19 3:38 ` [PATCH 07/32] ACPICA: Hardware: Cleanup the return values in acpi_set_waking_vector() Lv Zheng
2015-06-19 3:39 ` [PATCH 08/32] ACPICA: Tables: Fix an issue that FACS initialization is performed twice Lv Zheng
2015-06-19 3:39 ` [PATCH 09/32] ACPICA: Tables: Fix an issue that ACPI initialization is blocked due to no FACS Lv Zheng
2015-06-19 3:39 ` [PATCH 10/32] ACPICA: Remove a prototype for the reduced hardware case Lv Zheng
2015-06-19 3:39 ` [PATCH 11/32] ACPICA: Tables: Enable default 64-bit FADT addresses favor Lv Zheng
2015-06-19 3:39 ` [PATCH 12/32] ACPICA: MSVC6: Fix build issue for variable argument macros Lv Zheng
2015-06-19 3:39 ` [PATCH 13/32] ACPICA: EFI: Add EFI interface definitions to eliminate dependency of GNU EFI Lv Zheng
2015-06-19 3:39 ` [PATCH 14/32] ACPICA: Add dragon_fly support to unix file mapping file Lv Zheng
2015-06-19 3:39 ` [PATCH 15/32] ACPICA: Utilities: Add _CLS processing Lv Zheng
2015-06-19 3:40 ` [PATCH 16/32] ACPICA: ACPI 6.0: Add values for MADT GIC version field Lv Zheng
2015-06-19 3:40 ` [PATCH 17/32] ACPICA: Namespace: Add support to allow overriding objects Lv Zheng
2015-06-19 3:40 ` [PATCH 18/32] ACPICA: Namespace: Add support of OSDT table Lv Zheng
2015-06-19 3:40 ` [PATCH 19/32] ACPICA: Namespace: Change namespace override to avoid node deletion Lv Zheng
2015-06-19 3:40 ` [PATCH 20/32] ACPICA: Update for acpi_install_table memory types Lv Zheng
2015-06-19 3:40 ` [PATCH 21/32] ACPICA: Cleanup output for the ASL Debug object Lv Zheng
2015-06-19 3:40 ` [PATCH 22/32] ACPICA: acpidump: Allow customized tables to be dumped without accessing /dev/mem Lv Zheng
2015-06-19 3:40 ` [PATCH 23/32] ACPICA: acpidump: Convert the default behavior to dump from /sys/firmware/acpi/tables Lv Zheng
2015-06-19 3:40 ` [PATCH 24/32] ACPI / acpidump: Update acpidump manual Lv Zheng
2015-06-19 3:41 ` [PATCH 25/32] ACPICA: De-macroize calls to standard C library functions Lv Zheng
2015-06-19 3:41 ` [PATCH 26/32] ACPICA: Clib: Correct memset() declarations Lv Zheng
2015-06-19 3:41 ` [PATCH 27/32] ACPICA: Finish C library name transition Lv Zheng
2015-06-19 3:41 ` [PATCH 28/32] ACPICA: Split C library prototypes to new header Lv Zheng
2015-06-19 3:41 ` [PATCH 29/32] ACPICA: Update definitions for the TCPA and TPM2 ACPI tables Lv Zheng
2015-06-19 3:41 ` [PATCH 30/32] ACPICA: Update TPM2 ACPI table Lv Zheng
2015-06-19 3:41 ` [PATCH 31/32] ACPICA: Comment update, no functional change Lv Zheng
2015-06-19 3:41 ` [PATCH 32/32] ACPICA: Update version to 20150619 Lv Zheng
2015-06-19 3:43 ` [PATCH 05/32] ACPICA: Tables: Enable both 32-bit and 64-bit FACS Lv Zheng
2015-06-24 0:31 ` Rafael J. Wysocki
2015-06-24 0:17 ` Zheng, Lv
2015-06-24 3:01 ` [PATCH v2 00/28] ACPICA: 20150619 Release Lv Zheng
2015-06-24 3:01 ` [PATCH v2 01/28] ACPICA: Linuxize: Reduce divergences for 20150619 release Lv Zheng
2015-06-24 3:02 ` [PATCH v2 02/28] ACPICA: Linuxize: Replace __FUNCTION__ with __func__ Lv Zheng
2015-06-24 12:55 ` Christoph Hellwig
2015-06-25 0:24 ` Zheng, Lv
2015-06-24 3:02 ` [PATCH v2 03/28] ACPICA: Hardware: Enable 64-bit firmware waking vector for selected FACS Lv Zheng
2015-06-24 14:05 ` Rafael J. Wysocki
2015-06-24 23:24 ` Rafael J. Wysocki
2015-06-25 0:29 ` Zheng, Lv
2015-06-26 1:20 ` Rafael J. Wysocki
2015-06-26 1:39 ` Zheng, Lv
2015-06-25 1:09 ` Zheng, Lv
2015-06-24 3:02 ` [PATCH v2 04/28] ACPICA: Tables: Enable both 32-bit and 64-bit FACS Lv Zheng
2015-06-24 3:02 ` [PATCH v2 05/28] ACPICA: Hardware: Enable firmware waking vector for " Lv Zheng
2015-06-24 23:57 ` Rafael J. Wysocki
2015-06-25 0:43 ` Zheng, Lv
2015-06-26 0:44 ` Rafael J. Wysocki
2015-06-26 0:51 ` Zheng, Lv
2015-06-26 1:41 ` Rafael J. Wysocki
2015-06-26 1:41 ` Zheng, Lv
2015-06-24 3:03 ` [PATCH v2 06/28] ACPICA: Hardware: Cleanup the return values in acpi_set_waking_vector() Lv Zheng
2015-06-24 3:03 ` [PATCH v2 07/28] ACPICA: Tables: Fix an issue that FACS initialization is performed twice Lv Zheng
2015-06-24 3:03 ` [PATCH v2 08/28] ACPICA: Tables: Fix an issue that ACPI initialization is blocked due to no FACS Lv Zheng
2015-06-24 3:03 ` [PATCH v2 09/28] ACPICA: Tables: Enable default 64-bit FADT addresses favor Lv Zheng
2015-06-24 3:03 ` [PATCH v2 10/28] ACPICA: MSVC6: Fix build issue for variable argument macros Lv Zheng
2015-06-24 3:03 ` [PATCH v2 11/28] ACPICA: EFI: Add EFI interface definitions to eliminate dependency of GNU EFI Lv Zheng
2015-06-24 3:04 ` [PATCH v2 12/28] ACPICA: Add dragon_fly support to unix file mapping file Lv Zheng
2015-06-24 3:04 ` [PATCH v2 13/28] ACPICA: Utilities: Add _CLS processing Lv Zheng
2015-06-24 3:04 ` [PATCH v2 14/28] ACPICA: ACPI 6.0: Add values for MADT GIC version field Lv Zheng
2015-06-24 3:04 ` [PATCH v2 15/28] ACPICA: Namespace: Add support to allow overriding objects Lv Zheng
2015-06-24 3:04 ` [PATCH v2 16/28] ACPICA: Namespace: Add support of OSDT table Lv Zheng
2015-06-24 19:08 ` Al Stone
2015-06-24 20:02 ` Moore, Robert
2015-06-24 3:04 ` [PATCH v2 17/28] ACPICA: Namespace: Change namespace override to avoid node deletion Lv Zheng
2015-06-24 3:04 ` [PATCH v2 18/28] ACPICA: Update for acpi_install_table memory types Lv Zheng
2015-06-24 3:04 ` [PATCH v2 19/28] ACPICA: Cleanup output for the ASL Debug object Lv Zheng
2015-06-24 3:05 ` [PATCH v2 20/28] ACPICA: acpidump: Allow customized tables to be dumped without accessing /dev/mem Lv Zheng
2015-06-24 3:05 ` [PATCH v2 21/28] ACPICA: acpidump: Convert the default behavior to dump from /sys/firmware/acpi/tables Lv Zheng
2015-06-24 3:05 ` [PATCH v2 22/28] ACPI / acpidump: Update acpidump manual Lv Zheng
2015-06-24 3:05 ` [PATCH v2 23/28] ACPICA: De-macroize calls to standard C library functions Lv Zheng
2015-06-24 3:05 ` [PATCH v2 24/28] ACPICA: Split C library prototypes to new header Lv Zheng
2015-06-24 3:05 ` [PATCH v2 25/28] ACPICA: Update definitions for the TCPA and TPM2 ACPI tables Lv Zheng
2015-06-24 3:05 ` [PATCH v2 26/28] ACPICA: Update TPM2 ACPI table Lv Zheng
2015-06-24 3:05 ` [PATCH v2 27/28] ACPICA: Comment update, no functional change Lv Zheng
2015-06-24 3:05 ` [PATCH v2 28/28] ACPICA: Update version to 20150619 Lv Zheng
2015-07-01 6:42 ` [PATCH v3 00/26] ACPICA: 20150619 Release Lv Zheng
2015-07-01 6:42 ` [PATCH v3 01/26] ACPICA: Linuxize: Reduce divergences for 20150619 release Lv Zheng
2015-07-01 6:42 ` [PATCH v3 02/26] ACPICA: Linuxize: Replace __FUNCTION__ with __func__ Lv Zheng
2015-07-01 6:43 ` [PATCH v3 03/26] ACPICA: Hardware: Enable 64-bit firmware waking vector for selected FACS Lv Zheng
2015-07-01 6:43 ` [PATCH v3 04/26] ACPICA: Tables: Enable both 32-bit and 64-bit FACS Lv Zheng
2015-07-01 6:43 ` [PATCH v3 05/26] ACPICA: Hardware: Enable firmware waking vector for " Lv Zheng
2015-07-01 6:43 ` [PATCH v3 06/26] ACPICA: Tables: Fix an issue that FACS initialization is performed twice Lv Zheng
2015-07-01 6:43 ` [PATCH v3 07/26] ACPICA: Tables: Enable default 64-bit FADT addresses favor Lv Zheng
2015-07-01 6:43 ` [PATCH v3 08/26] ACPICA: MSVC6: Fix build issue for variable argument macros Lv Zheng
2015-07-01 6:43 ` [PATCH v3 09/26] ACPICA: EFI: Add EFI interface definitions to eliminate dependency of GNU EFI Lv Zheng
2015-07-01 6:43 ` [PATCH v3 10/26] ACPICA: Add dragon_fly support to unix file mapping file Lv Zheng
2015-07-01 6:44 ` [PATCH v3 11/26] ACPICA: Utilities: Add _CLS processing Lv Zheng
2015-07-01 6:44 ` [PATCH v3 12/26] ACPICA: ACPI 6.0: Add values for MADT GIC version field Lv Zheng
2015-07-01 6:44 ` [PATCH v3 13/26] ACPICA: Namespace: Add support to allow overriding objects Lv Zheng
2015-07-01 6:44 ` [PATCH v3 14/26] ACPICA: Namespace: Add support of OSDT table Lv Zheng
2015-07-01 6:44 ` [PATCH v3 15/26] ACPICA: Namespace: Change namespace override to avoid node deletion Lv Zheng
2015-07-01 6:44 ` [PATCH v3 16/26] ACPICA: Update for acpi_install_table memory types Lv Zheng
2015-07-01 6:44 ` [PATCH v3 17/26] ACPICA: Cleanup output for the ASL Debug object Lv Zheng
2015-07-01 6:44 ` [PATCH v3 18/26] ACPICA: acpidump: Allow customized tables to be dumped without accessing /dev/mem Lv Zheng
2015-07-01 6:44 ` [PATCH v3 19/26] ACPICA: acpidump: Convert the default behavior to dump from /sys/firmware/acpi/tables Lv Zheng
2015-07-01 6:45 ` [PATCH v3 20/26] ACPI / acpidump: Update acpidump manual Lv Zheng
2015-07-01 6:45 ` [PATCH v3 21/26] ACPICA: De-macroize calls to standard C library functions Lv Zheng
2015-07-01 6:45 ` [PATCH v3 22/26] ACPICA: Split C library prototypes to new header Lv Zheng
2015-07-01 6:45 ` [PATCH v3 23/26] ACPICA: Update definitions for the TCPA and TPM2 ACPI tables Lv Zheng
2015-07-01 6:45 ` [PATCH v3 24/26] ACPICA: Update TPM2 ACPI table Lv Zheng
2015-07-01 6:45 ` [PATCH v3 25/26] ACPICA: Comment update, no functional change Lv Zheng
2015-07-01 6:45 ` [PATCH v3 26/26] ACPICA: Update version to 20150619 Lv Zheng
2015-07-01 23:14 ` [PATCH v3 00/26] ACPICA: 20150619 Release Rafael J. Wysocki
2015-07-02 6:10 ` Zheng, Lv
2015-07-02 20:00 ` 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=2f708d4ee4100bd1b64ca1ea00b678d5f5b2135a.1434684719.git.lv.zheng@intel.com \
--to=lv.zheng@intel.com \
--cc=fenghua.yu@intel.com \
--cc=hpa@zytor.com \
--cc=len.brown@intel.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=rafael.j.wysocki@intel.com \
--cc=tglx@linutronix.de \
--cc=tony.luck@intel.com \
--cc=x86@kernel.org \
--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®