soc: qcom: llcc: Flip the manual slice configuration condition

Commit c14e64b46944 ("soc: qcom: llcc: Support chipsets that can write
to llcc") made the code not configure certain registers on SDM845 due
to firmware security policies. That turned out only to concern SDM845,
but the condition was chosen such that all other entries (for SoCs that
didnot need it) were required to set .need_llcc_cfg = true.

Flip the condition, so the default is "doesn't need the workaround".

Signed-off-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Link: https://lore.kernel.org/r/20241104-topic-llcc_flip-v1-1-3003c846d131@oss.qualcomm.com
[bjorn: Dropped a few newly added need_llcc_cfg uses]
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/drivers/soc/qcom/llcc-qcom.c b/drivers/soc/qcom/llcc-qcom.c
index 316645c..4cd6dac 100644 (file)
--- a/drivers/soc/qcom/llcc-qcom.c
+++ b/drivers/soc/qcom/llcc-qcom.c
@@ -139,7 +139,7 @@ struct qcom_llcc_config {
        u32 max_cap_shift; /* instead of ATTR1_MAX_CAP_SHIFT */
        u32 num_banks;
        int size;
-       bool need_llcc_cfg;
+       bool skip_llcc_cfg;
        bool no_edac;
 };
 
@@ -3142,7 +3142,6 @@ static const struct qcom_llcc_config qcs615_cfg[] = {
        {
                .sct_data       = qcs615_data,
                .size           = ARRAY_SIZE(qcs615_data),
-               .need_llcc_cfg  = true,
                .reg_offset     = llcc_v1_reg_offset,
                .edac_reg_offset = &llcc_v1_edac_reg_offset,
        },
@@ -3152,7 +3151,6 @@ static const struct qcom_llcc_config qcs8300_cfg[] = {
        {
                .sct_data       = qcs8300_data,
                .size           = ARRAY_SIZE(qcs8300_data),
-               .need_llcc_cfg  = true,
                .reg_offset     = llcc_v2_1_reg_offset,
                .edac_reg_offset = &llcc_v2_1_edac_reg_offset,
                .num_banks      = 4,
@@ -3163,28 +3161,24 @@ static const struct qcom_llcc_config qdu1000_cfg[] = {
        {
                .sct_data       = qdu1000_data_8ch,
                .size           = ARRAY_SIZE(qdu1000_data_8ch),
-               .need_llcc_cfg  = true,
                .reg_offset     = llcc_v2_1_reg_offset,
                .edac_reg_offset = &llcc_v2_1_edac_reg_offset,
        },
        {
                .sct_data       = qdu1000_data_4ch,
                .size           = ARRAY_SIZE(qdu1000_data_4ch),
-               .need_llcc_cfg  = true,
                .reg_offset     = llcc_v2_1_reg_offset,
                .edac_reg_offset = &llcc_v2_1_edac_reg_offset,
        },
        {
                .sct_data       = qdu1000_data_4ch,
                .size           = ARRAY_SIZE(qdu1000_data_4ch),
-               .need_llcc_cfg  = true,
                .reg_offset     = llcc_v2_1_reg_offset,
                .edac_reg_offset = &llcc_v2_1_edac_reg_offset,
        },
        {
                .sct_data       = qdu1000_data_2ch,
                .size           = ARRAY_SIZE(qdu1000_data_2ch),
-               .need_llcc_cfg  = true,
                .reg_offset     = llcc_v2_1_reg_offset,
                .edac_reg_offset = &llcc_v2_1_edac_reg_offset,
        },
@@ -3194,7 +3188,6 @@ static const struct qcom_llcc_config sa8775p_cfg[] = {
        {
                .sct_data       = sa8775p_data,
                .size           = ARRAY_SIZE(sa8775p_data),
-               .need_llcc_cfg  = true,
                .reg_offset     = llcc_v2_1_reg_offset,
                .edac_reg_offset = &llcc_v2_1_edac_reg_offset,
        },
@@ -3204,7 +3197,6 @@ static const struct qcom_llcc_config sar1130p_cfg[] = {
        {
                .sct_data       = sar1130p_data,
                .size           = ARRAY_SIZE(sar1130p_data),
-               .need_llcc_cfg  = true,
                .reg_offset     = llcc_v2_1_reg_offset,
                .edac_reg_offset = &llcc_v2_1_edac_reg_offset,
                .max_cap_shift  = 14,
@@ -3216,7 +3208,6 @@ static const struct qcom_llcc_config sar2130p_cfg[] = {
        {
                .sct_data       = sar2130p_data,
                .size           = ARRAY_SIZE(sar2130p_data),
-               .need_llcc_cfg  = true,
                .reg_offset     = llcc_v2_1_reg_offset,
                .edac_reg_offset = &llcc_v2_1_edac_reg_offset,
                .max_cap_shift  = 14,
@@ -3228,7 +3219,6 @@ static const struct qcom_llcc_config sc7180_cfg[] = {
        {
                .sct_data       = sc7180_data,
                .size           = ARRAY_SIZE(sc7180_data),
-               .need_llcc_cfg  = true,
                .reg_offset     = llcc_v1_reg_offset,
                .edac_reg_offset = &llcc_v1_edac_reg_offset,
        },
@@ -3238,7 +3228,6 @@ static const struct qcom_llcc_config sc7280_cfg[] = {
        {
                .sct_data       = sc7280_data,
                .size           = ARRAY_SIZE(sc7280_data),
-               .need_llcc_cfg  = true,
                .reg_offset     = llcc_v1_reg_offset,
                .edac_reg_offset = &llcc_v1_edac_reg_offset,
        },
@@ -3248,7 +3237,6 @@ static const struct qcom_llcc_config sc8180x_cfg[] = {
        {
                .sct_data       = sc8180x_data,
                .size           = ARRAY_SIZE(sc8180x_data),
-               .need_llcc_cfg  = true,
                .reg_offset     = llcc_v1_reg_offset,
                .edac_reg_offset = &llcc_v1_edac_reg_offset,
        },
@@ -3258,7 +3246,6 @@ static const struct qcom_llcc_config sc8280xp_cfg[] = {
        {
                .sct_data       = sc8280xp_data,
                .size           = ARRAY_SIZE(sc8280xp_data),
-               .need_llcc_cfg  = true,
                .reg_offset     = llcc_v1_reg_offset,
                .edac_reg_offset = &llcc_v1_edac_reg_offset,
        },
@@ -3268,7 +3255,7 @@ static const struct qcom_llcc_config sdm845_cfg[] = {
        {
                .sct_data       = sdm845_data,
                .size           = ARRAY_SIZE(sdm845_data),
-               .need_llcc_cfg  = false,
+               .skip_llcc_cfg  = true,
                .reg_offset     = llcc_v1_reg_offset,
                .edac_reg_offset = &llcc_v1_edac_reg_offset,
                .no_edac        = true,
@@ -3279,7 +3266,6 @@ static const struct qcom_llcc_config sm6350_cfg[] = {
        {
                .sct_data       = sm6350_data,
                .size           = ARRAY_SIZE(sm6350_data),
-               .need_llcc_cfg  = true,
                .reg_offset     = llcc_v1_reg_offset,
                .edac_reg_offset = &llcc_v1_edac_reg_offset,
        },
@@ -3289,7 +3275,6 @@ static const struct qcom_llcc_config sm7150_cfg[] = {
        {
                .sct_data       = sm7150_data,
                .size           = ARRAY_SIZE(sm7150_data),
-               .need_llcc_cfg  = true,
                .reg_offset     = llcc_v1_reg_offset,
                .edac_reg_offset = &llcc_v1_edac_reg_offset,
        },
@@ -3299,7 +3284,6 @@ static const struct qcom_llcc_config sm8150_cfg[] = {
        {
                .sct_data       = sm8150_data,
                .size           = ARRAY_SIZE(sm8150_data),
-               .need_llcc_cfg  = true,
                .reg_offset     = llcc_v1_reg_offset,
                .edac_reg_offset = &llcc_v1_edac_reg_offset,
        },
@@ -3309,7 +3293,6 @@ static const struct qcom_llcc_config sm8250_cfg[] = {
        {
                .sct_data       = sm8250_data,
                .size           = ARRAY_SIZE(sm8250_data),
-               .need_llcc_cfg  = true,
                .reg_offset     = llcc_v1_reg_offset,
                .edac_reg_offset = &llcc_v1_edac_reg_offset,
        },
@@ -3319,7 +3302,6 @@ static const struct qcom_llcc_config sm8350_cfg[] = {
        {
                .sct_data       = sm8350_data,
                .size           = ARRAY_SIZE(sm8350_data),
-               .need_llcc_cfg  = true,
                .reg_offset     = llcc_v1_reg_offset,
                .edac_reg_offset = &llcc_v1_edac_reg_offset,
        },
@@ -3329,7 +3311,6 @@ static const struct qcom_llcc_config sm8450_cfg[] = {
        {
                .sct_data       = sm8450_data,
                .size           = ARRAY_SIZE(sm8450_data),
-               .need_llcc_cfg  = true,
                .reg_offset     = llcc_v2_1_reg_offset,
                .edac_reg_offset = &llcc_v2_1_edac_reg_offset,
        },
@@ -3339,7 +3320,6 @@ static const struct qcom_llcc_config sm8550_cfg[] = {
        {
                .sct_data       = sm8550_data,
                .size           = ARRAY_SIZE(sm8550_data),
-               .need_llcc_cfg  = true,
                .reg_offset     = llcc_v2_1_reg_offset,
                .edac_reg_offset = &llcc_v2_1_edac_reg_offset,
        },
@@ -3349,7 +3329,6 @@ static const struct qcom_llcc_config sm8650_cfg[] = {
        {
                .sct_data       = sm8650_data,
                .size           = ARRAY_SIZE(sm8650_data),
-               .need_llcc_cfg  = true,
                .reg_offset     = llcc_v2_1_reg_offset,
                .edac_reg_offset = &llcc_v2_1_edac_reg_offset,
        },
@@ -3359,7 +3338,6 @@ static const struct qcom_llcc_config x1e80100_cfg[] = {
        {
                .sct_data       = x1e80100_data,
                .size           = ARRAY_SIZE(x1e80100_data),
-               .need_llcc_cfg  = true,
                .reg_offset     = llcc_v2_1_reg_offset,
                .edac_reg_offset = &llcc_v2_1_edac_reg_offset,
        },
@@ -3734,7 +3712,8 @@ static int _qcom_llcc_cfg_program(const struct llcc_slice_config *config,
                        return ret;
        }
 
-       if (cfg->need_llcc_cfg) {
+       /* At least SDM845 disallows non-secure writes to these registers */
+       if (!cfg->skip_llcc_cfg) {
                u32 disable_cap_alloc, retain_pc;
 
                disable_cap_alloc = config->dis_cap_alloc << config->slice_id;