From: tip-bot for Stefan Agner <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, tglx@linutronix.de,
stefan@agner.ch, hpa@zytor.com, mingo@kernel.org
Subject: [tip:irq/core] irqchip: nvic: Support hierarchy irq domain
Date: Mon, 18 May 2015 08:37:26 -0700 [thread overview]
Message-ID: <tip-2d9f59f7bf8ef5704b0b6ca8406be12568a1c2da@git.kernel.org> (raw)
In-Reply-To: <1431769465-26867-5-git-send-email-stefan@agner.ch>
Commit-ID: 2d9f59f7bf8ef5704b0b6ca8406be12568a1c2da
Gitweb: http://git.kernel.org/tip/2d9f59f7bf8ef5704b0b6ca8406be12568a1c2da
Author: Stefan Agner <stefan@agner.ch>
AuthorDate: Sat, 16 May 2015 11:44:16 +0200
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitDate: Mon, 18 May 2015 17:32:44 +0200
irqchip: nvic: Support hierarchy irq domain
Add support for hierarchy irq domains. This is required to stack
the MSCM interrupt router and the NVIC controller found in Vybrid
SoC.
Signed-off-by: Stefan Agner <stefan@agner.ch>
Cc: marc.zyngier@arm.com
Cc: linux@arm.linux.org.uk
Cc: u.kleine-koenig@pengutronix.de
Cc: olof@lixom.net
Cc: arnd@arndb.de
Cc: daniel.lezcano@linaro.org
Cc: mark.rutland@arm.com
Cc: pawel.moll@arm.com
Cc: robh+dt@kernel.org
Cc: ijc+devicetree@hellion.org.uk
Cc: galak@codeaurora.org
Cc: mcoquelin.stm32@gmail.com
Cc: linux-arm-kernel@lists.infradead.org
Cc: shawn.guo@linaro.org
Cc: kernel@pengutronix.de
Cc: jason@lakedaemon.net
Link: http://lkml.kernel.org/r/1431769465-26867-5-git-send-email-stefan@agner.ch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
drivers/irqchip/Kconfig | 1 +
drivers/irqchip/irq-nvic.c | 28 +++++++++++++++++++++++++++-
2 files changed, 28 insertions(+), 1 deletion(-)
diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig
index 6de62a9..99b9a97 100644
--- a/drivers/irqchip/Kconfig
+++ b/drivers/irqchip/Kconfig
@@ -30,6 +30,7 @@ config ARM_GIC_V3_ITS
config ARM_NVIC
bool
select IRQ_DOMAIN
+ select IRQ_DOMAIN_HIERARCHY
select GENERIC_IRQ_CHIP
config ARM_VIC
diff --git a/drivers/irqchip/irq-nvic.c b/drivers/irqchip/irq-nvic.c
index 4ff0805..5fac910 100644
--- a/drivers/irqchip/irq-nvic.c
+++ b/drivers/irqchip/irq-nvic.c
@@ -49,6 +49,31 @@ nvic_handle_irq(irq_hw_number_t hwirq, struct pt_regs *regs)
handle_IRQ(irq, regs);
}
+static int nvic_irq_domain_alloc(struct irq_domain *domain, unsigned int virq,
+ unsigned int nr_irqs, void *arg)
+{
+ int i, ret;
+ irq_hw_number_t hwirq;
+ unsigned int type = IRQ_TYPE_NONE;
+ struct of_phandle_args *irq_data = arg;
+
+ ret = irq_domain_xlate_onecell(domain, irq_data->np, irq_data->args,
+ irq_data->args_count, &hwirq, &type);
+ if (ret)
+ return ret;
+
+ for (i = 0; i < nr_irqs; i++)
+ irq_map_generic_chip(domain, virq + i, hwirq + i);
+
+ return 0;
+}
+
+static const struct irq_domain_ops nvic_irq_domain_ops = {
+ .xlate = irq_domain_xlate_onecell,
+ .alloc = nvic_irq_domain_alloc,
+ .free = irq_domain_free_irqs_top,
+};
+
static int __init nvic_of_init(struct device_node *node,
struct device_node *parent)
{
@@ -70,7 +95,8 @@ static int __init nvic_of_init(struct device_node *node,
irqs = NVIC_MAX_IRQ;
nvic_irq_domain =
- irq_domain_add_linear(node, irqs, &irq_generic_chip_ops, NULL);
+ irq_domain_add_linear(node, irqs, &nvic_irq_domain_ops, NULL);
+
if (!nvic_irq_domain) {
pr_warn("Failed to allocate irq domain\n");
return -ENOMEM;
next prev parent reply other threads:[~2015-05-18 15:37 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-16 9:44 [PATCH v7 00/13] ARM: vf610m4: Add Vybrid Cortex-M4 support Stefan Agner
2015-05-16 9:44 ` [PATCH v7 01/13] irqdomain: Add non-hierarchy helper irq_domain_set_info Stefan Agner
2015-05-18 15:36 ` [tip:irq/core] " tip-bot for Stefan Agner
2015-05-16 9:44 ` [PATCH v7 02/13] genirq: Add irq_chip_(enable|disable)_parent Stefan Agner
2015-05-18 15:36 ` [tip:irq/core] genirq: Add irq_chip_(enable/disable)_parent tip-bot for Stefan Agner
2015-05-16 9:44 ` [PATCH v7 03/13] genirq: generic chip: support hierarchy domain Stefan Agner
2015-05-18 15:37 ` [tip:irq/core] genirq: generic chip: Support " tip-bot for Stefan Agner
2015-05-16 9:44 ` [PATCH v7 04/13] irqchip: nvic: support hierarchy irq domain Stefan Agner
2015-05-18 15:37 ` tip-bot for Stefan Agner [this message]
2015-05-16 9:44 ` [PATCH v7 05/13] irqchip: vf610-mscm: support NVIC parent Stefan Agner
2015-05-18 15:37 ` [tip:irq/core] irqchip: vf610-mscm: Support NVIC parent chip tip-bot for Stefan Agner
2015-05-18 22:03 ` tip-bot for Stefan Agner
2015-05-16 9:44 ` [PATCH v7 06/13] ARM: ARMv7M: define size of vector table for Vybrid Stefan Agner
2015-05-16 9:44 ` [PATCH v7 07/13] clocksource: add dependencies for Vybrid pit clocksource Stefan Agner
2015-05-16 9:44 ` [PATCH v7 08/13] ARM: unify MMU/!MMU addruart calls Stefan Agner
2015-05-16 20:51 ` Russell King - ARM Linux
2015-05-17 7:53 ` Thomas Gleixner
2015-05-18 15:36 ` Thomas Gleixner
2015-05-19 5:35 ` Shawn Guo
2015-05-19 8:11 ` Thomas Gleixner
2015-05-19 8:56 ` Shawn Guo
2015-05-19 10:16 ` Russell King - ARM Linux
2015-05-19 11:23 ` Stefan Agner
2015-05-19 11:50 ` Arnd Bergmann
2015-05-19 16:06 ` Stefan Agner
2015-05-19 18:24 ` Arnd Bergmann
2015-05-19 21:26 ` Stefan Agner
2015-05-19 21:32 ` Thomas Gleixner
2015-05-19 21:32 ` Stefan Agner
2015-05-19 21:37 ` Arnd Bergmann
2015-05-19 21:37 ` Joachim Eastwood
2015-05-16 9:44 ` [PATCH v7 09/13] ARM: introduce ARM_SINGLE_ARMV7M for ARMv7-M platforms Stefan Agner
2015-05-16 9:44 ` [PATCH v7 10/13] ARM: efm32: use ARM_SINGLE_ARMV7M Stefan Agner
2015-05-19 12:14 ` Uwe Kleine-König
2015-05-16 9:44 ` [PATCH v7 11/13] ARM: vf610: enable Cortex-M4 configuration on Vybrid SoC Stefan Agner
2015-05-16 9:44 ` [PATCH v7 12/13] ARM: dts: add support for Vybrid running on Cortex-M4 Stefan Agner
2015-05-16 9:44 ` [PATCH v7 13/13] ARM: vf610m4: add defconfig for Linux on Vybrids Cortex-M4 Stefan Agner
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=tip-2d9f59f7bf8ef5704b0b6ca8406be12568a1c2da@git.kernel.org \
--to=tipbot@zytor.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=stefan@agner.ch \
--cc=tglx@linutronix.de \
/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;
as well as URLs for NNTP newsgroup(s).