We are about to introduce generic MIDR range helpers. Clean
up the existing helpers in erratum handling, preparing them
to use generic version.

Cc: Will Deacon <will.dea...@arm.com>
Cc: Mark Rutland <mark.rutl...@arm.com>
Cc: Ard Biesheuvel <ard.biesheu...@linaro.org>
Reviewed-by: Dave Martin <dave.mar...@arm.com>
Signed-off-by: Suzuki K Poulose <suzuki.poul...@arm.com>
---
 arch/arm64/kernel/cpu_errata.c | 106 +++++++++++++++++++++++------------------
 1 file changed, 59 insertions(+), 47 deletions(-)

diff --git a/arch/arm64/kernel/cpu_errata.c b/arch/arm64/kernel/cpu_errata.c
index f5ab9545c5ea..9ea14954972c 100644
--- a/arch/arm64/kernel/cpu_errata.c
+++ b/arch/arm64/kernel/cpu_errata.c
@@ -237,23 +237,38 @@ qcom_enable_link_stack_sanitization(const struct 
arm64_cpu_capabilities *entry)
 }
 #endif /* CONFIG_HARDEN_BRANCH_PREDICTOR */
 
-#define MIDR_RANGE(model, min, max) \
-       .type = ARM64_CPUCAP_LOCAL_CPU_ERRATUM, \
-       .matches = is_affected_midr_range, \
-       .midr_model = model, \
-       .midr_range_min = min, \
-       .midr_range_max = max
+#define CAP_MIDR_RANGE(model, v_min, r_min, v_max, r_max)      \
+       .matches = is_affected_midr_range,                      \
+       .midr_model = model,                                    \
+       .midr_range_min = MIDR_CPU_VAR_REV(v_min, r_min),       \
+       .midr_range_max = MIDR_CPU_VAR_REV(v_max, r_max)
 
-#define MIDR_ALL_VERSIONS(model) \
-       .type = ARM64_CPUCAP_LOCAL_CPU_ERRATUM, \
-       .matches = is_affected_midr_range, \
-       .midr_model = model, \
-       .midr_range_min = 0, \
+#define CAP_MIDR_ALL_VERSIONS(model)                                   \
+       .matches = is_affected_midr_range,                              \
+       .midr_model = model,                                            \
+       .midr_range_min = MIDR_CPU_VAR_REV(0, 0),                       \
        .midr_range_max = (MIDR_VARIANT_MASK | MIDR_REVISION_MASK)
 
 #define MIDR_FIXED(rev, revidr_mask) \
        .fixed_revs = (struct arm64_midr_revidr[]){{ (rev), (revidr_mask) }, {}}
 
