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>

1 files changed, 5 insertions, 2 deletions

diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c
index 1c423785..8523e7d1 100644
--- a/drivers/gpu/nvgpu/gp106/hal_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c
@@ -216,6 +216,10 @@ static int gp106_init_gpu_characteristics(struct gk20a *g)
 }
 
 static const struct gpu_ops gp106_ops = {
+        .bios = {
+                .init = gp106_bios_init,
+                .preos_wait_for_halt = gp106_bios_preos_wait_for_halt,
+        },
         .ltc = {
                 .determine_L2_size_bytes = gp10b_determine_L2_size_bytes,
                 .set_zbc_color_entry = gm20b_ltc_set_zbc_color_entry,
@@ -695,7 +699,6 @@ static const struct gpu_ops gp106_ops = {
         },
         .get_litter_value = gp106_get_litter_value,
         .chip_init_gpu_characteristics = gp106_init_gpu_characteristics,
-        .bios_init = gp106_bios_init,
 };
 
 int gp106_init_hal(struct gk20a *g)
@@ -705,6 +708,7 @@ int gp106_init_hal(struct gk20a *g)
 
         gk20a_dbg_fn("");
 
+        gops->bios = gp106_ops.bios;
         gops->ltc = gp106_ops.ltc;
         gops->ce2 = gp106_ops.ce2;
         gops->gr = gp106_ops.gr;
@@ -747,7 +751,6 @@ int gp106_init_hal(struct gk20a *g)
         gops->get_litter_value = gp106_ops.get_litter_value;
         gops->chip_init_gpu_characteristics =
                 gp106_ops.chip_init_gpu_characteristics;
-        gops->bios_init = gp106_ops.bios_init;
 
         __nvgpu_set_enabled(g, NVGPU_GR_USE_DMA_FOR_FW_BOOTSTRAP, true);
         __nvgpu_set_enabled(g, NVGPU_SEC_PRIVSECURITY, true);