On Thu, Apr 07, 2022 at 05:41:14PM -0700, Ricardo Koller wrote: > 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). > > Signed-off-by: Ricardo Koller <ricarkol@xxxxxxxxxx> > --- > .../selftests/kvm/include/aarch64/processor.h | 24 ++++++++++++++----- > .../selftests/kvm/lib/aarch64/processor.c | 2 +- > 2 files changed, 19 insertions(+), 7 deletions(-) > > diff --git a/tools/testing/selftests/kvm/include/aarch64/processor.h b/tools/testing/selftests/kvm/include/aarch64/processor.h > index 3965a5ac778e..16753a1f28e3 100644 > --- a/tools/testing/selftests/kvm/include/aarch64/processor.h > +++ b/tools/testing/selftests/kvm/include/aarch64/processor.h > @@ -38,12 +38,24 @@ > * 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_NORMAL_WT UL(0xbb) nit: MAIR_ATTR_NORMAL_WT Might be annoying if these are actually defined at a later date and someone tries to refresh the tools/ header copy. A bit more work, but how about adding these to the real asm/sysreg.h then catching tools/ up in a subsequent commit? Modulo the nit, fine with this as is: Reviewed-by: Oliver Upton <oupton@xxxxxxxxxx>
