gpu: nvgpu: Implement bus HAL for bar2 bind

Implement BAR2 bind as a bus HAL and remove the corresponding MM HAL.
BAR2 bind HW API is in bus.

JIRA NVGPU-588

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

4 files changed, 4 insertions, 56 deletions

diff --git a/drivers/gpu/nvgpu/gv11b/fb_gv11b.c b/drivers/gpu/nvgpu/gv11b/fb_gv11b.c
index bba47471..9fd6c857 100644
--- a/drivers/gpu/nvgpu/gv11b/fb_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/fb_gv11b.c
@@ -1229,7 +1229,7 @@ static void gv11b_fb_handle_bar2_fault(struct gk20a *g,
         }
         gv11b_ce_mthd_buffer_fault_in_bar2_fault(g);
 
-        g->ops.mm.init_bar2_mm_hw_setup(g);
+        g->ops.bus.bar2_bind(g, &g->mm.bar2.inst_block);
 
         if (mmfault->refch) {
                 gk20a_channel_put(mmfault->refch);
diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
index 7b552723..58912a30 100644
--- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
@@ -23,6 +23,7 @@
  */
 
 #include "common/bus/bus_gk20a.h"
+#include "common/bus/bus_gp10b.h"
 #include "common/clock_gating/gv11b_gating_reglist.h"
 #include "common/ptimer/ptimer_gk20a.h"
 
@@ -621,7 +622,6 @@ static const struct gpu_ops gv11b_ops = {
                 .get_kind_invalid = gm20b_get_kind_invalid,
                 .get_kind_pitch = gm20b_get_kind_pitch,
                 .init_bar2_vm = gp10b_init_bar2_vm,
-                .init_bar2_mm_hw_setup = gv11b_init_bar2_mm_hw_setup,
                 .remove_bar2_vm = gv11b_mm_remove_bar2_vm,
                 .fault_info_mem_destroy = gv11b_mm_fault_info_mem_destroy,
         },
@@ -724,6 +724,7 @@ static const struct gpu_ops gv11b_ops = {
                 .init_hw = gk20a_bus_init_hw,
                 .isr = gk20a_bus_isr,
                 .bar1_bind = NULL,
+                .bar2_bind = gp10b_bus_bar2_bind,
                 .set_bar0_window = gk20a_bus_set_bar0_window,
         },
         .ptimer = {
diff --git a/drivers/gpu/nvgpu/gv11b/mm_gv11b.c b/drivers/gpu/nvgpu/gv11b/mm_gv11b.c
index 357b15d7..6c38365c 100644
--- a/drivers/gpu/nvgpu/gv11b/mm_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/mm_gv11b.c
@@ -40,7 +40,6 @@
 
 #include <nvgpu/hw/gv11b/hw_fb_gv11b.h>
 #include <nvgpu/hw/gv11b/hw_gmmu_gv11b.h>
-#include <nvgpu/hw/gv11b/hw_bus_gv11b.h>
 
 #define NVGPU_L3_ALLOC_BIT      BIT(36)
 
@@ -236,7 +235,7 @@ int gv11b_init_mm_setup_hw(struct gk20a *g)
         g->ops.fb.set_mmu_page_size(g);
         g->ops.fb.init_hw(g);
 
-        err = g->ops.mm.init_bar2_mm_hw_setup(g);
+        err = g->ops.bus.bar2_bind(g, &g->mm.bar2.inst_block);
         if (err)
                 return err;
 
@@ -274,54 +273,3 @@ u64 gv11b_gpu_phys_addr(struct gk20a *g,
 
         return phys;
 }
-
-int gv11b_init_bar2_mm_hw_setup(struct gk20a *g)
-{
-        struct mm_gk20a *mm = &g->mm;
-        struct nvgpu_mem *inst_block = &mm->bar2.inst_block;
-        u64 inst_pa = nvgpu_inst_block_addr(g, inst_block);
-        u32 reg_val;
-        struct nvgpu_timeout timeout;
-        u32 delay = GR_IDLE_CHECK_DEFAULT;
-
-        nvgpu_log_fn(g, " ");
-
-        g->ops.fb.set_mmu_page_size(g);
-
-        inst_pa = (u32)(inst_pa >> bus_bar2_block_ptr_shift_v());
-        nvgpu_log_info(g, "bar2 inst block ptr: 0x%08x",  (u32)inst_pa);
-
-        gk20a_writel(g, bus_bar2_block_r(),
-                     nvgpu_aperture_mask(g, inst_block,
-                                         bus_bar2_block_target_sys_mem_ncoh_f(),
-                                         bus_bar2_block_target_sys_mem_coh_f(),
-                                         bus_bar2_block_target_vid_mem_f()) |
-                     bus_bar2_block_mode_virtual_f() |
-                     bus_bar2_block_ptr_f(inst_pa));
-
-        /* This is needed as BAR1 support is removed and there is no way
-         * to know if gpu successfully accessed memory.
-         * To avoid deadlocks and non-deterministic virtual address translation
-         * behavior, after writing BAR2_BLOCK to bind BAR2 to a virtual address
-         * space, SW must ensure that the bind has completed prior to issuing
-         * any further BAR2 requests by polling for both
-         * BUS_BIND_STATUS_BAR2_PENDING to return to EMPTY and
-         * BUS_BIND_STATUS_BAR2_OUTSTANDING to return to FALSE
-         */
-        nvgpu_timeout_init(g, &timeout, gk20a_get_gr_idle_timeout(g),
-                           NVGPU_TIMER_CPU_TIMER);
-        nvgpu_log_info(g, "check bar2 bind status");
-        do {
-                reg_val = gk20a_readl(g, bus_bind_status_r());
-
-                if (!((reg_val & bus_bind_status_bar2_pending_busy_f()) ||
-                        (reg_val & bus_bind_status_bar2_outstanding_true_f())))
-                        return 0;
-
-                nvgpu_usleep_range(delay, delay * 2);
-                delay = min_t(u32, delay << 1, GR_IDLE_CHECK_MAX);
-        } while (!nvgpu_timeout_expired_msg(&timeout, "bar2 bind timedout"));
-
-        nvgpu_err(g, "bar2 bind failed. gpu unable to access memory");
-        return -EBUSY;
-}
diff --git a/drivers/gpu/nvgpu/gv11b/mm_gv11b.h b/drivers/gpu/nvgpu/gv11b/mm_gv11b.h
index 2b3ebf4e..f5f89d94 100644
--- a/drivers/gpu/nvgpu/gv11b/mm_gv11b.h
+++ b/drivers/gpu/nvgpu/gv11b/mm_gv11b.h
@@ -34,7 +34,6 @@ void gv11b_init_inst_block(struct nvgpu_mem *inst_block,
 bool gv11b_mm_mmu_fault_pending(struct gk20a *g);
 void gv11b_mm_remove_bar2_vm(struct gk20a *g);
 int gv11b_init_mm_setup_hw(struct gk20a *g);
-int gv11b_init_bar2_mm_hw_setup(struct gk20a *g);
 void gv11b_mm_l2_flush(struct gk20a *g, bool invalidate);
 u64 gv11b_gpu_phys_addr(struct gk20a *g,
                         struct nvgpu_gmmu_attrs *attrs, u64 phys);