From: Greg Kroah-Hartman Date: Tue, 18 Oct 2022 17:28:30 +0000 (+0200) Subject: drop sparc-fix-the-generic-io-helpers.patch X-Git-Tag: v6.0.3~38 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9da33624f60aa9d64bacf35731ebac4acec9135d;p=thirdparty%2Fkernel%2Fstable-queue.git drop sparc-fix-the-generic-io-helpers.patch --- diff --git a/queue-5.15/series b/queue-5.15/series index b1ea86726c7..2f7561ef69d 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -533,7 +533,6 @@ arm-dts-imx6sl-add-missing-properties-for-sram.patch arm-dts-imx6sll-add-missing-properties-for-sram.patch arm-dts-imx6sx-add-missing-properties-for-sram.patch kselftest-arm64-fix-validatation-termination-record-.patch -sparc-fix-the-generic-io-helpers.patch arm64-run-softirqs-on-the-per-cpu-irq-stack.patch arm64-dts-imx8mq-librem5-add-bq25895-as-max17055-s-p.patch arm-orion-fix-include-path.patch diff --git a/queue-5.15/sparc-fix-the-generic-io-helpers.patch b/queue-5.15/sparc-fix-the-generic-io-helpers.patch deleted file mode 100644 index 02dee79954c..00000000000 --- a/queue-5.15/sparc-fix-the-generic-io-helpers.patch +++ /dev/null @@ -1,165 +0,0 @@ -From 0a3c7246dc046fe1f0c115275cc1a00836dae9e0 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 31 Aug 2022 21:55:53 +0200 -Subject: sparc: Fix the generic IO helpers - -From: Linus Walleij - -[ Upstream commit 2c230431e1e809270178905974f57cf3878939f5 ] - -This enables the Sparc to use to fill in the -missing (undefined) [read|write]sq I/O accessor functions. - -This is needed if Sparc[64] ever wants to uses CONFIG_REGMAP_MMIO -which has been patches to use accelerated _noinc accessors -such as readsq/writesq that Sparc64, while being a 64bit platform, -as of now not yet provide. - -This comes with the requirement that everything the architecture -already provides needs to be defined, rather than just being, -say, static inline functions. - -Bite the bullet and just provide the definitions and make it work. -Compile-tested on sparc32 and sparc64. - -Reported-by: kernel test robot -Signed-off-by: Linus Walleij -Cc: David S. Miller -Cc: sparclinux@vger.kernel.org -Cc: linux-arch@vger.kernel.org -Cc: Mark Brown -Cc: Arnd Bergmann -Link: https://lore.kernel.org/linux-arm-kernel/202208201639.HXye3ke4-lkp@intel.com/ -Signed-off-by: Arnd Bergmann -Signed-off-by: Sasha Levin ---- - arch/sparc/include/asm/io.h | 2 ++ - arch/sparc/include/asm/io_64.h | 22 ++++++++++++++++++++++ - 2 files changed, 24 insertions(+) - -diff --git a/arch/sparc/include/asm/io.h b/arch/sparc/include/asm/io.h -index 2eefa526b38f..2dad9be9ec75 100644 ---- a/arch/sparc/include/asm/io.h -+++ b/arch/sparc/include/asm/io.h -@@ -19,4 +19,6 @@ - #define writel_be(__w, __addr) __raw_writel(__w, __addr) - #define writew_be(__l, __addr) __raw_writew(__l, __addr) - -+#include -+ - #endif -diff --git a/arch/sparc/include/asm/io_64.h b/arch/sparc/include/asm/io_64.h -index 5ffa820dcd4d..9303270b22f3 100644 ---- a/arch/sparc/include/asm/io_64.h -+++ b/arch/sparc/include/asm/io_64.h -@@ -9,6 +9,7 @@ - #include /* IO address mapping routines need this */ - #include - #include -+#define pci_iomap pci_iomap - - /* BIO layer definitions. */ - extern unsigned long kern_base, kern_size; -@@ -239,38 +240,51 @@ static inline void outl(u32 l, unsigned long addr) - void outsb(unsigned long, const void *, unsigned long); - void outsw(unsigned long, const void *, unsigned long); - void outsl(unsigned long, const void *, unsigned long); -+#define outsb outsb -+#define outsw outsw -+#define outsl outsl - void insb(unsigned long, void *, unsigned long); - void insw(unsigned long, void *, unsigned long); - void insl(unsigned long, void *, unsigned long); -+#define insb insb -+#define insw insw -+#define insl insl - - static inline void readsb(void __iomem *port, void *buf, unsigned long count) - { - insb((unsigned long __force)port, buf, count); - } -+#define readsb readsb -+ - static inline void readsw(void __iomem *port, void *buf, unsigned long count) - { - insw((unsigned long __force)port, buf, count); - } -+#define readsw readsw - - static inline void readsl(void __iomem *port, void *buf, unsigned long count) - { - insl((unsigned long __force)port, buf, count); - } -+#define readsl readsl - - static inline void writesb(void __iomem *port, const void *buf, unsigned long count) - { - outsb((unsigned long __force)port, buf, count); - } -+#define writesb writesb - - static inline void writesw(void __iomem *port, const void *buf, unsigned long count) - { - outsw((unsigned long __force)port, buf, count); - } -+#define writesw writesw - - static inline void writesl(void __iomem *port, const void *buf, unsigned long count) - { - outsl((unsigned long __force)port, buf, count); - } -+#define writesl writesl - - #define ioread8_rep(p,d,l) readsb(p,d,l) - #define ioread16_rep(p,d,l) readsw(p,d,l) -@@ -344,6 +358,7 @@ static inline void memset_io(volatile void __iomem *dst, int c, __kernel_size_t - d++; - } - } -+#define memset_io memset_io - - static inline void sbus_memcpy_fromio(void *dst, const volatile void __iomem *src, - __kernel_size_t n) -@@ -369,6 +384,7 @@ static inline void memcpy_fromio(void *dst, const volatile void __iomem *src, - src++; - } - } -+#define memcpy_fromio memcpy_fromio - - static inline void sbus_memcpy_toio(volatile void __iomem *dst, const void *src, - __kernel_size_t n) -@@ -395,6 +411,7 @@ static inline void memcpy_toio(volatile void __iomem *dst, const void *src, - d++; - } - } -+#define memcpy_toio memcpy_toio - - #ifdef __KERNEL__ - -@@ -412,7 +429,9 @@ static inline void __iomem *ioremap(unsigned long offset, unsigned long size) - static inline void __iomem *ioremap_np(unsigned long offset, unsigned long size) - { - return NULL; -+ - } -+#define ioremap_np ioremap_np - - static inline void iounmap(volatile void __iomem *addr) - { -@@ -432,10 +451,13 @@ static inline void iounmap(volatile void __iomem *addr) - /* Create a virtual mapping cookie for an IO port range */ - void __iomem *ioport_map(unsigned long port, unsigned int nr); - void ioport_unmap(void __iomem *); -+#define ioport_map ioport_map -+#define ioport_unmap ioport_unmap - - /* Create a virtual mapping cookie for a PCI BAR (memory or IO) */ - struct pci_dev; - void pci_iounmap(struct pci_dev *dev, void __iomem *); -+#define pci_iounmap pci_iounmap - - static inline int sbus_can_dma_64bit(void) - { --- -2.35.1 - diff --git a/queue-5.19/series b/queue-5.19/series index 2f94b0fbab8..1f7e58da8b8 100644 --- a/queue-5.19/series +++ b/queue-5.19/series @@ -723,7 +723,6 @@ arm-dts-imx6sx-add-missing-properties-for-sram.patch arm-dts-imx6sl-use-tabs-for-code-indent.patch arm-dts-imx6sx-udoo-neo-don-t-use-multiple-blank-lin.patch kselftest-arm64-fix-validatation-termination-record-.patch -sparc-fix-the-generic-io-helpers.patch arm64-run-softirqs-on-the-per-cpu-irq-stack.patch arm64-dts-imx8mm-kontron-use-the-vselect-signal-to-s.patch arm64-dts-imx8ulp-no-executable-source-file-permissi.patch diff --git a/queue-5.19/sparc-fix-the-generic-io-helpers.patch b/queue-5.19/sparc-fix-the-generic-io-helpers.patch deleted file mode 100644 index fd56439b159..00000000000 --- a/queue-5.19/sparc-fix-the-generic-io-helpers.patch +++ /dev/null @@ -1,165 +0,0 @@ -From 36728f5f8ddec9d695ede1d89991cfb6f1f2f9cd Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 31 Aug 2022 21:55:53 +0200 -Subject: sparc: Fix the generic IO helpers - -From: Linus Walleij - -[ Upstream commit 2c230431e1e809270178905974f57cf3878939f5 ] - -This enables the Sparc to use to fill in the -missing (undefined) [read|write]sq I/O accessor functions. - -This is needed if Sparc[64] ever wants to uses CONFIG_REGMAP_MMIO -which has been patches to use accelerated _noinc accessors -such as readsq/writesq that Sparc64, while being a 64bit platform, -as of now not yet provide. - -This comes with the requirement that everything the architecture -already provides needs to be defined, rather than just being, -say, static inline functions. - -Bite the bullet and just provide the definitions and make it work. -Compile-tested on sparc32 and sparc64. - -Reported-by: kernel test robot -Signed-off-by: Linus Walleij -Cc: David S. Miller -Cc: sparclinux@vger.kernel.org -Cc: linux-arch@vger.kernel.org -Cc: Mark Brown -Cc: Arnd Bergmann -Link: https://lore.kernel.org/linux-arm-kernel/202208201639.HXye3ke4-lkp@intel.com/ -Signed-off-by: Arnd Bergmann -Signed-off-by: Sasha Levin ---- - arch/sparc/include/asm/io.h | 2 ++ - arch/sparc/include/asm/io_64.h | 22 ++++++++++++++++++++++ - 2 files changed, 24 insertions(+) - -diff --git a/arch/sparc/include/asm/io.h b/arch/sparc/include/asm/io.h -index 2eefa526b38f..2dad9be9ec75 100644 ---- a/arch/sparc/include/asm/io.h -+++ b/arch/sparc/include/asm/io.h -@@ -19,4 +19,6 @@ - #define writel_be(__w, __addr) __raw_writel(__w, __addr) - #define writew_be(__l, __addr) __raw_writew(__l, __addr) - -+#include -+ - #endif -diff --git a/arch/sparc/include/asm/io_64.h b/arch/sparc/include/asm/io_64.h -index 5ffa820dcd4d..9303270b22f3 100644 ---- a/arch/sparc/include/asm/io_64.h -+++ b/arch/sparc/include/asm/io_64.h -@@ -9,6 +9,7 @@ - #include /* IO address mapping routines need this */ - #include - #include -+#define pci_iomap pci_iomap - - /* BIO layer definitions. */ - extern unsigned long kern_base, kern_size; -@@ -239,38 +240,51 @@ static inline void outl(u32 l, unsigned long addr) - void outsb(unsigned long, const void *, unsigned long); - void outsw(unsigned long, const void *, unsigned long); - void outsl(unsigned long, const void *, unsigned long); -+#define outsb outsb -+#define outsw outsw -+#define outsl outsl - void insb(unsigned long, void *, unsigned long); - void insw(unsigned long, void *, unsigned long); - void insl(unsigned long, void *, unsigned long); -+#define insb insb -+#define insw insw -+#define insl insl - - static inline void readsb(void __iomem *port, void *buf, unsigned long count) - { - insb((unsigned long __force)port, buf, count); - } -+#define readsb readsb -+ - static inline void readsw(void __iomem *port, void *buf, unsigned long count) - { - insw((unsigned long __force)port, buf, count); - } -+#define readsw readsw - - static inline void readsl(void __iomem *port, void *buf, unsigned long count) - { - insl((unsigned long __force)port, buf, count); - } -+#define readsl readsl - - static inline void writesb(void __iomem *port, const void *buf, unsigned long count) - { - outsb((unsigned long __force)port, buf, count); - } -+#define writesb writesb - - static inline void writesw(void __iomem *port, const void *buf, unsigned long count) - { - outsw((unsigned long __force)port, buf, count); - } -+#define writesw writesw - - static inline void writesl(void __iomem *port, const void *buf, unsigned long count) - { - outsl((unsigned long __force)port, buf, count); - } -+#define writesl writesl - - #define ioread8_rep(p,d,l) readsb(p,d,l) - #define ioread16_rep(p,d,l) readsw(p,d,l) -@@ -344,6 +358,7 @@ static inline void memset_io(volatile void __iomem *dst, int c, __kernel_size_t - d++; - } - } -+#define memset_io memset_io - - static inline void sbus_memcpy_fromio(void *dst, const volatile void __iomem *src, - __kernel_size_t n) -@@ -369,6 +384,7 @@ static inline void memcpy_fromio(void *dst, const volatile void __iomem *src, - src++; - } - } -+#define memcpy_fromio memcpy_fromio - - static inline void sbus_memcpy_toio(volatile void __iomem *dst, const void *src, - __kernel_size_t n) -@@ -395,6 +411,7 @@ static inline void memcpy_toio(volatile void __iomem *dst, const void *src, - d++; - } - } -+#define memcpy_toio memcpy_toio - - #ifdef __KERNEL__ - -@@ -412,7 +429,9 @@ static inline void __iomem *ioremap(unsigned long offset, unsigned long size) - static inline void __iomem *ioremap_np(unsigned long offset, unsigned long size) - { - return NULL; -+ - } -+#define ioremap_np ioremap_np - - static inline void iounmap(volatile void __iomem *addr) - { -@@ -432,10 +451,13 @@ static inline void iounmap(volatile void __iomem *addr) - /* Create a virtual mapping cookie for an IO port range */ - void __iomem *ioport_map(unsigned long port, unsigned int nr); - void ioport_unmap(void __iomem *); -+#define ioport_map ioport_map -+#define ioport_unmap ioport_unmap - - /* Create a virtual mapping cookie for a PCI BAR (memory or IO) */ - struct pci_dev; - void pci_iounmap(struct pci_dev *dev, void __iomem *); -+#define pci_iounmap pci_iounmap - - static inline int sbus_can_dma_64bit(void) - { --- -2.35.1 - diff --git a/queue-6.0/series b/queue-6.0/series index 29a6282b5fb..e4cdd57f613 100644 --- a/queue-6.0/series +++ b/queue-6.0/series @@ -806,7 +806,6 @@ arm-dts-imx6sx-add-missing-properties-for-sram.patch arm-dts-imx6sl-use-tabs-for-code-indent.patch arm-dts-imx6sx-udoo-neo-don-t-use-multiple-blank-lin.patch kselftest-arm64-fix-validatation-termination-record-.patch -sparc-fix-the-generic-io-helpers.patch arm64-run-softirqs-on-the-per-cpu-irq-stack.patch arm64-dts-imx8mm-kontron-use-the-vselect-signal-to-s.patch arm64-dts-imx8ulp-no-executable-source-file-permissi.patch diff --git a/queue-6.0/sparc-fix-the-generic-io-helpers.patch b/queue-6.0/sparc-fix-the-generic-io-helpers.patch deleted file mode 100644 index 273fe7364bd..00000000000 --- a/queue-6.0/sparc-fix-the-generic-io-helpers.patch +++ /dev/null @@ -1,165 +0,0 @@ -From 7c9150bb93734ff3ffe5ba2fd3970707a7431416 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 31 Aug 2022 21:55:53 +0200 -Subject: sparc: Fix the generic IO helpers - -From: Linus Walleij - -[ Upstream commit 2c230431e1e809270178905974f57cf3878939f5 ] - -This enables the Sparc to use to fill in the -missing (undefined) [read|write]sq I/O accessor functions. - -This is needed if Sparc[64] ever wants to uses CONFIG_REGMAP_MMIO -which has been patches to use accelerated _noinc accessors -such as readsq/writesq that Sparc64, while being a 64bit platform, -as of now not yet provide. - -This comes with the requirement that everything the architecture -already provides needs to be defined, rather than just being, -say, static inline functions. - -Bite the bullet and just provide the definitions and make it work. -Compile-tested on sparc32 and sparc64. - -Reported-by: kernel test robot -Signed-off-by: Linus Walleij -Cc: David S. Miller -Cc: sparclinux@vger.kernel.org -Cc: linux-arch@vger.kernel.org -Cc: Mark Brown -Cc: Arnd Bergmann -Link: https://lore.kernel.org/linux-arm-kernel/202208201639.HXye3ke4-lkp@intel.com/ -Signed-off-by: Arnd Bergmann -Signed-off-by: Sasha Levin ---- - arch/sparc/include/asm/io.h | 2 ++ - arch/sparc/include/asm/io_64.h | 22 ++++++++++++++++++++++ - 2 files changed, 24 insertions(+) - -diff --git a/arch/sparc/include/asm/io.h b/arch/sparc/include/asm/io.h -index 2eefa526b38f..2dad9be9ec75 100644 ---- a/arch/sparc/include/asm/io.h -+++ b/arch/sparc/include/asm/io.h -@@ -19,4 +19,6 @@ - #define writel_be(__w, __addr) __raw_writel(__w, __addr) - #define writew_be(__l, __addr) __raw_writew(__l, __addr) - -+#include -+ - #endif -diff --git a/arch/sparc/include/asm/io_64.h b/arch/sparc/include/asm/io_64.h -index 5ffa820dcd4d..9303270b22f3 100644 ---- a/arch/sparc/include/asm/io_64.h -+++ b/arch/sparc/include/asm/io_64.h -@@ -9,6 +9,7 @@ - #include /* IO address mapping routines need this */ - #include - #include -+#define pci_iomap pci_iomap - - /* BIO layer definitions. */ - extern unsigned long kern_base, kern_size; -@@ -239,38 +240,51 @@ static inline void outl(u32 l, unsigned long addr) - void outsb(unsigned long, const void *, unsigned long); - void outsw(unsigned long, const void *, unsigned long); - void outsl(unsigned long, const void *, unsigned long); -+#define outsb outsb -+#define outsw outsw -+#define outsl outsl - void insb(unsigned long, void *, unsigned long); - void insw(unsigned long, void *, unsigned long); - void insl(unsigned long, void *, unsigned long); -+#define insb insb -+#define insw insw -+#define insl insl - - static inline void readsb(void __iomem *port, void *buf, unsigned long count) - { - insb((unsigned long __force)port, buf, count); - } -+#define readsb readsb -+ - static inline void readsw(void __iomem *port, void *buf, unsigned long count) - { - insw((unsigned long __force)port, buf, count); - } -+#define readsw readsw - - static inline void readsl(void __iomem *port, void *buf, unsigned long count) - { - insl((unsigned long __force)port, buf, count); - } -+#define readsl readsl - - static inline void writesb(void __iomem *port, const void *buf, unsigned long count) - { - outsb((unsigned long __force)port, buf, count); - } -+#define writesb writesb - - static inline void writesw(void __iomem *port, const void *buf, unsigned long count) - { - outsw((unsigned long __force)port, buf, count); - } -+#define writesw writesw - - static inline void writesl(void __iomem *port, const void *buf, unsigned long count) - { - outsl((unsigned long __force)port, buf, count); - } -+#define writesl writesl - - #define ioread8_rep(p,d,l) readsb(p,d,l) - #define ioread16_rep(p,d,l) readsw(p,d,l) -@@ -344,6 +358,7 @@ static inline void memset_io(volatile void __iomem *dst, int c, __kernel_size_t - d++; - } - } -+#define memset_io memset_io - - static inline void sbus_memcpy_fromio(void *dst, const volatile void __iomem *src, - __kernel_size_t n) -@@ -369,6 +384,7 @@ static inline void memcpy_fromio(void *dst, const volatile void __iomem *src, - src++; - } - } -+#define memcpy_fromio memcpy_fromio - - static inline void sbus_memcpy_toio(volatile void __iomem *dst, const void *src, - __kernel_size_t n) -@@ -395,6 +411,7 @@ static inline void memcpy_toio(volatile void __iomem *dst, const void *src, - d++; - } - } -+#define memcpy_toio memcpy_toio - - #ifdef __KERNEL__ - -@@ -412,7 +429,9 @@ static inline void __iomem *ioremap(unsigned long offset, unsigned long size) - static inline void __iomem *ioremap_np(unsigned long offset, unsigned long size) - { - return NULL; -+ - } -+#define ioremap_np ioremap_np - - static inline void iounmap(volatile void __iomem *addr) - { -@@ -432,10 +451,13 @@ static inline void iounmap(volatile void __iomem *addr) - /* Create a virtual mapping cookie for an IO port range */ - void __iomem *ioport_map(unsigned long port, unsigned int nr); - void ioport_unmap(void __iomem *); -+#define ioport_map ioport_map -+#define ioport_unmap ioport_unmap - - /* Create a virtual mapping cookie for a PCI BAR (memory or IO) */ - struct pci_dev; - void pci_iounmap(struct pci_dev *dev, void __iomem *); -+#define pci_iounmap pci_iounmap - - static inline int sbus_can_dma_64bit(void) - { --- -2.35.1 -