From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755372AbcJNMcO (ORCPT ); Fri, 14 Oct 2016 08:32:14 -0400 Received: from terminus.zytor.com ([198.137.202.10]:49442 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932094AbcJNMcC (ORCPT ); Fri, 14 Oct 2016 08:32:02 -0400 Date: Fri, 14 Oct 2016 05:31:40 -0700 From: tip-bot for Dan Carpenter Message-ID: Cc: jason@lakedaemon.net, tglx@linutronix.de, hpa@zytor.com, marc.zyngier@arm.com, mingo@kernel.org, linux-kernel@vger.kernel.org, sudeep.holla@arm.com, dan.carpenter@oracle.com Reply-To: linux-kernel@vger.kernel.org, dan.carpenter@oracle.com, sudeep.holla@arm.com, marc.zyngier@arm.com, mingo@kernel.org, tglx@linutronix.de, hpa@zytor.com, jason@lakedaemon.net In-Reply-To: <20161014072534.GA15168@mwanda> References: <20161014072534.GA15168@mwanda> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/urgent] irqchip/gicv3: Handle loop timeout proper Git-Commit-ID: d102eb5c1ac5e6743b1c6d145c06a25d98ad1375 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: d102eb5c1ac5e6743b1c6d145c06a25d98ad1375 Gitweb: http://git.kernel.org/tip/d102eb5c1ac5e6743b1c6d145c06a25d98ad1375 Author: Dan Carpenter AuthorDate: Fri, 14 Oct 2016 10:26:21 +0300 Committer: Thomas Gleixner CommitDate: Fri, 14 Oct 2016 14:26:55 +0200 irqchip/gicv3: Handle loop timeout proper The timeout loop terminates when the loop count is zero, but the decrement of the count variable is post check. So count is -1 when we check for the timeout and therefor the error message is supressed. Change it to predecrement, so the error message is emitted. [ tglx: Massaged changelog ] Fixes: a2c225101234 ("irqchip: gic-v3: Refactor gic_enable_redist to support both enabling and disabling") Signed-off-by: Dan Carpenter Acked-by: Sudeep Holla Cc: Marc Zyngier Cc: kernel-janitors@vger.kernel.org Cc: Jason Cooper Cc: stable@vger.kernel.org Link: http://lkml.kernel.org/r/20161014072534.GA15168@mwanda Signed-off-by: Thomas Gleixner --- drivers/irqchip/irq-gic-v3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c index 9b81bd8..19d642e 100644 --- a/drivers/irqchip/irq-gic-v3.c +++ b/drivers/irqchip/irq-gic-v3.c @@ -153,7 +153,7 @@ static void gic_enable_redist(bool enable) return; /* No PM support in this redistributor */ } - while (count--) { + while (--count) { val = readl_relaxed(rbase + GICR_WAKER); if (enable ^ (bool)(val & GICR_WAKER_ChildrenAsleep)) break;