1 files changed, 42 insertions, 5 deletions

diff --git a/drivers/gpu/nvgpu/gv100/flcn_gv100.c b/drivers/gpu/nvgpu/gv100/flcn_gv100.c
index 5167e3f0..900d9204 100644
--- a/drivers/gpu/nvgpu/gv100/flcn_gv100.c
+++ b/drivers/gpu/nvgpu/gv100/flcn_gv100.c
@@ -26,29 +26,66 @@
 #include "gk20a/flcn_gk20a.h"
 #include "gp106/flcn_gp106.h"
 #include "gv100/flcn_gv100.h"
+#include "gv100/gsp_gv100.h"
 
 #include <nvgpu/hw/gv100/hw_falcon_gv100.h>
+#include <nvgpu/hw/gv100/hw_pgsp_gv100.h>
+
+static void gv100_falcon_engine_dependency_ops(struct nvgpu_falcon *flcn)
+{
+        struct nvgpu_falcon_engine_dependency_ops *flcn_eng_dep_ops =
+                        &flcn->flcn_engine_dep_ops;
+
+        switch (flcn->flcn_id) {
+        case FALCON_ID_GSPLITE:
+                flcn_eng_dep_ops->reset_eng = gv100_gsp_reset;
+        break;
+        default:
+                flcn_eng_dep_ops->reset_eng = NULL;
+                break;
+        }
+}
+
+static void gv100_falcon_ops(struct nvgpu_falcon *flcn)
+{
+        gk20a_falcon_ops(flcn);
+        gv100_falcon_engine_dependency_ops(flcn);
+}
 
 int gv100_falcon_hal_sw_init(struct nvgpu_falcon *flcn)
 {
         struct gk20a *g = flcn->g;
         int err = 0;
 
-        if (flcn->flcn_id == FALCON_ID_MINION) {
+        switch (flcn->flcn_id) {
+        case FALCON_ID_MINION:
                 flcn->flcn_base = g->nvlink.minion_base;
                 flcn->is_falcon_supported = true;
                 flcn->is_interrupt_enabled = true;
+                break;
+        case FALCON_ID_GSPLITE:
+                flcn->flcn_base = pgsp_falcon_irqsset_r();
+                flcn->is_falcon_supported = true;
+                flcn->is_interrupt_enabled = false;
+                break;
+        default:
+                flcn->is_falcon_supported = false;
+                break;
+        }
 
+        if (flcn->is_falcon_supported) {
                 err = nvgpu_mutex_init(&flcn->copy_lock);
                 if (err != 0) {
                         nvgpu_err(g, "Error in flcn.copy_lock mutex initialization");
-                        return err;
+                } else {
+                        gv100_falcon_ops(flcn);
                 }
-
-                gk20a_falcon_ops(flcn);
         } else {
                 /*
-                 * Fall back
+                 * Forward call to previous chips HAL
+                 * to fetch info for requested
+                 * falcon as no changes between
+                 * current & previous chips.
                  */
                 err = gp106_falcon_hal_sw_init(flcn);
         }