gpu: nvgpu: Fold T19x code back to main code paths

Lots of code paths were split to T19x specific code paths and structs
due to split repository. Now that repositories are merged, fold all of
them back to main code paths and structs and remove the T19x specific
Kconfig flag.

Change-Id: Id0d17a5f0610fc0b49f51ab6664e716dc8b222b6
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1640606
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

1 files changed, 54 insertions, 56 deletions

diff --git a/drivers/gpu/nvgpu/common/linux/platform_gv11b_tegra.c b/drivers/gpu/nvgpu/common/linux/platform_gv11b_tegra.c
index 81b6204d..aad94cd2 100644
--- a/drivers/gpu/nvgpu/common/linux/platform_gv11b_tegra.c
+++ b/drivers/gpu/nvgpu/common/linux/platform_gv11b_tegra.c
@@ -26,7 +26,6 @@
 #include <linux/platform/tegra/emc_bwmgr.h>
 
 #include <nvgpu/nvhost.h>
-#include <nvgpu/nvhost_t19x.h>
 
 #include <uapi/linux/nvgpu.h>
 
@@ -44,7 +43,6 @@
 #include "os_linux.h"
 #include "platform_gk20a_tegra.h"
 #include "gv11b/gr_gv11b.h"
-#include "nvgpu_gpuid_t19x.h"
 
 static void gr_gv11b_remove_sysfs(struct device *dev);
 
@@ -203,7 +201,7 @@ static int gv11b_tegra_suspend(struct device *dev)
         return 0;
 }
 
