From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hans de Goede Subject: [RFC] Fix shared irq trigger-flags conflict when old irqaction uses IRQF_TRIGGER_NONE Date: Sun, 9 Apr 2017 21:59:18 +0200 Message-ID: <20170409195918.20864-1-hdegoede@redhat.com> Return-path: Received: from mx1.redhat.com ([209.132.183.28]:53528 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752322AbdDIT7W (ORCPT ); Sun, 9 Apr 2017 15:59:22 -0400 Sender: linux-acpi-owner@vger.kernel.org List-Id: linux-acpi@vger.kernel.org To: Thomas Gleixner Cc: Hans de Goede , linux-acpi@vger.kernel.org, x86@kernel.org, linux-kernel@vger.kernel.org While writing a driver for the INT0002 ACPI device found on Intel Bay and Cherry Trail devices I hit the following error: "genirq: Flags mismatch irq 9. 00000084 (INT0002) vs. 00000080 (acpi)" This is caused by drivers/acpi/osl.c first doing: request_irq(irq, acpi_irq, IRQF_SHARED, "acpi", acpi_irq) While the irqdata for the irq contains no trigger flags, resulting in an irqaction with IRQF_TRIGGER_NONE. And then the INT0002 driver I'm working on calling platform_get_irq which does: irqd_set_trigger_type(irqd, r->flags & IORESOURCE_BITS); And then request_irq(irq, ..., IRQF_SHARED, ...) on the irq returned by platform_get_irq causes the error quoted above. Arguably the genirq code should not hit the shared irq trigger-flags mismatch code if the old irqaction has IRQF_TRIGGER_NONE as flags. This patch is an attempt at fixing this, but I'm not sure it is the right fix, hence it RFC status. Signed-off-by: Hans de Goede --- kernel/irq/manage.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index a4afe5c..24e5eef 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c @@ -1212,8 +1212,13 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new) * set the trigger type must match. Also all must * agree on ONESHOT. */ + unsigned int old_msk = old->flags & IRQF_TRIGGER_MASK; + + if (!old_msk) + old_msk = irqd_get_trigger_type(&desc->irq_data); + if (!((old->flags & new->flags) & IRQF_SHARED) || - ((old->flags ^ new->flags) & IRQF_TRIGGER_MASK) || + ((old_msk ^ new->flags) & IRQF_TRIGGER_MASK) || ((old->flags ^ new->flags) & IRQF_ONESHOT)) goto mismatch; -- 2.9.3