mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Marc Zyngier <marc.zyngier@arm.com>
To: Thomas Gleixner <tglx@linutronix.de>,
	Jiang Liu <jiang.liu@linux.intel.com>,
	Jason Cooper <jason@lakedaemon.net>,
	"Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: <linux-acpi@vger.kernel.org>,
	<linux-arm-kernel@lists.infradead.org>,
	<linux-kernel@vger.kernel.org>,
	Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
	Tomasz Nowicki <tomasz.nowicki@linaro.org>,
	Hanjun Guo <hanjun.guo@linaro.org>,
	Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>,
	Graeme Gregory <graeme@xora.org.uk>,
	Jake Oshins <jakeo@microsoft.com>
Subject: [PATCH 09/16] acpi/gsi: Always perform an irq domain lookup
Date: Tue,  6 Oct 2015 18:36:22 +0100	[thread overview]
Message-ID: <1444152989-31726-10-git-send-email-marc.zyngier@arm.com> (raw)
In-Reply-To: <1444152989-31726-1-git-send-email-marc.zyngier@arm.com>

Instead of directly passing NULL to the various irq_domain functions,
start by looking up the domain with a domain identifier..

As this identifier is permanently set to NULL, the lookup function will
return the same value (no domain found) and the default will be used,
preserving the current behaviour.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
---
 drivers/acpi/gsi.c | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/drivers/acpi/gsi.c b/drivers/acpi/gsi.c
index 38208f2..2c39fe1 100644
--- a/drivers/acpi/gsi.c
+++ b/drivers/acpi/gsi.c
@@ -11,9 +11,12 @@
 #include <linux/acpi.h>
 #include <linux/irq.h>
 #include <linux/irqdomain.h>
+#include <linux/of.h>
 
 enum acpi_irq_model_id acpi_irq_model;
 
