The following commit has been merged into the irq/irqchip-next branch of irqchip: Commit-ID: d001e41e1b15716e9b759df5ef00510699f85282 Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms/d001e41e1b15716e9b759df5ef00510699f85282 Author: Chen Baozi <chenbaozi@xxxxxxxxxxxxxx> AuthorDate: Tue, 17 Nov 2020 11:20:15 +08:00 Committer: Marc Zyngier <maz@xxxxxxxxxx> CommitterDate: Sun, 22 Nov 2020 10:27:23 irqchip/exiu: Fix the index of fwspec for IRQ type Since fwspec->param_count of ACPI node is two, the index of IRQ type in fwspec->param[] should be 1 rather than 2. Fixes: 3d090a36c8c8 ("irqchip/exiu: Implement ACPI support") Signed-off-by: Chen Baozi <chenbaozi@xxxxxxxxxxxxxx> Signed-off-by: Marc Zyngier <maz@xxxxxxxxxx> Acked-by: Ard Biesheuvel <ardb@xxxxxxxxxx> Link: https://lore.kernel.org/r/20201117032015.11805-1-cbz@xxxxxxxxxx Cc: stable@xxxxxxxxxxxxxxx --- drivers/irqchip/irq-sni-exiu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/irqchip/irq-sni-exiu.c b/drivers/irqchip/irq-sni-exiu.c index 1d02762..abd011f 100644 --- a/drivers/irqchip/irq-sni-exiu.c +++ b/drivers/irqchip/irq-sni-exiu.c @@ -136,7 +136,7 @@ static int exiu_domain_translate(struct irq_domain *domain, if (fwspec->param_count != 2) return -EINVAL; *hwirq = fwspec->param[0]; - *type = fwspec->param[2] & IRQ_TYPE_SENSE_MASK; + *type = fwspec->param[1] & IRQ_TYPE_SENSE_MASK; } return 0; }
