gpu: nvgpu: add support for pre-os FW

Pre-os firmware takes care, among others, of the control of FAN till
the driver takes over its control. On some GPUs not enabling this FW can lead
tp physical board damage, hence it is needed to run this firmware.

JIRA: NVGPUGV100-9

Change-Id: I18d54cfd5eb64ecec79c5dae67ac8d5bb1facf36
Signed-off-by: David Nieto <dmartineznie@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1549035
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com>
Reviewed-by: Vijayakumar Subbu <vsubbu@nvidia.com>
Reviewed-by: Konsta Holtta <kholtta@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>

2 files changed, 7 insertions, 3 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c
index 17ba3ee4..d1ad5992 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.c
@@ -187,8 +187,8 @@ int gk20a_finalize_poweron(struct gk20a *g)
         nvgpu_flcn_sw_init(g, FALCON_ID_PMU);
         nvgpu_flcn_sw_init(g, FALCON_ID_SEC2);
 
-        if (g->ops.bios_init)
-                err = g->ops.bios_init(g);
+        if (g->ops.bios.init)
+                err = g->ops.bios.init(g);
         if (err)
                 goto done;
 
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index 97b40474..537d03d8 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -969,7 +969,11 @@ struct gpu_ops {
                 int (*bar1_bind)(struct gk20a *g, struct nvgpu_mem *bar1_inst);
         } bus;
 
-        int (*bios_init)(struct gk20a *g);
+        struct {
+                int (*init)(struct gk20a *g);
+                int (*preos_wait_for_halt)(struct gk20a *g);
+                void (*preos_reload_check)(struct gk20a *g);
+        } bios;
 
 #if defined(CONFIG_GK20A_CYCLE_STATS)
         struct {