summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAlan Mikhak <alan.mikhak@sifive.com>2019-10-24 09:11:43 -0700
committerMarc Zyngier <maz@kernel.org>2019-10-25 11:48:13 +0100
commit41860cc447045c811ce6d5a92f93a065a691fe8e (patch)
tree0b6d84b4dd0c2ad5b9c7c7a5358e1771ac40b087 /drivers
parent8424312516e5d9baeeb0a95d0e4523579b7aa395 (diff)
downloadlinux-stable-41860cc447045c811ce6d5a92f93a065a691fe8e.tar.gz
linux-stable-41860cc447045c811ce6d5a92f93a065a691fe8e.tar.bz2
linux-stable-41860cc447045c811ce6d5a92f93a065a691fe8e.zip
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
Diffstat (limited to 'drivers')
-rw-r--r--drivers/irqchip/irq-sifive-plic.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/irqchip/irq-sifive-plic.c b/drivers/irqchip/irq-sifive-plic.c
index 3e51deedbcc8..b1a33f97db03 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);