| Message ID | 1492784689-15701-6-git-send-email-bmeng.cn@gmail.com |
|---|---|
| State | Accepted |
| Commit | b727961b0706df57d408fe609cfe098a91626da3 |
| Delegated to: | Bin Meng |
| Headers | show |
On Fri, Apr 21, 2017 at 10:24 PM, Bin Meng <bmeng.cn@gmail.com> wrote: > Add one member in the global data to store previous sleep state, > and display the state during boot in print_cpuinfo(). > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> > Reviewed-by: Simon Glass <sjg@chromium.org> > > --- > > Changes in v2: > - add a function comment block for acpi_ss_string() > - use a string array for sleep state string > - add a description for gd->arch.prev_sleep_state > - change to use debug() in default_print_cpuinfo() > > arch/x86/cpu/cpu.c | 6 ++++++ > arch/x86/include/asm/acpi_s3.h | 13 +++++++++++++ > arch/x86/include/asm/global_data.h | 3 +++ > arch/x86/lib/fsp/fsp_common.c | 1 + > 4 files changed, 23 insertions(+) > applied to u-boot-x86/next, thanks!
diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c index 8fa6953..7222ec8 100644 --- a/arch/x86/cpu/cpu.c +++ b/arch/x86/cpu/cpu.c @@ -25,6 +25,7 @@ #include <errno.h> #include <malloc.h> #include <syscon.h> +#include <asm/acpi_s3.h> #include <asm/control_regs.h> #include <asm/coreboot_tables.h> #include <asm/cpu.h> @@ -179,6 +180,11 @@ int default_print_cpuinfo(void) cpu_has_64bit() ? "x86_64" : "x86", cpu_vendor_name(gd->arch.x86_vendor), gd->arch.x86_device); +#ifdef CONFIG_HAVE_ACPI_RESUME + debug("ACPI previous sleep state: %s\n", + acpi_ss_string(gd->arch.prev_sleep_state)); +#endif + return 0; } diff --git a/arch/x86/include/asm/acpi_s3.h b/arch/x86/include/asm/acpi_s3.h index ec05211..10cedde 100644 --- a/arch/x86/include/asm/acpi_s3.h +++ b/arch/x86/include/asm/acpi_s3.h @@ -37,6 +37,19 @@ enum acpi_sleep_state { }; /** + * acpi_ss_string() - get ACPI-defined sleep state string + * + * @pm1_cnt: ACPI-defined sleep state + * @return: a pointer to the sleep state string. + */ +static inline char *acpi_ss_string(enum acpi_sleep_state state) +{ + char *ss_string[] = { "S0", "S1", "S2", "S3", "S4", "S5"}; + + return ss_string[state]; +} + +/** * acpi_sleep_from_pm1() - get ACPI-defined sleep state from PM1_CNT register * * @pm1_cnt: PM1_CNT register value diff --git a/arch/x86/include/asm/global_data.h b/arch/x86/include/asm/global_data.h index 4570bc7..7d5efea 100644 --- a/arch/x86/include/asm/global_data.h +++ b/arch/x86/include/asm/global_data.h @@ -99,6 +99,9 @@ struct arch_global_data { u32 high_table_ptr; u32 high_table_limit; #endif +#ifdef CONFIG_HAVE_ACPI_RESUME + int prev_sleep_state; /* Previous sleep state */ +#endif }; #endif diff --git a/arch/x86/lib/fsp/fsp_common.c b/arch/x86/lib/fsp/fsp_common.c index cc42cad..f2d50ac 100644 --- a/arch/x86/lib/fsp/fsp_common.c +++ b/arch/x86/lib/fsp/fsp_common.c @@ -82,6 +82,7 @@ int arch_fsp_init(void) int boot_mode = BOOT_FULL_CONFIG; #ifdef CONFIG_HAVE_ACPI_RESUME int prev_sleep_state = chipset_prev_sleep_state(); + gd->arch.prev_sleep_state = prev_sleep_state; #endif if (!gd->arch.hob_list) {