* [PATCH v2] irqchip: vic: Support cascaded VIC in device tree
@ 2020-02-19 15:35 Linus Walleij
2020-03-29 20:26 ` [tip: irq/core] " tip-bot2 for Linus Walleij
0 siblings, 1 reply; 4+ messages in thread
From: Linus Walleij @ 2020-02-19 15:35 UTC (permalink / raw)
To: Thomas Gleixner, Marc Zyngier, Jason Cooper; +Cc: linux-kernel, Linus Walleij
When transitioning some elder platforms to device tree it
becomes necessary to cascade VIC IRQ chips off another
interrupt controller.
Tested with the cascaded VIC on the Integrator/AP attached
logic module IM-PD1.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
ChangeLog v1->v2:
- Drop the default assignment of 0 as parent IRQ.
- This is not tagged as fix: no regression.
---
drivers/irqchip/irq-vic.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/irqchip/irq-vic.c b/drivers/irqchip/irq-vic.c
index f3f20a3cff50..3c87d925f74c 100644
--- a/drivers/irqchip/irq-vic.c
+++ b/drivers/irqchip/irq-vic.c
@@ -509,9 +509,7 @@ static int __init vic_of_init(struct device_node *node,
void __iomem *regs;
u32 interrupt_mask = ~0;
u32 wakeup_mask = ~0;
-
- if (WARN(parent, "non-root VICs are not supported"))
- return -EINVAL;
+ int parent_irq;
regs = of_iomap(node, 0);
if (WARN_ON(!regs))
@@ -519,11 +517,14 @@ static int __init vic_of_init(struct device_node *node,
of_property_read_u32(node, "valid-mask", &interrupt_mask);
of_property_read_u32(node, "valid-wakeup-mask", &wakeup_mask);
+ parent_irq = of_irq_get(node, 0);
+ if (parent_irq < 0)
+ parent_irq = 0;
/*
* Passing 0 as first IRQ makes the simple domain allocate descriptors
*/
- __vic_init(regs, 0, 0, interrupt_mask, wakeup_mask, node);
+ __vic_init(regs, parent_irq, 0, interrupt_mask, wakeup_mask, node);
return 0;
}
--
2.24.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [tip: irq/core] irqchip: vic: Support cascaded VIC in device tree
2020-02-19 15:35 [PATCH v2] irqchip: vic: Support cascaded VIC in device tree Linus Walleij
@ 2020-03-29 20:26 ` tip-bot2 for Linus Walleij
0 siblings, 0 replies; 4+ messages in thread
From: tip-bot2 for Linus Walleij @ 2020-03-29 20:26 UTC (permalink / raw)
To: linux-tip-commits; +Cc: Linus Walleij, Marc Zyngier, x86, LKML
The following commit has been merged into the irq/core branch of tip:
Commit-ID: a15111075a847432b90e1534095b195aac8d9ec2
Gitweb: https://git.kernel.org/tip/a15111075a847432b90e1534095b195aac8d9ec2
Author: Linus Walleij <linus.walleij@linaro.org>
AuthorDate: Wed, 19 Feb 2020 16:35:43 +01:00
Committer: Marc Zyngier <maz@kernel.org>
CommitterDate: Sun, 08 Mar 2020 14:25:45
irqchip: vic: Support cascaded VIC in device tree
When transitioning some elder platforms to device tree it
becomes necessary to cascade VIC IRQ chips off another
interrupt controller.
Tested with the cascaded VIC on the Integrator/AP attached
logic module IM-PD1.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20200219153543.137153-1-linus.walleij@linaro.org
---
drivers/irqchip/irq-vic.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/irqchip/irq-vic.c b/drivers/irqchip/irq-vic.c
index f3f20a3..3c87d92 100644
--- a/drivers/irqchip/irq-vic.c
+++ b/drivers/irqchip/irq-vic.c
@@ -509,9 +509,7 @@ static int __init vic_of_init(struct device_node *node,
void __iomem *regs;
u32 interrupt_mask = ~0;
u32 wakeup_mask = ~0;
-
- if (WARN(parent, "non-root VICs are not supported"))
- return -EINVAL;
+ int parent_irq;
regs = of_iomap(node, 0);
if (WARN_ON(!regs))
@@ -519,11 +517,14 @@ static int __init vic_of_init(struct device_node *node,
of_property_read_u32(node, "valid-mask", &interrupt_mask);
of_property_read_u32(node, "valid-wakeup-mask", &wakeup_mask);
+ parent_irq = of_irq_get(node, 0);
+ if (parent_irq < 0)
+ parent_irq = 0;
/*
* Passing 0 as first IRQ makes the simple domain allocate descriptors
*/
- __vic_init(regs, 0, 0, interrupt_mask, wakeup_mask, node);
+ __vic_init(regs, parent_irq, 0, interrupt_mask, wakeup_mask, node);
return 0;
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2] irqchip: vic: Support cascaded VIC in device tree
2020-02-19 15:36 [PATCH v2] " Linus Walleij
@ 2020-02-20 9:42 ` Marc Zyngier
0 siblings, 0 replies; 4+ messages in thread
From: Marc Zyngier @ 2020-02-20 9:42 UTC (permalink / raw)
To: Linus Walleij; +Cc: Thomas Gleixner, Jason Cooper, linux-kernel
On 2020-02-19 15:36, Linus Walleij wrote:
> When transitioning some elder platforms to device tree it
> becomes necessary to cascade VIC IRQ chips off another
> interrupt controller.
>
> Tested with the cascaded VIC on the Integrator/AP attached
> logic module IM-PD1.
>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Queued for 5.7.
Thanks,
M.
--
Jazz is not dead. It just smells funny...
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v2] irqchip: vic: Support cascaded VIC in device tree
@ 2020-02-19 15:36 Linus Walleij
2020-02-20 9:42 ` Marc Zyngier
0 siblings, 1 reply; 4+ messages in thread
From: Linus Walleij @ 2020-02-19 15:36 UTC (permalink / raw)
To: Thomas Gleixner, Marc Zyngier, Jason Cooper; +Cc: linux-kernel, Linus Walleij
When transitioning some elder platforms to device tree it
becomes necessary to cascade VIC IRQ chips off another
interrupt controller.
Tested with the cascaded VIC on the Integrator/AP attached
logic module IM-PD1.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
ChangeLog v1->v2:
- Drop the default assignment of 0 as parent IRQ.
- This is not tagged as fix: no regression.
---
drivers/irqchip/irq-vic.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/irqchip/irq-vic.c b/drivers/irqchip/irq-vic.c
index f3f20a3cff50..3c87d925f74c 100644
--- a/drivers/irqchip/irq-vic.c
+++ b/drivers/irqchip/irq-vic.c
@@ -509,9 +509,7 @@ static int __init vic_of_init(struct device_node *node,
void __iomem *regs;
u32 interrupt_mask = ~0;
u32 wakeup_mask = ~0;
-
- if (WARN(parent, "non-root VICs are not supported"))
- return -EINVAL;
+ int parent_irq;
regs = of_iomap(node, 0);
if (WARN_ON(!regs))
@@ -519,11 +517,14 @@ static int __init vic_of_init(struct device_node *node,
of_property_read_u32(node, "valid-mask", &interrupt_mask);
of_property_read_u32(node, "valid-wakeup-mask", &wakeup_mask);
+ parent_irq = of_irq_get(node, 0);
+ if (parent_irq < 0)
+ parent_irq = 0;
/*
* Passing 0 as first IRQ makes the simple domain allocate descriptors
*/
- __vic_init(regs, 0, 0, interrupt_mask, wakeup_mask, node);
+ __vic_init(regs, parent_irq, 0, interrupt_mask, wakeup_mask, node);
return 0;
}
--
2.24.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-03-29 20:26 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-19 15:35 [PATCH v2] irqchip: vic: Support cascaded VIC in device tree Linus Walleij
2020-03-29 20:26 ` [tip: irq/core] " tip-bot2 for Linus Walleij
2020-02-19 15:36 [PATCH v2] " Linus Walleij
2020-02-20 9:42 ` Marc Zyngier
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).