gpu: nvgpu: Generalize BIOS code

Most of BIOS parsing code is not specific to any particular GPU. Move
most of the code to generic files, and leave only chip specific parts
dealing with microcontroller boot into chip specific files.

As most of the parsing is generic, they do not need to be called via
HALs so remove the HALs and change the calls into direct function
calls.

All definitions meant to be used outside BIOS code itself are now in
<nvgpu/bios.h>

Change-Id: Id48e94c74511d6e95645e90e5bba5c12ef8da45d
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1302222
GVS: Gerrit_Virtual_Submit

4 files changed, 16 insertions, 35 deletions

diff --git a/drivers/gpu/nvgpu/volt/volt_dev.c b/drivers/gpu/nvgpu/volt/volt_dev.c
index ebc140ef..4807f023 100644
--- a/drivers/gpu/nvgpu/volt/volt_dev.c
+++ b/drivers/gpu/nvgpu/volt/volt_dev.c
@@ -14,17 +14,17 @@
 #include <linux/sort.h>
 
 #include "gk20a/gk20a.h"
-#include "include/bios.h"
 #include "boardobj/boardobjgrp.h"
 #include "boardobj/boardobjgrp_e32.h"
 #include "gm206/bios_gm206.h"
 #include "ctrl/ctrlvolt.h"
 #include "gk20a/pmu_gk20a.h"
 
-#include "include/bios.h"
 #include "volt.h"
 #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h>
 
+#include <nvgpu/bios.h>
+
 #define VOLT_DEV_PWM_VOLTAGE_STEPS_INVALID      0
 #define VOLT_DEV_PWM_VOLTAGE_STEPS_DEFAULT      1
 
@@ -363,14 +363,9 @@ static u32 volt_get_volt_devices_table(struct gk20a *g,
         u8 entry_idx;
         u8 *entry_offset;
 
-        if (g->ops.bios.get_perf_table_ptrs) {
-                volt_device_table_ptr = (u8 *)g->ops.bios.get_perf_table_ptrs(g,
-                                g->bios.perf_token, VOLTAGE_DEVICE_TABLE);
-                if (volt_device_table_ptr == NULL) {
-                        status = -EINVAL;
-                        goto done;
-                }
-        } else {
+        volt_device_table_ptr = (u8 *)nvgpu_bios_get_perf_table_ptrs(g,
+                        g->bios.perf_token, VOLTAGE_DEVICE_TABLE);
+        if (volt_device_table_ptr == NULL) {
                 status = -EINVAL;
                 goto done;
         }
diff --git a/drivers/gpu/nvgpu/volt/volt_pmu.c b/drivers/gpu/nvgpu/volt/volt_pmu.c
index 488e67a3..f8167000 100644
--- a/drivers/gpu/nvgpu/volt/volt_pmu.c
+++ b/drivers/gpu/nvgpu/volt/volt_pmu.c
@@ -12,7 +12,6 @@
  */
 
 #include "gk20a/gk20a.h"
-#include "include/bios.h"
 #include "boardobj/boardobjgrp.h"
 #include "boardobj/boardobjgrp_e32.h"
 #include "gm206/bios_gm206.h"
@@ -20,7 +19,6 @@
 #include "ctrl/ctrlperf.h"
 #include "gk20a/pmu_gk20a.h"
 
-#include "include/bios.h"
 #include "volt.h"
 #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h>
 
diff --git a/drivers/gpu/nvgpu/volt/volt_policy.c b/drivers/gpu/nvgpu/volt/volt_policy.c
index e943e771..239b908e 100644
--- a/drivers/gpu/nvgpu/volt/volt_policy.c
+++ b/drivers/gpu/nvgpu/volt/volt_policy.c
@@ -11,16 +11,15 @@
  * more details.
  */
 
+#include <nvgpu/bios.h>
+
 #include "gk20a/gk20a.h"
-#include "include/bios.h"
 #include "boardobj/boardobjgrp.h"
 #include "boardobj/boardobjgrp_e32.h"
 #include "gm206/bios_gm206.h"
 #include "ctrl/ctrlvolt.h"
 #include "gk20a/pmu_gk20a.h"
 
-#include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h>
-#include "include/bios.h"
 #include "volt.h"
 
 static u32 volt_policy_pmu_data_init_super(struct gk20a *g,
@@ -170,15 +169,10 @@ static u32 volt_get_volt_policy_table(struct gk20a *g,
                 struct voltage_policy_split_rail        split_rail;
         } policy_type_data;
 
-        if (g->ops.bios.get_perf_table_ptrs) {
-                voltage_policy_table_ptr =
-                        (u8 *)g->ops.bios.get_perf_table_ptrs(g,
-                                g->bios.perf_token, VOLTAGE_POLICY_TABLE);
-                if (voltage_policy_table_ptr == NULL) {
-                        status = -EINVAL;
-                        goto done;
-                }
-        } else {
+        voltage_policy_table_ptr =
+                (u8 *)nvgpu_bios_get_perf_table_ptrs(g,
+                        g->bios.perf_token, VOLTAGE_POLICY_TABLE);
+        if (voltage_policy_table_ptr == NULL) {
                 status = -EINVAL;
                 goto done;
         }
diff --git a/drivers/gpu/nvgpu/volt/volt_rail.c b/drivers/gpu/nvgpu/volt/volt_rail.c
index 6d606228..aaad86a5 100644
--- a/drivers/gpu/nvgpu/volt/volt_rail.c
+++ b/drivers/gpu/nvgpu/volt/volt_rail.c
@@ -11,16 +11,15 @@
  * more details.
  */
 
+#include <nvgpu/bios.h>
+
 #include "gk20a/gk20a.h"
-#include "include/bios.h"
 #include "boardobj/boardobjgrp.h"
 #include "boardobj/boardobjgrp_e32.h"
 #include "gm206/bios_gm206.h"
 #include "ctrl/ctrlvolt.h"
 #include "gk20a/pmu_gk20a.h"
 
-#include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h>
-#include "include/bios.h"
 #include "volt.h"
 
 u8 volt_rail_volt_domain_convert_to_idx(struct gk20a *g, u8 volt_domain)
@@ -241,14 +240,9 @@ static u32 volt_get_volt_rail_table(struct gk20a *g,
                 struct voltage_rail volt_rail;
         } rail_type_data;
 
-        if (g->ops.bios.get_perf_table_ptrs) {
-                volt_rail_table_ptr = (u8 *)g->ops.bios.get_perf_table_ptrs(g,
-                                g->bios.perf_token, VOLTAGE_RAIL_TABLE);
-                if (volt_rail_table_ptr == NULL) {
-                        status = -EINVAL;
-                        goto done;
-                }
-        } else {
+        volt_rail_table_ptr = (u8 *)nvgpu_bios_get_perf_table_ptrs(g,
+                        g->bios.perf_token, VOLTAGE_RAIL_TABLE);
+        if (volt_rail_table_ptr == NULL) {
                 status = -EINVAL;
                 goto done;
         }