xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

powerpc/pseries: wire up rng during setup_arch()

Browse Source 
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: a489043f46 ("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>
This commit is contained in:
Jason A. Donenfeld
2022-06-11 17:10:15 +02:00
committed by Greg Kroah-Hartman
parent 95d73d510b
commit 1cca46c205
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/powerpc/platforms/pseries/pseries.h
View File

@@ -114,4 +114,6 @@ int dlpar_workqueue_init(void);
void pseries_setup_security_mitigations(void); void pseries_setup_security_mitigations(void);
void pseries_lpar_read_hblkrm_characteristics(void); void pseries_lpar_read_hblkrm_characteristics(void);
void pseries_rng_init(void);
#endif /* _PSERIES_PSERIES_H */ #endif /* _PSERIES_PSERIES_H */

11
arch/powerpc/platforms/pseries/rng.c
View File

@@ -10,6 +10,7 @@
#include <asm/archrandom.h> #include <asm/archrandom.h>
#include <asm/machdep.h> #include <asm/machdep.h>
#include <asm/plpar_wrappers.h> #include <asm/plpar_wrappers.h>
#include "pseries.h"
static int pseries_get_random_long(unsigned long *v) static int pseries_get_random_long(unsigned long *v)
@@ -24,19 +25,13 @@ static int pseries_get_random_long(unsigned long *v)
return 0; return 0;
} }
static __init int rng_init(void) void __init pseries_rng_init(void)
{ {
struct device_node *dn; struct device_node *dn;
dn = of_find_compatible_node(NULL, NULL, "ibm,random"); dn = of_find_compatible_node(NULL, NULL, "ibm,random");
if (!dn) if (!dn)
return -ENODEV; return;
pr_info("Registering arch random hook.\n");
ppc_md.get_random_seed = pseries_get_random_long; ppc_md.get_random_seed = pseries_get_random_long;
of_node_put(dn); of_node_put(dn);
return 0;
} }
machine_subsys_initcall(pseries, rng_init);

2
arch/powerpc/platforms/pseries/setup.c
View File

@@ -824,6 +824,8 @@ static void __init pSeries_setup_arch(void)
if (swiotlb_force == SWIOTLB_FORCE) if (swiotlb_force == SWIOTLB_FORCE)
ppc_swiotlb_enable = 1; ppc_swiotlb_enable = 1;
pseries_rng_init();
} }
static void pseries_panic(char *str) static void pseries_panic(char *str)