Revision 3dbcea54b3ff706c58f8e8d4470f5e5d3d24a6a0 authored by Mark Rutland on 15 March 2019, 12:22:36 UTC, committed by Catalin Marinas on 19 March 2019, 14:54:24 UTC
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: 3e32131abc311a5c ("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>
1 parent 6a019a9
History
File Mode Size
Kconfig -rw-r--r-- 293 bytes
Makefile -rw-r--r-- 175 bytes
ql4_83xx.c -rw-r--r-- 43.5 KB
ql4_83xx.h -rw-r--r-- 9.9 KB
ql4_attr.c -rw-r--r-- 9.6 KB
ql4_bsg.c -rw-r--r-- 24.0 KB
ql4_bsg.h -rw-r--r-- 969 bytes
ql4_dbg.c -rw-r--r-- 6.3 KB
ql4_dbg.h -rw-r--r-- 1.6 KB
ql4_def.h -rw-r--r-- 27.7 KB
ql4_fw.h -rw-r--r-- 44.8 KB
ql4_glbl.h -rw-r--r-- 14.5 KB
ql4_init.c -rw-r--r-- 35.3 KB
ql4_inline.h -rw-r--r-- 2.3 KB
ql4_iocb.c -rw-r--r-- 14.0 KB
ql4_isr.c -rw-r--r-- 44.7 KB
ql4_mbx.c -rw-r--r-- 71.6 KB
ql4_nvram.c -rw-r--r-- 6.1 KB
ql4_nvram.h -rw-r--r-- 6.8 KB
ql4_nx.c -rw-r--r-- 115.1 KB
ql4_nx.h -rw-r--r-- 35.9 KB
ql4_os.c -rw-r--r-- 282.8 KB
ql4_version.h -rw-r--r-- 189 bytes

back to top