diff options
author | Mark Rutland <mark.rutland@arm.com> | 2016-03-04 13:54:05 +0100 |
---|---|---|
committer | Catalin Marinas <catalin.marinas@arm.com> | 2016-03-04 15:12:46 +0100 |
commit | 1cc6ed90dd7313055dec0174e2cda745ebadd6b0 (patch) | |
tree | 4b517d6848f377ee261558d3cbd9a877325308c7 /arch/arm64/mm/context.c | |
parent | arm64: enable CONFIG_DEBUG_RODATA by default (diff) | |
download | linux-1cc6ed90dd7313055dec0174e2cda745ebadd6b0.tar.xz linux-1cc6ed90dd7313055dec0174e2cda745ebadd6b0.zip |
arm64: make mrs_s prefixing implicit in read_cpuid
Commit 0f54b14e76f5302a ("arm64: cpufeature: Change read_cpuid() to use
sysreg's mrs_s macro") changed read_cpuid to require a SYS_ prefix on
register names, to allow manual assembly of registers unknown by the
toolchain, using tables in sysreg.h.
This interacts poorly with commit 42b55734030c1f72 ("efi/arm64: Check
for h/w support before booting a >4 KB granular kernel"), which is
curretly queued via the tip tree, and uses read_cpuid without a SYS_
prefix. Due to this, a build of next-20160304 fails if EFI and 64K pages
are selected.
To avoid this issue when trees are merged, move the required SYS_
prefixing into read_cpuid, and revert all of the updated callsites to
pass plain register names. This effectively reverts the bulk of commit
0f54b14e76f5302a.
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Cc: James Morse <james.morse@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch/arm64/mm/context.c')
-rw-r--r-- | arch/arm64/mm/context.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/mm/context.c b/arch/arm64/mm/context.c index 6c989f06617f..c90c3c5f46af 100644 --- a/arch/arm64/mm/context.c +++ b/arch/arm64/mm/context.c @@ -45,7 +45,7 @@ static cpumask_t tlb_flush_pending; static u32 get_cpu_asid_bits(void) { u32 asid; - int fld = cpuid_feature_extract_unsigned_field(read_cpuid(SYS_ID_AA64MMFR0_EL1), + int fld = cpuid_feature_extract_unsigned_field(read_cpuid(ID_AA64MMFR0_EL1), ID_AA64MMFR0_ASID_SHIFT); switch (fld) { |