linux-kernel - [tip:irq/core] irqchip/gic-v3: Fix translation of LPIs after conversion to irq

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 for Android: free password hash cracker in your pocket

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

Message-ID: <tip-db8c70ec1f9d45e530383204c57f2971df4bd334@git.kernel.org>
Date:	Thu, 15 Oct 2015 01:21:37 -0700
From:	tip-bot for Marc Zyngier <tipbot@...or.com>
To:	linux-tip-commits@...r.kernel.org
Cc:	marc.zyngier@....com, Suravee.Suthikulpanit@....com,
	tglx@...utronix.de, dhdang@....com,
	linux-arm-kernel@...ts.infradead.org, jason@...edaemon.net,
	hpa@...or.com, mingo@...nel.org, linux-kernel@...r.kernel.org
Subject: [tip:irq/core] irqchip/gic-v3:
  Fix translation of LPIs after conversion to irq_fwspec

Commit-ID:  db8c70ec1f9d45e530383204c57f2971df4bd334
Gitweb:     http://git.kernel.org/tip/db8c70ec1f9d45e530383204c57f2971df4bd334
Author:     Marc Zyngier <marc.zyngier@....com>
AuthorDate: Wed, 14 Oct 2015 12:27:16 +0100
Committer:  Thomas Gleixner <tglx@...utronix.de>
CommitDate: Thu, 15 Oct 2015 10:18:48 +0200

irqchip/gic-v3: Fix translation of LPIs after conversion to irq_fwspec

Commit f833f57ff254 ("irqchip: Convert all alloc/xlate users from
of_node to fwnode") converted the GICv3 driver to using irq_fwspec
as part of its 'translate' method.

Too bad it ended up with a copy of the GICv2 'translate' method,
which screws up LPI translation (by not translating them at all).

Restore the code in its original shape, and just change what is
really required...

Signed-off-by: Marc Zyngier <marc.zyngier@....com>
Cc: <linux-arm-kernel@...ts.infradead.org>
Cc: Suravee Suthikulpanit <Suravee.Suthikulpanit@....com>
Cc: Duc Dang <dhdang@....com>
Cc: Jason Cooper <jason@...edaemon.net>
Link: http://lkml.kernel.org/r/1444822037-16983-2-git-send-email-marc.zyngier@arm.com
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
---
 drivers/irqchip/irq-gic-v3.c | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c
index 05d010b..d7be6dd 100644
--- a/drivers/irqchip/irq-gic-v3.c
+++ b/drivers/irqchip/irq-gic-v3.c
@@ -746,15 +746,19 @@ static int gic_irq_domain_translate(struct irq_domain *d,
 		if (fwspec->param_count < 3)
 			return -EINVAL;
 
-		/* Get the interrupt number and add 16 to skip over SGIs */
-		*hwirq = fwspec->param[1] + 16;
-
-		/*
-		 * For SPIs, we need to add 16 more to get the GIC irq
-		 * ID number
-		 */
-		if (!fwspec->param[0])
-			*hwirq += 16;
+		switch (fwspec->param[0]) {
+		case 0:			/* SPI */
+			*hwirq = fwspec->param[1] + 32;
+			break;
+		case 1:			/* PPI */
+			*hwirq = fwspec->param[1] + 16;
+			break;
+		case GIC_IRQ_TYPE_LPI:	/* LPI */
+			*hwirq = fwspec->param[1];
+			break;
+		default:
+			return -EINVAL;
+		}
 
 		*type = fwspec->param[2] & IRQ_TYPE_SENSE_MASK;
 		return 0;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/