arm64: make mrs_s prefixing implicit in read_cpuid

Browse source

Commit 0f54b14e76 ("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 42b5573403 ("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
0f54b14e76.

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>

...

This commit is contained in:

Mark Rutland 2016-03-04 12:54:05 +00:00 • committed by Catalin Marinas

parent 57efac2f71

commit 1cc6ed90dd

5 changed files with 64 additions and 64 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

arch/arm64/include/asm/cpufeature.h

View file

8

arch/arm64/include/asm/cputype.h

View file

56

arch/arm64/kernel/cpufeature.c

View file

52

arch/arm64/kernel/cpuinfo.c

View file

2

arch/arm64/mm/context.c

View file