From 01326be02684e67ba99f263ef79e977eafa4c678 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 4 Oct 2021 13:21:04 +0200 Subject: [PATCH] 4.4-stable patches added patches: arm64-extend-workaround-for-erratum-1024718-to-all-versions-of-cortex-a55.patch --- ...024718-to-all-versions-of-cortex-a55.patch | 58 +++++++++++++++++++ queue-4.4/series | 1 + 2 files changed, 59 insertions(+) create mode 100644 queue-4.4/arm64-extend-workaround-for-erratum-1024718-to-all-versions-of-cortex-a55.patch diff --git a/queue-4.4/arm64-extend-workaround-for-erratum-1024718-to-all-versions-of-cortex-a55.patch b/queue-4.4/arm64-extend-workaround-for-erratum-1024718-to-all-versions-of-cortex-a55.patch new file mode 100644 index 00000000000..7e32a1fad61 --- /dev/null +++ b/queue-4.4/arm64-extend-workaround-for-erratum-1024718-to-all-versions-of-cortex-a55.patch @@ -0,0 +1,58 @@ +From c0b15c25d25171db4b70cc0b7dbc1130ee94017d Mon Sep 17 00:00:00 2001 +From: Suzuki K Poulose +Date: Wed, 3 Feb 2021 23:00:57 +0000 +Subject: arm64: Extend workaround for erratum 1024718 to all versions of Cortex-A55 + +From: Suzuki K Poulose + +commit c0b15c25d25171db4b70cc0b7dbc1130ee94017d upstream. + +The erratum 1024718 affects Cortex-A55 r0p0 to r2p0. However +we apply the work around for r0p0 - r1p0. Unfortunately this +won't be fixed for the future revisions for the CPU. Thus +extend the work around for all versions of A55, to cover +for r2p0 and any future revisions. + +Cc: stable@vger.kernel.org +Cc: Catalin Marinas +Cc: Will Deacon +Cc: James Morse +Cc: Kunihiko Hayashi +Signed-off-by: Suzuki K Poulose +Link: https://lore.kernel.org/r/20210203230057.3961239-1-suzuki.poulose@arm.com +[will: Update Kconfig help text] +Signed-off-by: Will Deacon +[Nanyon: adjust for stable version below v4.16, which set TCR_HD earlier +in assembly code] +Signed-off-by: Nanyong Sun +Signed-off-by: Greg Kroah-Hartman + +--- + arch/arm64/Kconfig | 2 +- + arch/arm64/mm/proc.S | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +--- a/arch/arm64/Kconfig ++++ b/arch/arm64/Kconfig +@@ -381,7 +381,7 @@ config ARM64_ERRATUM_1024718 + help + This option adds work around for Arm Cortex-A55 Erratum 1024718. + +- Affected Cortex-A55 cores (r0p0, r0p1, r1p0) could cause incorrect ++ Affected Cortex-A55 cores (all revisions) could cause incorrect + update of the hardware dirty bit when the DBM/AP bits are updated + without a break-before-make. The work around is to disable the usage + of hardware DBM locally on the affected cores. CPUs not affected by +--- a/arch/arm64/mm/proc.S ++++ b/arch/arm64/mm/proc.S +@@ -222,8 +222,8 @@ ENTRY(__cpu_setup) + cmp x9, #2 + b.lt 1f + #ifdef CONFIG_ARM64_ERRATUM_1024718 +- /* Disable hardware DBM on Cortex-A55 r0p0, r0p1 & r1p0 */ +- cpu_midr_match MIDR_CORTEX_A55, MIDR_CPU_VAR_REV(0, 0), MIDR_CPU_VAR_REV(1, 0), x1, x2, x3, x4 ++ /* Disable hardware DBM on Cortex-A55 all versions */ ++ cpu_midr_match MIDR_CORTEX_A55, MIDR_CPU_VAR_REV(0, 0), MIDR_CPU_VAR_REV(0xf, 0xf), x1, x2, x3, x4 + cbnz x1, 1f + #endif + orr x10, x10, #TCR_HD // hardware Dirty flag update diff --git a/queue-4.4/series b/queue-4.4/series index 1da7ebc533d..75e0263be66 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -34,3 +34,4 @@ ipack-ipoctal-fix-missing-allocation-failure-check.patch ipack-ipoctal-fix-module-reference-leak.patch ext4-fix-potential-infinite-loop-in-ext4_dx_readdir.patch edac-synopsys-fix-wrong-value-type-assignment-for-edac_mode.patch +arm64-extend-workaround-for-erratum-1024718-to-all-versions-of-cortex-a55.patch -- 2.47.3