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

Commit 3eebdbe5 authored by Mark Rutland's avatar Mark Rutland Committed by Will Deacon
Browse files

arm64: sanity checks: add ID_AA64DFR{0,1}_EL1 



While we currently expect self-hosted debug support to be identical
across CPUs, we don't currently sanity check this.

This patch adds logging of the ID_AA64DFR{0,1}_EL1 values and associated
sanity checking code.

It's not clear to me whether we need to check PMUVer, TraceVer, and
DebugVer, as we don't currently rely on these fields at all.

Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent efdf4211

arch/arm64/include/asm/cpu.h

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ struct cpuinfo_arm64 { 
	u32		reg_dczid;

	u32		reg_midr;



	u64		reg_id_aa64dfr0;

	u64		reg_id_aa64dfr1;

	u64		reg_id_aa64isar0;

	u64		reg_id_aa64isar1;

	u64		reg_id_aa64mmfr0;

arch/arm64/kernel/cpuinfo.c

+11 −0
Original line number Diff line number Diff line
@@ -111,6 +111,15 @@ static void cpuinfo_sanity_check(struct cpuinfo_arm64 *cur) 
	/* If different, timekeeping will be broken (especially with KVM) */

	diff |= CHECK(cntfrq, boot, cur, cpu);



	/*

	 * The kernel uses self-hosted debug features and expects CPUs to

	 * support identical debug features. We presently need CTX_CMPs, WRPs,

	 * and BRPs to be identical.

	 * ID_AA64DFR1 is currently RES0.

	 */

	diff |= CHECK(id_aa64dfr0, boot, cur, cpu);

	diff |= CHECK(id_aa64dfr1, boot, cur, cpu);



	/*

	 * Even in big.LITTLE, processors should be identical instruction-set

	 * wise.
@@ -171,6 +180,8 @@ static void __cpuinfo_store_cpu(struct cpuinfo_arm64 *info) 
	info->reg_dczid = read_cpuid(DCZID_EL0);

	info->reg_midr = read_cpuid_id();



	info->reg_id_aa64dfr0 = read_cpuid(ID_AA64DFR0_EL1);

	info->reg_id_aa64dfr1 = read_cpuid(ID_AA64DFR1_EL1);

	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);