5.4-stable patches

added patches:
	hexagon-clean-up-ioremap.patch
	hexagon-define-ioremap_uc.patch

diff --git a/queue-5.4/hexagon-clean-up-ioremap.patch b/queue-5.4/hexagon-clean-up-ioremap.patch
new file mode 100644 (file)
index 0000000..c3bdc73
--- /dev/null
+++ b/queue-5.4/hexagon-clean-up-ioremap.patch
@@ -0,0 +1,64 @@
+From ac32292c8552f7e8517be184e65dd09786e991f9 Mon Sep 17 00:00:00 2001
+From: Christoph Hellwig <hch@lst.de>
+Date: Mon, 12 Aug 2019 23:27:12 +0200
+Subject: hexagon: clean up ioremap
+
+From: Christoph Hellwig <hch@lst.de>
+
+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 <hch@lst.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ 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
+@@ -171,16 +171,9 @@ static inline void writel(u32 data, vola
+ #define writew_relaxed __raw_writew
+ #define writel_relaxed __raw_writel
+ 
+-/*
+- * 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
+@@ -20,7 +20,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
+@@ -9,7 +9,7 @@
+ #include <linux/vmalloc.h>
+ #include <linux/mm.h>
+ 
+-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-5.4/hexagon-define-ioremap_uc.patch b/queue-5.4/hexagon-define-ioremap_uc.patch
new file mode 100644 (file)
index 0000000..869bdba
--- /dev/null
+++ b/queue-5.4/hexagon-define-ioremap_uc.patch
@@ -0,0 +1,53 @@
+From 7312b70699252074d753c5005fc67266c547bbe3 Mon Sep 17 00:00:00 2001
+From: Nick Desaulniers <ndesaulniers@google.com>
+Date: Sat, 4 Jan 2020 13:00:26 -0800
+Subject: hexagon: define ioremap_uc
+
+From: Nick Desaulniers <ndesaulniers@google.com>
+
+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 <ndesaulniers@google.com>
+Suggested-by: Nathan Chancellor <natechancellor@gmail.com>
+Acked-by: Brian Cain <bcain@codeaurora.org>
+Cc: Lee Jones <lee.jones@linaro.org>
+Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+Cc: Tuowen Zhao <ztuowen@gmail.com>
+Cc: Mika Westerberg <mika.westerberg@linux.intel.com>
+Cc: Luis Chamberlain <mcgrof@kernel.org>
+Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Cc: Alexios Zavras <alexios.zavras@intel.com>
+Cc: Allison Randal <allison@lohutok.net>
+Cc: Will Deacon <will@kernel.org>
+Cc: Richard Fontana <rfontana@redhat.com>
+Cc: Thomas Gleixner <tglx@linutronix.de>
+Cc: Peter Zijlstra <peterz@infradead.org>
+Cc: Boqun Feng <boqun.feng@gmail.com>
+Cc: Ingo Molnar <mingo@redhat.com>
+Cc: Geert Uytterhoeven <geert@linux-m68k.org>
+Cc: Christoph Hellwig <hch@lst.de>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ 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
+@@ -173,6 +173,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-5.4/series b/queue-5.4/series
index 1950a936f436a031350492ac769fac489e7a4c64..73358360bb7c4222b67cce90cfb87ac192567cd1 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -33,3 +33,5 @@ drm-amdgpu-fix-oops-when-pp_funcs-is-unset-in-acpi-event.patch
 revert-software-node-simplify-software_node_release-function.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