From patchwork Wed Jun 7 22:58:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Willy Tarreau X-Patchwork-Id: 103324 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp2179900qgd; Wed, 7 Jun 2017 16:22:29 -0700 (PDT) X-Received: by 10.84.201.74 with SMTP id t10mr4605634plh.191.1496877749476; Wed, 07 Jun 2017 16:22:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496877749; cv=none; d=google.com; s=arc-20160816; b=h/hdjHsLkn01zsm4LUeQlhDZz4WQt0+atqLWXFM++AreKv+hFHjRJP7YYVVF2IZHY7 W+36AOZ18EeV5E6VlQerC/RNRJxSDvn8p5aXBpReZD5G+vgn/kIbWCmkoEI9BBusUEmW sov2HZSWE9d1js6qNhEXvBi/wZ2Gkbh1Cu4tiA7rB/G+tRFlK8BKV9v76ia8NWu7yKeZ qqvvIxJ8YVY25d5/zPZmYBb8bHr7vh3R4Tq8MQhqjuMIR+vdFnC7q0KSZ3mTLvgL7qM2 jkJGpLexAT3cgaFp/2HpNpzgvF8vMVvd0zm5CVeL9NERsb3z/B+/SE7uJc/BXugla5Sp H0mA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=N25dycyS/zEeJo4AovW47aqCNBgKty/se3q3WVnm97A=; b=e3TMyvr0Sbrh93AsaoJXIs2tGF0K2h3RAQ7wHooyNizIgYSFuy3mLgG1/kNbmbF+E5 V4ZqTJIQAAbvNPqbTc9B3SR858o6lAW+ZmE64xdajj2pxf4bA4lQHIrJ5SFs1r7NOYU6 cBePZEuIlamUcofI7glt2ZJz0j2kJBITMkI2Got1zxKyCpfNMynz7yASAp90N5FqaPn1 YapfKVWFD0MVjEUxpOksfgZCPEcjoqNhxyIbIxlGg03+bQRUSnHSr/s0A06I05yRMddd JlQtPU7SkQFklR/NYC64Kt8nrksPLjIhYGoY/s4QfDO+iTHYBoY17wwEzWkXK7U2tBha ddbw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l27si2857824pfa.92.2017.06.07.16.22.29; Wed, 07 Jun 2017 16:22:29 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752901AbdFGXWF (ORCPT + 25 others); Wed, 7 Jun 2017 19:22:05 -0400 Received: from wtarreau.pck.nerim.net ([62.212.114.60]:50797 "EHLO 1wt.eu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753426AbdFGXFn (ORCPT ); Wed, 7 Jun 2017 19:05:43 -0400 Received: (from willy@localhost) by pcw.home.local (8.15.2/8.15.2/Submit) id v57N1Bli000335; Thu, 8 Jun 2017 01:01:11 +0200 From: Willy Tarreau To: linux-kernel@vger.kernel.org, stable@vger.kernel.org, linux@roeck-us.net Cc: Arnd Bergmann , Linus Walleij , Willy Tarreau Subject: [PATCH 3.10 103/250] ARM: ux500: fix prcmu_is_cpu_in_wfi() calculation Date: Thu, 8 Jun 2017 00:58:09 +0200 Message-Id: <1496876436-32402-104-git-send-email-w@1wt.eu> X-Mailer: git-send-email 2.8.0.rc2.1.gbe9624a In-Reply-To: <1496876436-32402-1-git-send-email-w@1wt.eu> References: <1496876436-32402-1-git-send-email-w@1wt.eu> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arnd Bergmann commit f0e8faa7a5e894b0fc99d24be1b18685a92ea466 upstream. This function clearly never worked and always returns true, as pointed out by gcc-7: arch/arm/mach-ux500/pm.c: In function 'prcmu_is_cpu_in_wfi': arch/arm/mach-ux500/pm.c:137:212: error: ?: using integer constants in boolean context, the expression will always evaluate to 'true' [-Werror=int-in-bool-context] With the added braces, the condition actually makes sense. Fixes: 34fe6f107eab ("mfd : Check if the other db8500 core is in WFI") Signed-off-by: Arnd Bergmann Acked-by: Daniel Lezcano Signed-off-by: Linus Walleij Signed-off-by: Willy Tarreau --- arch/arm/mach-ux500/pm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.8.0.rc2.1.gbe9624a diff --git a/arch/arm/mach-ux500/pm.c b/arch/arm/mach-ux500/pm.c index 1a468f0..9d53256 100644 --- a/arch/arm/mach-ux500/pm.c +++ b/arch/arm/mach-ux500/pm.c @@ -128,8 +128,8 @@ bool prcmu_pending_irq(void) */ bool prcmu_is_cpu_in_wfi(int cpu) { - return readl(PRCM_ARM_WFI_STANDBY) & cpu ? PRCM_ARM_WFI_STANDBY_WFI1 : - PRCM_ARM_WFI_STANDBY_WFI0; + return readl(PRCM_ARM_WFI_STANDBY) & + (cpu ? PRCM_ARM_WFI_STANDBY_WFI1 : PRCM_ARM_WFI_STANDBY_WFI0); } /*