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-- 6.1 KB
Makefile -rw-r--r-- 1.1 KB
da8xx_remoteproc.c -rw-r--r-- 10.3 KB
imx_rproc.c -rw-r--r-- 10.6 KB
keystone_remoteproc.c -rw-r--r-- 14.3 KB
omap_remoteproc.c -rw-r--r-- 6.3 KB
omap_remoteproc.h -rw-r--r-- 2.8 KB
qcom_common.c -rw-r--r-- 6.8 KB
qcom_common.h -rw-r--r-- 1.6 KB
qcom_q6v5.c -rw-r--r-- 7.4 KB
qcom_q6v5.h -rw-r--r-- 941 bytes
qcom_q6v5_adsp.c -rw-r--r-- 11.8 KB
qcom_q6v5_mss.c -rw-r--r-- 40.0 KB
qcom_q6v5_pas.c -rw-r--r-- 9.7 KB
qcom_q6v5_wcss.c -rw-r--r-- 14.3 KB
qcom_sysmon.c -rw-r--r-- 15.1 KB
qcom_wcnss.c -rw-r--r-- 14.6 KB
qcom_wcnss.h -rw-r--r-- 504 bytes
qcom_wcnss_iris.c -rw-r--r-- 4.5 KB
remoteproc_core.c -rw-r--r-- 58.3 KB
remoteproc_debugfs.c -rw-r--r-- 11.3 KB
remoteproc_elf_loader.c -rw-r--r-- 9.4 KB
remoteproc_internal.h -rw-r--r-- 3.4 KB
remoteproc_sysfs.c -rw-r--r-- 3.6 KB
remoteproc_virtio.c -rw-r--r-- 11.1 KB
st_remoteproc.c -rw-r--r-- 11.5 KB
st_slim_rproc.c -rw-r--r-- 8.5 KB
wkup_m3_rproc.c -rw-r--r-- 6.4 KB

back to top