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>
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>,
"Rafael J. Wysocki" <rjw@rjwysocki.net>,
Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
Subject: [PATCH 3/5] genirq: irqdomain: Add irq_create_acpi_mappings
Date: Tue, 21 Jul 2015 11:07:58 +0100 [thread overview]
Message-ID: <1437473280-11431-4-git-send-email-marc.zyngier@arm.com> (raw)
In-Reply-To: <1437473280-11431-1-git-send-email-marc.zyngier@arm.com>
In order to help ACPI on arm64 to make use of most of the irqdomain
goodies, add a new entry point (irq_create_acpi_mapping) which
mimics irq_create_of_mapping, except that it takes a new
struct acpi_gsi_descriptor, which is the pendent of of_phandle_args
in the OF world.
We assume that the way the acpi_gsi_descriptor is populated matches
of_phandle_args, as the latter is still the building block for
interrupt descriptor in the whole kernel.
Eventually, these two representations should be merged in a single
structure, but that's probably for another day.
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
---
include/linux/acpi.h | 9 +++++++++
kernel/irq/irqdomain.c | 18 ++++++++++++++++++
2 files changed, 27 insertions(+)
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index d2445fa..2f23ab0 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -205,6 +205,15 @@ int acpi_register_gsi (struct device *dev, u32 gsi, int triggering, int polarity
int acpi_gsi_to_irq (u32 gsi, unsigned int *irq);
int acpi_isa_irq_to_gsi (unsigned isa_irq, u32 *gsi);
+#define MAX_GSI_DESC_PARAMS 16
+struct acpi_gsi_descriptor {
+ int param_count;
+ u32 param[MAX_GSI_DESC_PARAMS];
+};
+
+unsigned int irq_create_acpi_mapping(struct irq_domain *d,
+ struct acpi_gsi_descriptor *irq_data);
+
#ifdef CONFIG_X86_IO_APIC
extern int acpi_get_override_irq(u32 gsi, int *trigger, int *polarity);
#else
diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c
index 27f4ec7..542cda3 100644
--- a/kernel/irq/irqdomain.c
+++ b/kernel/irq/irqdomain.c
@@ -1,5 +1,6 @@
#define pr_fmt(fmt) "irq: " fmt
+#include <linux/acpi.h>
#include <linux/debugfs.h>
#include <linux/hardirq.h>
#include <linux/interrupt.h>
@@ -557,6 +558,23 @@ unsigned int irq_create_of_mapping(struct of_phandle_args *irq_data)
}
EXPORT_SYMBOL_GPL(irq_create_of_mapping);
+#ifdef CONFIG_ACPI
+unsigned int irq_create_acpi_mapping(struct irq_domain *d,
+ struct acpi_gsi_descriptor *irq_data)
+{
+ struct of_phandle_args args;
+ int i;
+
+ for (i = 0; i < min(irq_data->param_count, MAX_PHANDLE_ARGS); i++)
+ args.args[i] = irq_data->param[i];
+
+ args.np = d ? d->domain_token : NULL;
+ args.args_count = i;
+
+ return irq_create_of_mapping(&args);
+}
+#endif
+
/**
* irq_dispose_mapping() - Unmap an interrupt
* @virq: linux irq number of the interrupt to unmap
--
2.1.4
next prev parent reply other threads:[~2015-07-21 10:09 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-21 10:07 [PATCH 0/5] Making the generic ACPI GSI layer irqdomain aware Marc Zyngier
2015-07-21 10:07 ` [PATCH 1/5] genirq: irqdomain: Use an accessor for the of_node field Marc Zyngier
2015-07-22 7:35 ` Hanjun Guo
2015-07-22 7:52 ` Marc Zyngier
2015-07-22 7:58 ` Thomas Gleixner
2015-07-22 12:43 ` Marc Zyngier
2015-07-22 7:57 ` Thomas Gleixner
2015-07-21 10:07 ` [PATCH 2/5] genirq: irqdomain: Remove irqdomain dependency on struct device_node Marc Zyngier
2015-07-21 17:56 ` Lorenzo Pieralisi
2015-07-22 8:13 ` Hanjun Guo
2015-07-23 8:59 ` Suravee Suthikulpanit
2015-07-21 10:07 ` Marc Zyngier [this message]
2015-07-21 10:07 ` [PATCH 4/5] acpi: gsi: Use acpi_gsi_descriptor to allocate interrupts Marc Zyngier
2015-07-21 18:16 ` Lorenzo Pieralisi
2015-07-22 7:46 ` Marc Zyngier
2015-07-21 10:08 ` [PATCH 5/5] irqchip: GIC: Switch ACPI support to stacked domains Marc Zyngier
2015-07-21 12:34 ` Graeme Gregory
2015-07-21 13:03 ` Marc Zyngier
2015-07-21 18:05 ` Lorenzo Pieralisi
2015-07-21 18:12 ` Marc Zyngier
2015-07-22 8:35 ` Hanjun Guo
2015-07-22 8:45 ` Hanjun Guo
2015-07-22 8:53 ` Marc Zyngier
2015-07-22 9:33 ` Hanjun Guo
2015-07-21 12:35 ` [PATCH 0/5] Making the generic ACPI GSI layer irqdomain aware Graeme Gregory
2015-07-22 6:45 ` Hanjun Guo
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=1437473280-11431-4-git-send-email-marc.zyngier@arm.com \
--to=marc.zyngier@arm.com \
--cc=Suravee.Suthikulpanit@amd.com \
--cc=hanjun.guo@linaro.org \
--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®