arm64: cpufeature: Change read_cpuid() to use sysreg's mrs_s macro

Browse source

Older assemblers may not have support for newer feature registers. To get
round this, sysreg.h provides a 'mrs_s' macro that takes a register
encoding and generates the raw instruction.

Change read_cpuid() to use mrs_s in all cases so that new registers
don't have to be a special case. Including sysreg.h means we need to move
the include and definition of read_cpuid() after the #ifndef __ASSEMBLY__
to avoid syntax errors in vmlinux.lds.

Signed-off-by: James Morse <james.morse@arm.com>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

...

This commit is contained in:

James Morse 2016-02-05 14:58:46 +00:00 • committed by Catalin Marinas

parent 7abc7d833c

commit 0f54b14e76

5 changed files with 69 additions and 67 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

20

arch/arm64/include/asm/cputype.h

View file

54

arch/arm64/kernel/cpufeature.c

View file

50

arch/arm64/kernel/cpuinfo.c

View file

2

arch/arm64/mm/context.c

View file