gpu: nvgpu: add clock gating support for HSHUB

Add BLCG and SLCG clock gating support for HSHUB unit on gv11b

Register list for BLCG and SLCG is auto generated with scripts.
Add HAL operations to enable/disable HSHUB clock gating

Re-generate gv11b reglist so that all the manually commented registers
are automatically deleted. Some of the unicast registers are also
deleted. We already have corresponding broadcast registers present.

Cherry-pick/manually port from dev-main

Bug 2526212

Change-Id: I2654f158daa802bcf992e103ed4a44675aa5fd4d
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/2150199
(cherry picked from commit e34b6f76d38ad5641c1ed7c3a4b36752d9dd4750)
Reviewed-on: https://git-master.nvidia.com/r/2224708
Reviewed-by: Seshendra Gadagottu <sgadagottu@nvidia.com>
GVS: Gerrit_Virtual_Submit
Tested-by: Peter Daifuku <pdaifuku@nvidia.com>
Reviewed-by: Luis Dib <ldib@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

5 files changed, 73 insertions, 22 deletions

diff --git a/drivers/gpu/nvgpu/common/clock_gating/gv11b_gating_reglist.c b/drivers/gpu/nvgpu/common/clock_gating/gv11b_gating_reglist.c
index 418f2c12..57b1443b 100644
--- a/drivers/gpu/nvgpu/common/clock_gating/gv11b_gating_reglist.c
+++ b/drivers/gpu/nvgpu/common/clock_gating/gv11b_gating_reglist.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2014-2019, NVIDIA CORPORATION.  All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -43,9 +43,7 @@ static const struct gating_desc gv11b_slcg_ce2[] = {
 
 /* slcg chiplet */
 static const struct gating_desc gv11b_slcg_chiplet[] = {
-        {.addr = 0x0010c07cU, .prod = 0x00000000U, .disable = 0x00000007U},
         {.addr = 0x0010e07cU, .prod = 0x00000000U, .disable = 0x00000007U},
-        {.addr = 0x0010d07cU, .prod = 0x00000000U, .disable = 0x00000007U},
         {.addr = 0x0010e17cU, .prod = 0x00000000U, .disable = 0x00000007U},
 };
 
@@ -70,22 +68,15 @@ static const struct gating_desc gv11b_slcg_gr[] = {
         {.addr = 0x00405864U, .prod = 0x00000000U, .disable = 0x000001feU},
         {.addr = 0x00405910U, .prod = 0xfffffff0U, .disable = 0xfffffffeU},
         {.addr = 0x00408044U, .prod = 0x00000000U, .disable = 0x000007feU},
-        /* fix priv error */
-        /*{.addr = 0x00407004U, .prod = 0x00000000U, .disable = 0x000001feU},*/
-        /*{.addr = 0x00405bf4U, .prod = 0x00000000U, .disable = 0x00000002U},*/
         {.addr = 0x0041a134U, .prod = 0x00020008U, .disable = 0x0003fffeU},
         {.addr = 0x0041a894U, .prod = 0x00000000U, .disable = 0x0000fffeU},
         {.addr = 0x00418504U, .prod = 0x00000000U, .disable = 0x0007fffeU},
-        /* fix priv error */
-        /*{.addr = 0x0041860cU, .prod = 0x00000000U, .disable = 0x000001feU},*/
         {.addr = 0x0041868cU, .prod = 0x00000000U, .disable = 0x0000001eU},
         {.addr = 0x0041871cU, .prod = 0x00000000U, .disable = 0x000003feU},
         {.addr = 0x00418388U, .prod = 0x00000000U, .disable = 0x00000001U},
         {.addr = 0x0041882cU, .prod = 0x00000000U, .disable = 0x0001fffeU},
         {.addr = 0x00418bc0U, .prod = 0x00000000U, .disable = 0x000001feU},
         {.addr = 0x00418974U, .prod = 0x00000000U, .disable = 0x0001fffeU},
-        /* fix priv error */
-        /*{.addr = 0x00418c74U, .prod = 0xffffff80U, .disable = 0xfffffffeU},*/
         {.addr = 0x00418cf4U, .prod = 0xfffffff8U, .disable = 0xfffffffeU},
         {.addr = 0x00418d74U, .prod = 0xffffffe0U, .disable = 0xfffffffeU},
         {.addr = 0x00418f10U, .prod = 0xffffffe0U, .disable = 0xfffffffeU},
@@ -95,8 +86,6 @@ static const struct gating_desc gv11b_slcg_gr[] = {
         {.addr = 0x00419d24U, .prod = 0x00000000U, .disable = 0x000000ffU},
         {.addr = 0x0041986cU, .prod = 0x00000104U, .disable = 0x00fffffeU},
         {.addr = 0x00419c74U, .prod = 0x0000001eU, .disable = 0x0000001eU},
-        /* fix priv error */
-        /*{.addr = 0x00419c84U, .prod = 0x0003fff8U, .disable = 0x0003fffeU},*/
         {.addr = 0x00419c8cU, .prod = 0xffffff84U, .disable = 0xfffffffeU},
         {.addr = 0x00419c94U, .prod = 0x00080040U, .disable = 0x000ffffeU},
         {.addr = 0x00419ca4U, .prod = 0x00003ffeU, .disable = 0x00003ffeU},
@@ -110,8 +99,6 @@ static const struct gating_desc gv11b_slcg_gr[] = {
         {.addr = 0x00419a84U, .prod = 0x0000000cU, .disable = 0x0000000eU},
         {.addr = 0x0041be2cU, .prod = 0x04115fc0U, .disable = 0xfffffffeU},
         {.addr = 0x0041bfecU, .prod = 0xfffffff0U, .disable = 0xfffffffeU},
-        /* fix priv error */
-        /*{.addr = 0x0041bed4U, .prod = 0xfffffff8U, .disable = 0xfffffffeU},*/
         {.addr = 0x00408814U, .prod = 0x00000000U, .disable = 0x0001fffeU},
         {.addr = 0x00408a84U, .prod = 0x00000000U, .disable = 0x0001fffeU},
         {.addr = 0x004089acU, .prod = 0x00000000U, .disable = 0x0001fffeU},
@@ -130,8 +117,6 @@ static const struct gating_desc gv11b_slcg_perf[] = {
         {.addr = 0x00248018U, .prod = 0xffffffffU, .disable = 0x00000000U},
         {.addr = 0x00246018U, .prod = 0xffffffffU, .disable = 0x00000000U},
         {.addr = 0x00246018U, .prod = 0xffffffffU, .disable = 0x00000000U},
-        {.addr = 0x00246018U, .prod = 0xffffffffU, .disable = 0x00000000U},
-        {.addr = 0x00244018U, .prod = 0xffffffffU, .disable = 0x00000000U},
         {.addr = 0x00244018U, .prod = 0xffffffffU, .disable = 0x00000000U},
         {.addr = 0x00244018U, .prod = 0xffffffffU, .disable = 0x00000000U},
         {.addr = 0x0024a124U, .prod = 0x00000001U, .disable = 0x00000000U},
@@ -168,7 +153,13 @@ static const struct gating_desc gv11b_slcg_xbar[] = {
         {.addr = 0x0013dc08U, .prod = 0x00000000U, .disable = 0xfffffffeU},
         {.addr = 0x0013c924U, .prod = 0x00000000U, .disable = 0x7ffffffeU},
         {.addr = 0x0013cbe4U, .prod = 0x00000000U, .disable = 0x1ffffffeU},
-        {.addr = 0x0013cc04U, .prod = 0x00000000U, .disable = 0x1ffffffeU},
+};
+
+/* slcg Hshub */
+static const struct gating_desc gv11b_slcg_hshub[] = {
+        {.addr = 0x001fb3f4U, .prod = 0x00000000U, .disable = 0xfffffffeU},
+        {.addr = 0x001fb7f4U, .prod = 0x00000000U, .disable = 0xfffffffeU},
+        {.addr = 0x001fbbf4U, .prod = 0x00000000U, .disable = 0xfffffffeU},
 };
 
 /* blcg bus */
@@ -191,8 +182,6 @@ static const struct gating_desc gv11b_blcg_fb[] = {
         {.addr = 0x00100d30U, .prod = 0x0000c242U, .disable = 0x00000000U},
         {.addr = 0x00100d3cU, .prod = 0x00000242U, .disable = 0x00000000U},
         {.addr = 0x00100d48U, .prod = 0x0000c242U, .disable = 0x00000000U},
-        /* fix priv error */
-        /*{.addr = 0x00100d1cU, .prod = 0x00000042U, .disable = 0x00000000U},*/
         {.addr = 0x00100c98U, .prod = 0x00004242U, .disable = 0x00000000U},
 };
 
@@ -279,7 +268,13 @@ static const struct gating_desc gv11b_blcg_xbar[] = {
         {.addr = 0x0013dc04U, .prod = 0x0001004aU, .disable = 0x00000000U},
         {.addr = 0x0013c920U, .prod = 0x0000004aU, .disable = 0x00000000U},
         {.addr = 0x0013cbe0U, .prod = 0x00000042U, .disable = 0x00000000U},
-        {.addr = 0x0013cc00U, .prod = 0x00000042U, .disable = 0x00000000U},
+};
+
+/* blcg Hshub */
+static const struct gating_desc gv11b_blcg_hshub[] = {
+        {.addr = 0x001fb3f0U, .prod = 0x0000c242U, .disable = 0x00000000U},
+        {.addr = 0x001fb7f0U, .prod = 0x0000c242U, .disable = 0x00000000U},
+        {.addr = 0x001fbbf0U, .prod = 0x0000c242U, .disable = 0x00000000U},
 };
 
 /* pg gr */
@@ -502,6 +497,22 @@ void gv11b_slcg_xbar_load_gating_prod(struct gk20a *g,
         }
 }
 
+void gv11b_slcg_hshub_load_gating_prod(struct gk20a *g,
+        bool prod)
+{
+        u32 i;
+        u32 size = (u32)(sizeof(gv11b_slcg_hshub) / GATING_DESC_SIZE);
+
+        if (nvgpu_is_enabled(g, NVGPU_GPU_CAN_SLCG)) {
+                for (i = 0; i < size; i++) {
+                        u32 reg = gv11b_slcg_hshub[i].addr;
+                        u32 val = prod ? gv11b_slcg_hshub[i].prod :
+                                         gv11b_slcg_hshub[i].disable;
+                        gk20a_writel(g, reg, val);
+                }
+        }
+}
+
 void gv11b_blcg_bus_load_gating_prod(struct gk20a *g,
         bool prod)
 {
@@ -662,6 +673,22 @@ void gv11b_blcg_xbar_load_gating_prod(struct gk20a *g,
         }
 }
 
+void gv11b_blcg_hshub_load_gating_prod(struct gk20a *g,
+        bool prod)
+{
+        u32 i;
+        u32 size = (u32)(sizeof(gv11b_blcg_hshub) / GATING_DESC_SIZE);
+
+        if (nvgpu_is_enabled(g, NVGPU_GPU_CAN_BLCG)) {
+                for (i = 0; i < size; i++) {
+                        u32 reg = gv11b_blcg_hshub[i].addr;
+                        u32 val = prod ? gv11b_blcg_hshub[i].prod :
+                                         gv11b_blcg_hshub[i].disable;
+                        gk20a_writel(g, reg, val);
+                }
+        }
+}
+
 void gr_gv11b_pg_gr_load_gating_prod(struct gk20a *g,
         bool prod)
 {
diff --git a/drivers/gpu/nvgpu/common/clock_gating/gv11b_gating_reglist.h b/drivers/gpu/nvgpu/common/clock_gating/gv11b_gating_reglist.h
index 155b6e2e..e1229dcf 100644
--- a/drivers/gpu/nvgpu/common/clock_gating/gv11b_gating_reglist.h
+++ b/drivers/gpu/nvgpu/common/clock_gating/gv11b_gating_reglist.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, NVIDIA Corporation. All rights reserved.
+ * Copyright (c) 2016-2019, NVIDIA Corporation. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -69,6 +69,9 @@ void gv11b_slcg_therm_load_gating_prod(struct gk20a *g,
 void gv11b_slcg_xbar_load_gating_prod(struct gk20a *g,
         bool prod);
 
+void gv11b_slcg_hshub_load_gating_prod(struct gk20a *g,
+        bool prod);
+
 void gv11b_blcg_bus_load_gating_prod(struct gk20a *g,
         bool prod);
 
@@ -99,6 +102,9 @@ void gv11b_blcg_pmu_load_gating_prod(struct gk20a *g,
 void gv11b_blcg_xbar_load_gating_prod(struct gk20a *g,
         bool prod);
 
+void gv11b_blcg_hshub_load_gating_prod(struct gk20a *g,
+        bool prod);
+
 void gr_gv11b_pg_gr_load_gating_prod(struct gk20a *g,
         bool prod);
 #endif /* GV11B_GATING_REGLIST_H */
diff --git a/drivers/gpu/nvgpu/common/power_features/cg/cg.c b/drivers/gpu/nvgpu/common/power_features/cg/cg.c
index a538c44b..39796bc8 100644
--- a/drivers/gpu/nvgpu/common/power_features/cg/cg.c
+++ b/drivers/gpu/nvgpu/common/power_features/cg/cg.c
@@ -428,6 +428,9 @@ void nvgpu_cg_init_gr_load_gating_prod(struct gk20a *g)
         if (g->ops.clock_gating.slcg_xbar_load_gating_prod != NULL) {
                 g->ops.clock_gating.slcg_xbar_load_gating_prod(g, true);
         }
+        if (g->ops.clock_gating.slcg_hshub_load_gating_prod != NULL) {
+                g->ops.clock_gating.slcg_hshub_load_gating_prod(g, true);
+        }
 
 check_can_blcg:
         if (!nvgpu_is_enabled(g, NVGPU_GPU_CAN_BLCG)) {
@@ -449,6 +452,9 @@ check_can_blcg:
         if (g->ops.clock_gating.blcg_xbar_load_gating_prod != NULL) {
                 g->ops.clock_gating.blcg_xbar_load_gating_prod(g, true);
         }
+        if (g->ops.clock_gating.blcg_hshub_load_gating_prod != NULL) {
+                g->ops.clock_gating.blcg_hshub_load_gating_prod(g, true);
+        }
 pg_gr_load:
         if (g->ops.clock_gating.pg_gr_load_gating_prod != NULL) {
                 g->ops.clock_gating.pg_gr_load_gating_prod(g, true);
@@ -538,6 +544,9 @@ void nvgpu_cg_blcg_set_blcg_enabled(struct gk20a *g, bool enable)
         if (g->ops.clock_gating.blcg_xbar_load_gating_prod != NULL) {
                 g->ops.clock_gating.blcg_xbar_load_gating_prod(g, enable);
         }
+        if (g->ops.clock_gating.blcg_hshub_load_gating_prod != NULL) {
+                g->ops.clock_gating.blcg_hshub_load_gating_prod(g, enable);
+        }
 
 done:
         nvgpu_mutex_release(&g->cg_pg_lock);
@@ -610,6 +619,9 @@ void nvgpu_cg_slcg_set_slcg_enabled(struct gk20a *g, bool enable)
         if (g->ops.clock_gating.slcg_xbar_load_gating_prod != NULL) {
                 g->ops.clock_gating.slcg_xbar_load_gating_prod(g, enable);
         }
+        if (g->ops.clock_gating.slcg_hshub_load_gating_prod != NULL) {
+                g->ops.clock_gating.slcg_hshub_load_gating_prod(g, enable);
+        }
 
 done:
         nvgpu_mutex_release(&g->cg_pg_lock);
diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
index 84469fa0..38f21bff 100644
--- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
@@ -527,6 +527,8 @@ static const struct gpu_ops gv11b_ops = {
                         gv11b_slcg_therm_load_gating_prod,
                 .slcg_xbar_load_gating_prod =
                         gv11b_slcg_xbar_load_gating_prod,
+                .slcg_hshub_load_gating_prod =
+                        gv11b_slcg_hshub_load_gating_prod,
                 .blcg_bus_load_gating_prod =
                         gv11b_blcg_bus_load_gating_prod,
                 .blcg_ce_load_gating_prod =
@@ -547,6 +549,8 @@ static const struct gpu_ops gv11b_ops = {
                         gv11b_blcg_pmu_load_gating_prod,
                 .blcg_xbar_load_gating_prod =
                         gv11b_blcg_xbar_load_gating_prod,
+                .blcg_hshub_load_gating_prod =
+                        gv11b_blcg_hshub_load_gating_prod,
                 .pg_gr_load_gating_prod =
                         gr_gv11b_pg_gr_load_gating_prod,
         },
diff --git a/drivers/gpu/nvgpu/include/nvgpu/gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/gk20a.h
index 47a04f16..af8a868e 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/gk20a.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/gk20a.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2018, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2011-2019, NVIDIA CORPORATION.  All rights reserved.
  *
  * GK20A Graphics
  *
@@ -616,6 +616,7 @@ struct gpu_ops {
                 void (*slcg_pmu_load_gating_prod)(struct gk20a *g, bool prod);
                 void (*slcg_therm_load_gating_prod)(struct gk20a *g, bool prod);
                 void (*slcg_xbar_load_gating_prod)(struct gk20a *g, bool prod);
+                void (*slcg_hshub_load_gating_prod)(struct gk20a *g, bool prod);
                 void (*blcg_bus_load_gating_prod)(struct gk20a *g, bool prod);
                 void (*blcg_ce_load_gating_prod)(struct gk20a *g, bool prod);
                 void (*blcg_ctxsw_firmware_load_gating_prod)(struct gk20a *g, bool prod);
@@ -626,6 +627,7 @@ struct gpu_ops {
                 void (*blcg_pwr_csb_load_gating_prod)(struct gk20a *g, bool prod);
                 void (*blcg_pmu_load_gating_prod)(struct gk20a *g, bool prod);
                 void (*blcg_xbar_load_gating_prod)(struct gk20a *g, bool prod);
+                void (*blcg_hshub_load_gating_prod)(struct gk20a *g, bool prod);
                 void (*pg_gr_load_gating_prod)(struct gk20a *g, bool prod);
         } clock_gating;
         struct {