Commit ac36a881 authored by Vladimir Murzin's avatar Vladimir Murzin Committed by Russell King

ARM: 8564/1: fix cpu feature extracting helper

Commit b8c9592b "ARM: 8318/1: treat CPU feature register fields as signed
quantities" introduced helper to extract signed quantities of 4-bit
blocks. However, with a current code feature with value 0b1000 isn't
rejected as negative. So fix the "if" condition.
Reported-by: default avatarJonathan Brawn <Jon.Brawn@arm.com>
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>
parent 03f1217e
...@@ -276,7 +276,7 @@ static inline int __attribute_const__ cpuid_feature_extract_field(u32 features, ...@@ -276,7 +276,7 @@ static inline int __attribute_const__ cpuid_feature_extract_field(u32 features,
int feature = (features >> field) & 15; int feature = (features >> field) & 15;
/* feature registers are signed values */ /* feature registers are signed values */
if (feature > 8) if (feature > 7)
feature -= 16; feature -= 16;
return feature; return feature;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment