[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1430239874-15928-1-git-send-email-msalter@redhat.com>
Date: Tue, 28 Apr 2015 12:51:14 -0400
From: Mark Salter <msalter@...hat.com>
To: "Rafael J. Wysocki" <rjw@...ysocki.net>
Cc: linux-acpi@...r.kernel.org, linux-kernel@...r.kernel.org,
Mark Salter <msalter@...hat.com>,
Hanjun Guo <hanjun.guo@...aro.org>,
Marc Zyngier <marc.zyngier@....com>,
Lorenzo Pieralisi <lorenzo.pieralisi@....com>,
Will Deacon <will.deacon@....com>
Subject: [PATCH] acpi: fix generic acpi_register_gsi() handling of shared interrupts
If there are devices sharing an interrupt, acpi_register_gsi() could
be called multiple times for the same gsi. Currently, it just maps
the gsi without checking for a previous mapping. This patch adds a
check for an existing mapping and uses that if found.
Cc: Hanjun Guo <hanjun.guo@...aro.org>
Cc: Marc Zyngier <marc.zyngier@....com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@....com>
Cc: Will Deacon <will.deacon@....com>
Signed-off-by: Mark Salter <msalter@...hat.com>
---
drivers/acpi/gsi.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/drivers/acpi/gsi.c b/drivers/acpi/gsi.c
index 38208f2..5698c4f 100644
--- a/drivers/acpi/gsi.c
+++ b/drivers/acpi/gsi.c
@@ -76,6 +76,13 @@ int acpi_register_gsi(struct device *dev, u32 gsi, int trigger,
unsigned int irq_type = acpi_gsi_get_irq_type(trigger, polarity);
/*
+ * The gsi may be shared with other devices, so check for a
+ * previous mapping and use that if found.
+ */
+ if (acpi_gsi_to_irq(gsi, &irq) > 0)
+ return irq;
+
+ /*
* There is no way at present to look-up the IRQ domain on ACPI,
* hence always create mapping referring to the default domain
* by passing NULL as irq_domain parameter
--
1.8.3.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists