gpu: nvgpu: Add support for gm204 and gm206

Add support for chips gm204 and gm206. Adds also support for reading
VBIOS and booting devinit and pre-os images on PMU.

Change-Id: I4824b44245611e5379ace62793cc37158048f432
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1120467
GVS: Gerrit_Virtual_Submit
Reviewed-by: Ken Adams <kadams@nvidia.com>

3 files changed, 59 insertions, 0 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c
index 3ae30e88..3ab26fb9 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.c
@@ -792,6 +792,11 @@ int gk20a_pm_finalize_poweron(struct device *dev)
         if (err)
                 goto done;
 
+        if (g->ops.bios.init)
+                err = g->ops.bios.init(g);
+        if (err)
+                goto done;
+
         if (!tegra_platform_is_silicon())
                 gk20a_writel(g, bus_intr_en_0_r(), 0x0);
         else
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index 49da164c..f5b4bb3f 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -592,6 +592,40 @@ struct gpu_ops {
 
         int (*get_litter_value)(struct gk20a *g, enum nvgpu_litter_value value);
         int (*chip_init_gpu_characteristics)(struct gk20a *g);
+
+        struct {
+                int (*init)(struct gk20a *g);
+        } bios;
+};
+
+struct nvgpu_bios_ucode {
+        u8 *bootloader;
+        u32 bootloader_phys_base;
+        u32 bootloader_size;
+        u8 *ucode;
+        u32 phys_base;
+        u32 size;
+        u8 *dmem;
+        u32 dmem_phys_base;
+        u32 dmem_size;
+        u32 code_entry_point;
+};
+
+struct nvgpu_bios {
+        u8 *data;
+
+        struct nvgpu_bios_ucode devinit;
+        struct nvgpu_bios_ucode preos;
+
+        u8 *devinit_tables;
+        u32 devinit_tables_size;
+        u8 *bootscripts;
+        u32 bootscripts_size;
+
+        u32 devinit_tables_phys_base;
+        u32 devinit_script_phys_base;
+
+        u32 expansion_rom_offset;
 };
 
 struct gk20a {
@@ -763,6 +797,9 @@ struct gk20a {
         bool mmu_debug_ctrl;
 
         u32 tpc_fs_mask_user;
+
+        struct nvgpu_bios bios;
+        struct debugfs_blob_wrapper bios_blob;
 };
 
 static inline unsigned long gk20a_get_gr_idle_timeout(struct gk20a *g)
@@ -1020,6 +1057,12 @@ gk20a_request_firmware(struct gk20a *g, const char *fw_name);
 #define GK20A_GPUID_GM20B \
         GK20A_GPUID(NVGPU_GPU_ARCH_GM200, NVGPU_GPU_IMPL_GM20B)
 
+#define GK20A_GPUID_GM204 \
+        GK20A_GPUID(NVGPU_GPU_ARCH_GM200, NVGPU_GPU_IMPL_GM204)
+
+#define GK20A_GPUID_GM206 \
+        GK20A_GPUID(NVGPU_GPU_ARCH_GM200, NVGPU_GPU_IMPL_GM206)
+
 int gk20a_init_gpu_characteristics(struct gk20a *g);
 
 void gk20a_pbus_isr(struct gk20a *g);
diff --git a/drivers/gpu/nvgpu/gk20a/hal.c b/drivers/gpu/nvgpu/gk20a/hal.c
index 16ba4a03..52ec108b 100644
--- a/drivers/gpu/nvgpu/gk20a/hal.c
+++ b/drivers/gpu/nvgpu/gk20a/hal.c
@@ -16,6 +16,7 @@
 #include "gk20a.h"
 #include "hal_gk20a.h"
 #include "gm20b/hal_gm20b.h"
+#include "gm206/hal_gm206.h"
 
 #ifdef CONFIG_ARCH_TEGRA_18x_SOC
 #include "nvgpu_gpuid_t18x.h"
@@ -38,11 +39,21 @@ int gpu_init_hal(struct gk20a *g)
                 if (gm20b_init_hal(g))
                         return -ENODEV;
                 break;
+        case GK20A_GPUID_GM204:
+        case GK20A_GPUID_GM206:
+                gk20a_dbg_info("gm20x detected");
+                if (gm206_init_hal(g))
+                        return -ENODEV;
+                break;
 #if defined(CONFIG_ARCH_TEGRA_18x_SOC)
         case TEGRA_18x_GPUID:
                 if (TEGRA_18x_GPUID_HAL(g))
                         return -ENODEV;
                 break;
+        case TEGRA_18x_GPUID2:
+                if (TEGRA_18x_GPUID2_HAL(g))
+                        return -ENODEV;
+                break;
 #endif
 #if defined(CONFIG_ARCH_TEGRA_19x_SOC)
         case TEGRA_19x_GPUID: