[U-Boot,v2,06/22] x86: baytrail: Conditionally report S3 in the ACPI table

Message ID 1492784689-15701-7-git-send-email-bmeng.cn@gmail.com
State Accepted
Commit e652e1304a9f3b59b3e47005ea19b5b6a3e799d1
Delegated to: Bin Meng
Headers show

Commit Message

Bin Meng April 21, 2017, 2:24 p.m.
When U-Boot is built without ACPI S3 support, it should not report
S3 in the ACPI table otherwise when kernel does STR it won't work.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

Changes in v2: None

 arch/x86/include/asm/arch-baytrail/acpi/sleepstates.asl | 2 ++
 arch/x86/include/asm/global_data.h                      | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

Comments

Bin Meng April 26, 2017, 7:34 a.m. | #1
On Fri, Apr 21, 2017 at 10:24 PM, Bin Meng <bmeng.cn@gmail.com> wrote:
> When U-Boot is built without ACPI S3 support, it should not report
> S3 in the ACPI table otherwise when kernel does STR it won't work.
>
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
> Reviewed-by: Simon Glass <sjg@chromium.org>
> ---
>
> Changes in v2: None
>
>  arch/x86/include/asm/arch-baytrail/acpi/sleepstates.asl | 2 ++
>  arch/x86/include/asm/global_data.h                      | 2 +-
>  2 files changed, 3 insertions(+), 1 deletion(-)
>

applied to u-boot-x86/next, thanks!

Patch

diff --git a/arch/x86/include/asm/arch-baytrail/acpi/sleepstates.asl b/arch/x86/include/asm/arch-baytrail/acpi/sleepstates.asl
index eb5ae76..5600723 100644
--- a/arch/x86/include/asm/arch-baytrail/acpi/sleepstates.asl
+++ b/arch/x86/include/asm/arch-baytrail/acpi/sleepstates.asl
@@ -8,6 +8,8 @@ 
  */
 
 Name(\_S0, Package() {0x0, 0x0, 0x0, 0x0})
+#ifdef CONFIG_HAVE_ACPI_RESUME
 Name(\_S3, Package() {0x5, 0x0, 0x0, 0x0})
+#endif
 Name(\_S4, Package() {0x6, 0x0, 0x0, 0x0})
 Name(\_S5, Package() {0x7, 0x0, 0x0, 0x0})
diff --git a/arch/x86/include/asm/global_data.h b/arch/x86/include/asm/global_data.h
index 7d5efea..b4ca473 100644
--- a/arch/x86/include/asm/global_data.h
+++ b/arch/x86/include/asm/global_data.h
@@ -100,7 +100,7 @@  struct arch_global_data {
 	u32 high_table_limit;
 #endif
 #ifdef CONFIG_HAVE_ACPI_RESUME
-	int prev_sleep_state;		/* Previous sleep state */
+	int prev_sleep_state;		/* Previous sleep state ACPI_S0/1../5 */
 #endif
 };