| Message ID | 20220123120043.3586018-7-npiggin@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | KVM: PPC: Book3S: Make LPID/nested LPID allocations dynamic | expand |
Nicholas Piggin <npiggin@gmail.com> writes: > 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> > --- > arch/powerpc/include/asm/kvm_book3s_asm.h | 3 --- > arch/powerpc/kvm/book3s_64_mmu_hv.c | 3 --- > 2 files changed, 6 deletions(-) > > diff --git a/arch/powerpc/include/asm/kvm_book3s_asm.h b/arch/powerpc/include/asm/kvm_book3s_asm.h > index e6bda70b1d93..c8882d9b86c2 100644 > --- 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 f983fb36cbf2..aafd2a74304c 100644 > --- 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))
diff --git a/arch/powerpc/include/asm/kvm_book3s_asm.h b/arch/powerpc/include/asm/kvm_book3s_asm.h index e6bda70b1d93..c8882d9b86c2 100644 --- 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 f983fb36cbf2..aafd2a74304c 100644 --- 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))
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> --- arch/powerpc/include/asm/kvm_book3s_asm.h | 3 --- arch/powerpc/kvm/book3s_64_mmu_hv.c | 3 --- 2 files changed, 6 deletions(-)