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

Commit 2aa408b1 authored by Vladimir Murzin's avatar Vladimir Murzin Committed by Eric Biggers
Browse files

UPSTREAM: ARM: 8563/1: fix demoting HWCAP_SWP 



Commit b8c9592 "ARM: 8318/1: treat CPU feature register fields as signed
quantities" accidentally altered cpuid register used to demote
HWCAP_SWP.
ARM ARM says that SyncPrim_instrs bits in ID_ISAR3 should be used with
SynchPrim_instrs_frac from ID_ISAR4. So, follow this rule.

Signed-off-by: default avatarVladimir Murzin <vladimir.murzin@arm.com>
Acked-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
(cherry picked from commit 03f1217e5fafac8eb9e28aa8d04a67b6db1e435b)
Change-Id: Iaec80be5c2ec4f46421a78dae4521f7bca22a2ab
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
parent 145ab1f4

arch/arm/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -438,7 +438,7 @@ static void __init elf_hwcap_fixup(void) 
	 */

	if (cpuid_feature_extract(CPUID_EXT_ISAR3, 12) > 1 ||

	    (cpuid_feature_extract(CPUID_EXT_ISAR3, 12) == 1 &&

	     cpuid_feature_extract(CPUID_EXT_ISAR3, 20) >= 3))

	     cpuid_feature_extract(CPUID_EXT_ISAR4, 20) >= 3))

		elf_hwcap &= ~HWCAP_SWP;

}