Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 315cfe78 authored by Catalin Marinas's avatar Catalin Marinas Committed by Russell King
Browse files

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: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 32c3fcb0

arch/arm/kernel/setup.c

+2 −2
Original line number Diff line number Diff line
@@ -226,8 +226,8 @@ int cpu_architecture(void) 
		 * Register 0 and check for VMSAv7 or PMSAv7 */

		asm("mrc	p15, 0, %0, c0, c1, 4"

		    : "=r" (mmfr0));

		if ((mmfr0 & 0x0000000f) == 0x00000003 ||

		    (mmfr0 & 0x000000f0) == 0x00000030)

		if ((mmfr0 & 0x0000000f) >= 0x00000003 ||

		    (mmfr0 & 0x000000f0) >= 0x00000030)

			cpu_arch = CPU_ARCH_ARMv7;

		else if ((mmfr0 & 0x0000000f) == 0x00000002 ||

			 (mmfr0 & 0x000000f0) == 0x00000020)