* [PATCH v2] irqchip: Skip contexts except supervisor in plic_init()
@ 2019-10-24 16:11 Alan Mikhak
2019-10-25 12:30 ` [tip: irq/urgent] irqchip/sifive-plic: " tip-bot2 for Alan Mikhak
0 siblings, 1 reply; 2+ messages in thread
From: Alan Mikhak @ 2019-10-24 16:11 UTC (permalink / raw)
To: linux-kernel, linux-riscv, tglx, jason, maz, palmer, paul.walmsley
Cc: Alan Mikhak
From: Alan Mikhak <alan.mikhak@sifive.com>
Modify plic_init() to skip .dts interrupt contexts other
than supervisor external interrupt.
The .dts entry for plic may specify multiple interrupt contexts.
For example, it may assign two entries IRQ_M_EXT and IRQ_S_EXT,
in that order, to the same interrupt controller. This patch
modifies plic_init() to skip the IRQ_M_EXT context since
IRQ_S_EXT is currently the only supported context.
If IRQ_M_EXT is not skipped, plic_init() will report "handler
already present for context" when it comes across the IRQ_S_EXT
context in the next iteration of its loop.
Without this patch, .dts would have to be edited to replace the
value of IRQ_M_EXT with -1 for it to be skipped.
Signed-off-by: Alan Mikhak <alan.mikhak@sifive.com>
Acked-by: Paul Walmsley <paul.walmsley@sifive.com> # arch/riscv
Reviewed-by: Christoph Hellwig <hch@lst.de>
---
drivers/irqchip/irq-sifive-plic.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/irqchip/irq-sifive-plic.c b/drivers/irqchip/irq-sifive-plic.c
index c72c036aea76..5f2a773d5669 100644
--- a/drivers/irqchip/irq-sifive-plic.c
+++ b/drivers/irqchip/irq-sifive-plic.c
@@ -251,8 +251,8 @@ static int __init plic_init(struct device_node *node,
continue;
}
- /* skip context holes */
- if (parent.args[0] == -1)
+ /* skip contexts other than supervisor external interrupt */
+ if (parent.args[0] != IRQ_S_EXT)
continue;
hartid = plic_find_hart_id(parent.np);
--
2.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [tip: irq/urgent] irqchip/sifive-plic: Skip contexts except supervisor in plic_init()
2019-10-24 16:11 [PATCH v2] irqchip: Skip contexts except supervisor in plic_init() Alan Mikhak
@ 2019-10-25 12:30 ` tip-bot2 for Alan Mikhak
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot2 for Alan Mikhak @ 2019-10-25 12:30 UTC (permalink / raw)
To: linux-tip-commits
Cc: Alan Mikhak, Marc Zyngier, Christoph Hellwig, Paul Walmsley,
Ingo Molnar, Borislav Petkov, linux-kernel
The following commit has been merged into the irq/urgent branch of tip:
Commit-ID: 41860cc447045c811ce6d5a92f93a065a691fe8e
Gitweb: https://git.kernel.org/tip/41860cc447045c811ce6d5a92f93a065a691fe8e
Author: Alan Mikhak <alan.mikhak@sifive.com>
AuthorDate: Thu, 24 Oct 2019 09:11:43 -07:00
Committer: Marc Zyngier <maz@kernel.org>
CommitterDate: Fri, 25 Oct 2019 11:48:13 +01:00
irqchip/sifive-plic: Skip contexts except supervisor in plic_init()
Modify plic_init() to skip .dts interrupt contexts other
than supervisor external interrupt.
The .dts entry for plic may specify multiple interrupt contexts.
For example, it may assign two entries IRQ_M_EXT and IRQ_S_EXT,
in that order, to the same interrupt controller. This patch
modifies plic_init() to skip the IRQ_M_EXT context since
IRQ_S_EXT is currently the only supported context.
If IRQ_M_EXT is not skipped, plic_init() will report "handler
already present for context" when it comes across the IRQ_S_EXT
context in the next iteration of its loop.
Without this patch, .dts would have to be edited to replace the
value of IRQ_M_EXT with -1 for it to be skipped.
Signed-off-by: Alan Mikhak <alan.mikhak@sifive.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Acked-by: Paul Walmsley <paul.walmsley@sifive.com> # arch/riscv
Link: https://lkml.kernel.org/r/1571933503-21504-1-git-send-email-alan.mikhak@sifive.com
---
drivers/irqchip/irq-sifive-plic.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/irqchip/irq-sifive-plic.c b/drivers/irqchip/irq-sifive-plic.c
index 3e51dee..b1a33f9 100644
--- a/drivers/irqchip/irq-sifive-plic.c
+++ b/drivers/irqchip/irq-sifive-plic.c
@@ -251,8 +251,8 @@ static int __init plic_init(struct device_node *node,
continue;
}
- /* skip context holes */
- if (parent.args[0] == -1)
+ /* skip contexts other than supervisor external interrupt */
+ if (parent.args[0] != IRQ_S_EXT)
continue;
hartid = plic_find_hart_id(parent.np);
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-10-25 12:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-24 16:11 [PATCH v2] irqchip: Skip contexts except supervisor in plic_init() Alan Mikhak
2019-10-25 12:30 ` [tip: irq/urgent] irqchip/sifive-plic: " tip-bot2 for Alan Mikhak
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).