+#define ERRATA_MIDR_RANGE(model, v_min, r_min, v_max, r_max)           \
+       .type = ARM64_CPUCAP_LOCAL_CPU_ERRATUM,                         \
+       CAP_MIDR_RANGE(model, v_min, r_min, v_max, r_max)
+
+/* Errata affecting a range of revisions of  given model variant */
+#define ERRATA_MIDR_REV_RANGE(m, var, r_min, r_max)     \
+       ERRATA_MIDR_RANGE(m, var, r_min, var, r_max)
+
+/* Errata affecting a single variant/revision of a model */
+#define ERRATA_MIDR_REV(model, var, rev)       \
+       ERRATA_MIDR_RANGE(model, var, rev, var, rev)
+
+/* Errata affecting all variants/revisions of a given a model */
+#define ERRATA_MIDR_ALL_VERSIONS(model)                                \
+       .type = ARM64_CPUCAP_LOCAL_CPU_ERRATUM,                 \
+       CAP_MIDR_ALL_VERSIONS(model)
+
 const struct arm64_cpu_capabilities arm64_errata[] = {
 #if    defined(CONFIG_ARM64_ERRATUM_826319) || \
        defined(CONFIG_ARM64_ERRATUM_827319) || \
@@ -262,7 +277,7 @@ const struct arm64_cpu_capabilities arm64_errata[] = {
        /* Cortex-A53 r0p[012] */
                .desc = "ARM errata 826319, 827319, 824069",
                .capability = ARM64_WORKAROUND_CLEAN_CACHE,
-               MIDR_RANGE(MIDR_CORTEX_A53, 0x00, 0x02),
+               ERRATA_MIDR_REV_RANGE(MIDR_CORTEX_A53, 0, 0, 2),
                .cpu_enable = cpu_enable_cache_maint_trap,
        },
 #endif
@@ -271,7 +286,7 @@ const struct arm64_cpu_capabilities arm64_errata[] = {
        /* Cortex-A53 r0p[01] */
                .desc = "ARM errata 819472",
                .capability = ARM64_WORKAROUND_CLEAN_CACHE,
-               MIDR_RANGE(MIDR_CORTEX_A53, 0x00, 0x01),
+               ERRATA_MIDR_REV_RANGE(MIDR_CORTEX_A53, 0, 0, 1),
                .cpu_enable = cpu_enable_cache_maint_trap,
        },
 #endif
@@ -280,9 +295,9 @@ const struct arm64_cpu_capabilities arm64_errata[] = {
        /* Cortex-A57 r0p0 - r1p2 */
                .desc = "ARM erratum 832075",
                .capability = ARM64_WORKAROUND_DEVICE_LOAD_ACQUIRE,
-               MIDR_RANGE(MIDR_CORTEX_A57,
-                          MIDR_CPU_VAR_REV(0, 0),
-                          MIDR_CPU_VAR_REV(1, 2)),
+               ERRATA_MIDR_RANGE(MIDR_CORTEX_A57,
+                                 0, 0,
+                                 1, 2),
        },
 #endif
 #ifdef CONFIG_ARM64_ERRATUM_834220
@@ -290,9 +305,9 @@ const struct arm64_cpu_capabilities arm64_errata[] = {
        /* Cortex-A57 r0p0 - r1p2 */
                .desc = "ARM erratum 834220",
                .capability = ARM64_WORKAROUND_834220,
-               MIDR_RANGE(MIDR_CORTEX_A57,
-                          MIDR_CPU_VAR_REV(0, 0),
-                          MIDR_CPU_VAR_REV(1, 2)),
+               ERRATA_MIDR_RANGE(MIDR_CORTEX_A57,
+                                 0, 0,
+                                 1, 2),
        },
 #endif
 #ifdef CONFIG_ARM64_ERRATUM_843419
@@ -300,7 +315,7 @@ const struct arm64_cpu_capabilities arm64_errata[] = {
        /* Cortex-A53 r0p[01234] */
                .desc = "ARM erratum 843419",
                .capability = ARM64_WORKAROUND_843419,
-               MIDR_RANGE(MIDR_CORTEX_A53, 0x00, 0x04),
+               ERRATA_MIDR_REV_RANGE(MIDR_CORTEX_A53, 0, 0, 4),
                MIDR_FIXED(0x4, BIT(8)),
        },
 #endif
@@ -309,7 +324,7 @@ const struct arm64_cpu_capabilities arm64_errata[] = {
        /* Cortex-A53 r0p[01234] */
                .desc = "ARM erratum 845719",
                .capability = ARM64_WORKAROUND_845719,
-               MIDR_RANGE(MIDR_CORTEX_A53, 0x00, 0x04),
+               ERRATA_MIDR_REV_RANGE(MIDR_CORTEX_A53, 0, 0, 4),
        },
 #endif
 #ifdef CONFIG_CAVIUM_ERRATUM_23154
@@ -317,7 +332,7 @@ const struct arm64_cpu_capabilities arm64_errata[] = {
        /* Cavium ThunderX, pass 1.x */
                .desc = "Cavium erratum 23154",
                .capability = ARM64_WORKAROUND_CAVIUM_23154,
-               MIDR_RANGE(MIDR_THUNDERX, 0x00, 0x01),
+               ERRATA_MIDR_REV_RANGE(MIDR_THUNDERX, 0, 0, 1),
        },
 #endif
 #ifdef CONFIG_CAVIUM_ERRATUM_27456
@@ -325,15 +340,15 @@ const struct arm64_cpu_capabilities arm64_errata[] = {
        /* Cavium ThunderX, T88 pass 1.x - 2.1 */
                .desc = "Cavium erratum 27456",
                .capability = ARM64_WORKAROUND_CAVIUM_27456,
-               MIDR_RANGE(MIDR_THUNDERX,
-                          MIDR_CPU_VAR_REV(0, 0),
-                          MIDR_CPU_VAR_REV(1, 1)),
+               ERRATA_MIDR_RANGE(MIDR_THUNDERX,
+                                 0, 0,
+                                 1, 1),
        },
        {
        /* Cavium ThunderX, T81 pass 1.0 */
                .desc = "Cavium erratum 27456",
                .capability = ARM64_WORKAROUND_CAVIUM_27456,
-               MIDR_RANGE(MIDR_THUNDERX_81XX, 0x00, 0x00),
+               ERRATA_MIDR_REV(MIDR_THUNDERX_81XX, 0, 0),
        },
 #endif
 #ifdef CONFIG_CAVIUM_ERRATUM_30115
@@ -341,20 +356,21 @@ const struct arm64_cpu_capabilities arm64_errata[] = {
        /* Cavium ThunderX, T88 pass 1.x - 2.2 */
                .desc = "Cavium erratum 30115",
                .capability = ARM64_WORKAROUND_CAVIUM_30115,
-               MIDR_RANGE(MIDR_THUNDERX, 0x00,
-                          (1 << MIDR_VARIANT_SHIFT) | 2),
+               ERRATA_MIDR_RANGE(MIDR_THUNDERX,
+                                     0, 0,
+                                     1, 2),
        },
        {
        /* Cavium ThunderX, T81 pass 1.0 - 1.2 */
                .desc = "Cavium erratum 30115",
                .capability = ARM64_WORKAROUND_CAVIUM_30115,
-               MIDR_RANGE(MIDR_THUNDERX_81XX, 0x00, 0x02),
+               ERRATA_MIDR_REV_RANGE(MIDR_THUNDERX_81XX, 0, 0, 2),
        },
        {
        /* Cavium ThunderX, T83 pass 1.0 */
                .desc = "Cavium erratum 30115",
                .capability = ARM64_WORKAROUND_CAVIUM_30115,
-               MIDR_RANGE(MIDR_THUNDERX_83XX, 0x00, 0x00),
+               ERRATA_MIDR_REV(MIDR_THUNDERX_83XX, 0, 0),
        },
 #endif
        {
@@ -368,9 +384,7 @@ const struct arm64_cpu_capabilities arm64_errata[] = {
        {
                .desc = "Qualcomm Technologies Falkor erratum 1003",
                .capability = ARM64_WORKAROUND_QCOM_FALKOR_E1003,
-               MIDR_RANGE(MIDR_QCOM_FALKOR_V1,
-                          MIDR_CPU_VAR_REV(0, 0),
-                          MIDR_CPU_VAR_REV(0, 0)),
+               ERRATA_MIDR_REV(MIDR_QCOM_FALKOR_V1, 0, 0),
        },
        {
                .desc = "Qualcomm Technologies Kryo erratum 1003",
@@ -384,9 +398,7 @@ const struct arm64_cpu_capabilities arm64_errata[] = {
        {
                .desc = "Qualcomm Technologies Falkor erratum 1009",
                .capability = ARM64_WORKAROUND_REPEAT_TLBI,
-               MIDR_RANGE(MIDR_QCOM_FALKOR_V1,
-                          MIDR_CPU_VAR_REV(0, 0),
-                          MIDR_CPU_VAR_REV(0, 0)),
+               ERRATA_MIDR_REV(MIDR_QCOM_FALKOR_V1, 0, 0),
        },
 #endif
 #ifdef CONFIG_ARM64_ERRATUM_858921
@@ -394,56 +406,56 @@ const struct arm64_cpu_capabilities arm64_errata[] = {
        /* Cortex-A73 all versions */
                .desc = "ARM erratum 858921",
                .capability = ARM64_WORKAROUND_858921,
-               MIDR_ALL_VERSIONS(MIDR_CORTEX_A73),
+               ERRATA_MIDR_ALL_VERSIONS(MIDR_CORTEX_A73),
        },
 #endif
 #ifdef CONFIG_HARDEN_BRANCH_PREDICTOR
        {
                .capability = ARM64_HARDEN_BRANCH_PREDICTOR,
-               MIDR_ALL_VERSIONS(MIDR_CORTEX_A57),
+               ERRATA_MIDR_ALL_VERSIONS(MIDR_CORTEX_A57),
                .cpu_enable = enable_smccc_arch_workaround_1,
        },
        {
                .capability = ARM64_HARDEN_BRANCH_PREDICTOR,
-               MIDR_ALL_VERSIONS(MIDR_CORTEX_A72),
+               ERRATA_MIDR_ALL_VERSIONS(MIDR_CORTEX_A72),
                .cpu_enable = enable_smccc_arch_workaround_1,
        },
        {
                .capability = ARM64_HARDEN_BRANCH_PREDICTOR,
-               MIDR_ALL_VERSIONS(MIDR_CORTEX_A73),
+               ERRATA_MIDR_ALL_VERSIONS(MIDR_CORTEX_A73),
                .cpu_enable = enable_smccc_arch_workaround_1,
        },
        {
                .capability = ARM64_HARDEN_BRANCH_PREDICTOR,
-               MIDR_ALL_VERSIONS(MIDR_CORTEX_A75),
+               ERRATA_MIDR_ALL_VERSIONS(MIDR_CORTEX_A75),
                .cpu_enable = enable_smccc_arch_workaround_1,
        },
        {
                .capability = ARM64_HARDEN_BRANCH_PREDICTOR,
-               MIDR_ALL_VERSIONS(MIDR_QCOM_FALKOR_V1),
+               ERRATA_MIDR_ALL_VERSIONS(MIDR_QCOM_FALKOR_V1),
                .cpu_enable = qcom_enable_link_stack_sanitization,
        },
        {
                .capability = ARM64_HARDEN_BP_POST_GUEST_EXIT,
-               MIDR_ALL_VERSIONS(MIDR_QCOM_FALKOR_V1),
+               ERRATA_MIDR_ALL_VERSIONS(MIDR_QCOM_FALKOR_V1),
        },
        {
                .capability = ARM64_HARDEN_BRANCH_PREDICTOR,
-               MIDR_ALL_VERSIONS(MIDR_QCOM_FALKOR),
+               ERRATA_MIDR_ALL_VERSIONS(MIDR_QCOM_FALKOR),
                .cpu_enable = qcom_enable_link_stack_sanitization,
        },
        {
                .capability = ARM64_HARDEN_BP_POST_GUEST_EXIT,
-               MIDR_ALL_VERSIONS(MIDR_QCOM_FALKOR),
+               ERRATA_MIDR_ALL_VERSIONS(MIDR_QCOM_FALKOR),
        },
        {
                .capability = ARM64_HARDEN_BRANCH_PREDICTOR,
-               MIDR_ALL_VERSIONS(MIDR_BRCM_VULCAN),
+               ERRATA_MIDR_ALL_VERSIONS(MIDR_BRCM_VULCAN),
                .cpu_enable = enable_smccc_arch_workaround_1,
        },
        {
                .capability = ARM64_HARDEN_BRANCH_PREDICTOR,
-               MIDR_ALL_VERSIONS(MIDR_CAVIUM_THUNDERX2),
+               ERRATA_MIDR_ALL_VERSIONS(MIDR_CAVIUM_THUNDERX2),
                .cpu_enable = enable_smccc_arch_workaround_1,
        },
 #endif
-- 
2.14.3

Reply via email to