diff options
| author | Laurent Dufour <ldufour@linux.ibm.com> | 2022-05-23 18:43:53 +0200 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2022-06-29 19:37:07 +1000 |
| commit | 61bdbca855024997fd8c82dc190f458aa81beca8 (patch) | |
| tree | 611f835cb68c29ddcf4cc1e95e9a0bdc1bea4529 /arch | |
| parent | d9abe36df74976231baa5abc4d399d11b504ace2 (diff) | |
| download | lwn-61bdbca855024997fd8c82dc190f458aa81beca8.tar.gz lwn-61bdbca855024997fd8c82dc190f458aa81beca8.zip | |
powerpc/64s: Don't read H_BLOCK_REMOVE characteristics in radix mode
There is no need to read the H_BLOCK_REMOVE characteristics when running in
Radix mode because this hcall is never called.
Furthermore since the commit 387e220a2e5e ("powerpc/64s: Move hash MMU
support code under CONFIG_PPC_64S_HASH_MMU") define
pseries_lpar_read_hblkrm_characteristics as un empty function if
CONFIG_PPC_64S_HASH_MMU is not set, the #ifdef block can be removed.
Signed-off-by: Laurent Dufour <ldufour@linux.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20220523164353.26441-1-ldufour@linux.ibm.com
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/platforms/pseries/setup.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c index e86a749173e6..4f08161f09b9 100644 --- a/arch/powerpc/platforms/pseries/setup.c +++ b/arch/powerpc/platforms/pseries/setup.c @@ -803,9 +803,8 @@ static void __init pSeries_setup_arch(void) fwnmi_init(); pseries_setup_security_mitigations(); -#ifdef CONFIG_PPC_64S_HASH_MMU - pseries_lpar_read_hblkrm_characteristics(); -#endif + if (!radix_enabled()) + pseries_lpar_read_hblkrm_characteristics(); /* By default, only probe PCI (can be overridden by rtas_pci) */ pci_add_flags(PCI_PROBE_ONLY); |