gpu: nvgpu: remove circular dependency between hal.c and gk20a/

gk20a/hal.c depends on HAL init functions in all chips. But all chips
also depend on gk20a. That creates a circular dependency. In order to
solve the above, move gpu_init_hal and gk20a_detect_chip to
common/init/hal_init.c. These methods are declared in
include/nvgpu/hal_init.h. Also, the above methods are renamed to
nvgpu_init_hal and nvgpu_detect_chip respectively.

Jira NVGPU-613

Change-Id: Ib0df90287d4491571e4751475739b75fabd1041b
Signed-off-by: Debarshi Dutta <ddutta@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1827576
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

1 files changed, 122 insertions, 0 deletions

diff --git a/drivers/gpu/nvgpu/common/init/hal_init.c b/drivers/gpu/nvgpu/common/init/hal_init.c
new file mode 100644
index 00000000..598790b6
--- /dev/null
+++ b/drivers/gpu/nvgpu/common/init/hal_init.c
@@ -0,0 +1,122 @@
+/*
+ * NVIDIA GPU HAL interface.
+ *
+ * Copyright (c) 2014-2018, NVIDIA CORPORATION.  All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+#include <nvgpu/gk20a.h>
+#include <nvgpu/log.h>
+#include <nvgpu/hal_init.h>
+#include <nvgpu/mc.h>
+#include <nvgpu/soc.h>
+
+#include "gm20b/hal_gm20b.h"
+#include "gp10b/hal_gp10b.h"
+#include "gp106/hal_gp106.h"
+#include "gv100/hal_gv100.h"
+#include "gv11b/hal_gv11b.h"
+#if defined(CONFIG_TEGRA_GPU_NEXT)
+#include "nvgpu_gpuid_next.h"
+#endif
+
+int nvgpu_init_hal(struct gk20a *g)
+{
+        int err = 0;
+        u32 ver = g->params.gpu_arch + g->params.gpu_impl;
+
+        switch (ver) {
+        case GK20A_GPUID_GM20B:
+                nvgpu_log_info(g, "gm20b detected");
+                if (gm20b_init_hal(g) != 0) {
+                        return -ENODEV;
+                }
+                break;
+        case GK20A_GPUID_GM20B_B:
+                nvgpu_log_info(g, "gm20b detected");
+                if (gm20b_init_hal(g) != 0) {
+                        return -ENODEV;
+                }
+                break;
+        case NVGPU_GPUID_GP10B:
+                if (gp10b_init_hal(g) != 0) {
+                        return -ENODEV;
+                }
+                break;
+        case NVGPU_GPUID_GP104:
+                if (gp106_init_hal(g) != 0) {
+                        return -ENODEV;
+                }
+                break;
+        case NVGPU_GPUID_GP106:
+                if (gp106_init_hal(g) != 0) {
+                        return -ENODEV;
+                }
+                break;
+        case NVGPU_GPUID_GV11B:
+                if (gv11b_init_hal(g) != 0) {
+                        return -ENODEV;
+                }
+                break;
+        case NVGPU_GPUID_GV100:
+                if (gv100_init_hal(g) != 0) {
+                        return -ENODEV;
+                }
+                break;
+#if defined(CONFIG_TEGRA_GPU_NEXT)
+        case NVGPU_GPUID_NEXT:
+                if (NVGPU_NEXT_INIT_HAL(g) != 0) {
+                        return -ENODEV;
+                }
+                break;
+#endif
+        default:
+                nvgpu_err(g, "no support for %x", ver);
+                err = -ENODEV;
+                break;
+        }
+
+        return err;
+}
+
+
+int nvgpu_detect_chip(struct gk20a *g)
+{
+        struct nvgpu_gpu_params *p = &g->params;
+
+        if (p->gpu_arch != 0U) {
+                return 0;
+        }
+
+        nvgpu_mc_boot_0(g, &p->gpu_arch, &p->gpu_impl, &p->gpu_rev);
+
+        if ((p->gpu_arch + p->gpu_impl) == (u32)NVGPU_GPUID_GV11B) {
+                /* overwrite gpu revison for A02  */
+                if (!nvgpu_is_soc_t194_a01(g)) {
+                        p->gpu_rev = 0xa2;
+                }
+        }
+        nvgpu_log_info(g, "arch: %x, impl: %x, rev: %x\n",
+                        g->params.gpu_arch,
+                        g->params.gpu_impl,
+                        g->params.gpu_rev);
+
+        return nvgpu_init_hal(g);
+}