From patchwork Thu Mar 16 14:26:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 739857 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 3vkW8s68l3z9rvt for ; Fri, 17 Mar 2017 01:30:21 +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="O+Pgm1Bm"; dkim-atps=neutral Received: by lists.denx.de (Postfix, from userid 105) id 864E3C21C61; Thu, 16 Mar 2017 14:28:08 +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_NONE, 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 241EDC21C80; Thu, 16 Mar 2017 14:25:39 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id B8D6EC21C76; Thu, 16 Mar 2017 14:22:43 +0000 (UTC) Received: from mail-pg0-f68.google.com (mail-pg0-f68.google.com [74.125.83.68]) by lists.denx.de (Postfix) with ESMTPS id 1973FC21C53 for ; Thu, 16 Mar 2017 14:22:40 +0000 (UTC) Received: by mail-pg0-f68.google.com with SMTP id g2so6273014pge.2 for ; Thu, 16 Mar 2017 07:22:40 -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=F4/Naxu3r+5HxTay3VfwhyBRIbz1+M2uwYkg2s7Vk9E=; b=O+Pgm1BmtNLxaklGPKEO+IRwhuAIDroEGYIsMWBhBMoT1xc7DKn5KkZnufkrfdYDlB zWXqc/q9f+rAOZ/hnRUIBbBIe3c6hX+18fI+ilcMOylVNchhiLMAcoZPF0I8acO6V6nS pYmEB5f3i+H+AGjOEUitSvJHfQAwycymeq3/OQWSziewTvPzI7fW1WawuiykBfI9mVhy SKiFF9H38c7dxZ9eGzQVbYOXRivrGZqgMslEJ5p5YNxTL7XB2amQs+vsOxPv+7zV3vF9 gZKOgqY2B60FuH9BYmytr499VMd/8Bcr1SFODMpGOudxYXDwGNhB1+x3ZYffyrUaITLA rWNw== 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=F4/Naxu3r+5HxTay3VfwhyBRIbz1+M2uwYkg2s7Vk9E=; b=nlJEfhdYHMRG3ZAIz8tzVCHCQ0cFA1FIQXzCcDj6aC0LN69P2L2RtST3N+BsP4dGax Xi3zaWG8t1EuWQYRBStIsx0rsH/nI4uGhj4vgKY7epzH6Y4x+acTnWiUHR+oM9rdD6tP yFRqAd01oV5f8S5rYqYgkoM/T/iYgj4QfcvwzW76gBCncG7mGWibzfh5U2OBdEAI/yii FQyejycpbcaka3fw9rI2kwNamLT4EMyKUf+t0FFQCS6Qj4ddzPxtEx8+eGGiN3SYOPv3 PhSxDx6i4DlIO1S/p/grICcEzjmGlDNNUEzFe/pI/d0kIc9YIMBYkF8CqQwqjoGwIIkv NBWQ== X-Gm-Message-State: AFeK/H1l/jsUrkDOuDImESJv0pxtDrICwVNkyrKpfA0lfNx6AE1UGGvzQCN3ftmii6ZM6A== X-Received: by 10.84.231.141 with SMTP id g13mr7263443plk.157.1489674158774; Thu, 16 Mar 2017 07:22:38 -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.37 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 16 Mar 2017 07:22:37 -0700 (PDT) From: Bin Meng To: Simon Glass , Stefan Roese , U-Boot Mailing List Date: Thu, 16 Mar 2017 07:26:42 -0700 Message-Id: <1489674408-17498-17-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 16/22] x86: apci: Change PM1_CNT register access to RMW 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" In enter_acpi_mode() PM1_CNT register is changed to PM1_CNT_SCI_EN directly without preserving its previous value. Update to change the register access to read-modify-write (RMW). Signed-off-by: Bin Meng Reviewed-by: Simon Glass --- arch/x86/lib/acpi_table.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/x86/lib/acpi_table.c b/arch/x86/lib/acpi_table.c index f118345..8be8120 100644 --- a/arch/x86/lib/acpi_table.c +++ b/arch/x86/lib/acpi_table.c @@ -306,6 +306,8 @@ static void acpi_create_mcfg(struct acpi_mcfg *mcfg) static void enter_acpi_mode(int pm1_cnt) { + u16 val = inw(pm1_cnt); + /* * PM1_CNT register bit0 selects the power management event to be * either an SCI or SMI interrupt. When this bit is set, then power @@ -320,7 +322,7 @@ static void enter_acpi_mode(int pm1_cnt) * system, and expose ourselves to OSPM as working under ACPI mode * already, turn this bit on. */ - outw(PM1_CNT_SCI_EN, pm1_cnt); + outw(val | PM1_CNT_SCI_EN, pm1_cnt); } /*