Skip to content

Commit 61bdbca

Browse files
ldu4mpe
authored andcommitted
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 387e220 ("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
1 parent d9abe36 commit 61bdbca

File tree

1 file changed

+2
-3
lines changed
  • arch/powerpc/platforms/pseries

1 file changed

+2
-3
lines changed

arch/powerpc/platforms/pseries/setup.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -803,9 +803,8 @@ static void __init pSeries_setup_arch(void)
803803
fwnmi_init();
804804

805805
pseries_setup_security_mitigations();
806-
#ifdef CONFIG_PPC_64S_HASH_MMU
807-
pseries_lpar_read_hblkrm_characteristics();
808-
#endif
806+
if (!radix_enabled())
807+
pseries_lpar_read_hblkrm_characteristics();
809808

810809
/* By default, only probe PCI (can be overridden by rtas_pci) */
811810
pci_add_flags(PCI_PROBE_ONLY);

0 commit comments

Comments
 (0)