Patch "irqchip/versatile-fpga: Fix PCI IRQ mapping on Versatile PB" has been added to the 3.14-stable tree

Patch "irqchip/versatile-fpga: Fix PCI IRQ mapping on Versatile PB" has been added to the 3.14-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    irqchip/versatile-fpga: Fix PCI IRQ mapping on Versatile PB

to the 3.14-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     irqchip-versatile-fpga-fix-pci-irq-mapping-on-versatile-pb.patch
and it can be found in the queue-3.14 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From d5d4fdd86f5759924fe54efa793e22eccf508db6 Mon Sep 17 00:00:00 2001
From: Guillaume Delbergue <guillaume.delbergue@greensocs.com>
Date: Tue, 1 Dec 2015 18:55:51 +0100
Subject: irqchip/versatile-fpga: Fix PCI IRQ mapping on Versatile PB

From: Guillaume Delbergue <guillaume.delbergue@greensocs.com>

commit d5d4fdd86f5759924fe54efa793e22eccf508db6 upstream.

This patch is specifically for PCI support on the Versatile PB board using
a DT. Currently, the dynamic IRQ mapping is broken when using DTs. For
example, on QEMU, the SCSI driver is unable to request the IRQ. To fix
this issue, this patch replaces the current dynamic mechanism with a
static value as is done in the non-DT case.

Signed-off-by: Guillaume Delbergue <guillaume.delbergue@greensocs.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 drivers/irqchip/irq-versatile-fpga.c |    5 +++++
 1 file changed, 5 insertions(+)

--- a/drivers/irqchip/irq-versatile-fpga.c
+++ b/drivers/irqchip/irq-versatile-fpga.c
@@ -204,7 +204,12 @@ int __init fpga_irq_of_init(struct devic
 	if (!parent_irq)
 		parent_irq = -1;
 
+#ifdef CONFIG_ARCH_VERSATILE
+	fpga_irq_init(base, node->name, IRQ_SIC_START, parent_irq, valid_mask,
+				  node);
+#else
 	fpga_irq_init(base, node->name, 0, parent_irq, valid_mask, node);
+#endif
 
 	writel(clear_mask, base + IRQ_ENABLE_CLEAR);
 	writel(clear_mask, base + FIQ_ENABLE_CLEAR);


Patches currently in stable-queue which might be from guillaume.delbergue@greensocs.com are

queue-3.14/irqchip-versatile-fpga-fix-pci-irq-mapping-on-versatile-pb.patch