From: Greg Kroah-Hartman Date: Wed, 4 Nov 2020 14:30:14 +0000 (+0100) Subject: drop f5810e5c3292 ("asm-generic/io.h: Fix !CONFIG_GENERIC_IOMAP pci_iounmap() impleme... X-Git-Tag: v4.14.204~3 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=628b4e122855ea55fa6437eed798ed49f9679c07;p=thirdparty%2Fkernel%2Fstable-queue.git drop f5810e5c3292 ("asm-generic/io.h: Fix !CONFIG_GENERIC_IOMAP pci_iounmap() implementation") from 5.4 and 4.14 --- diff --git a/queue-4.14/asm-generic-io.h-fix-config_generic_iomap-pci_iounma.patch b/queue-4.14/asm-generic-io.h-fix-config_generic_iomap-pci_iounma.patch deleted file mode 100644 index 2ad0c8ade18..00000000000 --- a/queue-4.14/asm-generic-io.h-fix-config_generic_iomap-pci_iounma.patch +++ /dev/null @@ -1,114 +0,0 @@ -From 546e9d3d72b1c65b1aa2910571d3842596bcbf1c Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 16 Sep 2020 12:06:58 +0100 -Subject: asm-generic/io.h: Fix !CONFIG_GENERIC_IOMAP pci_iounmap() - implementation - -From: Lorenzo Pieralisi - -[ Upstream commit f5810e5c329238b8553ebd98b914bdbefd8e6737 ] - -For arches that do not select CONFIG_GENERIC_IOMAP, the current -pci_iounmap() function does nothing causing obvious memory leaks -for mapped regions that are backed by MMIO physical space. - -In order to detect if a mapped pointer is IO vs MMIO, a check must made -available to the pci_iounmap() function so that it can actually detect -whether the pointer has to be unmapped. - -In configurations where CONFIG_HAS_IOPORT_MAP && !CONFIG_GENERIC_IOMAP, -a mapped port is detected using an ioport_map() stub defined in -asm-generic/io.h. - -Use the same logic to implement a stub (ie __pci_ioport_unmap()) that -detects if the passed in pointer in pci_iounmap() is IO vs MMIO to -iounmap conditionally and call it in pci_iounmap() fixing the issue. - -Leave __pci_ioport_unmap() as a NOP for all other config options. - -Tested-by: George Cherian -Link: https://lore.kernel.org/lkml/20200905024811.74701-1-yangyingliang@huawei.com -Link: https://lore.kernel.org/lkml/20200824132046.3114383-1-george.cherian@marvell.com -Link: https://lore.kernel.org/r/a9daf8d8444d0ebd00bc6d64e336ec49dbb50784.1600254147.git.lorenzo.pieralisi@arm.com -Reported-by: George Cherian -Signed-off-by: Lorenzo Pieralisi -Signed-off-by: Lorenzo Pieralisi -Reviewed-by: Catalin Marinas -Cc: Arnd Bergmann -Cc: George Cherian -Cc: Will Deacon -Cc: Bjorn Helgaas -Cc: Catalin Marinas -Cc: Yang Yingliang -Signed-off-by: Sasha Levin ---- - include/asm-generic/io.h | 39 +++++++++++++++++++++++++++------------ - 1 file changed, 27 insertions(+), 12 deletions(-) - -diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h -index b4531e3b21209..1eafea2bf3ac2 100644 ---- a/include/asm-generic/io.h -+++ b/include/asm-generic/io.h -@@ -767,18 +767,6 @@ static inline void iowrite64_rep(volatile void __iomem *addr, - #include - #define __io_virt(x) ((void __force *)(x)) - --#ifndef CONFIG_GENERIC_IOMAP --struct pci_dev; --extern void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max); -- --#ifndef pci_iounmap --#define pci_iounmap pci_iounmap --static inline void pci_iounmap(struct pci_dev *dev, void __iomem *p) --{ --} --#endif --#endif /* CONFIG_GENERIC_IOMAP */ -- - /* - * Change virtual addresses to physical addresses and vv. - * These are pretty trivial -@@ -901,6 +889,16 @@ static inline void __iomem *ioport_map(unsigned long port, unsigned int nr) - { - return PCI_IOBASE + (port & IO_SPACE_LIMIT); - } -+#define __pci_ioport_unmap __pci_ioport_unmap -+static inline void __pci_ioport_unmap(void __iomem *p) -+{ -+ uintptr_t start = (uintptr_t) PCI_IOBASE; -+ uintptr_t addr = (uintptr_t) p; -+ -+ if (addr >= start && addr < start + IO_SPACE_LIMIT) -+ return; -+ iounmap(p); -+} - #endif - - #ifndef ioport_unmap -@@ -915,6 +913,23 @@ extern void ioport_unmap(void __iomem *p); - #endif /* CONFIG_GENERIC_IOMAP */ - #endif /* CONFIG_HAS_IOPORT_MAP */ - -+#ifndef CONFIG_GENERIC_IOMAP -+struct pci_dev; -+extern void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max); -+ -+#ifndef __pci_ioport_unmap -+static inline void __pci_ioport_unmap(void __iomem *p) {} -+#endif -+ -+#ifndef pci_iounmap -+#define pci_iounmap pci_iounmap -+static inline void pci_iounmap(struct pci_dev *dev, void __iomem *p) -+{ -+ __pci_ioport_unmap(p); -+} -+#endif -+#endif /* CONFIG_GENERIC_IOMAP */ -+ - /* - * Convert a virtual cached pointer to an uncached pointer - */ --- -2.27.0 - diff --git a/queue-4.14/series b/queue-4.14/series index d64e4be76b9..237eb846b18 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -45,7 +45,6 @@ power-supply-test_power-add-missing-newlines-when-pr.patch md-bitmap-md_bitmap_get_counter-returns-wrong-blocks.patch bnxt_en-log-unknown-link-speed-appropriately.patch clk-ti-clockdomain-fix-static-checker-warning.patch -asm-generic-io.h-fix-config_generic_iomap-pci_iounma.patch net-9p-initialize-sun_server.sun_path-to-have-addr-s.patch drivers-watchdog-rdc321x_wdt-fix-race-condition-bugs.patch ext4-detect-already-used-quota-file-early.patch diff --git a/queue-5.4/asm-generic-io.h-fix-config_generic_iomap-pci_iounma.patch b/queue-5.4/asm-generic-io.h-fix-config_generic_iomap-pci_iounma.patch deleted file mode 100644 index 5eed3d5bea8..00000000000 --- a/queue-5.4/asm-generic-io.h-fix-config_generic_iomap-pci_iounma.patch +++ /dev/null @@ -1,114 +0,0 @@ -From e81ac1dbc3f674964e03a9e15e8019b47c6eb554 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 16 Sep 2020 12:06:58 +0100 -Subject: asm-generic/io.h: Fix !CONFIG_GENERIC_IOMAP pci_iounmap() - implementation - -From: Lorenzo Pieralisi - -[ Upstream commit f5810e5c329238b8553ebd98b914bdbefd8e6737 ] - -For arches that do not select CONFIG_GENERIC_IOMAP, the current -pci_iounmap() function does nothing causing obvious memory leaks -for mapped regions that are backed by MMIO physical space. - -In order to detect if a mapped pointer is IO vs MMIO, a check must made -available to the pci_iounmap() function so that it can actually detect -whether the pointer has to be unmapped. - -In configurations where CONFIG_HAS_IOPORT_MAP && !CONFIG_GENERIC_IOMAP, -a mapped port is detected using an ioport_map() stub defined in -asm-generic/io.h. - -Use the same logic to implement a stub (ie __pci_ioport_unmap()) that -detects if the passed in pointer in pci_iounmap() is IO vs MMIO to -iounmap conditionally and call it in pci_iounmap() fixing the issue. - -Leave __pci_ioport_unmap() as a NOP for all other config options. - -Tested-by: George Cherian -Link: https://lore.kernel.org/lkml/20200905024811.74701-1-yangyingliang@huawei.com -Link: https://lore.kernel.org/lkml/20200824132046.3114383-1-george.cherian@marvell.com -Link: https://lore.kernel.org/r/a9daf8d8444d0ebd00bc6d64e336ec49dbb50784.1600254147.git.lorenzo.pieralisi@arm.com -Reported-by: George Cherian -Signed-off-by: Lorenzo Pieralisi -Signed-off-by: Lorenzo Pieralisi -Reviewed-by: Catalin Marinas -Cc: Arnd Bergmann -Cc: George Cherian -Cc: Will Deacon -Cc: Bjorn Helgaas -Cc: Catalin Marinas -Cc: Yang Yingliang -Signed-off-by: Sasha Levin ---- - include/asm-generic/io.h | 39 +++++++++++++++++++++++++++------------ - 1 file changed, 27 insertions(+), 12 deletions(-) - -diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h -index d02806513670c..5e6c4f375e0c3 100644 ---- a/include/asm-generic/io.h -+++ b/include/asm-generic/io.h -@@ -887,18 +887,6 @@ static inline void iowrite64_rep(volatile void __iomem *addr, - #include - #define __io_virt(x) ((void __force *)(x)) - --#ifndef CONFIG_GENERIC_IOMAP --struct pci_dev; --extern void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max); -- --#ifndef pci_iounmap --#define pci_iounmap pci_iounmap --static inline void pci_iounmap(struct pci_dev *dev, void __iomem *p) --{ --} --#endif --#endif /* CONFIG_GENERIC_IOMAP */ -- - /* - * Change virtual addresses to physical addresses and vv. - * These are pretty trivial -@@ -1013,6 +1001,16 @@ static inline void __iomem *ioport_map(unsigned long port, unsigned int nr) - port &= IO_SPACE_LIMIT; - return (port > MMIO_UPPER_LIMIT) ? NULL : PCI_IOBASE + port; - } -+#define __pci_ioport_unmap __pci_ioport_unmap -+static inline void __pci_ioport_unmap(void __iomem *p) -+{ -+ uintptr_t start = (uintptr_t) PCI_IOBASE; -+ uintptr_t addr = (uintptr_t) p; -+ -+ if (addr >= start && addr < start + IO_SPACE_LIMIT) -+ return; -+ iounmap(p); -+} - #endif - - #ifndef ioport_unmap -@@ -1027,6 +1025,23 @@ extern void ioport_unmap(void __iomem *p); - #endif /* CONFIG_GENERIC_IOMAP */ - #endif /* CONFIG_HAS_IOPORT_MAP */ - -+#ifndef CONFIG_GENERIC_IOMAP -+struct pci_dev; -+extern void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max); -+ -+#ifndef __pci_ioport_unmap -+static inline void __pci_ioport_unmap(void __iomem *p) {} -+#endif -+ -+#ifndef pci_iounmap -+#define pci_iounmap pci_iounmap -+static inline void pci_iounmap(struct pci_dev *dev, void __iomem *p) -+{ -+ __pci_ioport_unmap(p); -+} -+#endif -+#endif /* CONFIG_GENERIC_IOMAP */ -+ - /* - * Convert a virtual cached pointer to an uncached pointer - */ --- -2.27.0 - diff --git a/queue-5.4/series b/queue-5.4/series index 19416770854..906b54ea405 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -75,7 +75,6 @@ md-bitmap-md_bitmap_get_counter-returns-wrong-blocks.patch bnxt_en-log-unknown-link-speed-appropriately.patch rpmsg-glink-use-complete_all-for-open-states.patch clk-ti-clockdomain-fix-static-checker-warning.patch -asm-generic-io.h-fix-config_generic_iomap-pci_iounma.patch net-9p-initialize-sun_server.sun_path-to-have-addr-s.patch drivers-watchdog-rdc321x_wdt-fix-race-condition-bugs.patch ext4-detect-already-used-quota-file-early.patch