From patchwork Fri Apr 21 14:24: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: 753447 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 3w8dVw1mgjz9s4s for ; Sat, 22 Apr 2017 00:32: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="fghBFcsf"; dkim-atps=neutral Received: by lists.denx.de (Postfix, from userid 105) id 02123C21D3B; Fri, 21 Apr 2017 14:25:33 +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 5501DC21D0C; Fri, 21 Apr 2017 14:23:20 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id B9930C21C62; Fri, 21 Apr 2017 14:21:29 +0000 (UTC) Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by lists.denx.de (Postfix) with ESMTPS id BF15FC21C45 for ; Fri, 21 Apr 2017 14:21:25 +0000 (UTC) Received: by mail-wm0-f66.google.com with SMTP id o81so5184127wmb.0 for ; Fri, 21 Apr 2017 07:21: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=KfqtaB7Y4j/j/7MRjcgyZ2jWfzKRhXLYQ086g0NVTr4=; b=fghBFcsfgD5DsvNwzIFVW29pAMtxN56EgdThHN3bYXpaNvFAzXqA5E933OBndZHRMX zIyH6rh/ufUhrQtAZVaIqbdY0YDp0ERrx1RMeVDqiJqcmajLIocViq+q8yjW68jVE8Wb +S3ZDBeMMhW37vU3sPE0jgfvQWQBLMmqKXUKXjC9Wa322/xwi2S8AwP1I8Hm+hyzYXKg TcJazxkhco2stGamuba20+I/dD5PhgktWv6haCoj2k/J/ALMzVFsmTjT85qfwDnatbYe WkqlpUoS0DqrQojE4dX15Kf5smfQPFzKDpAkrbTFEodLbxOCQDgxw+5/uz/hz0B6Lvx8 tGWQ== 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=KfqtaB7Y4j/j/7MRjcgyZ2jWfzKRhXLYQ086g0NVTr4=; b=ROYOxNFnRXXtVYtkLu/l0LT5oDu7vmPxBLQ0Hw1rEbLWbCg+9YNMbcHwDjTW41UJe/ UZoSo6Vi2DG2m01MeMWXxRGITOI/Y5stCX65HPNH4OR+ympZzW0nyUWd39skD+ZMyrEb MamgDcQV6NBxAU2ii3EQP83oc0eTBWdcE3+r/3LUEH6+PrRkRFXiyTE6cJAfTv3mtoBD 5xvhjvfGO97h+Q8YHp3MInQQ6HX7itXcAKGc9PkQTgHiqydZWkSLuk1GDz8DaNiTnhlX ZAlPuJrH4/ytiok6Ky+g7t8yuqiMr/L4pSF/OLL5Q7bjhqbyrLnuHC3GAw3GGXIPUy4j Kt2g== X-Gm-Message-State: AN3rC/5m1YNnv6+diEwyKhjmvyyaLy8bDbhxvRUVaAl+QazV0y4PSlzU JJ/npJEV3eRkFg== X-Received: by 10.80.179.121 with SMTP id r54mr61862edd.1.1492784485489; Fri, 21 Apr 2017 07:21:25 -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.23 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 21 Apr 2017 07:21:24 -0700 (PDT) From: Bin Meng To: Simon Glass , Stefan Roese , U-Boot Mailing List Date: Fri, 21 Apr 2017 07:24:42 -0700 Message-Id: <1492784689-15701-16-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 15/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 --- Changes in v2: None 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); } /*