KVM: PPC: Book3S HV: Remove KVMPPC_NR_LPIDS

KVMPPC_NR_LPIDS no longer represents any size restriction on the
LPID space and can be removed. A CPU with more than 12 LPID bits
implemented will now be able to create more than 4095 guests.

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Reviewed-by: Fabiano Rosas <farosas@linux.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20220123120043.3586018-7-npiggin@gmail.com

diff --git a/arch/powerpc/include/asm/kvm_book3s_asm.h b/arch/powerpc/include/asm/kvm_book3s_asm.h
index e6bda70b1d93cedde39ce0bd7e53812f4331c385..c8882d9b86c27c5118c1b09ff6f8fc15bed32dfb 100644 (file)
--- a/arch/powerpc/include/asm/kvm_book3s_asm.h
+++ b/arch/powerpc/include/asm/kvm_book3s_asm.h
@@ -14,9 +14,6 @@
 #define XICS_MFRR              0xc
 #define XICS_IPI               2       /* interrupt source # for IPIs */
 
-/* LPIDs we support with this build -- runtime limit may be lower */
-#define KVMPPC_NR_LPIDS                        (1UL << 12)
-
 /* Maximum number of threads per physical core */
 #define MAX_SMT_THREADS                8
 

diff --git a/arch/powerpc/kvm/book3s_64_mmu_hv.c b/arch/powerpc/kvm/book3s_64_mmu_hv.c
index a2254390e74b57c8e93835d8a317bb9448c04b30..f622a39d64e0dc001ff32457086a3a178c58f39d 100644 (file)
--- a/arch/powerpc/kvm/book3s_64_mmu_hv.c
+++ b/arch/powerpc/kvm/book3s_64_mmu_hv.c
@@ -269,9 +269,6 @@ int kvmppc_mmu_hv_init(void)
                nr_lpids = 1UL << KVM_MAX_NESTED_GUESTS_SHIFT;
        }
 
-       if (nr_lpids > KVMPPC_NR_LPIDS)
-               nr_lpids = KVMPPC_NR_LPIDS;
-
        if (!cpu_has_feature(CPU_FTR_ARCH_300)) {
                /* POWER7 has 10-bit LPIDs, POWER8 has 12-bit LPIDs */
                if (cpu_has_feature(CPU_FTR_ARCH_207S))