From 1012eb1f293d4903acf686e0893e0f505d6b2748 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Sun, 18 Apr 2021 19:19:15 -0400 Subject: [PATCH] Fixes for 5.4 Signed-off-by: Sasha Levin --- ...footbridge-fix-pci-interrupt-mapping.patch | 98 +++++++++++++++++++ ...ner-fix-sd-card-cd-gpio-for-sopine-s.patch | 61 ++++++++++++ queue-5.4/series | 2 + 3 files changed, 161 insertions(+) create mode 100644 queue-5.4/arm-footbridge-fix-pci-interrupt-mapping.patch create mode 100644 queue-5.4/arm64-dts-allwinner-fix-sd-card-cd-gpio-for-sopine-s.patch diff --git a/queue-5.4/arm-footbridge-fix-pci-interrupt-mapping.patch b/queue-5.4/arm-footbridge-fix-pci-interrupt-mapping.patch new file mode 100644 index 00000000000..e6901730e65 --- /dev/null +++ b/queue-5.4/arm-footbridge-fix-pci-interrupt-mapping.patch @@ -0,0 +1,98 @@ +From f36180d073ab4847b82634b556ed547c1d9cd709 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 25 Mar 2021 10:26:21 +0000 +Subject: ARM: footbridge: fix PCI interrupt mapping + +From: Russell King + +[ Upstream commit 30e3b4f256b4e366a61658c294f6a21b8626dda7 ] + +Since commit 30fdfb929e82 ("PCI: Add a call to pci_assign_irq() in +pci_device_probe()"), the PCI code will call the IRQ mapping function +whenever a PCI driver is probed. If these are marked as __init, this +causes an oops if a PCI driver is loaded or bound after the kernel has +initialised. + +Fixes: 30fdfb929e82 ("PCI: Add a call to pci_assign_irq() in pci_device_probe()") +Signed-off-by: Russell King +Signed-off-by: Sasha Levin +--- + arch/arm/mach-footbridge/cats-pci.c | 4 ++-- + arch/arm/mach-footbridge/ebsa285-pci.c | 4 ++-- + arch/arm/mach-footbridge/netwinder-pci.c | 2 +- + arch/arm/mach-footbridge/personal-pci.c | 5 ++--- + 4 files changed, 7 insertions(+), 8 deletions(-) + +diff --git a/arch/arm/mach-footbridge/cats-pci.c b/arch/arm/mach-footbridge/cats-pci.c +index 0b2fd7e2e9b4..90b1e9be430e 100644 +--- a/arch/arm/mach-footbridge/cats-pci.c ++++ b/arch/arm/mach-footbridge/cats-pci.c +@@ -15,14 +15,14 @@ + #include + + /* cats host-specific stuff */ +-static int irqmap_cats[] __initdata = { IRQ_PCI, IRQ_IN0, IRQ_IN1, IRQ_IN3 }; ++static int irqmap_cats[] = { IRQ_PCI, IRQ_IN0, IRQ_IN1, IRQ_IN3 }; + + static u8 cats_no_swizzle(struct pci_dev *dev, u8 *pin) + { + return 0; + } + +-static int __init cats_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) ++static int cats_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) + { + if (dev->irq >= 255) + return -1; /* not a valid interrupt. */ +diff --git a/arch/arm/mach-footbridge/ebsa285-pci.c b/arch/arm/mach-footbridge/ebsa285-pci.c +index 6f28aaa9ca79..c3f280d08fa7 100644 +--- a/arch/arm/mach-footbridge/ebsa285-pci.c ++++ b/arch/arm/mach-footbridge/ebsa285-pci.c +@@ -14,9 +14,9 @@ + #include + #include + +-static int irqmap_ebsa285[] __initdata = { IRQ_IN3, IRQ_IN1, IRQ_IN0, IRQ_PCI }; ++static int irqmap_ebsa285[] = { IRQ_IN3, IRQ_IN1, IRQ_IN0, IRQ_PCI }; + +-static int __init ebsa285_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) ++static int ebsa285_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) + { + if (dev->vendor == PCI_VENDOR_ID_CONTAQ && + dev->device == PCI_DEVICE_ID_CONTAQ_82C693) +diff --git a/arch/arm/mach-footbridge/netwinder-pci.c b/arch/arm/mach-footbridge/netwinder-pci.c +index 9473aa0305e5..e8304392074b 100644 +--- a/arch/arm/mach-footbridge/netwinder-pci.c ++++ b/arch/arm/mach-footbridge/netwinder-pci.c +@@ -18,7 +18,7 @@ + * We now use the slot ID instead of the device identifiers to select + * which interrupt is routed where. + */ +-static int __init netwinder_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) ++static int netwinder_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) + { + switch (slot) { + case 0: /* host bridge */ +diff --git a/arch/arm/mach-footbridge/personal-pci.c b/arch/arm/mach-footbridge/personal-pci.c +index 4391e433a4b2..9d19aa98a663 100644 +--- a/arch/arm/mach-footbridge/personal-pci.c ++++ b/arch/arm/mach-footbridge/personal-pci.c +@@ -14,13 +14,12 @@ + #include + #include + +-static int irqmap_personal_server[] __initdata = { ++static int irqmap_personal_server[] = { + IRQ_IN0, IRQ_IN1, IRQ_IN2, IRQ_IN3, 0, 0, 0, + IRQ_DOORBELLHOST, IRQ_DMA1, IRQ_DMA2, IRQ_PCI + }; + +-static int __init personal_server_map_irq(const struct pci_dev *dev, u8 slot, +- u8 pin) ++static int personal_server_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) + { + unsigned char line; + +-- +2.30.2 + diff --git a/queue-5.4/arm64-dts-allwinner-fix-sd-card-cd-gpio-for-sopine-s.patch b/queue-5.4/arm64-dts-allwinner-fix-sd-card-cd-gpio-for-sopine-s.patch new file mode 100644 index 00000000000..28094896b2a --- /dev/null +++ b/queue-5.4/arm64-dts-allwinner-fix-sd-card-cd-gpio-for-sopine-s.patch @@ -0,0 +1,61 @@ +From e7b39957c0dca4f5d6f1506b4934e0917f4dc0be Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 16 Mar 2021 14:42:19 +0000 +Subject: arm64: dts: allwinner: Fix SD card CD GPIO for SOPine systems + +From: Andre Przywara + +[ Upstream commit 3dd4ce4185df6798dcdcc3669bddb35899d7d5e1 ] + +Commit 941432d00768 ("arm64: dts: allwinner: Drop non-removable from +SoPine/LTS SD card") enabled the card detect GPIO for the SOPine module, +along the way with the Pine64-LTS, which share the same base .dtsi. + +However while both boards indeed have a working CD GPIO on PF6, the +polarity is different: the SOPine modules uses a "push-pull" socket, +which has an active-high switch, while the Pine64-LTS use the more +traditional push-push socket and the common active-low switch. + +Fix the polarity in the sopine.dtsi, and overwrite it in the LTS +board .dts, to make the SD card work again on systems using SOPine +modules. + +Fixes: 941432d00768 ("arm64: dts: allwinner: Drop non-removable from SoPine/LTS SD card") +Reported-by: Ashley +Signed-off-by: Andre Przywara +Signed-off-by: Maxime Ripard +Link: https://lore.kernel.org/r/20210316144219.5973-1-andre.przywara@arm.com +Signed-off-by: Sasha Levin +--- + arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts | 4 ++++ + arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts +index 72d6961dc312..8d15164f2a3c 100644 +--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts ++++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts +@@ -11,3 +11,7 @@ + compatible = "pine64,pine64-lts", "allwinner,sun50i-r18", + "allwinner,sun50i-a64"; + }; ++ ++&mmc0 { ++ cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 push-push switch */ ++}; +diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi +index d935e3028fcb..19e5b7e298fd 100644 +--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi ++++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi +@@ -57,7 +57,7 @@ + vmmc-supply = <®_dcdc1>; + disable-wp; + bus-width = <4>; +- cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */ ++ cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; /* PF6 push-pull switch */ + status = "okay"; + }; + +-- +2.30.2 + diff --git a/queue-5.4/series b/queue-5.4/series index eea0f37909e..47def80bb55 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -61,3 +61,5 @@ ibmvnic-avoid-calling-napi_disable-twice.patch ibmvnic-remove-duplicate-napi_schedule-call-in-do_reset-function.patch ibmvnic-remove-duplicate-napi_schedule-call-in-open-function.patch gro-ensure-frag0-meets-ip-header-alignment.patch +arm-footbridge-fix-pci-interrupt-mapping.patch +arm64-dts-allwinner-fix-sd-card-cd-gpio-for-sopine-s.patch -- 2.47.3