arm64: make mrs_s prefixing implicit in read_cpuid
authorMark Rutland <mark.rutland@arm.com>
Fri, 4 Mar 2016 12:54:05 +0000 (12:54 +0000)
committerCatalin Marinas <catalin.marinas@arm.com>
Fri, 4 Mar 2016 14:12:46 +0000 (14:12 +0000)
commit1cc6ed90dd7313055dec0174e2cda745ebadd6b0
tree4b517d6848f377ee261558d3cbd9a877325308c7
parent57efac2f7108e3255d0dfe512290c9896f4ed55f
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>
arch/arm64/include/asm/cpufeature.h
arch/arm64/include/asm/cputype.h
arch/arm64/kernel/cpufeature.c
arch/arm64/kernel/cpuinfo.c
arch/arm64/mm/context.c
This page took 0.029552 seconds and 5 git commands to generate.