arm64: Enable workaround for Cavium erratum 27456 on thunderx-81xx

Ganapatrao Kulkarni · wildea01 · commit 47c459beabe9 · 2016-07-07T18:35:21.000+01:00
Cavium erratum 27456 commit 104a0c0 ("arm64: Add workaround for Cavium erratum 27456") is applicable for thunderx-81xx pass1.0 SoC as well. Adding code to enable to 81xx. Signed-off-by: Ganapatrao Kulkarni <gkulkarni@cavium.com> Reviewed-by: Andrew Pinski <apinski@cavium.com> Signed-off-by: Will Deacon <will.deacon@arm.com>
diff --git a/arch/arm64/include/asm/cputype.h b/arch/arm64/include/asm/cputype.h
@@ -80,12 +80,14 @@
 #define APM_CPU_PART_POTENZA		0x000
 
 #define CAVIUM_CPU_PART_THUNDERX	0x0A1
+#define CAVIUM_CPU_PART_THUNDERX_81XX	0x0A2
 
 #define BRCM_CPU_PART_VULCAN		0x516
 
 #define MIDR_CORTEX_A53 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A53)
 #define MIDR_CORTEX_A57 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A57)
 #define MIDR_THUNDERX	MIDR_CPU_MODEL(ARM_CPU_IMP_CAVIUM, CAVIUM_CPU_PART_THUNDERX)
+#define MIDR_THUNDERX_81XX MIDR_CPU_MODEL(ARM_CPU_IMP_CAVIUM, CAVIUM_CPU_PART_THUNDERX_81XX)
 
 #ifndef __ASSEMBLY__
 
diff --git a/arch/arm64/kernel/cpu_errata.c b/arch/arm64/kernel/cpu_errata.c
@@ -98,6 +98,12 @@ const struct arm64_cpu_capabilities arm64_errata[] = {
 		MIDR_RANGE(MIDR_THUNDERX, 0x00,
 			   (1 << MIDR_VARIANT_SHIFT) | 1),
 	},
+	{
+	/* Cavium ThunderX, T81 pass 1.0 */
+		.desc = "Cavium erratum 27456",
+		.capability = ARM64_WORKAROUND_CAVIUM_27456,
+		MIDR_RANGE(MIDR_THUNDERX_81XX, 0x00, 0x00),
+	},
 #endif
 	{
 	}

Original file line number	Diff line number	Diff line change
`@@ -98,6 +98,12 @@ const struct arm64_cpu_capabilities arm64_errata[] = {`
`98`	`98`	`MIDR_RANGE(MIDR_THUNDERX, 0x00,`
`99`	`99`	`(1 << MIDR_VARIANT_SHIFT) \| 1),`
`100`	`100`	`},`
	`101`	`+ {`
	`102`	`+ /* Cavium ThunderX, T81 pass 1.0 */`
	`103`	`+ .desc = "Cavium erratum 27456",`
	`104`	`+ .capability = ARM64_WORKAROUND_CAVIUM_27456,`
	`105`	`+ MIDR_RANGE(MIDR_THUNDERX_81XX, 0x00, 0x00),`
	`106`	`+ },`
`101`	`107`	`#endif`
`102`	`108`	`{`
`103`	`109`	`}`