gpu: nvgpu: vgpu: fixes for no bar1 support case

- add check of is_bar1_supported
- move vgpu_init_fifo_setup_hw to hal
- assume it's bar1 reg if no "reg-names" in dts

Jira VFND-3796

Change-Id: I022a0ed98144bb8f1e7e55f24fcaf928b4a3fe32
Signed-off-by: Richard Zhao <rizhao@nvidia.com>
Reviewed-on: https://git-master/r/1474716
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Aingara Paramakuru <aparamakuru@nvidia.com>
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>

2 files changed, 25 insertions, 14 deletions

diff --git a/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c b/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c
index 55b3de07..7029498d 100644
--- a/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c
@@ -270,17 +270,21 @@ static int vgpu_init_fifo_setup_sw(struct gk20a *g)
         }
 
         /* bar1 va */
-        f->userd.gpu_va = vgpu_bar1_map(g, &f->userd.priv.sgt, f->userd.size);
-        if (!f->userd.gpu_va) {
-                dev_err(d, "gmmu mapping failed\n");
-                goto clean_up;
+        if (g->ops.mm.is_bar1_supported(g)) {
+                f->userd.gpu_va = vgpu_bar1_map(g, &f->userd.priv.sgt,
+                                                f->userd.size);
+                if (!f->userd.gpu_va) {
+                        dev_err(d, "gmmu mapping failed\n");
+                        goto clean_up;
+                }
+                /* if reduced BAR1 range is specified, use offset of 0
+                 * (server returns offset assuming full BAR1 range)
+                 */
+                if (resource_size(g->bar1_mem) ==
+                                (resource_size_t)f->userd.size)
+                        f->userd.gpu_va = 0;
         }
 
-       /* if reduced BAR1 range is specified, use offset of 0
-          (server returns offset assuming full BAR1 range) */
-       if (resource_size(g->bar1_mem) == (resource_size_t)f->userd.size)
-                f->userd.gpu_va = 0;
-
         gk20a_dbg(gpu_dbg_map_v, "userd bar1 va = 0x%llx", f->userd.gpu_va);
 
         f->channel = nvgpu_vzalloc(g, f->num_channels * sizeof(*f->channel));
@@ -403,7 +407,8 @@ int vgpu_init_fifo_support(struct gk20a *g)
         if (err)
                 return err;
 
-        err = vgpu_init_fifo_setup_hw(g);
+        if (g->ops.fifo.init_fifo_setup_hw)
+                err = g->ops.fifo.init_fifo_setup_hw(g);
         return err;
 }
 
@@ -788,6 +793,7 @@ u32 vgpu_fifo_default_timeslice_us(struct gk20a *g)
 
 void vgpu_init_fifo_ops(struct gpu_ops *gops)
 {
+        gops->fifo.init_fifo_setup_hw = vgpu_init_fifo_setup_hw;
         gops->fifo.bind_channel = vgpu_channel_bind;
         gops->fifo.unbind_channel = vgpu_channel_unbind;
         gops->fifo.enable_channel = vgpu_channel_enable;
diff --git a/drivers/gpu/nvgpu/vgpu/vgpu.c b/drivers/gpu/nvgpu/vgpu/vgpu.c
index 1a6dbb35..d94543a8 100644
--- a/drivers/gpu/nvgpu/vgpu/vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/vgpu.c
@@ -259,6 +259,7 @@ static int vgpu_init_support(struct platform_device *pdev)
 {
         struct resource *r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         struct gk20a *g = get_gk20a(&pdev->dev);
+        void __iomem *regs;
         int err = 0;
 
         if (!r) {
@@ -267,13 +268,17 @@ static int vgpu_init_support(struct platform_device *pdev)
                 goto fail;
         }
 
-        g->bar1 = devm_ioremap_resource(&pdev->dev, r);
-        if (IS_ERR(g->bar1)) {
-                dev_err(dev_from_gk20a(g), "failed to remap gk20a bar1\n");
+        regs = devm_ioremap_resource(&pdev->dev, r);
+        if (IS_ERR(regs)) {
+                dev_err(dev_from_gk20a(g), "failed to remap gk20a regs\n");
                 err = PTR_ERR(g->bar1);
                 goto fail;
         }
-        g->bar1_mem = r;
+
+        if (r->name && !strcmp(r->name, "/vgpu")) {
+                g->bar1 = regs;
+                g->bar1_mem = r;
+        }
 
         nvgpu_mutex_init(&g->dbg_sessions_lock);
         nvgpu_mutex_init(&g->client_lock);