b6afd1234c
Commit01c9348c76powerpc: Use hardware RNG for arch_get_random_seed_* not arch_get_random_* updated arch_get_random_[int|long]() to be NOPs, and moved the hardware RNG backing to arch_get_random_seed_[int|long]() instead. However, it failed to take into account that arch_get_random_int() was implemented in terms of arch_get_random_long(), and so we ended up with a version of the former that is essentially a NOP as well. Fix this by calling arch_get_random_seed_long() from arch_get_random_seed_int() instead. Fixes:01c9348c76("powerpc: Use hardware RNG for arch_get_random_seed_* not arch_get_random_*") Signed-off-by: Ard Biesheuvel <ardb@kernel.org> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/20191204115015.18015-1-ardb@kernel.org
59 lines
1.1 KiB
C
59 lines
1.1 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef _ASM_POWERPC_ARCHRANDOM_H
|
|
#define _ASM_POWERPC_ARCHRANDOM_H
|
|
|
|
#ifdef CONFIG_ARCH_RANDOM
|
|
|
|
#include <asm/machdep.h>
|
|
|
|
static inline int arch_get_random_long(unsigned long *v)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline int arch_get_random_int(unsigned int *v)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline int arch_get_random_seed_long(unsigned long *v)
|
|
{
|
|
if (ppc_md.get_random_seed)
|
|
return ppc_md.get_random_seed(v);
|
|
|
|
return 0;
|
|
}
|
|
static inline int arch_get_random_seed_int(unsigned int *v)
|
|
{
|
|
unsigned long val;
|
|
int rc;
|
|
|
|
rc = arch_get_random_seed_long(&val);
|
|
if (rc)
|
|
*v = val;
|
|
|
|
return rc;
|
|
}
|
|
|
|
static inline int arch_has_random(void)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline int arch_has_random_seed(void)
|
|
{
|
|
return !!ppc_md.get_random_seed;
|
|
}
|
|
#endif /* CONFIG_ARCH_RANDOM */
|
|
|
|
#ifdef CONFIG_PPC_POWERNV
|
|
int powernv_hwrng_present(void);
|
|
int powernv_get_random_long(unsigned long *v);
|
|
int powernv_get_random_real_mode(unsigned long *v);
|
|
#else
|
|
static inline int powernv_hwrng_present(void) { return 0; }
|
|
static inline int powernv_get_random_real_mode(unsigned long *v) { return 0; }
|
|
#endif
|
|
|
|
#endif /* _ASM_POWERPC_ARCHRANDOM_H */
|