From: Greg Kroah-Hartman Date: Fri, 6 Dec 2019 13:07:42 +0000 (+0100) Subject: 4.19-stable patches X-Git-Tag: v5.4.3~90 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d2f003298e23d300c833e648b0610a3a660a2403;p=thirdparty%2Fkernel%2Fstable-queue.git 4.19-stable patches added patches: arm64-tegra-fix-active-low-warning-for-jetson-tx1-regulator.patch lp-fix-sparc64-lpsettimeout-ioctl.patch sparc64-implement-ioremap_uc.patch --- diff --git a/queue-4.19/arm64-tegra-fix-active-low-warning-for-jetson-tx1-regulator.patch b/queue-4.19/arm64-tegra-fix-active-low-warning-for-jetson-tx1-regulator.patch new file mode 100644 index 00000000000..d16583a490d --- /dev/null +++ b/queue-4.19/arm64-tegra-fix-active-low-warning-for-jetson-tx1-regulator.patch @@ -0,0 +1,44 @@ +From 1e5e929c009559bd7e898ac8e17a5d01037cb057 Mon Sep 17 00:00:00 2001 +From: Jon Hunter +Date: Wed, 25 Sep 2019 15:12:29 +0100 +Subject: arm64: tegra: Fix 'active-low' warning for Jetson TX1 regulator + +From: Jon Hunter + +commit 1e5e929c009559bd7e898ac8e17a5d01037cb057 upstream. + +Commit 34993594181d ("arm64: tegra: Enable HDMI on Jetson TX1") +added a regulator for HDMI on the Jetson TX1 platform. This regulator +has an active high enable, but the GPIO specifier for enabling the +regulator incorrectly defines it as active-low. This causes the +following warning to occur on boot ... + + WARNING KERN regulator@10 GPIO handle specifies active low - ignored + +The fixed-regulator binding does not use the active-low flag from the +gpio specifier and purely relies of the presence of the +'enable-active-high' property to determine if it is active high or low +(if this property is omitted). Fix this warning by setting the GPIO +to active-high in the GPIO specifier which aligns with the presense of +the 'enable-active-high' property. + +Fixes: 34993594181d ("arm64: tegra: Enable HDMI on Jetson TX1") +Signed-off-by: Jon Hunter +Signed-off-by: Thierry Reding +Signed-off-by: Greg Kroah-Hartman + +--- + arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi ++++ b/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi +@@ -1589,7 +1589,7 @@ + regulator-name = "VDD_HDMI_5V0"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; +- gpio = <&exp1 12 GPIO_ACTIVE_LOW>; ++ gpio = <&exp1 12 GPIO_ACTIVE_HIGH>; + enable-active-high; + vin-supply = <&vdd_5v0_sys>; + }; diff --git a/queue-4.19/lp-fix-sparc64-lpsettimeout-ioctl.patch b/queue-4.19/lp-fix-sparc64-lpsettimeout-ioctl.patch new file mode 100644 index 00000000000..d6b14b2a131 --- /dev/null +++ b/queue-4.19/lp-fix-sparc64-lpsettimeout-ioctl.patch @@ -0,0 +1,40 @@ +From 45a2d64696b11913bcf1087b041740edbade3e21 Mon Sep 17 00:00:00 2001 +From: Arnd Bergmann +Date: Fri, 8 Nov 2019 21:34:29 +0100 +Subject: lp: fix sparc64 LPSETTIMEOUT ioctl + +From: Arnd Bergmann + +commit 45a2d64696b11913bcf1087b041740edbade3e21 upstream. + +The layout of struct timeval is different on sparc64 from +anything else, and the patch I did long ago failed to take +this into account. + +Change it now to handle sparc64 user space correctly again. + +Quite likely nobody cares about parallel ports on sparc64, +but there is no reason not to fix it. + +Cc: stable@vger.kernel.org +Fixes: 9a450484089d ("lp: support 64-bit time_t user space") +Signed-off-by: Arnd Bergmann +Link: https://lore.kernel.org/r/20191108203435.112759-7-arnd@arndb.de +Signed-off-by: Greg Kroah-Hartman +--- + drivers/char/lp.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/drivers/char/lp.c ++++ b/drivers/char/lp.c +@@ -708,6 +708,10 @@ static int lp_set_timeout64(unsigned int + if (copy_from_user(karg, arg, sizeof(karg))) + return -EFAULT; + ++ /* sparc64 suseconds_t is 32-bit only */ ++ if (IS_ENABLED(CONFIG_SPARC64) && !in_compat_syscall()) ++ karg[1] >>= 32; ++ + return lp_set_timeout(minor, karg[0], karg[1]); + } + diff --git a/queue-4.19/series b/queue-4.19/series index 94cd1412733..fe24704a6b8 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -1 +1,4 @@ rsi-release-skb-if-rsi_prepare_beacon-fails.patch +arm64-tegra-fix-active-low-warning-for-jetson-tx1-regulator.patch +sparc64-implement-ioremap_uc.patch +lp-fix-sparc64-lpsettimeout-ioctl.patch diff --git a/queue-4.19/sparc64-implement-ioremap_uc.patch b/queue-4.19/sparc64-implement-ioremap_uc.patch new file mode 100644 index 00000000000..307abbd5ad5 --- /dev/null +++ b/queue-4.19/sparc64-implement-ioremap_uc.patch @@ -0,0 +1,34 @@ +From 38e45d81d14e5f78cd67922596b1c37b4c22ec74 Mon Sep 17 00:00:00 2001 +From: Tuowen Zhao +Date: Wed, 16 Oct 2019 15:06:27 -0600 +Subject: sparc64: implement ioremap_uc + +From: Tuowen Zhao + +commit 38e45d81d14e5f78cd67922596b1c37b4c22ec74 upstream. + +On sparc64, the whole physical IO address space is accessible using +physically addressed loads and stores. *_uc does nothing like the +others. + +Cc: # v4.19+ +Reported-by: kbuild test robot +Signed-off-by: Tuowen Zhao +Acked-by: David S. Miller +Signed-off-by: Lee Jones +Signed-off-by: Greg Kroah-Hartman + +--- + arch/sparc/include/asm/io_64.h | 1 + + 1 file changed, 1 insertion(+) + +--- a/arch/sparc/include/asm/io_64.h ++++ b/arch/sparc/include/asm/io_64.h +@@ -409,6 +409,7 @@ static inline void __iomem *ioremap(unsi + } + + #define ioremap_nocache(X,Y) ioremap((X),(Y)) ++#define ioremap_uc(X,Y) ioremap((X),(Y)) + #define ioremap_wc(X,Y) ioremap((X),(Y)) + #define ioremap_wt(X,Y) ioremap((X),(Y)) +