From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932291AbdBPOgl (ORCPT ); Thu, 16 Feb 2017 09:36:41 -0500 Received: from terminus.zytor.com ([65.50.211.136]:33844 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932067AbdBPOgj (ORCPT ); Thu, 16 Feb 2017 09:36:39 -0500 Date: Thu, 16 Feb 2017 06:35:15 -0800 From: tip-bot for Thomas Gleixner Message-ID: Cc: mingo@kernel.org, peterz@infradead.org, hpa@zytor.com, linux-kernel@vger.kernel.org, tglx@linutronix.de Reply-To: mingo@kernel.org, linux-kernel@vger.kernel.org, tglx@linutronix.de, hpa@zytor.com, peterz@infradead.org In-Reply-To: References: To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/core] genirq: Reenable shared irq debugging in request_*_irq() Git-Commit-ID: f91f694540f3f8ed25da57814fe0c673afd36e7e 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: f91f694540f3f8ed25da57814fe0c673afd36e7e Gitweb: http://git.kernel.org/tip/f91f694540f3f8ed25da57814fe0c673afd36e7e Author: Thomas Gleixner AuthorDate: Wed, 15 Feb 2017 15:43:54 +0100 Committer: Thomas Gleixner CommitDate: Thu, 16 Feb 2017 15:32:19 +0100 genirq: Reenable shared irq debugging in request_*_irq() Commit 6d83f94db95c ("genirq: Disable the SHIRQ_DEBUG call in request_threaded_irq for now") disabled the SHIRQ_DEBUG facility for the irq request side. Unfortunately the 'for now' part and the _FIXME add on to the CONFIG_SHIRQ_DEBUG guard got forgotten. It's unfortunately not possible to keep the original idea of just invoking the newly installed handler due to the reasons described in the commit which disabled it, but having this debug facility available makes a lot of sense. The only way to regain that testing is to invoke the real interrupt handling mechanism, which will also invoke an already registered handler, but that's not an issue because _all_ interrupt handlers need to be prepared for handling spurious interrupts. Signed-off-by: Thomas Gleixner Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/alpine.DEB.2.20.1702151542330.3562@nanos Signed-off-by: Thomas Gleixner --- kernel/irq/manage.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index 6b66959..6db4345 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c @@ -1696,23 +1696,17 @@ int request_threaded_irq(unsigned int irq, irq_handler_t handler, kfree(action); } -#ifdef CONFIG_DEBUG_SHIRQ_FIXME +#ifdef CONFIG_DEBUG_SHIRQ if (!retval && (irqflags & IRQF_SHARED)) { /* * It's a shared IRQ -- the driver ought to be prepared for it * to happen immediately, so let's make sure.... - * We disable the irq to make sure that a 'real' IRQ doesn't - * run in parallel with our fake. */ unsigned long flags; - disable_irq(irq); local_irq_save(flags); - - handler(irq, dev_id); - + generic_handle_irq_desc(desc); local_irq_restore(flags); - enable_irq(irq); } #endif return retval;