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

3 files changed, 2 insertions, 156 deletions

diff --git a/drivers/gpu/nvgpu/gp106/bios_gp106.c b/drivers/gpu/nvgpu/gp106/bios_gp106.c
deleted file mode 100644
index d3e565ca..00000000
--- a/drivers/gpu/nvgpu/gp106/bios_gp106.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright (c) 2015-2016, NVIDIA CORPORATION.  All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- */
-
-#include "gk20a/gk20a.h"
-#include "gm206/bios_gm206.h"
-
-#include "bios_gp106.h"
-
-#include <nvgpu/hw/gp106/hw_gc6_gp106.h>
-
-static void gp106_init_xmemsel_zm_nv_reg_array(struct gk20a *g, bool *condition,
-        u32 reg, u32 stride, u32 count, u32 data_table_offset)
-{
-        u8 i;
-        u32 data, strap, index;
-
-        if (*condition) {
-
-                strap = gk20a_readl(g, gc6_sci_strap_r()) & 0xf;
-
-                index = g->bios.mem_strap_xlat_tbl_ptr ?
-                        gm206_bios_read_u8(g, g->bios.mem_strap_xlat_tbl_ptr +
-                                strap) : strap;
-
-                for (i = 0; i < count; i++) {
-                        data = gm206_bios_read_u32(g, data_table_offset + ((i *
-                                g->bios.mem_strap_data_count + index) *
-                                sizeof(u32)));
-                        gk20a_writel(g, reg, data);
-                        reg += stride;
-                }
-        }
-}
-
-static void gp106_init_condition(struct gk20a *g, bool *condition,
-        u32 condition_id)
-{
-        struct condition_entry entry;
-
-        entry.cond_addr = gm206_bios_read_u32(g, g->bios.condition_table_ptr +
-                sizeof(entry)*condition_id);
-        entry.cond_mask = gm206_bios_read_u32(g, g->bios.condition_table_ptr +
-                sizeof(entry)*condition_id + 4);
-        entry.cond_compare = gm206_bios_read_u32(g, g->bios.condition_table_ptr +
-                sizeof(entry)*condition_id + 8);
-
-        if ((gk20a_readl(g, entry.cond_addr) & entry.cond_mask)
-                != entry.cond_compare) {
-                *condition = false;
-        }
-}
-
-static int gp106_execute_script(struct gk20a *g, u32 offset)
-{
-        u8 opcode;
-        u32 ip;
-        u32 operand[8];
-        bool condition, end;
-        int status = 0;
-
-        ip = offset;
-        condition = true;
-        end = false;
-
-        while (!end) {
-
-                opcode = gm206_bios_read_u8(g, ip++);
-
-                switch (opcode) {
-
-                case INIT_XMEMSEL_ZM_NV_REG_ARRAY:
-                        operand[0] = gm206_bios_read_u32(g, ip);
-                        operand[1] = gm206_bios_read_u8(g, ip+4);
-                        operand[2] = gm206_bios_read_u8(g, ip+5);
-                        ip += 6;
-
-                        gp106_init_xmemsel_zm_nv_reg_array(g, &condition,
-                                operand[0], operand[1], operand[2], ip);
-                        ip += operand[2] * sizeof(u32) *
-                                g->bios.mem_strap_data_count;
-                        break;
-
-                case INIT_CONDITION:
-                        operand[0] = gm206_bios_read_u8(g, ip);
-                        ip++;
-
-                        gp106_init_condition(g, &condition, operand[0]);
-                        break;
-
-                case INIT_RESUME:
-                        condition = true;
-                        break;
-
-                case INIT_DONE:
-                        end = true;
-                        break;
-
-                default:
-                        gk20a_err(dev_from_gk20a(g), "opcode: 0x%02x", opcode);
-                        end = true;
-                        status = -EINVAL;
-                        break;
-                }
-        }
-
-        return status;
-}
-
-void gp106_init_bios(struct gpu_ops *gops)
-{
-        gm206_init_bios(gops);
-        gops->bios.execute_script = gp106_execute_script;
-}
diff --git a/drivers/gpu/nvgpu/gp106/bios_gp106.h b/drivers/gpu/nvgpu/gp106/bios_gp106.h
deleted file mode 100644
index f47d11ca..00000000
--- a/drivers/gpu/nvgpu/gp106/bios_gp106.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- */
-
-#ifndef NVGPU_BIOS_GP106_H
-#define NVGPU_BIOS_GP106_H
-
-struct gpu_ops;
-
-#define INIT_DONE 0x71
-#define INIT_RESUME 0x72
-#define INIT_CONDITION 0x75
-#define INIT_XMEMSEL_ZM_NV_REG_ARRAY 0x8f
-
-struct condition_entry {
-        u32 cond_addr;
-        u32 cond_mask;
-        u32 cond_compare;
-} __packed;
-
-void gp106_init_bios(struct gpu_ops *gops);
-#endif
diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c
index e3874c06..cece5dd6 100644
--- a/drivers/gpu/nvgpu/gp106/hal_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c
@@ -39,7 +39,7 @@
 
 #include "gp106/clk_gp106.h"
 #include "gp106/clk_arb_gp106.h"
-#include "gp106/bios_gp106.h"
+#include "gm206/bios_gm206.h"
 #include "gp106/therm_gp106.h"
 #include "gp106/xve_gp106.h"
 #include "gp106/fifo_gp106.h"
@@ -245,7 +245,7 @@ int gp106_init_hal(struct gk20a *g)
 #if defined(CONFIG_GK20A_CYCLE_STATS)
         gk20a_init_css_ops(gops);
 #endif
-        gp106_init_bios(gops);
+        gm206_init_bios_ops(gops);
         gp106_init_therm_ops(gops);
         gp106_init_xve_ops(gops);