]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
arm64: cpufeature: Add helpers for extracting unsigned values
authorSuzuki K. Poulose <suzuki.poulose@arm.com>
Wed, 18 Nov 2015 17:08:56 +0000 (17:08 +0000)
committerCatalin Marinas <catalin.marinas@arm.com>
Thu, 26 Nov 2015 18:02:42 +0000 (18:02 +0000)
The cpuid_feature_extract_field() extracts the feature value
as a signed integer. This could be problematic for features
whose values are unsigned. e.g, ID_AA64DFR0_EL1:BRPs. Add
an unsigned variant for the unsigned fields.

Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reported-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
Signed-off-by: Suzuki K. Poulose <suzuki.poulose@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
arch/arm64/include/asm/cpufeature.h

index 11d5bb0fdd541052b9cdd49197b2dc90e9ece737..7a161027ee12bb236454c62dbc81050783dcb1ca 100644 (file)
@@ -123,6 +123,18 @@ cpuid_feature_extract_field(u64 features, int field)
        return cpuid_feature_extract_field_width(features, field, 4);
 }
 
+static inline unsigned int __attribute_const__
+cpuid_feature_extract_unsigned_field_width(u64 features, int field, int width)
+{
+       return (u64)(features << (64 - width - field)) >> (64 - width);
+}
+
+static inline unsigned int __attribute_const__
+cpuid_feature_extract_unsigned_field(u64 features, int field)
+{
+       return cpuid_feature_extract_unsigned_field_width(features, field, 4);
+}
+
 static inline u64 arm64_ftr_mask(struct arm64_ftr_bits *ftrp)
 {
        return (u64)GENMASK(ftrp->shift + ftrp->width - 1, ftrp->shift);