linux-kernel - [tip:irq/urgent] irqchip/mips-gic: Map to VPs using HW VPNum

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] [thread-next>] [day] [month] [year] [list]

Message-ID: <tip-99ec8a3608330d202448085185cf28389b789b7b@git.kernel.org>
Date:	Tue, 5 Jul 2016 08:01:17 -0700
From:	tip-bot for Paul Burton <tipbot@...or.com>
To:	linux-tip-commits@...r.kernel.org
Cc:	ralf@...ux-mips.org, tglx@...utronix.de, jason@...edaemon.net,
	qsyousef@...il.com, linux-kernel@...r.kernel.org, mingo@...nel.org,
	marc.zyngier@....com, hpa@...or.com, paul.burton@...tec.com
Subject: [tip:irq/urgent] irqchip/mips-gic: Map to VPs using HW VPNum

Commit-ID:  99ec8a3608330d202448085185cf28389b789b7b
Gitweb:     http://git.kernel.org/tip/99ec8a3608330d202448085185cf28389b789b7b
Author:     Paul Burton <paul.burton@...tec.com>
AuthorDate: Tue, 5 Jul 2016 14:25:59 +0100
Committer:  Thomas Gleixner <tglx@...utronix.de>
CommitDate: Tue, 5 Jul 2016 16:54:21 +0200

irqchip/mips-gic: Map to VPs using HW VPNum

When mapping an interrupt to a VP(E) we must use the identifier for the
VP that the hardware expects, and this does not always match up with the
Linux CPU number. Commit d46812bb0bef ("irqchip: mips-gic: Use HW IDs
for VPE_OTHER_ADDR") corrected this for the cases that existed at the
time it was written, but commit 2af70a962070 ("irqchip/mips-gic: Add a
IPI hierarchy domain") added another case before the former patch was
merged. This leads to incorrectly using Linux CPU numbers when mapping
interrupts to VPs, which breaks on certain systems such as those with
multi-core I6400 CPUs. Fix by adding the appropriate call to
mips_cm_vp_id() to retrieve the expected VP identifier.

Fixes: d46812bb0bef ("irqchip: mips-gic: Use HW IDs for VPE_OTHER_ADDR")
Fixes: 2af70a962070 ("irqchip/mips-gic: Add a IPI hierarchy domain")
Signed-off-by: Paul Burton <paul.burton@...tec.com>
Cc: linux-mips@...ux-mips.org
Cc: Jason Cooper <jason@...edaemon.net>
Cc: Qais Yousef <qsyousef@...il.com>
Cc: Ralf Baechle <ralf@...ux-mips.org>
Cc: Marc Zyngier <marc.zyngier@....com>
Cc: stable@...r.kernel.org
Link: http://lkml.kernel.org/r/20160705132600.27730-1-paul.burton@imgtec.com
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>

---
 drivers/irqchip/irq-mips-gic.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/irqchip/irq-mips-gic.c b/drivers/irqchip/irq-mips-gic.c
index 8a4adbeb..69b1b82 100644
--- a/drivers/irqchip/irq-mips-gic.c
+++ b/drivers/irqchip/irq-mips-gic.c
@@ -718,7 +718,7 @@ static int gic_shared_irq_domain_map(struct irq_domain *d, unsigned int virq,
 
 	spin_lock_irqsave(&gic_lock, flags);
 	gic_map_to_pin(intr, gic_cpu_pin);
-	gic_map_to_vpe(intr, vpe);
+	gic_map_to_vpe(intr, mips_cm_vp_id(vpe));
 	for (i = 0; i < min(gic_vpes, NR_CPUS); i++)
 		clear_bit(intr, pcpu_masks[i].pcpu_mask);
 	set_bit(intr, pcpu_masks[vpe].pcpu_mask);