Home Home > GIT Browse > stable
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2019-02-15 10:23:48 +0100
committerJiri Slaby <jslaby@suse.cz>2019-02-15 10:24:06 +0100
commitd3b24c49161036874eb22a466dfa5dcae2af58f2 (patch)
tree8b38754d1052d5ecf7069b0b609b4755a8a0f802
parent120d0d495c5c61aa30599ecb8b806fa935d62abf (diff)
ARM: iop32x/n2100: fix PCI IRQ mapping (bnc#1012628).
-rw-r--r--patches.kernel.org/4.20.9-029-ARM-iop32x-n2100-fix-PCI-IRQ-mapping.patch38
-rw-r--r--series.conf1
2 files changed, 39 insertions, 0 deletions
diff --git a/patches.kernel.org/4.20.9-029-ARM-iop32x-n2100-fix-PCI-IRQ-mapping.patch b/patches.kernel.org/4.20.9-029-ARM-iop32x-n2100-fix-PCI-IRQ-mapping.patch
new file mode 100644
index 0000000000..50a301ebe0
--- /dev/null
+++ b/patches.kernel.org/4.20.9-029-ARM-iop32x-n2100-fix-PCI-IRQ-mapping.patch
@@ -0,0 +1,38 @@
+From: Russell King <rmk+kernel@armlinux.org.uk>
+Date: Fri, 25 Jan 2019 20:10:15 +0000
+Subject: [PATCH] ARM: iop32x/n2100: fix PCI IRQ mapping
+References: bnc#1012628
+Patch-mainline: 4.20.9
+Git-commit: db4090920ba2d61a5827a23e441447926a02ffee
+
+commit db4090920ba2d61a5827a23e441447926a02ffee upstream.
+
+Booting 4.20 on a TheCUS N2100 results in a kernel oops while probing
+PCI, due to n2100_pci_map_irq() having been discarded during boot.
+
+Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
+Cc: stable@vger.kernel.org # 2.6.18+
+Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+---
+ arch/arm/mach-iop32x/n2100.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/arch/arm/mach-iop32x/n2100.c b/arch/arm/mach-iop32x/n2100.c
+index 3b73813c6b04..23e8c93515d4 100644
+--- a/arch/arm/mach-iop32x/n2100.c
++++ b/arch/arm/mach-iop32x/n2100.c
+@@ -75,8 +75,7 @@ void __init n2100_map_io(void)
+ /*
+ * N2100 PCI.
+ */
+-static int __init
+-n2100_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
++static int n2100_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
+ {
+ int irq;
+
+--
+2.20.1
+
diff --git a/series.conf b/series.conf
index 9b3cceb31a..9c46279a42 100644
--- a/series.conf
+++ b/series.conf
@@ -1111,6 +1111,7 @@
patches.kernel.org/4.20.9-026-MIPS-VDSO-Use-same-m-float-cflag-as-the-kernel.patch
patches.kernel.org/4.20.9-027-mips-loongson64-remove-unreachable-fix-loongso.patch
patches.kernel.org/4.20.9-028-MIPS-VDSO-Include-ccflags-vdso-in-o32-n32-.lds.patch
+ patches.kernel.org/4.20.9-029-ARM-iop32x-n2100-fix-PCI-IRQ-mapping.patch
########################################################
# Build fixes that apply to the vanilla kernel too.