Skip to content

Commit bfc97f9

Browse files
Doug Bergerwilldeacon
authored andcommitted
arm64: apply ARM64_ERRATUM_845719 workaround for Brahma-B53 core
The Broadcom Brahma-B53 core is susceptible to the issue described by ARM64_ERRATUM_845719 so this commit enables the workaround to be applied when executing on that core. Since there are now multiple entries to match, we must convert the existing ARM64_ERRATUM_845719 into an erratum list. Signed-off-by: Doug Berger <[email protected]> Signed-off-by: Florian Fainelli <[email protected]> Signed-off-by: Will Deacon <[email protected]>
1 parent 36c602d commit bfc97f9

File tree

3 files changed

+16
-2
lines changed

3 files changed

+16
-2
lines changed

Documentation/arm64/silicon-errata.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,9 @@ stable kernels.
9191
| ARM | MMU-500 | #841119,826419 | N/A |
9292
+----------------+-----------------+-----------------+-----------------------------+
9393
+----------------+-----------------+-----------------+-----------------------------+
94+
| Broadcom | Brahma-B53 | N/A | ARM64_ERRATUM_845719 |
95+
+----------------+-----------------+-----------------+-----------------------------+
96+
+----------------+-----------------+-----------------+-----------------------------+
9497
| Cavium | ThunderX ITS | #22375,24313 | CAVIUM_ERRATUM_22375 |
9598
+----------------+-----------------+-----------------+-----------------------------+
9699
| Cavium | ThunderX ITS | #23144 | CAVIUM_ERRATUM_23144 |

arch/arm64/include/asm/cputype.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@
7979
#define CAVIUM_CPU_PART_THUNDERX_83XX 0x0A3
8080
#define CAVIUM_CPU_PART_THUNDERX2 0x0AF
8181

82+
#define BRCM_CPU_PART_BRAHMA_B53 0x100
8283
#define BRCM_CPU_PART_VULCAN 0x516
8384

8485
#define QCOM_CPU_PART_FALKOR_V1 0x800
@@ -105,6 +106,7 @@
105106
#define MIDR_THUNDERX_81XX MIDR_CPU_MODEL(ARM_CPU_IMP_CAVIUM, CAVIUM_CPU_PART_THUNDERX_81XX)
106107
#define MIDR_THUNDERX_83XX MIDR_CPU_MODEL(ARM_CPU_IMP_CAVIUM, CAVIUM_CPU_PART_THUNDERX_83XX)
107108
#define MIDR_CAVIUM_THUNDERX2 MIDR_CPU_MODEL(ARM_CPU_IMP_CAVIUM, CAVIUM_CPU_PART_THUNDERX2)
109+
#define MIDR_BRAHMA_B53 MIDR_CPU_MODEL(ARM_CPU_IMP_BRCM, BRCM_CPU_PART_BRAHMA_B53)
108110
#define MIDR_BRCM_VULCAN MIDR_CPU_MODEL(ARM_CPU_IMP_BRCM, BRCM_CPU_PART_VULCAN)
109111
#define MIDR_QCOM_FALKOR_V1 MIDR_CPU_MODEL(ARM_CPU_IMP_QCOM, QCOM_CPU_PART_FALKOR_V1)
110112
#define MIDR_QCOM_FALKOR MIDR_CPU_MODEL(ARM_CPU_IMP_QCOM, QCOM_CPU_PART_FALKOR)

arch/arm64/kernel/cpu_errata.c

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -743,6 +743,16 @@ static const struct midr_range erratum_1418040_list[] = {
743743
};
744744
#endif
745745

746+
#ifdef CONFIG_ARM64_ERRATUM_845719
747+
static const struct midr_range erratum_845719_list[] = {
748+
/* Cortex-A53 r0p[01234] */
749+
MIDR_REV_RANGE(MIDR_CORTEX_A53, 0, 0, 4),
750+
/* Brahma-B53 r0p[0] */
751+
MIDR_REV(MIDR_BRAHMA_B53, 0, 0),
752+
{},
753+
};
754+
#endif
755+
746756
const struct arm64_cpu_capabilities arm64_errata[] = {
747757
#ifdef CONFIG_ARM64_WORKAROUND_CLEAN_CACHE
748758
{
@@ -783,10 +793,9 @@ const struct arm64_cpu_capabilities arm64_errata[] = {
783793
#endif
784794
#ifdef CONFIG_ARM64_ERRATUM_845719
785795
{
786-
/* Cortex-A53 r0p[01234] */
787796
.desc = "ARM erratum 845719",
788797
.capability = ARM64_WORKAROUND_845719,
789-
ERRATA_MIDR_REV_RANGE(MIDR_CORTEX_A53, 0, 0, 4),
798+
ERRATA_MIDR_RANGE_LIST(erratum_845719_list),
790799
},
791800
#endif
792801
#ifdef CONFIG_CAVIUM_ERRATUM_23154

0 commit comments

Comments
 (0)