Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d4dc688 authored by Vladimir Murzin's avatar Vladimir Murzin Committed by Marc Zyngier
Browse files

arm/arm64: KVM: Remove unreferenced S2_PGD_ORDER 



Since commit a987370f ("arm64: KVM: Fix stage-2 PGD allocation to have
per-page refcounting") there is no reference to S2_PGD_ORDER, so kill it
for the good.

Acked-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: default avatarVladimir Murzin <vladimir.murzin@arm.com>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent 281243cb

arch/arm/include/asm/kvm_arm.h

+0 −1
Original line number Diff line number Diff line
@@ -135,7 +135,6 @@ 
#define KVM_PHYS_SIZE	(1ULL << KVM_PHYS_SHIFT)

#define KVM_PHYS_MASK	(KVM_PHYS_SIZE - 1ULL)

#define PTRS_PER_S2_PGD	(1ULL << (KVM_PHYS_SHIFT - 30))

#define S2_PGD_ORDER	get_order(PTRS_PER_S2_PGD * sizeof(pgd_t))



/* Virtualization Translation Control Register (VTCR) bits */

#define VTCR_SH0	(3 << 12)

arch/arm/kvm/mmu.c

+3 −3
Original line number Diff line number Diff line
@@ -656,9 +656,9 @@ static void *kvm_alloc_hwpgd(void) 
 * kvm_alloc_stage2_pgd - allocate level-1 table for stage-2 translation.

 * @kvm:	The KVM struct pointer for the VM.

 *

 * Allocates the 1st level table only of size defined by S2_PGD_ORDER (can

 * support either full 40-bit input addresses or limited to 32-bit input

 * addresses). Clears the allocated pages.

 * Allocates only the stage-2 HW PGD level table(s) (can support either full

 * 40-bit input addresses or limited to 32-bit input addresses). Clears the

 * allocated pages.

 *

 * Note we don't need locking here as this is only called when the VM is

 * created, which can only be done once.

arch/arm64/include/asm/kvm_mmu.h

+0 −1
Original line number Diff line number Diff line
@@ -158,7 +158,6 @@ static inline bool kvm_s2pmd_readonly(pmd_t *pmd) 
#define PTRS_PER_S2_PGD_SHIFT	(KVM_PHYS_SHIFT - PGDIR_SHIFT)

#endif

#define PTRS_PER_S2_PGD		(1 << PTRS_PER_S2_PGD_SHIFT)

#define S2_PGD_ORDER		get_order(PTRS_PER_S2_PGD * sizeof(pgd_t))



#define kvm_pgd_index(addr)	(((addr) >> PGDIR_SHIFT) & (PTRS_PER_S2_PGD - 1))