diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-24 16:19:33 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-24 16:19:33 -0400 |
| commit | 234d9acfe2223d70a162ed6fbf728e9ff48ba578 (patch) | |
| tree | 59864849c339f70b27cf265be4713e21f3040f2e | |
| parent | 6fc8ce3e90ee7ef713317cf6a5952cbf13e1293a (diff) | |
| download | longterm-queue-4.12-234d9acfe2223d70a162ed6fbf728e9ff48ba578.tar.gz | |
arm: readjust cpucaps to lower total for 4.12
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/arm64-Add-ARCH_WORKAROUND_2-probing.patch | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/queue/arm64-Add-ARCH_WORKAROUND_2-probing.patch b/queue/arm64-Add-ARCH_WORKAROUND_2-probing.patch index 1a7f029..e46c592 100644 --- a/queue/arm64-Add-ARCH_WORKAROUND_2-probing.patch +++ b/queue/arm64-Add-ARCH_WORKAROUND_2-probing.patch @@ -1,4 +1,4 @@ -From a725e3dda1813ed306734823ac4c65ca04e38500 Mon Sep 17 00:00:00 2001 +From fd0d86c724977fedd1c1f2554c667417fdebd825 Mon Sep 17 00:00:00 2001 From: Marc Zyngier <marc.zyngier@arm.com> Date: Tue, 29 May 2018 13:11:08 +0100 Subject: [PATCH] arm64: Add ARCH_WORKAROUND_2 probing @@ -17,12 +17,13 @@ Acked-by: Will Deacon <will.deacon@arm.com> Reviewed-by: Suzuki K Poulose <suzuki.poulose@arm.com> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig -index 3aed13626fd7..0b98a6c42454 100644 +index 0761f2d527cd..427d4b01ed53 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig -@@ -940,6 +940,15 @@ config HARDEN_EL2_VECTORS +@@ -805,6 +805,15 @@ config HARDEN_BRANCH_PREDICTOR If unsure, say Y. @@ -39,24 +40,24 @@ index 3aed13626fd7..0b98a6c42454 100644 bool "Emulate deprecated/obsolete ARMv8 instructions" depends on COMPAT diff --git a/arch/arm64/include/asm/cpucaps.h b/arch/arm64/include/asm/cpucaps.h -index bc51b72fafd4..8a699c708fc9 100644 +index 2f770398d455..3abc27608f9e 100644 --- a/arch/arm64/include/asm/cpucaps.h +++ b/arch/arm64/include/asm/cpucaps.h -@@ -48,7 +48,8 @@ - #define ARM64_HAS_CACHE_IDC 27 - #define ARM64_HAS_CACHE_DIC 28 - #define ARM64_HW_DBM 29 -+#define ARM64_SSBD 30 +@@ -41,7 +41,8 @@ + #define ARM64_UNMAP_KERNEL_AT_EL0 23 + #define ARM64_HARDEN_BRANCH_PREDICTOR 24 + #define ARM64_HARDEN_BP_POST_GUEST_EXIT 25 ++#define ARM64_SSBD 26 /* 30 in mainline */ --#define ARM64_NCAPS 30 -+#define ARM64_NCAPS 31 +-#define ARM64_NCAPS 26 ++#define ARM64_NCAPS 27 #endif /* __ASM_CPUCAPS_H */ diff --git a/arch/arm64/kernel/cpu_errata.c b/arch/arm64/kernel/cpu_errata.c -index cd91ca0250f1..7e8f12d85d99 100644 +index 60f64a0702e7..222779fce333 100644 --- a/arch/arm64/kernel/cpu_errata.c +++ b/arch/arm64/kernel/cpu_errata.c -@@ -256,6 +256,67 @@ void __init arm64_update_smccc_conduit(struct alt_instr *alt, +@@ -252,6 +252,67 @@ void __init arm64_update_smccc_conduit(struct alt_instr *alt, *updptr = cpu_to_le32(insn); } @@ -123,10 +124,10 @@ index cd91ca0250f1..7e8f12d85d99 100644 +} #endif /* CONFIG_ARM64_SSBD */ - #define CAP_MIDR_RANGE(model, v_min, r_min, v_max, r_max) \ -@@ -512,6 +573,14 @@ const struct arm64_cpu_capabilities arm64_errata[] = { - .type = ARM64_CPUCAP_LOCAL_CPU_ERRATUM, - ERRATA_MIDR_RANGE_LIST(arm64_harden_el2_vectors), + #define MIDR_RANGE(model, min, max) \ +@@ -421,6 +482,14 @@ const struct arm64_cpu_capabilities arm64_errata[] = { + MIDR_ALL_VERSIONS(MIDR_CAVIUM_THUNDERX2), + .enable = enable_smccc_arch_workaround_1, }, +#endif +#ifdef CONFIG_ARM64_SSBD |