From: Lv Zheng <lv.zh...@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.
Signed-off-by: Lv Zheng <lv.zh...@intel.com>
Cc: Oswald Buddenhagen <o...@kde.org>
---
arch/ia64/include/asm/acpi.h | 1 +
arch/x86/include/asm/acpi.h | 3 ++-
drivers/acpi/sleep.c | 8 ++++++--
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/arch/ia64/include/asm/acpi.h b/arch/ia64/include/asm/acpi.h
index 75dc59a..45e45ec 100644
--- a/arch/ia64/include/asm/acpi.h
+++ b/arch/ia64/include/asm/acpi.h
@@ -75,6 +75,7 @@ int acpi_gsi_to_irq (u32 gsi, unsigned int *irq);
extern int acpi_suspend_lowlevel(void);
extern unsigned long acpi_wakeup_address;
+#define acpi_wakeup_address64 ((acpi_physical_address)0)
/*
* Record the cpei override flag and current logical cpu. This is
diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h
index e06225e..46a7dd8 100644
--- a/arch/x86/include/asm/acpi.h
+++ b/arch/x86/include/asm/acpi.h
@@ -71,7 +71,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 c11e379..5ca7ab0 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -23,6 +23,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)
@@ -59,7 +61,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();
@@ -403,7 +406,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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
