gpu: nvgpu: Bump FB gk20a code to gm20b

Move all code from fb_gk20a.c to fb_gm20b.c.

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

5 files changed, 102 insertions, 163 deletions

diff --git a/drivers/gpu/nvgpu/common/fb/fb_gk20a.c b/drivers/gpu/nvgpu/common/fb/fb_gk20a.c
deleted file mode 100644
index 78523965..00000000
--- a/drivers/gpu/nvgpu/common/fb/fb_gk20a.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * GK20A memory interface
- *
- * Copyright (c) 2014-2018, 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"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-#include <trace/events/gk20a.h>
-
-#include "gk20a/gk20a.h"
-
-#include "fb_gk20a.h"
-
-#include <nvgpu/timers.h>
-#include <nvgpu/io.h>
-#include <nvgpu/utils.h>
-
-#include <nvgpu/hw/gk20a/hw_mc_gk20a.h>
-#include <nvgpu/hw/gk20a/hw_fb_gk20a.h>
-
-void fb_gk20a_reset(struct gk20a *g)
-{
-        u32 val;
-
-        nvgpu_log_info(g, "reset gk20a fb");
-
-        val = gk20a_readl(g, mc_elpg_enable_r());
-        val |= mc_elpg_enable_xbar_enabled_f()
-                | mc_elpg_enable_pfb_enabled_f()
-                | mc_elpg_enable_hub_enabled_f();
-        gk20a_writel(g, mc_elpg_enable_r(), val);
-}
-
-void gk20a_fb_init_hw(struct gk20a *g)
-{
-        u32 addr = nvgpu_mem_get_addr(g, &g->mm.sysmem_flush) >> 8;
-
-        gk20a_writel(g, fb_niso_flush_sysmem_addr_r(), addr);
-}
-
-void gk20a_fb_tlb_invalidate(struct gk20a *g, struct nvgpu_mem *pdb)
-{
-        struct nvgpu_timeout timeout;
-        u32 addr_lo;
-        u32 data;
-
-        nvgpu_log_fn(g, " ");
-
-        /* pagetables are considered sw states which are preserved after
-           prepare_poweroff. When gk20a deinit releases those pagetables,
-           common code in vm unmap path calls tlb invalidate that touches
-           hw. Use the power_on flag to skip tlb invalidation when gpu
-           power is turned off */
-
-        if (!g->power_on) {
-                return;
-        }
-
-        addr_lo = u64_lo32(nvgpu_mem_get_addr(g, pdb) >> 12);
-
-        nvgpu_mutex_acquire(&g->mm.tlb_lock);
-
-        trace_gk20a_mm_tlb_invalidate(g->name);
-
-        nvgpu_timeout_init(g, &timeout, 1000, NVGPU_TIMER_RETRY_TIMER);
-
-        do {
-                data = gk20a_readl(g, fb_mmu_ctrl_r());
-                if (fb_mmu_ctrl_pri_fifo_space_v(data) != 0) {
-                        break;
-                }
-                nvgpu_udelay(2);
-        } while (!nvgpu_timeout_expired_msg(&timeout,
-                                         "wait mmu fifo space"));
-
-        if (nvgpu_timeout_peek_expired(&timeout)) {
-                goto out;
-        }
-
-        nvgpu_timeout_init(g, &timeout, 1000, NVGPU_TIMER_RETRY_TIMER);
-
-        gk20a_writel(g, fb_mmu_invalidate_pdb_r(),
-                fb_mmu_invalidate_pdb_addr_f(addr_lo) |
-                nvgpu_aperture_mask(g, pdb,
-                                fb_mmu_invalidate_pdb_aperture_sys_mem_f(),
-                                fb_mmu_invalidate_pdb_aperture_sys_mem_f(),
-                                fb_mmu_invalidate_pdb_aperture_vid_mem_f()));
-
-        gk20a_writel(g, fb_mmu_invalidate_r(),
-                fb_mmu_invalidate_all_va_true_f() |
-                fb_mmu_invalidate_trigger_true_f());
-
-        do {
-                data = gk20a_readl(g, fb_mmu_ctrl_r());
-                if (fb_mmu_ctrl_pri_fifo_empty_v(data) !=
-                        fb_mmu_ctrl_pri_fifo_empty_false_f()) {
-                        break;
-                }
-                nvgpu_udelay(2);
-        } while (!nvgpu_timeout_expired_msg(&timeout,
-                                         "wait mmu invalidate"));
-
-        trace_gk20a_mm_tlb_invalidate_done(g->name);
-
-out:
-        nvgpu_mutex_release(&g->mm.tlb_lock);
-}
diff --git a/drivers/gpu/nvgpu/common/fb/fb_gk20a.h b/drivers/gpu/nvgpu/common/fb/fb_gk20a.h
deleted file mode 100644
index 072c9027..00000000
--- a/drivers/gpu/nvgpu/common/fb/fb_gk20a.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2014-2017, 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"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef FB_GK20A_H
-#define FB_GK20A_H
-
-struct gk20a;
-struct nvgpu_mem;
-
-void fb_gk20a_reset(struct gk20a *g);
-void gk20a_fb_init_hw(struct gk20a *g);
-void gk20a_fb_tlb_invalidate(struct gk20a *g, struct nvgpu_mem *pdb);
-
-#endif
diff --git a/drivers/gpu/nvgpu/common/fb/fb_gm20b.c b/drivers/gpu/nvgpu/common/fb/fb_gm20b.c
index 4ad8b722..b4756546 100644
--- a/drivers/gpu/nvgpu/common/fb/fb_gm20b.c
+++ b/drivers/gpu/nvgpu/common/fb/fb_gm20b.c
@@ -22,22 +22,112 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include <trace/events/gk20a.h>
+
 #include <nvgpu/sizes.h>
 #include <nvgpu/utils.h>
 
 #include "gk20a/gk20a.h"
 