+static struct fwnode_handle *acpi_gsi_domain_id;
+
 static unsigned int acpi_gsi_get_irq_type(int trigger, int polarity)
 {
 	switch (polarity) {
@@ -45,12 +48,10 @@ static unsigned int acpi_gsi_get_irq_type(int trigger, int polarity)
  */
 int acpi_gsi_to_irq(u32 gsi, unsigned int *irq)
 {
-	/*
-	 * Only default domain is supported at present, always find
-	 * the mapping corresponding to default domain by passing NULL
-	 * as irq_domain parameter
-	 */
-	*irq = irq_find_mapping(NULL, gsi);
+	struct irq_domain *d = irq_find_matching_fwnode(acpi_gsi_domain_id,
+							DOMAIN_BUS_ANY);
+
+	*irq = irq_find_mapping(d, gsi);
 	/*
 	 * *irq == 0 means no mapping, that should
 	 * be reported as a failure
@@ -74,13 +75,10 @@ int acpi_register_gsi(struct device *dev, u32 gsi, int trigger,
 {
 	unsigned int irq;
 	unsigned int irq_type = acpi_gsi_get_irq_type(trigger, polarity);
+	struct irq_domain *d = irq_find_matching_fwnode(acpi_gsi_domain_id,
+							DOMAIN_BUS_ANY);
 
-	/*
-	 * 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
-	 */
-	irq = irq_create_mapping(NULL, gsi);
+	irq = irq_create_mapping(d, gsi);
 	if (!irq)
 		return -EINVAL;
 
@@ -98,7 +96,9 @@ EXPORT_SYMBOL_GPL(acpi_register_gsi);
  */
 void acpi_unregister_gsi(u32 gsi)
 {
-	int irq = irq_find_mapping(NULL, gsi);
+	struct irq_domain *d = irq_find_matching_fwnode(acpi_gsi_domain_id,
+							DOMAIN_BUS_ANY);
+	int irq = irq_find_mapping(d, gsi);
 
 	irq_dispose_mapping(irq);
 }
-- 
2.1.4


  parent reply	other threads:[~2015-10-06 17:37 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-06 17:36 [PATCH 00/16] Divorcing irqdomain and device_node Marc Zyngier
2015-10-06 17:36 ` [PATCH 01/16] irqdomain: Use an accessor for the of_node field Marc Zyngier
2015-10-09 14:24   ` Thomas Gleixner
2015-10-09 14:31     ` Marc Zyngier
2015-10-12  6:04   ` Hanjun Guo
2015-10-12  9:30     ` Marc Zyngier
2015-10-06 17:36 ` [PATCH 02/16] irqdomain: Convert irqdomain->of_node to fwnode Marc Zyngier
2015-10-06 17:36 ` [PATCH 03/16] irqdomain: Allow irq domain lookup by fwnode Marc Zyngier
2015-10-12 18:31   ` Suravee Suthikulpanit
2015-10-13  7:35     ` Marc Zyngier
2015-10-06 17:36 ` [PATCH 04/16] irqdomain: Introduce a firmware-specific IRQ specifier structure Marc Zyngier
2015-10-06 17:36 ` [PATCH 05/16] irqchip: Convert all alloc/xlate users from of_node to fwnode Marc Zyngier
2015-10-12  6:44   ` Hanjun Guo
2015-10-06 17:36 ` [PATCH 06/16] irqdomain: Introduce irq_create_fwspec_mapping Marc Zyngier
2015-10-06 17:36 ` [PATCH 07/16] irqdomain: Introduce irq_domain_create_{linear,tree} Marc Zyngier
2015-10-06 17:36 ` [PATCH 08/16] irqdomain: Add a fwnode_handle allocator Marc Zyngier
2015-10-12 20:32   ` Rafael J. Wysocki
2015-10-06 17:36 ` Marc Zyngier [this message]
2015-10-12 20:34   ` [PATCH 09/16] acpi/gsi: Always perform an irq domain lookup Rafael J. Wysocki
2015-10-06 17:36 ` [PATCH 10/16] acpi/gsi: Add acpi_set_irq_model to initialize the GSI layer Marc Zyngier
2015-10-12 20:36   ` Rafael J. Wysocki
2015-10-06 17:36 ` [PATCH 11/16] irqchip/gic: Get rid of gic_init_bases() Marc Zyngier
2015-10-06 17:36 ` [PATCH 12/16] irqchip/gic: Switch ACPI support to stacked domains Marc Zyngier
2015-10-06 17:36 ` [PATCH 13/16] irqchip/gic: Kill the xlate method Marc Zyngier
2015-10-06 17:36 ` [PATCH 14/16] acpi/gsi: Cleanup acpi_register_gsi Marc Zyngier
2015-10-12 20:37   ` Rafael J. Wysocki
2015-10-06 17:36 ` [PATCH 15/16] irqdomain: Introduce irq_domain_create_hierarchy Marc Zyngier
2015-10-06 17:36 ` [PATCH 16/16] irqdomain/msi: Use fwnode instead of of_node Marc Zyngier
2015-10-11 21:01 ` [PATCH 00/16] Divorcing irqdomain and device_node Thomas Gleixner
2015-10-12  2:40   ` Hanjun Guo
2015-10-12  7:09     ` Hanjun Guo
2015-10-12 10:31   ` Marc Zyngier
2015-10-12 20:38   ` Rafael J. Wysocki
2015-10-13  8:24     ` Marc Zyngier

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1444152989-31726-10-git-send-email-marc.zyngier@arm.com \
    --to=marc.zyngier@arm.com \
    --cc=Suravee.Suthikulpanit@amd.com \
    --cc=graeme@xora.org.uk \
    --cc=hanjun.guo@linaro.org \
    --cc=jakeo@microsoft.com \
    --cc=jason@lakedaemon.net \
    --cc=jiang.liu@linux.intel.com \
    --cc=linux-acpi@vger.kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lorenzo.pieralisi@arm.com \
    --cc=rjw@rjwysocki.net \
    --cc=tglx@linutronix.de \
    --cc=tomasz.nowicki@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®