gpu: nvgpu: gv11b: set soc credits after fs_hub is out of reset

Without these credits, gpu mmu binds over nvlink to soc are hanging.
Also add l2_enabled for mc_elpg_enable.

Bug 1899460

Change-Id: I0b26410d5c8ec9b4c88b319ddd9442f2fd91b321
Signed-off-by: Seema Khowala <seemaj@nvidia.com>
Reviewed-on: http://git-master/r/1463204
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>

3 files changed, 82 insertions, 1 deletions

diff --git a/drivers/gpu/nvgpu/gv11b/fb_gv11b.c b/drivers/gpu/nvgpu/gv11b/fb_gv11b.c
index 61b23711..98aad4e0 100644
--- a/drivers/gpu/nvgpu/gv11b/fb_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/fb_gv11b.c
@@ -24,6 +24,61 @@
 
 #include <nvgpu/hw/gv11b/hw_gmmu_gv11b.h>
 #include <nvgpu/hw/gv11b/hw_fb_gv11b.h>
+#include <nvgpu/hw/gv11b/hw_mc_gv11b.h>
+#include <nvgpu/hw/gv11b/hw_fifo_gv11b.h>
+
+static void gv11b_init_nvlink_soc_credits(struct gk20a *g)
+{
+        void __iomem *soc1 = ioremap(0x02b10010, 4096);
+        void __iomem *soc2 = ioremap(0x02b20010, 4096);
+        void __iomem *soc3 = ioremap(0x02b30010, 4096);
+        void __iomem *soc4 = ioremap(0x02b40010, 4096);
+
+        gk20a_dbg_info("init nvlink soc credits");
+
+        writel_relaxed(0x14050000, soc1);
+        writel_relaxed(0x08020000, soc1 + 4);
+        writel_relaxed(0x14050000, soc2);
+        writel_relaxed(0x08020000, soc2 + 4);
+        writel_relaxed(0x14050000, soc3);
+        writel_relaxed(0x08020000, soc3 + 4);
+        writel_relaxed(0x14050000, soc4);
+        writel_relaxed(0x08020000, soc4 + 4);
+
+}
+
+static void gv11b_fb_reset(struct gk20a *g)
+{
+        u32 val;
+
+        gk20a_dbg_info("reset gv11b fb");
+
+        g->ops.mc.reset(g, mc_enable_pfb_enabled_f() |
+                                mc_enable_l2_enabled_f() |
+                                mc_enable_xbar_enabled_f() |
+                                mc_enable_hub_enabled_f());
+
+        val = gk20a_readl(g, mc_elpg_enable_r());
+        val |= mc_elpg_enable_xbar_enabled_f() |
+                mc_elpg_enable_pfb_enabled_f() |
+                mc_elpg_enable_l2_enabled_f() |
+                mc_elpg_enable_hub_enabled_f();
+        gk20a_writel(g, mc_elpg_enable_r(), val);
+
+        /* fs hub should be out of reset by now */
+        gv11b_init_nvlink_soc_credits(g);
+
+        val = gk20a_readl(g, fifo_fb_iface_r());
+        gk20a_dbg_info("fifo_fb_iface val = 0x%x", val);
+        if (!(val & fifo_fb_iface_control_enable_f() &&
+                val & fifo_fb_iface_status_enabled_f())) {
+                gk20a_dbg_info("fifo_fb_iface set control enable");
+                gk20a_writel(g, fifo_fb_iface_r(),
+                                fifo_fb_iface_control_enable_f());
+                val = gk20a_readl(g, fifo_fb_iface_r());
+                gk20a_dbg_info("fifo_fb_iface val = 0x%x", val);
+        }
+}
 
 static void gv11b_init_uncompressed_kind_map(void)
 {
@@ -94,6 +149,8 @@ void gv11b_init_fb(struct gpu_ops *gops)
 {
         gp10b_init_fb(gops);
         gops->fb.hub_isr = gv11b_fb_hub_isr;
+        gops->fb.reset = gv11b_fb_reset;
+
         gv11b_init_uncompressed_kind_map();
         gv11b_init_kind_attr();
 
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_fifo_gv11b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_fifo_gv11b.h
index dbcb02c8..bd2f628c 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_fifo_gv11b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_fifo_gv11b.h
@@ -630,4 +630,24 @@ static inline u32 fifo_cfg0_pbdma_fault_id_v(u32 r)
 {
         return (r >> 16) & 0xff;
 }
+static inline u32 fifo_fb_iface_r(void)
+{
+        return 0x000026f0;
+}
+static inline u32 fifo_fb_iface_control_v(u32 r)
+{
+        return (r >> 0) & 0x1;
+}
+static inline u32 fifo_fb_iface_control_enable_f(void)
+{
+        return 0x1;
+}
+static inline u32 fifo_fb_iface_status_v(u32 r)
+{
+        return (r >> 4) & 0x1;
+}
+static inline u32 fifo_fb_iface_status_enabled_f(void)
+{
+        return 0x10;
+}
 #endif
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_mc_gv11b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_mc_gv11b.h
index 98bec43a..f05910a9 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_mc_gv11b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_mc_gv11b.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2016-2017, NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -242,4 +242,8 @@ static inline u32 mc_elpg_enable_hub_enabled_f(void)
 {
         return 0x20000000;
 }
+static inline u32 mc_elpg_enable_l2_enabled_f(void)
+{
+        return 0x8;
+}
 #endif