From patchwork Fri Apr 21 14:24:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 753425 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 3w8dGc1hzZz9s4s for ; Sat, 22 Apr 2017 00:22:00 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="r6Bpi3bK"; dkim-atps=neutral Received: by lists.denx.de (Postfix, from userid 105) id D29AAC21CA9; Fri, 21 Apr 2017 14:21:19 +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_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 EF545C21CBA; Fri, 21 Apr 2017 14:21:00 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 24D3AC21C76; Fri, 21 Apr 2017 14:20:58 +0000 (UTC) Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by lists.denx.de (Postfix) with ESMTPS id 1ED57C21BE5 for ; Fri, 21 Apr 2017 14:20:58 +0000 (UTC) Received: by mail-wm0-f65.google.com with SMTP id d79so5185189wmi.2 for ; Fri, 21 Apr 2017 07:20:58 -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=Akwb5Ndz02tri5NSG182/nrTPpKCYsSzbMf4WhTC/2s=; b=r6Bpi3bKKD5V87NnITKNtzGPBfRgPGL8WLIu5UupUnTjTklSNXjQPBq5FWWvt//6m+ PhobEzSic2oy/uZWJWkTld6Qasupkp/WLLtikfjNpyUkHa3HNB2g2GWMdr+Dj5f3yYgW ZgKyhRRctbvn/Oqw4VZqGVfG+2kx4td/WUjqUbbPDUlkjIgpo8YXyp4N2xL9K23VHolM c1EZ+va3MISWyyCX/syj2FmA1m1UyDigsY7imw6EsSExuegMjXikgQj3kAHDxTaZvYQ/ 6pPpkpO/LFcuXS8M/qqJeC5j3nvve7PptB01AGX7XAOPMIycQKt97JkFVUPKy22UOgP4 K8Pg== 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=Akwb5Ndz02tri5NSG182/nrTPpKCYsSzbMf4WhTC/2s=; b=TnCp/5XVK//x3feXHIFhIM7cEKqwAK5lyLRJTuKNqhXbYkci+2RGqM3RfCmNS/3yjC JpBTlCtrzbWqyUBzt+bmAAnlSdqKFl3fyIMquxAZmMCrA+pVNyYkV53bBggGthLB0PoR Dz2VrZtaAJiqFFcILgIqPL+sV3/MdzoDqIL80yvnOPMDFUpy4iYNJhvfRAxgR+G24J0I tRJHi8DeirQVGJqUNtOJ9B/z/abgAWXJ37yPCGv7u8FeT5XmTq99K94rD1/vJCLUgDCC qjX1nubF8yChGJxAnid+Tm6Zp5tdBnlmpYAmuGd4Q+q02J9kc7/wmhNJTiioT8IQuOSo Cd+g== X-Gm-Message-State: AN3rC/7Y4s41oKKYWBDCFHfyE8KsY9Kcz2dq42n6v9A9h74pxHSAYxZi NvOrikZM+5dcNw== X-Received: by 10.80.186.35 with SMTP id g32mr60413edc.15.1492784457759; Fri, 21 Apr 2017 07:20:57 -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 4sm464843edt.64.2017.04.21.07.20.55 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 21 Apr 2017 07:20:56 -0700 (PDT) From: Bin Meng To: Simon Glass , Stefan Roese , U-Boot Mailing List Date: Fri, 21 Apr 2017 07:24:28 -0700 Message-Id: <1492784689-15701-2-git-send-email-bmeng.cn@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1492784689-15701-1-git-send-email-bmeng.cn@gmail.com> References: <1492784689-15701-1-git-send-email-bmeng.cn@gmail.com> Subject: [U-Boot] [PATCH v2 01/22] x86: acpi: Add Kconfig option and header file for ACPI resume 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" This introduces a Kconfig option for ACPI S3 resume, as well as a header file to include anything related to ACPI S3 resume. Signed-off-by: Bin Meng Reviewed-by: Simon Glass --- Changes in v2: - fixed several nits in CONFIG_HAVE_ACPI_RESUME Kconfig help text - return -EINVAL instead of -1 in acpi_sleep_from_pm1() - add a function comment block for acpi_sleep_from_pm1() arch/x86/Kconfig | 12 ++++++++ arch/x86/include/asm/acpi_s3.h | 64 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+) create mode 100644 arch/x86/include/asm/acpi_s3.h diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 9ead3eb..b568852 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -589,6 +589,18 @@ config GENERATE_ACPI_TABLE endmenu +config HAVE_ACPI_RESUME + bool "Enable ACPI S3 resume" + help + Select this to enable ACPI S3 resume. S3 is an ACPI-defined sleeping + state where all system context is lost except system memory. U-Boot + is responsible for restoring the machine state as it was before sleep. + It needs restore the memory controller, without overwriting memory + which is not marked as reserved. For the peripherals which lose their + registers, U-Boot needs to write the original value. When everything + is done, U-Boot needs to find out the wakeup vector provided by OSes + and jump there. + config MAX_PIRQ_LINKS int default 8 diff --git a/arch/x86/include/asm/acpi_s3.h b/arch/x86/include/asm/acpi_s3.h new file mode 100644 index 0000000..78c53ea --- /dev/null +++ b/arch/x86/include/asm/acpi_s3.h @@ -0,0 +1,64 @@ +/* + * Copyright (C) 2017, Bin Meng + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef __ASM_ACPI_S3_H__ +#define __ASM_ACPI_S3_H__ + +/* PM1_STATUS register */ +#define WAK_STS (1 << 15) +#define PCIEXPWAK_STS (1 << 14) +#define RTC_STS (1 << 10) +#define SLPBTN_STS (1 << 9) +#define PWRBTN_STS (1 << 8) +#define GBL_STS (1 << 5) +#define BM_STS (1 << 4) +#define TMR_STS (1 << 0) + +/* PM1_CNT register */ +#define SLP_EN (1 << 13) +#define SLP_TYP_SHIFT 10 +#define SLP_TYP (7 << SLP_TYP_SHIFT) +#define SLP_TYP_S0 0 +#define SLP_TYP_S1 1 +#define SLP_TYP_S3 5 +#define SLP_TYP_S4 6 +#define SLP_TYP_S5 7 + +enum acpi_sleep_state { + ACPI_S0, + ACPI_S1, + ACPI_S2, + ACPI_S3, + ACPI_S4, + ACPI_S5, +}; + +/** + * acpi_sleep_from_pm1() - get ACPI-defined sleep state from PM1_CNT register + * + * @pm1_cnt: PM1_CNT register value + * @return: ACPI-defined sleep state if given valid PM1_CNT register value, + * -EINVAL otherwise. + */ +static inline enum acpi_sleep_state acpi_sleep_from_pm1(u32 pm1_cnt) +{ + switch ((pm1_cnt & SLP_TYP) >> SLP_TYP_SHIFT) { + case SLP_TYP_S0: + return ACPI_S0; + case SLP_TYP_S1: + return ACPI_S1; + case SLP_TYP_S3: + return ACPI_S3; + case SLP_TYP_S4: + return ACPI_S4; + case SLP_TYP_S5: + return ACPI_S5; + } + + return -EINVAL; +} + +#endif /* __ASM_ACPI_S3_H__ */