| Message ID | 20220523164353.26441-1-ldufour@linux.ibm.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v2] powerpc/64s: Don't read H_BLOCK_REMOVE characteristics in radix mode | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/github-powerpc_ppctests | success | Successfully ran 10 jobs. |
| snowpatch_ozlabs/github-powerpc_selftests | success | Successfully ran 10 jobs. |
| snowpatch_ozlabs/github-powerpc_kernel_qemu | success | Successfully ran 24 jobs. |
| snowpatch_ozlabs/github-powerpc_sparse | success | Successfully ran 4 jobs. |
| snowpatch_ozlabs/github-powerpc_clang | success | Successfully ran 7 jobs. |
On Mon, 23 May 2022 18:43:53 +0200, Laurent Dufour wrote: > 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. > > [...] Applied to powerpc/next. [1/1] powerpc/64s: Don't read H_BLOCK_REMOVE characteristics in radix mode https://git.kernel.org/powerpc/c/61bdbca855024997fd8c82dc190f458aa81beca8 cheers
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c index c9fcc30a0365..6d7d31d8099d 100644 --- a/arch/powerpc/platforms/pseries/setup.c +++ b/arch/powerpc/platforms/pseries/setup.c @@ -802,9 +802,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);
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. Cc: Nicholas Piggin <npiggin@gmail.com> Cc: Christophe Leroy <christophe.leroy@csgroup.eu> Signed-off-by: Laurent Dufour <ldufour@linux.ibm.com> --- arch/powerpc/platforms/pseries/setup.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)