From: Sasha Levin Date: Mon, 15 Nov 2021 12:24:45 +0000 (-0500) Subject: Drop mips-ralink-don-t-define-pc_iobase-but-increase-io_s.patch X-Git-Tag: v5.4.160~69^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6cb66b5f9db849c09fb4e810a699cc8d51dba2c1;p=thirdparty%2Fkernel%2Fstable-queue.git Drop mips-ralink-don-t-define-pc_iobase-but-increase-io_s.patch Signed-off-by: Sasha Levin --- diff --git a/queue-5.14/mips-ralink-don-t-define-pc_iobase-but-increase-io_s.patch b/queue-5.14/mips-ralink-don-t-define-pc_iobase-but-increase-io_s.patch deleted file mode 100644 index bdb96ceeb2d..00000000000 --- a/queue-5.14/mips-ralink-don-t-define-pc_iobase-but-increase-io_s.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 04f24c5f790baa4f2644ce62d8d4727b5bb55b1e Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sun, 22 Aug 2021 18:10:03 +0200 -Subject: MIPS: ralink: don't define PC_IOBASE but increase IO_SPACE_LIMIT - -From: Sergio Paracuellos - -[ Upstream commit 159697474db41732ef3b6c2e8d9395f09d1f659e ] - -Defining PCI_IOBASE results in pci resource handling working but the -addresses generated for IO accesses are wrong since the ioremap in the pci core -function 'pci_parse_request_of_pci_ranges' tries to remap to a fixed virtual -address (PC_IOBASE) which can't work for KSEG1 addresses. To get it working this -way, we would need to put PCI_IOBASE somewhere into KSEG2 which will result in -creating TLB entries for IO addresses, which most of the time isn't needed on -MIPS because of access via KSEG1. So avoid to define PCI_IOBASE and increase -IO_SPACE_LIMIT resource for ralink MIPS platform instead, to get valid IO -addresses for resources from pci core 'pci_address_to_pio' function. - -Fixes: 222b27713d7f ("MIPS: ralink: Define PCI_IOBASE") -Acked-by: Thomas Bogendoerfer -Signed-off-by: Sergio Paracuellos -Link: https://lore.kernel.org/r/20210822161005.22467-2-sergio.paracuellos@gmail.com -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Sasha Levin ---- - arch/mips/include/asm/mach-ralink/spaces.h | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/arch/mips/include/asm/mach-ralink/spaces.h b/arch/mips/include/asm/mach-ralink/spaces.h -index 87d085c9ad610..31a3525213cf3 100644 ---- a/arch/mips/include/asm/mach-ralink/spaces.h -+++ b/arch/mips/include/asm/mach-ralink/spaces.h -@@ -2,9 +2,7 @@ - #ifndef __ASM_MACH_RALINK_SPACES_H_ - #define __ASM_MACH_RALINK_SPACES_H_ - --#define PCI_IOBASE _AC(0xa0000000, UL) --#define PCI_IOSIZE SZ_16M --#define IO_SPACE_LIMIT (PCI_IOSIZE - 1) -+#define IO_SPACE_LIMIT 0x1fffffff - - #include - #endif --- -2.33.0 - diff --git a/queue-5.14/series b/queue-5.14/series index 5e24f2ccc87..1f6a6851055 100644 --- a/queue-5.14/series +++ b/queue-5.14/series @@ -571,7 +571,6 @@ arm64-dts-meson-g12b-fix-the-pwm-regulator-supply-pr.patch arm64-dts-meson-sm1-fix-the-pwm-regulator-supply-pro.patch bus-ti-sysc-fix-timekeeping_suspended-warning-on-res.patch arm-dts-at91-tse850-the-emac-phy-interface-is-rmii.patch -mips-ralink-don-t-define-pc_iobase-but-increase-io_s.patch arm64-dts-qcom-sc7180-base-dynamic-cpu-power-coeffic.patch soc-qcom-llcc-disable-mmuhwt-retention.patch scsi-dc395-fix-error-case-unwinding.patch diff --git a/queue-5.15/mips-ralink-don-t-define-pc_iobase-but-increase-io_s.patch b/queue-5.15/mips-ralink-don-t-define-pc_iobase-but-increase-io_s.patch deleted file mode 100644 index f3077b6e53c..00000000000 --- a/queue-5.15/mips-ralink-don-t-define-pc_iobase-but-increase-io_s.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 38e92cf76656405e5c5ba7e4e80f4766e9dc0500 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sun, 22 Aug 2021 18:10:03 +0200 -Subject: MIPS: ralink: don't define PC_IOBASE but increase IO_SPACE_LIMIT - -From: Sergio Paracuellos - -[ Upstream commit 159697474db41732ef3b6c2e8d9395f09d1f659e ] - -Defining PCI_IOBASE results in pci resource handling working but the -addresses generated for IO accesses are wrong since the ioremap in the pci core -function 'pci_parse_request_of_pci_ranges' tries to remap to a fixed virtual -address (PC_IOBASE) which can't work for KSEG1 addresses. To get it working this -way, we would need to put PCI_IOBASE somewhere into KSEG2 which will result in -creating TLB entries for IO addresses, which most of the time isn't needed on -MIPS because of access via KSEG1. So avoid to define PCI_IOBASE and increase -IO_SPACE_LIMIT resource for ralink MIPS platform instead, to get valid IO -addresses for resources from pci core 'pci_address_to_pio' function. - -Fixes: 222b27713d7f ("MIPS: ralink: Define PCI_IOBASE") -Acked-by: Thomas Bogendoerfer -Signed-off-by: Sergio Paracuellos -Link: https://lore.kernel.org/r/20210822161005.22467-2-sergio.paracuellos@gmail.com -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Sasha Levin ---- - arch/mips/include/asm/mach-ralink/spaces.h | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/arch/mips/include/asm/mach-ralink/spaces.h b/arch/mips/include/asm/mach-ralink/spaces.h -index 87d085c9ad610..31a3525213cf3 100644 ---- a/arch/mips/include/asm/mach-ralink/spaces.h -+++ b/arch/mips/include/asm/mach-ralink/spaces.h -@@ -2,9 +2,7 @@ - #ifndef __ASM_MACH_RALINK_SPACES_H_ - #define __ASM_MACH_RALINK_SPACES_H_ - --#define PCI_IOBASE _AC(0xa0000000, UL) --#define PCI_IOSIZE SZ_16M --#define IO_SPACE_LIMIT (PCI_IOSIZE - 1) -+#define IO_SPACE_LIMIT 0x1fffffff - - #include - #endif --- -2.33.0 - diff --git a/queue-5.15/series b/queue-5.15/series index 94ed3136276..1076100a4bf 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -591,7 +591,6 @@ arm64-dts-meson-g12b-fix-the-pwm-regulator-supply-pr.patch arm64-dts-meson-sm1-fix-the-pwm-regulator-supply-pro.patch bus-ti-sysc-fix-timekeeping_suspended-warning-on-res.patch arm-dts-at91-tse850-the-emac-phy-interface-is-rmii.patch -mips-ralink-don-t-define-pc_iobase-but-increase-io_s.patch arm64-dts-qcom-sc7180-base-dynamic-cpu-power-coeffic.patch soc-qcom-llcc-disable-mmuhwt-retention.patch arm64-dts-qcom-sc7280-fix-display-port-phy-reg-prope.patch