From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 27 Jun 2022 11:03:05 +0000 (+0200)
Subject: 5.18-stable patches
X-Git-Tag: v5.4.202~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=948440dbdf1c13205825f335e9cf18210b69ee78;p=thirdparty%2Fkernel%2Fstable-queue.git

5.18-stable patches

added patches:
	powerpc-pseries-wire-up-rng-during-setup_arch.patch
---

diff --git a/queue-5.18/powerpc-pseries-wire-up-rng-during-setup_arch.patch b/queue-5.18/powerpc-pseries-wire-up-rng-during-setup_arch.patch
new file mode 100644
index 00000000000..fd31ed65cf5
--- /dev/null
+++ b/queue-5.18/powerpc-pseries-wire-up-rng-during-setup_arch.patch
@@ -0,0 +1,82 @@
+From e561e472a3d441753bd012333b057f48fef1045b Mon Sep 17 00:00:00 2001
+From: "Jason A. Donenfeld" <Jason@zx2c4.com>
+Date: Sat, 11 Jun 2022 17:10:15 +0200
+Subject: powerpc/pseries: wire up rng during setup_arch()
+
+From: Jason A. Donenfeld <Jason@zx2c4.com>
+
+commit e561e472a3d441753bd012333b057f48fef1045b upstream.
+
+The platform's RNG must be available before random_init() in order to be
+useful for initial seeding, which in turn means that it needs to be
+called from setup_arch(), rather than from an init call. Fortunately,
+each platform already has a setup_arch function pointer, which means
+it's easy to wire this up. This commit also removes some noisy log
+messages that don't add much.
+
+Fixes: a489043f4626 ("powerpc/pseries: Implement arch_get_random_long() based on H_RANDOM")
+Cc: stable@vger.kernel.org # v3.13+
+Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
+Reviewed-by: Christophe Leroy <christophe.leroy@csgroup.eu>
+Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
+Link: https://lore.kernel.org/r/20220611151015.548325-4-Jason@zx2c4.com
+Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/powerpc/platforms/pseries/pseries.h |    2 ++
+ arch/powerpc/platforms/pseries/rng.c     |   11 +++--------
+ arch/powerpc/platforms/pseries/setup.c   |    2 ++
+ 3 files changed, 7 insertions(+), 8 deletions(-)
+
+--- a/arch/powerpc/platforms/pseries/pseries.h
++++ b/arch/powerpc/platforms/pseries/pseries.h
+@@ -121,4 +121,6 @@ void pseries_lpar_read_hblkrm_characteri
+ static inline void pseries_lpar_read_hblkrm_characteristics(void) { }
+ #endif
+ 
++void pseries_rng_init(void);
++
+ #endif /* _PSERIES_PSERIES_H */
+--- a/arch/powerpc/platforms/pseries/rng.c
++++ b/arch/powerpc/platforms/pseries/rng.c
+@@ -10,6 +10,7 @@
+ #include <asm/archrandom.h>
+ #include <asm/machdep.h>
+ #include <asm/plpar_wrappers.h>
++#include "pseries.h"
+ 
+ 
+ static int pseries_get_random_long(unsigned long *v)
+@@ -24,19 +25,13 @@ static int pseries_get_random_long(unsig
+ 	return 0;
+ }
+ 
+-static __init int rng_init(void)
++void __init pseries_rng_init(void)
+ {
+ 	struct device_node *dn;
+ 
+ 	dn = of_find_compatible_node(NULL, NULL, "ibm,random");
+ 	if (!dn)
+-		return -ENODEV;
+-
+-	pr_info("Registering arch random hook.\n");
+-
++		return;
+ 	ppc_md.get_random_seed = pseries_get_random_long;
+-
+ 	of_node_put(dn);
+-	return 0;
+ }
+-machine_subsys_initcall(pseries, rng_init);
+--- a/arch/powerpc/platforms/pseries/setup.c
++++ b/arch/powerpc/platforms/pseries/setup.c
+@@ -852,6 +852,8 @@ static void __init pSeries_setup_arch(vo
+ 
+ 	if (swiotlb_force == SWIOTLB_FORCE)
+ 		ppc_swiotlb_enable = 1;
++
++	pseries_rng_init();
+ }
+ 
+ static void pseries_panic(char *str)
diff --git a/queue-5.18/series b/queue-5.18/series
index 48ecdf2ac3f..12cc173dd69 100644
--- a/queue-5.18/series
+++ b/queue-5.18/series
@@ -178,3 +178,4 @@ perf-build-id-fix-caching-files-with-a-wrong-build-id.patch
 smb3-use-netname-when-available-on-secondary-channels.patch
 dma-direct-use-the-correct-size-for-dma_set_encrypted.patch
 kbuild-link-vmlinux-only-once-for-config_trim_unused_ksyms-2nd-attempt.patch
+powerpc-pseries-wire-up-rng-during-setup_arch.patch