-struct gk20a_platform t19x_gpu_tegra_platform = {
+struct gk20a_platform gv11b_tegra_platform = {
         .has_syncpoints = true,
 
         /* no cde. use sysmem compression */
@@ -297,7 +295,7 @@ void gr_gv11b_create_sysfs(struct gk20a *g)
        initialized multiple times but we only need to create the ECC
        stats once. Therefore, add the following check to avoid
        creating duplicate stat sysfs nodes. */
-        if (g->ecc.gr.t19x.sm_l1_tag_corrected_err_count.counters != NULL)
+        if (g->ecc.gr.sm_l1_tag_corrected_err_count.counters != NULL)
                 return;
 
         gr_gp10b_create_sysfs(g);
@@ -305,61 +303,61 @@ void gr_gv11b_create_sysfs(struct gk20a *g)
         error |= gr_gp10b_ecc_stat_create(dev,
                                 0,
                                 "sm_l1_tag_ecc_corrected_err_count",
-                                &g->ecc.gr.t19x.sm_l1_tag_corrected_err_count,
+                                &g->ecc.gr.sm_l1_tag_corrected_err_count,
                                 &dev_attr_sm_l1_tag_ecc_corrected_err_count_array);
 
         error |= gr_gp10b_ecc_stat_create(dev,
                                 0,
                                 "sm_l1_tag_ecc_uncorrected_err_count",
-                                &g->ecc.gr.t19x.sm_l1_tag_uncorrected_err_count,
+                                &g->ecc.gr.sm_l1_tag_uncorrected_err_count,
                                 &dev_attr_sm_l1_tag_ecc_uncorrected_err_count_array);
 
         error |= gr_gp10b_ecc_stat_create(dev,
                                 0,
                                 "sm_cbu_ecc_corrected_err_count",
-                                &g->ecc.gr.t19x.sm_cbu_corrected_err_count,
+                                &g->ecc.gr.sm_cbu_corrected_err_count,
                                 &dev_attr_sm_cbu_ecc_corrected_err_count_array);
 
         error |= gr_gp10b_ecc_stat_create(dev,
                                 0,
                                 "sm_cbu_ecc_uncorrected_err_count",
-                                &g->ecc.gr.t19x.sm_cbu_uncorrected_err_count,
+                                &g->ecc.gr.sm_cbu_uncorrected_err_count,
                                 &dev_attr_sm_cbu_ecc_uncorrected_err_count_array);
 
         error |= gr_gp10b_ecc_stat_create(dev,
                                 0,
                                 "sm_l1_data_ecc_corrected_err_count",
-                                &g->ecc.gr.t19x.sm_l1_data_corrected_err_count,
+                                &g->ecc.gr.sm_l1_data_corrected_err_count,
                                 &dev_attr_sm_l1_data_ecc_corrected_err_count_array);
 
         error |= gr_gp10b_ecc_stat_create(dev,
                                 0,
                                 "sm_l1_data_ecc_uncorrected_err_count",
-                                &g->ecc.gr.t19x.sm_l1_data_uncorrected_err_count,
+                                &g->ecc.gr.sm_l1_data_uncorrected_err_count,
                                 &dev_attr_sm_l1_data_ecc_uncorrected_err_count_array);
 
         error |= gr_gp10b_ecc_stat_create(dev,
                                 0,
                                 "sm_icache_ecc_corrected_err_count",
-                                &g->ecc.gr.t19x.sm_icache_corrected_err_count,
+                                &g->ecc.gr.sm_icache_corrected_err_count,
                                 &dev_attr_sm_icache_ecc_corrected_err_count_array);
 
         error |= gr_gp10b_ecc_stat_create(dev,
                                 0,
                                 "sm_icache_ecc_uncorrected_err_count",
-                                &g->ecc.gr.t19x.sm_icache_uncorrected_err_count,
+                                &g->ecc.gr.sm_icache_uncorrected_err_count,
                                 &dev_attr_sm_icache_ecc_uncorrected_err_count_array);
 
         error |= gr_gp10b_ecc_stat_create(dev,
                                 0,
                                 "gcc_l15_ecc_corrected_err_count",
-                                &g->ecc.gr.t19x.gcc_l15_corrected_err_count,
+                                &g->ecc.gr.gcc_l15_corrected_err_count,
                                 &dev_attr_gcc_l15_ecc_corrected_err_count_array);
 
         error |= gr_gp10b_ecc_stat_create(dev,
                                 0,
                                 "gcc_l15_ecc_uncorrected_err_count",
-                                &g->ecc.gr.t19x.gcc_l15_uncorrected_err_count,
+                                &g->ecc.gr.gcc_l15_uncorrected_err_count,
                                 &dev_attr_gcc_l15_ecc_uncorrected_err_count_array);
 
         error |= gp10b_ecc_stat_create(dev,
@@ -368,7 +366,7 @@ void gr_gv11b_create_sysfs(struct gk20a *g)
                                 "ltc",
                                 NULL,
                                 "l2_cache_uncorrected_err_count",
-                                &g->ecc.ltc.t19x.l2_cache_uncorrected_err_count,
+                                &g->ecc.ltc.l2_cache_uncorrected_err_count,
                                 &dev_attr_l2_cache_ecc_uncorrected_err_count_array);
 
         error |= gp10b_ecc_stat_create(dev,
@@ -377,7 +375,7 @@ void gr_gv11b_create_sysfs(struct gk20a *g)
                                 "ltc",
                                 NULL,
                                 "l2_cache_corrected_err_count",
-                                &g->ecc.ltc.t19x.l2_cache_corrected_err_count,
+                                &g->ecc.ltc.l2_cache_corrected_err_count,
                                 &dev_attr_l2_cache_ecc_corrected_err_count_array);
 
         error |= gp10b_ecc_stat_create(dev,
@@ -386,7 +384,7 @@ void gr_gv11b_create_sysfs(struct gk20a *g)
                                 "gpc",
                                 NULL,
                                 "fecs_ecc_uncorrected_err_count",
-                                &g->ecc.gr.t19x.fecs_uncorrected_err_count,
+                                &g->ecc.gr.fecs_uncorrected_err_count,
                                 &dev_attr_fecs_ecc_uncorrected_err_count_array);
 
         error |= gp10b_ecc_stat_create(dev,
@@ -395,7 +393,7 @@ void gr_gv11b_create_sysfs(struct gk20a *g)
                                 "gpc",
                                 NULL,
                                 "fecs_ecc_corrected_err_count",
-                                &g->ecc.gr.t19x.fecs_corrected_err_count,
+                                &g->ecc.gr.fecs_corrected_err_count,
                                 &dev_attr_fecs_ecc_corrected_err_count_array);
 
         error |= gp10b_ecc_stat_create(dev,
@@ -404,7 +402,7 @@ void gr_gv11b_create_sysfs(struct gk20a *g)
                                 "gpc",
                                 NULL,
                                 "gpccs_ecc_uncorrected_err_count",
-                                &g->ecc.gr.t19x.gpccs_uncorrected_err_count,
+                                &g->ecc.gr.gpccs_uncorrected_err_count,
                                 &dev_attr_gpccs_ecc_uncorrected_err_count_array);
 
         error |= gp10b_ecc_stat_create(dev,
@@ -413,7 +411,7 @@ void gr_gv11b_create_sysfs(struct gk20a *g)
                                 "gpc",
                                 NULL,
                                 "gpccs_ecc_corrected_err_count",
-                                &g->ecc.gr.t19x.gpccs_corrected_err_count,
+                                &g->ecc.gr.gpccs_corrected_err_count,
                                 &dev_attr_gpccs_ecc_corrected_err_count_array);
 
         error |= gp10b_ecc_stat_create(dev,
@@ -422,7 +420,7 @@ void gr_gv11b_create_sysfs(struct gk20a *g)
                                 "gpc",
                                 NULL,
                                 "mmu_l1tlb_ecc_uncorrected_err_count",
-                                &g->ecc.gr.t19x.mmu_l1tlb_uncorrected_err_count,
+                                &g->ecc.gr.mmu_l1tlb_uncorrected_err_count,
                                 &dev_attr_mmu_l1tlb_ecc_uncorrected_err_count_array);
 
         error |= gp10b_ecc_stat_create(dev,
@@ -431,7 +429,7 @@ void gr_gv11b_create_sysfs(struct gk20a *g)
                                 "gpc",
                                 NULL,
                                 "mmu_l1tlb_ecc_corrected_err_count",
-                                &g->ecc.gr.t19x.mmu_l1tlb_corrected_err_count,
+                                &g->ecc.gr.mmu_l1tlb_corrected_err_count,
                                 &dev_attr_mmu_l1tlb_ecc_corrected_err_count_array);
 
         error |= gp10b_ecc_stat_create(dev,
@@ -440,7 +438,7 @@ void gr_gv11b_create_sysfs(struct gk20a *g)
                                 "eng",
                                 NULL,
                                 "mmu_l2tlb_ecc_uncorrected_err_count",
-                                &g->ecc.eng.t19x.mmu_l2tlb_uncorrected_err_count,
+                                &g->ecc.fb.mmu_l2tlb_uncorrected_err_count,
                                 &dev_attr_mmu_l2tlb_ecc_uncorrected_err_count_array);
 
         error |= gp10b_ecc_stat_create(dev,
@@ -449,7 +447,7 @@ void gr_gv11b_create_sysfs(struct gk20a *g)
                                 "eng",
                                 NULL,
                                 "mmu_l2tlb_ecc_corrected_err_count",
-                                &g->ecc.eng.t19x.mmu_l2tlb_corrected_err_count,
+                                &g->ecc.fb.mmu_l2tlb_corrected_err_count,
                                 &dev_attr_mmu_l2tlb_ecc_corrected_err_count_array);
 
         error |= gp10b_ecc_stat_create(dev,
@@ -458,7 +456,7 @@ void gr_gv11b_create_sysfs(struct gk20a *g)
                                 "eng",
                                 NULL,
                                 "mmu_hubtlb_ecc_uncorrected_err_count",
-                                &g->ecc.eng.t19x.mmu_hubtlb_uncorrected_err_count,
+                                &g->ecc.fb.mmu_hubtlb_uncorrected_err_count,
                                 &dev_attr_mmu_hubtlb_ecc_uncorrected_err_count_array);
 
         error |= gp10b_ecc_stat_create(dev,
@@ -467,7 +465,7 @@ void gr_gv11b_create_sysfs(struct gk20a *g)
                                 "eng",
                                 NULL,
                                 "mmu_hubtlb_ecc_corrected_err_count",
-                                &g->ecc.eng.t19x.mmu_hubtlb_corrected_err_count,
+                                &g->ecc.fb.mmu_hubtlb_corrected_err_count,
                                 &dev_attr_mmu_hubtlb_ecc_corrected_err_count_array);
 
         error |= gp10b_ecc_stat_create(dev,
@@ -476,7 +474,7 @@ void gr_gv11b_create_sysfs(struct gk20a *g)
                                 "eng",
                                 NULL,
                                 "mmu_fillunit_ecc_uncorrected_err_count",
-                                &g->ecc.eng.t19x.mmu_fillunit_uncorrected_err_count,
+                                &g->ecc.fb.mmu_fillunit_uncorrected_err_count,
                                 &dev_attr_mmu_fillunit_ecc_uncorrected_err_count_array);
 
         error |= gp10b_ecc_stat_create(dev,
@@ -485,7 +483,7 @@ void gr_gv11b_create_sysfs(struct gk20a *g)
                                 "eng",
                                 NULL,
                                 "mmu_fillunit_ecc_corrected_err_count",
-                                &g->ecc.eng.t19x.mmu_fillunit_corrected_err_count,
+                                &g->ecc.fb.mmu_fillunit_corrected_err_count,
                                 &dev_attr_mmu_fillunit_ecc_corrected_err_count_array);
 
         error |= gp10b_ecc_stat_create(dev,
@@ -494,7 +492,7 @@ void gr_gv11b_create_sysfs(struct gk20a *g)
                                 "eng",
                                 NULL,
                                 "pmu_ecc_uncorrected_err_count",
-                                &g->ecc.eng.t19x.pmu_uncorrected_err_count,
+                                &g->ecc.pmu.pmu_uncorrected_err_count,
                                 &dev_attr_pmu_ecc_uncorrected_err_count_array);
 
         error |= gp10b_ecc_stat_create(dev,
@@ -503,7 +501,7 @@ void gr_gv11b_create_sysfs(struct gk20a *g)
                                 "eng",
                                 NULL,
                                 "pmu_ecc_corrected_err_count",
-                                &g->ecc.eng.t19x.pmu_corrected_err_count,
+                                &g->ecc.pmu.pmu_corrected_err_count,
                                 &dev_attr_pmu_ecc_corrected_err_count_array);
 
 
@@ -517,131 +515,131 @@ static void gr_gv11b_remove_sysfs(struct device *dev)
 
         gr_gp10b_ecc_stat_remove(dev,
                         0,
-                        &g->ecc.gr.t19x.sm_l1_tag_corrected_err_count,
+                        &g->ecc.gr.sm_l1_tag_corrected_err_count,
                         dev_attr_sm_l1_tag_ecc_corrected_err_count_array);
 
         gr_gp10b_ecc_stat_remove(dev,
                         0,
-                        &g->ecc.gr.t19x.sm_l1_tag_uncorrected_err_count,
+                        &g->ecc.gr.sm_l1_tag_uncorrected_err_count,
                         dev_attr_sm_l1_tag_ecc_uncorrected_err_count_array);
 
         gr_gp10b_ecc_stat_remove(dev,
                         0,
-                        &g->ecc.gr.t19x.sm_cbu_corrected_err_count,
+                        &g->ecc.gr.sm_cbu_corrected_err_count,
                         dev_attr_sm_cbu_ecc_corrected_err_count_array);
 
         gr_gp10b_ecc_stat_remove(dev,
                         0,
-                        &g->ecc.gr.t19x.sm_cbu_uncorrected_err_count,
+                        &g->ecc.gr.sm_cbu_uncorrected_err_count,
                         dev_attr_sm_cbu_ecc_uncorrected_err_count_array);
 
         gr_gp10b_ecc_stat_remove(dev,
                         0,
-                        &g->ecc.gr.t19x.sm_l1_data_corrected_err_count,
+                        &g->ecc.gr.sm_l1_data_corrected_err_count,
                         dev_attr_sm_l1_data_ecc_corrected_err_count_array);
 
         gr_gp10b_ecc_stat_remove(dev,
                         0,
-                        &g->ecc.gr.t19x.sm_l1_data_uncorrected_err_count,
+                        &g->ecc.gr.sm_l1_data_uncorrected_err_count,
                         dev_attr_sm_l1_data_ecc_uncorrected_err_count_array);
 
         gr_gp10b_ecc_stat_remove(dev,
                         0,
-                        &g->ecc.gr.t19x.sm_icache_corrected_err_count,
+                        &g->ecc.gr.sm_icache_corrected_err_count,
                         dev_attr_sm_icache_ecc_corrected_err_count_array);
 
         gr_gp10b_ecc_stat_remove(dev,
                         0,
-                        &g->ecc.gr.t19x.sm_icache_uncorrected_err_count,
+                        &g->ecc.gr.sm_icache_uncorrected_err_count,
                         dev_attr_sm_icache_ecc_uncorrected_err_count_array);
 
         gr_gp10b_ecc_stat_remove(dev,
                         0,
-                        &g->ecc.gr.t19x.gcc_l15_corrected_err_count,
+                        &g->ecc.gr.gcc_l15_corrected_err_count,
                         dev_attr_gcc_l15_ecc_corrected_err_count_array);
 
         gr_gp10b_ecc_stat_remove(dev,
                         0,
-                        &g->ecc.gr.t19x.gcc_l15_uncorrected_err_count,
+                        &g->ecc.gr.gcc_l15_uncorrected_err_count,
                         dev_attr_gcc_l15_ecc_uncorrected_err_count_array);
 
         gp10b_ecc_stat_remove(dev,
                         g->ltc_count,
-                        &g->ecc.ltc.t19x.l2_cache_uncorrected_err_count,
+                        &g->ecc.ltc.l2_cache_uncorrected_err_count,
                         dev_attr_l2_cache_ecc_uncorrected_err_count_array);
 
         gp10b_ecc_stat_remove(dev,
                         g->ltc_count,
-                        &g->ecc.ltc.t19x.l2_cache_corrected_err_count,
+                        &g->ecc.ltc.l2_cache_corrected_err_count,
                         dev_attr_l2_cache_ecc_corrected_err_count_array);
 
         gp10b_ecc_stat_remove(dev,
                         1,
-                        &g->ecc.gr.t19x.fecs_uncorrected_err_count,
+                        &g->ecc.gr.fecs_uncorrected_err_count,
                         dev_attr_fecs_ecc_uncorrected_err_count_array);
 
         gp10b_ecc_stat_remove(dev,
                         1,
-                        &g->ecc.gr.t19x.fecs_corrected_err_count,
+                        &g->ecc.gr.fecs_corrected_err_count,
                         dev_attr_fecs_ecc_corrected_err_count_array);
 
         gp10b_ecc_stat_remove(dev,
                         g->gr.gpc_count,
-                        &g->ecc.gr.t19x.gpccs_uncorrected_err_count,
+                        &g->ecc.gr.gpccs_uncorrected_err_count,
                         dev_attr_gpccs_ecc_uncorrected_err_count_array);
 
         gp10b_ecc_stat_remove(dev,
                         g->gr.gpc_count,
-                        &g->ecc.gr.t19x.gpccs_corrected_err_count,
+                        &g->ecc.gr.gpccs_corrected_err_count,
                         dev_attr_gpccs_ecc_corrected_err_count_array);
 
         gp10b_ecc_stat_remove(dev,
                         g->gr.gpc_count,
-                        &g->ecc.gr.t19x.mmu_l1tlb_uncorrected_err_count,
+                        &g->ecc.gr.mmu_l1tlb_uncorrected_err_count,
                         dev_attr_mmu_l1tlb_ecc_uncorrected_err_count_array);
 
         gp10b_ecc_stat_remove(dev,
                         g->gr.gpc_count,
-                        &g->ecc.gr.t19x.mmu_l1tlb_corrected_err_count,
+                        &g->ecc.gr.mmu_l1tlb_corrected_err_count,
                         dev_attr_mmu_l1tlb_ecc_corrected_err_count_array);
 
         gp10b_ecc_stat_remove(dev,
                         1,
-                        &g->ecc.eng.t19x.mmu_l2tlb_uncorrected_err_count,
+                        &g->ecc.fb.mmu_l2tlb_uncorrected_err_count,
                         dev_attr_mmu_l2tlb_ecc_uncorrected_err_count_array);
 
         gp10b_ecc_stat_remove(dev,
                         1,
-                        &g->ecc.eng.t19x.mmu_l2tlb_corrected_err_count,
+                        &g->ecc.fb.mmu_l2tlb_corrected_err_count,
                         dev_attr_mmu_l2tlb_ecc_corrected_err_count_array);
 
         gp10b_ecc_stat_remove(dev,
                         1,
-                        &g->ecc.eng.t19x.mmu_hubtlb_uncorrected_err_count,
+                        &g->ecc.fb.mmu_hubtlb_uncorrected_err_count,
                         dev_attr_mmu_hubtlb_ecc_uncorrected_err_count_array);
 
         gp10b_ecc_stat_remove(dev,
                         1,
-                        &g->ecc.eng.t19x.mmu_hubtlb_corrected_err_count,
+                        &g->ecc.fb.mmu_hubtlb_corrected_err_count,
                         dev_attr_mmu_hubtlb_ecc_corrected_err_count_array);
 
         gp10b_ecc_stat_remove(dev,
                         1,
-                        &g->ecc.eng.t19x.mmu_fillunit_uncorrected_err_count,
+                        &g->ecc.fb.mmu_fillunit_uncorrected_err_count,
                         dev_attr_mmu_fillunit_ecc_uncorrected_err_count_array);
 
         gp10b_ecc_stat_remove(dev,
                         1,
-                        &g->ecc.eng.t19x.mmu_fillunit_corrected_err_count,
+                        &g->ecc.fb.mmu_fillunit_corrected_err_count,
                         dev_attr_mmu_fillunit_ecc_corrected_err_count_array);
 
         gp10b_ecc_stat_remove(dev,
                         1,
-                        &g->ecc.eng.t19x.pmu_uncorrected_err_count,
+                        &g->ecc.pmu.pmu_uncorrected_err_count,
                         dev_attr_pmu_ecc_uncorrected_err_count_array);
 
         gp10b_ecc_stat_remove(dev,
                         1,
-                        &g->ecc.eng.t19x.pmu_corrected_err_count,
+                        &g->ecc.pmu.pmu_corrected_err_count,
                         dev_attr_pmu_ecc_corrected_err_count_array);
 }