]> git.baikalelectronics.ru Git - kernel.git/commit
arm64: apply workaround on A64FX v1r0
authorMark Rutland <mark.rutland@arm.com>
Fri, 15 Mar 2019 12:22:36 +0000 (12:22 +0000)
committerCatalin Marinas <catalin.marinas@arm.com>
Tue, 19 Mar 2019 14:54:24 +0000 (14:54 +0000)
commitb8f45e1ac35f89b1525d13dccdebecad8b21b557
tree9590905f6647bad08f3a262b3ed8300d8b927184
parentd24805ac4648047e586761579e24ce7594acde68
arm64: apply workaround on A64FX v1r0

Fujitsu erratum 010001 applies to A64FX v0r0 and v1r0, and we try to
handle either by masking MIDR with MIDR_FUJITSU_ERRATUM_010001_MASK
before comparing it to MIDR_FUJITSU_ERRATUM_010001.

Unfortunately, MIDR_FUJITSU_ERRATUM_010001 is constructed incorrectly
using MIDR_VARIANT(), which is intended to extract the variant field
from MIDR_EL1, rather than generate the field in-place. This results in
MIDR_FUJITSU_ERRATUM_010001 being all-ones, and we only match A64FX
v0r0.

This patch uses MIDR_CPU_VAR_REV() to generate an in-place mask for the
variant field, ensuring the we match both v0r0 and v1r0.

Fixes: 3d50a293cf16bf21 ("arm64: Add workaround for Fujitsu A64FX erratum 010001")
Reported-by: "Okamoto, Takayuki" <tokamoto@jp.fujitsu.com>
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
[catalin.marinas@arm.com: fixed the patch author]
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
arch/arm64/include/asm/cputype.h