From d9f7ca18a78cf968cf21a46d7dfb252642271084 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 8 May 2020 08:51:14 +0200 Subject: [PATCH] 4.19-stable patches added patches: hexagon-clean-up-ioremap.patch hexagon-define-ioremap_uc.patch --- queue-4.19/hexagon-clean-up-ioremap.patch | 64 ++++++++++++++++++++++ queue-4.19/hexagon-define-ioremap_uc.patch | 53 ++++++++++++++++++ queue-4.19/series | 2 + 3 files changed, 119 insertions(+) create mode 100644 queue-4.19/hexagon-clean-up-ioremap.patch create mode 100644 queue-4.19/hexagon-define-ioremap_uc.patch diff --git a/queue-4.19/hexagon-clean-up-ioremap.patch b/queue-4.19/hexagon-clean-up-ioremap.patch new file mode 100644 index 00000000000..4d886fb1031 --- /dev/null +++ b/queue-4.19/hexagon-clean-up-ioremap.patch @@ -0,0 +1,64 @@ +From ac32292c8552f7e8517be184e65dd09786e991f9 Mon Sep 17 00:00:00 2001 +From: Christoph Hellwig +Date: Mon, 12 Aug 2019 23:27:12 +0200 +Subject: hexagon: clean up ioremap + +From: Christoph Hellwig + +commit ac32292c8552f7e8517be184e65dd09786e991f9 upstream. + +Use ioremap as the main implemented function, and defined +ioremap_nocache to it as a deprecated alias. + +Signed-off-by: Christoph Hellwig +Signed-off-by: Greg Kroah-Hartman + +--- + arch/hexagon/include/asm/io.h | 11 ++--------- + arch/hexagon/kernel/hexagon_ksyms.c | 2 +- + arch/hexagon/mm/ioremap.c | 2 +- + 3 files changed, 4 insertions(+), 11 deletions(-) + +--- a/arch/hexagon/include/asm/io.h ++++ b/arch/hexagon/include/asm/io.h +@@ -186,16 +186,9 @@ static inline void writel(u32 data, vola + + #define mmiowb() + +-/* +- * Need an mtype somewhere in here, for cache type deals? +- * This is probably too long for an inline. +- */ +-void __iomem *ioremap_nocache(unsigned long phys_addr, unsigned long size); ++void __iomem *ioremap(unsigned long phys_addr, unsigned long size); ++#define ioremap_nocache ioremap + +-static inline void __iomem *ioremap(unsigned long phys_addr, unsigned long size) +-{ +- return ioremap_nocache(phys_addr, size); +-} + + static inline void iounmap(volatile void __iomem *addr) + { +--- a/arch/hexagon/kernel/hexagon_ksyms.c ++++ b/arch/hexagon/kernel/hexagon_ksyms.c +@@ -33,7 +33,7 @@ EXPORT_SYMBOL(__vmgetie); + EXPORT_SYMBOL(__vmsetie); + EXPORT_SYMBOL(__vmyield); + EXPORT_SYMBOL(empty_zero_page); +-EXPORT_SYMBOL(ioremap_nocache); ++EXPORT_SYMBOL(ioremap); + EXPORT_SYMBOL(memcpy); + EXPORT_SYMBOL(memset); + +--- a/arch/hexagon/mm/ioremap.c ++++ b/arch/hexagon/mm/ioremap.c +@@ -22,7 +22,7 @@ + #include + #include + +-void __iomem *ioremap_nocache(unsigned long phys_addr, unsigned long size) ++void __iomem *ioremap(unsigned long phys_addr, unsigned long size) + { + unsigned long last_addr, addr; + unsigned long offset = phys_addr & ~PAGE_MASK; diff --git a/queue-4.19/hexagon-define-ioremap_uc.patch b/queue-4.19/hexagon-define-ioremap_uc.patch new file mode 100644 index 00000000000..c29de5ad13d --- /dev/null +++ b/queue-4.19/hexagon-define-ioremap_uc.patch @@ -0,0 +1,53 @@ +From 7312b70699252074d753c5005fc67266c547bbe3 Mon Sep 17 00:00:00 2001 +From: Nick Desaulniers +Date: Sat, 4 Jan 2020 13:00:26 -0800 +Subject: hexagon: define ioremap_uc + +From: Nick Desaulniers + +commit 7312b70699252074d753c5005fc67266c547bbe3 upstream. + +Similar to commit 38e45d81d14e ("sparc64: implement ioremap_uc") define +ioremap_uc for hexagon to avoid errors from +-Wimplicit-function-definition. + +Link: http://lkml.kernel.org/r/20191209222956.239798-2-ndesaulniers@google.com +Link: https://github.com/ClangBuiltLinux/linux/issues/797 +Fixes: e537654b7039 ("lib: devres: add a helper function for ioremap_uc") +Signed-off-by: Nick Desaulniers +Suggested-by: Nathan Chancellor +Acked-by: Brian Cain +Cc: Lee Jones +Cc: Andy Shevchenko +Cc: Tuowen Zhao +Cc: Mika Westerberg +Cc: Luis Chamberlain +Cc: Greg Kroah-Hartman +Cc: Alexios Zavras +Cc: Allison Randal +Cc: Will Deacon +Cc: Richard Fontana +Cc: Thomas Gleixner +Cc: Peter Zijlstra +Cc: Boqun Feng +Cc: Ingo Molnar +Cc: Geert Uytterhoeven +Cc: Christoph Hellwig +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + arch/hexagon/include/asm/io.h | 1 + + 1 file changed, 1 insertion(+) + +--- a/arch/hexagon/include/asm/io.h ++++ b/arch/hexagon/include/asm/io.h +@@ -188,6 +188,7 @@ static inline void writel(u32 data, vola + + void __iomem *ioremap(unsigned long phys_addr, unsigned long size); + #define ioremap_nocache ioremap ++#define ioremap_uc(X, Y) ioremap((X), (Y)) + + + static inline void iounmap(volatile void __iomem *addr) diff --git a/queue-4.19/series b/queue-4.19/series index 6f941a479f7..e9a3e23d135 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -23,3 +23,5 @@ sctp-fix-shutdown-ctsn-ack-in-the-peer-restart-case.patch drm-amdgpu-fix-oops-when-pp_funcs-is-unset-in-acpi-event.patch lib-devres-add-a-helper-function-for-ioremap_uc.patch mfd-intel-lpss-use-devm_ioremap_uc-for-mmio.patch +hexagon-clean-up-ioremap.patch +hexagon-define-ioremap_uc.patch -- 2.47.3