From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751276AbbJOIWh (ORCPT ); Thu, 15 Oct 2015 04:22:37 -0400 Received: from terminus.zytor.com ([198.137.202.10]:45354 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750852AbbJOIWb (ORCPT ); Thu, 15 Oct 2015 04:22:31 -0400 Date: Thu, 15 Oct 2015 01:21:37 -0700 From: tip-bot for Marc Zyngier Message-ID: Cc: marc.zyngier@arm.com, Suravee.Suthikulpanit@amd.com, tglx@linutronix.de, dhdang@apm.com, linux-arm-kernel@lists.infradead.org, jason@lakedaemon.net, hpa@zytor.com, mingo@kernel.org, linux-kernel@vger.kernel.org Reply-To: jason@lakedaemon.net, hpa@zytor.com, linux-arm-kernel@lists.infradead.org, dhdang@apm.com, linux-kernel@vger.kernel.org, mingo@kernel.org, Suravee.Suthikulpanit@amd.com, marc.zyngier@arm.com, tglx@linutronix.de In-Reply-To: <1444822037-16983-2-git-send-email-marc.zyngier@arm.com> References: <1444822037-16983-2-git-send-email-marc.zyngier@arm.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/core] irqchip/gic-v3: Fix translation of LPIs after conversion to irq_fwspec Git-Commit-ID: db8c70ec1f9d45e530383204c57f2971df4bd334 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: db8c70ec1f9d45e530383204c57f2971df4bd334 Gitweb: http://git.kernel.org/tip/db8c70ec1f9d45e530383204c57f2971df4bd334 Author: Marc Zyngier AuthorDate: Wed, 14 Oct 2015 12:27:16 +0100 Committer: Thomas Gleixner 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 Cc: Cc: Suravee Suthikulpanit Cc: Duc Dang Cc: Jason Cooper Link: http://lkml.kernel.org/r/1444822037-16983-2-git-send-email-marc.zyngier@arm.com Signed-off-by: Thomas Gleixner --- 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;