-#include "fb_gk20a.h"
 #include "fb_gm20b.h"
 
 #include <nvgpu/io.h>
 #include <nvgpu/timers.h>
 
+#include <nvgpu/hw/gm20b/hw_mc_gm20b.h>
 #include <nvgpu/hw/gm20b/hw_fb_gm20b.h>
 
 #define VPR_INFO_FETCH_WAIT     (5)
 #define WPR_INFO_ADDR_ALIGNMENT 0x0000000c
 
+void gm20b_fb_reset(struct gk20a *g)
+{
+        u32 val;
+
+        nvgpu_log_info(g, "reset gk20a fb");
+
+        val = gk20a_readl(g, mc_elpg_enable_r());
+        val |= mc_elpg_enable_xbar_enabled_f()
+                | mc_elpg_enable_pfb_enabled_f()
+                | mc_elpg_enable_hub_enabled_f();
+        gk20a_writel(g, mc_elpg_enable_r(), val);
+}
+
+void gm20b_fb_init_hw(struct gk20a *g)
+{
+        u32 addr = nvgpu_mem_get_addr(g, &g->mm.sysmem_flush) >> 8;
+
+        gk20a_writel(g, fb_niso_flush_sysmem_addr_r(), addr);
+}
+
+void gm20b_fb_tlb_invalidate(struct gk20a *g, struct nvgpu_mem *pdb)
+{
+        struct nvgpu_timeout timeout;
+        u32 addr_lo;
+        u32 data;
+
+        nvgpu_log_fn(g, " ");
+
+        /* pagetables are considered sw states which are preserved after
+           prepare_poweroff. When gk20a deinit releases those pagetables,
+           common code in vm unmap path calls tlb invalidate that touches
+           hw. Use the power_on flag to skip tlb invalidation when gpu
+           power is turned off */
+
+        if (!g->power_on) {
+                return;
+        }
+
+        addr_lo = u64_lo32(nvgpu_mem_get_addr(g, pdb) >> 12);
+
+        nvgpu_mutex_acquire(&g->mm.tlb_lock);
+
+        trace_gk20a_mm_tlb_invalidate(g->name);
+
+        nvgpu_timeout_init(g, &timeout, 1000, NVGPU_TIMER_RETRY_TIMER);
+
+        do {
+                data = gk20a_readl(g, fb_mmu_ctrl_r());
+                if (fb_mmu_ctrl_pri_fifo_space_v(data) != 0) {
+                        break;
+                }
+                nvgpu_udelay(2);
+        } while (!nvgpu_timeout_expired_msg(&timeout,
+                                         "wait mmu fifo space"));
+
+        if (nvgpu_timeout_peek_expired(&timeout)) {
+                goto out;
+        }
+
+        nvgpu_timeout_init(g, &timeout, 1000, NVGPU_TIMER_RETRY_TIMER);
+
+        gk20a_writel(g, fb_mmu_invalidate_pdb_r(),
+                fb_mmu_invalidate_pdb_addr_f(addr_lo) |
+                nvgpu_aperture_mask(g, pdb,
+                                fb_mmu_invalidate_pdb_aperture_sys_mem_f(),
+                                fb_mmu_invalidate_pdb_aperture_sys_mem_f(),
+                                fb_mmu_invalidate_pdb_aperture_vid_mem_f()));
+
+        gk20a_writel(g, fb_mmu_invalidate_r(),
+                fb_mmu_invalidate_all_va_true_f() |
+                fb_mmu_invalidate_trigger_true_f());
+
+        do {
+                data = gk20a_readl(g, fb_mmu_ctrl_r());
+                if (fb_mmu_ctrl_pri_fifo_empty_v(data) !=
+                        fb_mmu_ctrl_pri_fifo_empty_false_f()) {
+                        break;
+                }
+                nvgpu_udelay(2);
+        } while (!nvgpu_timeout_expired_msg(&timeout,
+                                         "wait mmu invalidate"));
+
+        trace_gk20a_mm_tlb_invalidate_done(g->name);
+
+out:
+        nvgpu_mutex_release(&g->mm.tlb_lock);
+}
+
 void fb_gm20b_init_fs_state(struct gk20a *g)
 {
         nvgpu_log_info(g, "initialize gm20b fb");
diff --git a/drivers/gpu/nvgpu/common/fb/fb_gm20b.h b/drivers/gpu/nvgpu/common/fb/fb_gm20b.h
index eb868b01..95991432 100644
--- a/drivers/gpu/nvgpu/common/fb/fb_gm20b.h
+++ b/drivers/gpu/nvgpu/common/fb/fb_gm20b.h
@@ -1,7 +1,7 @@
 /*
  * GM20B FB
  *
- * Copyright (c) 2014-2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2014-2018, 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"),
@@ -22,12 +22,18 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef _NVHOST_GM20B_FB
-#define _NVHOST_GM20B_FB
+#ifndef NVGPU_FB_GM20B
+#define NVGPU_FB_GM20B
+
+#include <nvgpu/types.h>
 
 struct gk20a;
 struct wpr_carveout_info;
+struct nvgpu_mem;
 
+void gm20b_fb_reset(struct gk20a *g);
+void gm20b_fb_init_hw(struct gk20a *g);
+void gm20b_fb_tlb_invalidate(struct gk20a *g, struct nvgpu_mem *pdb);
 void fb_gm20b_init_fs_state(struct gk20a *g);
 void gm20b_fb_set_mmu_page_size(struct gk20a *g);
 bool gm20b_fb_set_use_full_comp_tag_line(struct gk20a *g);
diff --git a/drivers/gpu/nvgpu/common/fb/fb_gv11b.c b/drivers/gpu/nvgpu/common/fb/fb_gv11b.c
index e6996321..c46d3976 100644
--- a/drivers/gpu/nvgpu/common/fb/fb_gv11b.c
+++ b/drivers/gpu/nvgpu/common/fb/fb_gv11b.c
@@ -40,7 +40,7 @@
 #include "gv11b/fifo_gv11b.h"
 #include "gv11b/ce_gv11b.h"
 
-#include "fb_gk20a.h"
+#include "fb_gm20b.h"
 #include "fb_gp10b.h"
 #include "fb_gv11b.h"
 
@@ -64,7 +64,7 @@ static void gv11b_init_nvlink_soc_credits(struct gk20a *g)
 
 void gv11b_fb_init_hw(struct gk20a *g)
 {
-        gk20a_fb_init_hw(g);
+        gm20b_fb_init_hw(g);
 
         g->ops.fb.enable_hub_intr(g);
 }