linux-kernel - [tip: irq/urgent] irqchip/sifive-plic: Skip contexts except supervisor in plic

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <157200661432.29376.6464692458150883535.tip-bot2@tip-bot2>
Date:   Fri, 25 Oct 2019 12:30:14 -0000
From:   "tip-bot2 for Alan Mikhak" <tip-bot2@...utronix.de>
To:     linux-tip-commits@...r.kernel.org
Cc:     Alan Mikhak <alan.mikhak@...ive.com>,
        Marc Zyngier <maz@...nel.org>, Christoph Hellwig <hch@....de>,
        Paul Walmsley <paul.walmsley@...ive.com>,
        Ingo Molnar <mingo@...nel.org>, Borislav Petkov <bp@...en8.de>,
        linux-kernel@...r.kernel.org
Subject: [tip: irq/urgent] irqchip/sifive-plic: Skip contexts except
 supervisor in plic_init()

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@...ive.com>
AuthorDate:    Thu, 24 Oct 2019 09:11:43 -07:00
Committer:     Marc Zyngier <maz@...nel.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@...ive.com>
Signed-off-by: Marc Zyngier <maz@...nel.org>
Reviewed-by: Christoph Hellwig <hch@....de>
Acked-by: Paul Walmsley <paul.walmsley@...ive.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);