From patchwork Fri Apr 21 14:24:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 753434 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 3w8dLr3m4mz9s2x for ; Sat, 22 Apr 2017 00:25:40 +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="YcNAIERe"; dkim-atps=neutral Received: by lists.denx.de (Postfix, from userid 105) id 353C8C21CDC; Fri, 21 Apr 2017 14:22:44 +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 A7062C21CE3; Fri, 21 Apr 2017 14:21:34 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 0C732C21CD2; Fri, 21 Apr 2017 14:21:11 +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 F2C8BC21CE7 for ; Fri, 21 Apr 2017 14:21:07 +0000 (UTC) Received: by mail-wm0-f65.google.com with SMTP id o81so5182932wmb.0 for ; Fri, 21 Apr 2017 07:21:07 -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=ZcFTarX9j22/nwCDCx5PTizB+G13Re8lspABVWv+CQw=; b=YcNAIEReR5+vmU1PcoNe0WAJWHnQwB68s312TrYgmNfOg2MTXCUXjuNR86YuT8UkUX BkBt9piMmY5hnRJmtQfUpL8l8iv8U88ELmpYeSBjAGPhp/PaXshafUrQ+gBRCt/g8qTb 13+2MbB5sb9nDw+g9KM+ugN0UQEJiWsakptLWP3GeklpbCvdUd4xSkXBKUfgaJBvHJV/ DrEvGzALUMvUl/C1MwItDNe9hkTy5QJl8t7+R7HgKx1Iom+oLcO+Ol4E3D8/SqfJWaAz Ve3LUMJ5Pg3yj8O5p1C3iiHAJgUFdjvIThmpWJN5LIg6sONDsEmJTTxY7fT74GKn28bx kGLw== 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=ZcFTarX9j22/nwCDCx5PTizB+G13Re8lspABVWv+CQw=; b=oU7/yAzcjsP/yJwijyGzCbvwdt/TaB/QuD+lirfdJeBBSTcaEDAk5aJrpnUU88wXIu BFCy0S5nDMnVY3yxZ1nkCwcrUZ7gg0aHE9BB4+0U5Bd9oCLUxYhlptSrMIcB0T8Rq+M1 HJlWyImrdMSfg4V82ynVX/nwoiHmiS3eH2Zui4ApNgfcL9+iFPkQAB+JbypA7YRR6ZC7 a/sBOqszVeito7bBEtNddLjudyxuOwi2h5arCYFseqyhfEGl4wcnu5SAtF3lZphDofPz RL/I51YiwKYlReJvRSEYsTuDkRKAAf8aD7mdFjBQrqtud1g75YnE79fBNzETqxkvApyo Y1BA== X-Gm-Message-State: AN3rC/6riOXxke+4Hz0SUWSqbs5wcDoFU4dyr+T271/wg3+h4eopQpl0 Zp2uF8mVmYf7ag== X-Received: by 10.80.134.5 with SMTP id o5mr58924edo.93.1492784467687; Fri, 21 Apr 2017 07:21:07 -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.21.05 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 21 Apr 2017 07:21:06 -0700 (PDT) From: Bin Meng To: Simon Glass , Stefan Roese , U-Boot Mailing List Date: Fri, 21 Apr 2017 07:24:33 -0700 Message-Id: <1492784689-15701-7-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 06/22] x86: baytrail: Conditionally report S3 in the ACPI table 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" 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 Reviewed-by: Simon Glass --- 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(-) 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 };