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

Commit 67d25a86 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "arm64: Mask out 16KB granule in MMFR register"

parents 16fc1369 b689f36d

arch/arm64/include/asm/cputype.h

+4 −0
Original line number Diff line number Diff line
@@ -32,6 +32,10 @@ 
#define MPIDR_AFFINITY_LEVEL(mpidr, level) \

	((mpidr >> MPIDR_LEVEL_SHIFT(level)) & MPIDR_LEVEL_MASK)



#define MMFR0_16KGRAN_SIZE	15

#define MMFR0_16KGRAN_SHFT	20

#define MMFR0_EL1_16KGRAN_MASK	(MMFR0_16KGRAN_SIZE << MMFR0_16KGRAN_SHFT)



#define read_cpuid(reg) ({						\

	u64 __val;							\

	asm("mrs	%0, " #reg : "=r" (__val));			\

arch/arm64/kernel/cpuinfo.c

+6 −1
Original line number Diff line number Diff line
@@ -189,7 +189,12 @@ static void __cpuinfo_store_cpu(struct cpuinfo_arm64 *info) 


	info->reg_id_aa64isar0 = read_cpuid(ID_AA64ISAR0_EL1);

	info->reg_id_aa64isar1 = read_cpuid(ID_AA64ISAR1_EL1);

	info->reg_id_aa64mmfr0 = read_cpuid(ID_AA64MMFR0_EL1);

	/*

	 * Explicitly mask out 16KB granule since we donot

	 * want to support it

	 */

	info->reg_id_aa64mmfr0 = read_cpuid(ID_AA64MMFR0_EL1) &

					(~MMFR0_EL1_16KGRAN_MASK);

	info->reg_id_aa64mmfr1 = read_cpuid(ID_AA64MMFR1_EL1);

	info->reg_id_aa64pfr0 = read_cpuid(ID_AA64PFR0_EL1);

	info->reg_id_aa64pfr1 = read_cpuid(ID_AA64PFR1_EL1);