]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
powerpc/pseries: H_REGISTER_PROC_TBL should ask for GTSE only if enabled
authorBharata B Rao <bharata@linux.ibm.com>
Fri, 3 Jul 2020 05:36:07 +0000 (11:06 +0530)
committerMichael Ellerman <mpe@ellerman.id.au>
Thu, 16 Jul 2020 03:00:21 +0000 (13:00 +1000)
H_REGISTER_PROC_TBL asks for GTSE by default. GTSE flag bit should
be set only when GTSE is supported.

Signed-off-by: Bharata B Rao <bharata@linux.ibm.com>
Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200703053608.12884-3-bharata@linux.ibm.com
arch/powerpc/platforms/pseries/lpar.c

index fd26f3d21d7b4b650ed1f5d51818b6a2518ae192..f82569a505f111b883e7df41735d6d2da3a2dda4 100644 (file)
@@ -1680,9 +1680,11 @@ static int pseries_lpar_register_process_table(unsigned long base,
 
        if (table_size)
                flags |= PROC_TABLE_NEW;
-       if (radix_enabled())
-               flags |= PROC_TABLE_RADIX | PROC_TABLE_GTSE;
-       else
+       if (radix_enabled()) {
+               flags |= PROC_TABLE_RADIX;
+               if (mmu_has_feature(MMU_FTR_GTSE))
+                       flags |= PROC_TABLE_GTSE;
+       } else
                flags |= PROC_TABLE_HPT_SLB;
        for (;;) {
                rc = plpar_hcall_norets(H_REGISTER_PROC_TBL, flags, base,