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

Commit d53d9bc6 authored by Marc Zyngier's avatar Marc Zyngier Committed by Christoffer Dall
Browse files

arm64: KVM: Define HYP offset masks 



Define the two possible HYP VA regions in terms of VA_BITS,
and keep HYP_PAGE_OFFSET_MASK as a temporary compatibility
definition.

Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
parent 853c3b21

arch/arm64/include/asm/kvm_mmu.h

+6 −2
Original line number Diff line number Diff line
@@ -68,8 +68,12 @@ 
 * functionality is already mapped as part of the main kernel

 * mappings, and none of this applies in that case.

 */

#define HYP_PAGE_OFFSET_SHIFT	VA_BITS

#define HYP_PAGE_OFFSET_MASK	((UL(1) << HYP_PAGE_OFFSET_SHIFT) - 1)



#define HYP_PAGE_OFFSET_HIGH_MASK	((UL(1) << VA_BITS) - 1)

#define HYP_PAGE_OFFSET_LOW_MASK	((UL(1) << (VA_BITS - 1)) - 1)



/* Temporary compat define */

#define HYP_PAGE_OFFSET_MASK		HYP_PAGE_OFFSET_HIGH_MASK



/*

 * Our virtual mapping for the idmap-ed MMU-enable code. Must be