1 files changed, 115 insertions, 1 deletions

diff --git a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c
index 6ceaa47a..d3fe5f65 100644
--- a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c
@@ -4488,11 +4488,125 @@ static int gr_gv11b_ecc_scrub_sm_icahe(struct gk20a *g)
                                 scrub_mask, scrub_done);
 }
 
+static void gr_gv11b_detect_ecc_enabled_units(struct gk20a *g)
+{
+        bool opt_ecc_en = g->ops.fuse.is_opt_ecc_enable(g);
+        bool opt_feature_fuses_override_disable =
+                g->ops.fuse.is_opt_feature_override_disable(g);
+        u32 fecs_feature_override_ecc =
+                        gk20a_readl(g,
+                                gr_fecs_feature_override_ecc_r());
+
+        if (opt_feature_fuses_override_disable) {
+                if (opt_ecc_en) {
+                        __nvgpu_set_enabled(g,
+                                        NVGPU_ECC_ENABLED_SM_LRF, true);
+                        __nvgpu_set_enabled(g,
+                                        NVGPU_ECC_ENABLED_SM_L1_DATA, true);
+                        __nvgpu_set_enabled(g,
+                                        NVGPU_ECC_ENABLED_SM_L1_TAG, true);
+                        __nvgpu_set_enabled(g,
+                                        NVGPU_ECC_ENABLED_SM_ICACHE, true);
+                        __nvgpu_set_enabled(g, NVGPU_ECC_ENABLED_LTC, true);
+                        __nvgpu_set_enabled(g, NVGPU_ECC_ENABLED_SM_CBU, true);
+                }
+        } else {
+                /* SM LRF */
+                if (gr_fecs_feature_override_ecc_sm_lrf_override_v(
+                                fecs_feature_override_ecc) == 1U) {
+                        if (gr_fecs_feature_override_ecc_sm_lrf_v(
+                                fecs_feature_override_ecc) == 1U) {
+                                __nvgpu_set_enabled(g,
+                                                NVGPU_ECC_ENABLED_SM_LRF, true);
+                        }
+                } else {
+                        if (opt_ecc_en) {
+                                __nvgpu_set_enabled(g,
+                                                NVGPU_ECC_ENABLED_SM_LRF, true);
+                        }
+                }
+                /* SM L1 DATA*/
+                if (gr_fecs_feature_override_ecc_sm_l1_data_override_v(
+                                fecs_feature_override_ecc) == 1U) {
+                        if (gr_fecs_feature_override_ecc_sm_l1_data_v(
+                                fecs_feature_override_ecc) == 1U) {
+                                __nvgpu_set_enabled(g,
+                                        NVGPU_ECC_ENABLED_SM_L1_DATA, true);
+                        }
+                } else {
+                        if (opt_ecc_en) {
+                                __nvgpu_set_enabled(g,
+                                        NVGPU_ECC_ENABLED_SM_L1_DATA, true);
+                        }
+                }
+                /* SM L1 TAG*/
+                if (gr_fecs_feature_override_ecc_sm_l1_tag_override_v(
+                                fecs_feature_override_ecc) == 1U) {
+                        if (gr_fecs_feature_override_ecc_sm_l1_tag_v(
+                                fecs_feature_override_ecc) == 1U) {
+                                __nvgpu_set_enabled(g,
+                                        NVGPU_ECC_ENABLED_SM_L1_TAG, true);
+                        }
+                } else {
+                        if (opt_ecc_en) {
+                                __nvgpu_set_enabled(g,
+                                        NVGPU_ECC_ENABLED_SM_L1_TAG, true);
+                        }
+                }
+                /* SM ICACHE*/
+                if ((gr_fecs_feature_override_ecc_1_sm_l0_icache_override_v(
+                                fecs_feature_override_ecc) == 1U) &&
+                        (gr_fecs_feature_override_ecc_1_sm_l1_icache_override_v(
+                                fecs_feature_override_ecc) == 1U)) {
+                        if ((gr_fecs_feature_override_ecc_1_sm_l0_icache_v(
+                                        fecs_feature_override_ecc) == 1U) &&
+                                (gr_fecs_feature_override_ecc_1_sm_l1_icache_v(
+                                        fecs_feature_override_ecc) == 1U)) {
+                                __nvgpu_set_enabled(g,
+                                        NVGPU_ECC_ENABLED_SM_ICACHE, true);
+                        }
+                } else {
+                        if (opt_ecc_en) {
+                                __nvgpu_set_enabled(g,
+                                        NVGPU_ECC_ENABLED_SM_ICACHE, true);
+                        }
+                }
+                /* LTC */
+                if (gr_fecs_feature_override_ecc_ltc_override_v(
+                                fecs_feature_override_ecc) == 1U) {
+                        if (gr_fecs_feature_override_ecc_ltc_v(
+                                fecs_feature_override_ecc) == 1U) {
+                                __nvgpu_set_enabled(g,
+                                                NVGPU_ECC_ENABLED_LTC, true);
+                        }
+                } else {
+                        if (opt_ecc_en) {
+                                __nvgpu_set_enabled(g,
+                                                NVGPU_ECC_ENABLED_LTC, true);
+                        }
+                }
+                /* SM CBU */
+                if (gr_fecs_feature_override_ecc_sm_cbu_override_v(
+                                fecs_feature_override_ecc) == 1U) {
+                        if (gr_fecs_feature_override_ecc_sm_cbu_v(
+                                fecs_feature_override_ecc) == 1U) {
+                                __nvgpu_set_enabled(g,
+                                        NVGPU_ECC_ENABLED_SM_CBU, true);
+                        }
+                } else {
+                        if (opt_ecc_en) {
+                                __nvgpu_set_enabled(g,
+                                        NVGPU_ECC_ENABLED_SM_CBU, true);
+                        }
+                }
+        }
+}
+
 void gr_gv11b_ecc_init_scrub_reg(struct gk20a *g)
 {
         nvgpu_log_fn(g, "ecc srub start ");
 
-        gv11b_detect_ecc_enabled_units(g);
+        gr_gv11b_detect_ecc_enabled_units(g);
 
         if (gr_gv11b_ecc_scrub_sm_lrf(g))
                 nvgpu_warn(g, "ECC SCRUB SM LRF Failed");