arm64: cpufeature: Fix feature comparison for CTR_EL0.{CWG,ERG}
authorWill Deacon <will@kernel.org>
Tue, 30 Jul 2019 14:40:20 +0000 (15:40 +0100)
committerCatalin Marinas <catalin.marinas@arm.com>
Wed, 31 Jul 2019 17:10:55 +0000 (18:10 +0100)
commit147b9635e6347104b91f48ca9dca61eb0fbf2a54
treeb353ced3427563d2135282afda8d350fcb1208bb
parenta22c5cf5d37ddcd4d2dd98ee9cf04fa5dd1e1c01
arm64: cpufeature: Fix feature comparison for CTR_EL0.{CWG,ERG}

If CTR_EL0.{CWG,ERG} are 0b0000 then they must be interpreted to have
their architecturally maximum values, which defeats the use of
FTR_HIGHER_SAFE when sanitising CPU ID registers on heterogeneous
machines.

Introduce FTR_HIGHER_OR_ZERO_SAFE so that these fields effectively
saturate at zero.

Fixes: 3c739b571084 ("arm64: Keep track of CPU feature registers")
Cc: <stable@vger.kernel.org> # 4.4.x-
Reviewed-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Will Deacon <will@kernel.org>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
arch/arm64/include/asm/cpufeature.h
arch/arm64/kernel/cpufeature.c