From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752463AbdGDKvV (ORCPT ); Tue, 4 Jul 2017 06:51:21 -0400 Received: from terminus.zytor.com ([65.50.211.136]:44355 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752319AbdGDKvP (ORCPT ); Tue, 4 Jul 2017 06:51:15 -0400 Date: Tue, 4 Jul 2017 03:48:36 -0700 From: tip-bot for Thomas Gleixner Message-ID: Cc: dianders@chromium.org, julia@ni.com, linus.walleij@linaro.org, mingo@kernel.org, briannorris@chromium.org, linux-kernel@vger.kernel.org, marc.zyngier@arm.com, john@metanate.com, heiko@sntech.de, tglx@linutronix.de, hpa@zytor.com Reply-To: john@metanate.com, tglx@linutronix.de, heiko@sntech.de, hpa@zytor.com, linux-kernel@vger.kernel.org, marc.zyngier@arm.com, julia@ni.com, linus.walleij@linaro.org, mingo@kernel.org, briannorris@chromium.org, dianders@chromium.org In-Reply-To: <20170629214343.960949031@linutronix.de> References: <20170629214343.960949031@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/urgent] genirq: Move bus locking into __setup_irq() Git-Commit-ID: 3a90795e1e885167209056a1a90be965add30e25 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: 3a90795e1e885167209056a1a90be965add30e25 Gitweb: http://git.kernel.org/tip/3a90795e1e885167209056a1a90be965add30e25 Author: Thomas Gleixner AuthorDate: Thu, 29 Jun 2017 23:33:36 +0200 Committer: Thomas Gleixner CommitDate: Tue, 4 Jul 2017 12:46:15 +0200 genirq: Move bus locking into __setup_irq() There is no point in having the irq_bus_lock() protection around all callers to __setup_irq(). Move it into __setup_irq(). This is also a preparatory patch for addressing the issues with the irq resource callbacks. Signed-off-by: Thomas Gleixner Reviewed-by: Marc Zyngier Cc: Heiko Stuebner Cc: Julia Cartwright Cc: Linus Walleij Cc: Brian Norris Cc: Doug Anderson Cc: linux-rockchip@lists.infradead.org Cc: John Keeping Cc: linux-gpio@vger.kernel.org Link: http://lkml.kernel.org/r/20170629214343.960949031@linutronix.de --- kernel/irq/manage.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index 5c11c17..0934e02 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c @@ -1167,6 +1167,8 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new) if (desc->irq_data.chip->flags & IRQCHIP_ONESHOT_SAFE) new->flags &= ~IRQF_ONESHOT; + chip_bus_lock(desc); + /* * The following block of code has to be executed atomically */ @@ -1347,6 +1349,7 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new) } raw_spin_unlock_irqrestore(&desc->lock, flags); + chip_bus_sync_unlock(desc); irq_setup_timings(desc, new); @@ -1378,6 +1381,8 @@ mismatch: out_unlock: raw_spin_unlock_irqrestore(&desc->lock, flags); + chip_bus_sync_unlock(desc); + out_thread: if (new->thread) { struct task_struct *t = new->thread; @@ -1417,9 +1422,7 @@ int setup_irq(unsigned int irq, struct irqaction *act) if (retval < 0) return retval; - chip_bus_lock(desc); retval = __setup_irq(irq, desc, act); - chip_bus_sync_unlock(desc); if (retval) irq_chip_pm_put(&desc->irq_data); @@ -1674,9 +1677,7 @@ int request_threaded_irq(unsigned int irq, irq_handler_t handler, return retval; } - chip_bus_lock(desc); retval = __setup_irq(irq, desc, action); - chip_bus_sync_unlock(desc); if (retval) { irq_chip_pm_put(&desc->irq_data); @@ -1924,9 +1925,7 @@ int setup_percpu_irq(unsigned int irq, struct irqaction *act) if (retval < 0) return retval; - chip_bus_lock(desc); retval = __setup_irq(irq, desc, act); - chip_bus_sync_unlock(desc); if (retval) irq_chip_pm_put(&desc->irq_data); @@ -1980,9 +1979,7 @@ int request_percpu_irq(unsigned int irq, irq_handler_t handler, return retval; } - chip_bus_lock(desc); retval = __setup_irq(irq, desc, action); - chip_bus_sync_unlock(desc); if (retval) { irq_chip_pm_put(&desc->irq_data);