Commit 41f5189e authored by Ricardo Koller's avatar Ricardo Koller Committed by Marc Zyngier
Browse files

KVM: selftests: aarch64: Construct DEFAULT_MAIR_EL1 using sysreg.h macros 



Define macros for memory type indexes and construct DEFAULT_MAIR_EL1
with macros from asm/sysreg.h.  The index macros can then be used when
constructing PTEs (instead of using raw numbers).

Reviewed-by: default avatarAndrew Jones <andrew.jones@linux.dev>
Reviewed-by: default avatarOliver Upton <oupton@google.com>
Signed-off-by: default avatarRicardo Koller <ricarkol@google.com>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20221017195834.2295901-5-ricarkol@google.com
parent b6b03b86

tools/testing/selftests/kvm/include/aarch64/processor.h

+19 −6
Original line number Diff line number Diff line
@@ -38,12 +38,25 @@ 
 * NORMAL             4     1111:1111

 * NORMAL_WT          5     1011:1011

 */

#define DEFAULT_MAIR_EL1 ((0x00ul << (0 * 8)) | \

			  (0x04ul << (1 * 8)) | \

			  (0x0cul << (2 * 8)) | \

			  (0x44ul << (3 * 8)) | \

			  (0xfful << (4 * 8)) | \

			  (0xbbul << (5 * 8)))



/* Linux doesn't use these memory types, so let's define them. */

#define MAIR_ATTR_DEVICE_GRE	UL(0x0c)

#define MAIR_ATTR_NORMAL_WT	UL(0xbb)



#define MT_DEVICE_nGnRnE	0

#define MT_DEVICE_nGnRE		1

#define MT_DEVICE_GRE		2

#define MT_NORMAL_NC		3

#define MT_NORMAL		4

#define MT_NORMAL_WT		5



#define DEFAULT_MAIR_EL1							\

	(MAIR_ATTRIDX(MAIR_ATTR_DEVICE_nGnRnE, MT_DEVICE_nGnRnE) |		\

	 MAIR_ATTRIDX(MAIR_ATTR_DEVICE_nGnRE, MT_DEVICE_nGnRE) |		\

	 MAIR_ATTRIDX(MAIR_ATTR_DEVICE_GRE, MT_DEVICE_GRE) |			\

	 MAIR_ATTRIDX(MAIR_ATTR_NORMAL_NC, MT_NORMAL_NC) |			\

	 MAIR_ATTRIDX(MAIR_ATTR_NORMAL, MT_NORMAL) |				\

	 MAIR_ATTRIDX(MAIR_ATTR_NORMAL_WT, MT_NORMAL_WT))



#define MPIDR_HWID_BITMASK (0xff00fffffful)

tools/testing/selftests/kvm/lib/aarch64/processor.c

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ static void _virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr, 


void virt_arch_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr)

{

	uint64_t attr_idx = 4; /* NORMAL (See DEFAULT_MAIR_EL1) */

	uint64_t attr_idx = MT_NORMAL;



	_virt_pg_map(vm, vaddr, paddr, attr_idx);

}