Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
ARM: 6676/1: Correct the cpu_architecture() function for ARMv7
If ID_MMFR0[3:0] >= 3, the architecture version is ARMv7. The code was
currently only testing for ID_MMFR0[3:0] == 3.
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
authored by Catalin Marinas and committed by Russell King 315cfe78 32c3fcb0
+2
-2
arch/arm/kernel/setup.c
+2
-2
arch/arm/kernel/setup.c
···
226
226
* Register 0 and check for VMSAv7 or PMSAv7 */
227
227
asm("mrc p15, 0, %0, c0, c1, 4"
228
228
: "=r" (mmfr0));
229
-
if ((mmfr0 & 0x0000000f) == 0x00000003 ||
230
-
(mmfr0 & 0x000000f0) == 0x00000030)
229
+
if ((mmfr0 & 0x0000000f) >= 0x00000003 ||
230
+
(mmfr0 & 0x000000f0) >= 0x00000030)
231
231
cpu_arch = CPU_ARCH_ARMv7;
232
232
else if ((mmfr0 & 0x0000000f) == 0x00000002 ||
233
233
(mmfr0 & 0x000000f0) == 0x00000020)