From patchwork Thu Mar 16 14:26:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 739865 X-Patchwork-Delegate: bmeng.cn@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3vkWCZ561Lz9rvt for ; Fri, 17 Mar 2017 01:32:42 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="B2N7MWLY"; dkim-atps=neutral Received: by lists.denx.de (Postfix, from userid 105) id 69DDFC21C76; Thu, 16 Mar 2017 14:24:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 32A72C21C59; Thu, 16 Mar 2017 14:22:46 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 99710C21C5E; Thu, 16 Mar 2017 14:22:29 +0000 (UTC) Received: from mail-pg0-f65.google.com (mail-pg0-f65.google.com [74.125.83.65]) by lists.denx.de (Postfix) with ESMTPS id A7693C21C65 for ; Thu, 16 Mar 2017 14:22:25 +0000 (UTC) Received: by mail-pg0-f65.google.com with SMTP id m5so6278964pgk.3 for ; Thu, 16 Mar 2017 07:22:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=BE5lYVd4U3z5hL+ksc1FFQF10YZZCrhOFNLQIZqWi6g=; b=B2N7MWLYirrA5eWN+t3wiaiMc9RMIAZIs76b+NRuksKfU1SSAwWLSFsxKS/QuEIO+d l133+0vozmxBnlOOr4DUAfZq3ALYDTfoovY2O1JYg3R2UsjEivNUGd500vCV3yukbM4+ +lzpMm6s2wJ+n6Go/rpX+s+08mzYp259oSrsijOJMrhp2yokSvDr7XoCHyGEUbem0IZg A5UTT4i54s5hzu2a3Jr6cEOQw5Al20oQdNuTPohXjDyk2eHcssSznYnBrU147tvXc5WL l9/KbPUSYfG10KWvPZjFlckUYvUznbrDQjbdNsimi0m+3rHmgEWQ5dqxUn21eq1BVZA8 lGsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=BE5lYVd4U3z5hL+ksc1FFQF10YZZCrhOFNLQIZqWi6g=; b=oIaA0UJ/SzPAxEufJENt/8K7W1f3ICpw96F6jP2OWkaDV7jSVN1Wxa/0tSxj3iVU57 aUvXYnB+wJpTzUkwHaiFxz4aCu8sz6KZ0lDN95mfhe1RkOAJLA8Yh477Q/KQzsnhSG9T +lU9qbAFj1nkp3CF9Ek8ypBhOovU/8aJ4qLnrM3rmxjXEGMS+E3BwXyslhgahaTZ74J1 vTB9CBTcQqqE3Rhexh3YEeu9RkY5lwxGy/HWlw/HK0yeg4GaygMRwQpEDy90DQMjj6h6 0X8Hvwfc0Z5SWTaiHVzR+n1Whw2Ff4VRgV4+a2KRCMbGICIqS7QjUurH902eX8tdRqOc kPzw== X-Gm-Message-State: AFeK/H1qKIi4zT6KM6h99koXEpDex/XxlIIs6BVnmf5UBMUj6AQwdaZ3dBMQVNNJlZBC0w== X-Received: by 10.99.178.9 with SMTP id x9mr10118320pge.48.1489674144350; Thu, 16 Mar 2017 07:22:24 -0700 (PDT) Received: from ala-d2121-lx1.wrs.com (unknown-157-139.windriver.com. [147.11.157.139]) by smtp.gmail.com with ESMTPSA id c64sm11039959pfa.45.2017.03.16.07.22.23 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 16 Mar 2017 07:22:23 -0700 (PDT) From: Bin Meng To: Simon Glass , Stefan Roese , U-Boot Mailing List Date: Thu, 16 Mar 2017 07:26:32 -0700 Message-Id: <1489674408-17498-7-git-send-email-bmeng.cn@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1489674408-17498-1-git-send-email-bmeng.cn@gmail.com> References: <1489674408-17498-1-git-send-email-bmeng.cn@gmail.com> Subject: [U-Boot] [PATCH 06/22] x86: Store and display previous sleep state X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" 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 Reviewed-by: Simon Glass --- arch/x86/cpu/cpu.c | 6 ++++++ arch/x86/include/asm/acpi_s3.h | 20 ++++++++++++++++++++ arch/x86/include/asm/global_data.h | 3 +++ arch/x86/lib/fsp/fsp_common.c | 1 + 4 files changed, 30 insertions(+) diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c index 8fa6953..9dde54c 100644 --- a/arch/x86/cpu/cpu.c +++ b/arch/x86/cpu/cpu.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -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 + printf("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 74878c1..c1cdbd0 100644 --- a/arch/x86/include/asm/acpi_s3.h +++ b/arch/x86/include/asm/acpi_s3.h @@ -36,6 +36,26 @@ enum acpi_sleep_state { ACPI_S5, }; +/* Given the ACPI sleep state return the state string */ +static inline char *acpi_ss_string(enum acpi_sleep_state state) +{ + switch (state) { + case ACPI_S0: + return "S0"; + case ACPI_S1: + return "S1"; + case ACPI_S2: + return "S2"; + case ACPI_S3: + return "S3"; + case ACPI_S4: + return "S4"; + case ACPI_S5: + default: + return "S5"; + } +} + /* Given the provided PM1 control register return the ACPI sleep type */ static inline enum acpi_sleep_state acpi_sleep_from_pm1(u32 pm1_cnt) { 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 2058ee3..2b33fba 100644 --- a/arch/x86/lib/fsp/fsp_common.c +++ b/arch/x86/lib/fsp/fsp_common.c @@ -77,6 +77,7 @@ int x86_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) {