gpu: nvgpu: Move MC HAL to common

Move implementation of MC HAL to common/mc. Also bump gk20a
implementation to gm20b.

gk20a_mc_boot_0 was used via a HAL, but we have only one possible
implementation. It also has to be anyway called directly to detect
which HALs to assign, so make it a true common function.

mc_gk20a_handle_intr_nonstall was also used only in os/linux/intr.c
so move it there.

JIRA NVGPU-954

Change-Id: I79aedc9158f90d578db0edc17b714617b52690ac
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1813519
Reviewed-by: svc-misra-checker <svc-misra-checker@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

5 files changed, 7 insertions, 131 deletions

diff --git a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c
index 64b8084e..4632d3f8 100644
--- a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c
@@ -59,7 +59,6 @@
 #include "fifo_gv11b.h"
 #include "subctx_gv11b.h"
 #include "gr_gv11b.h"
-#include "mc_gv11b.h"
 
 void gv11b_get_tsg_runlist_entry(struct tsg_gk20a *tsg, u32 *runlist)
 {
diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
index a27d9ab5..91122fba 100644
--- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
@@ -40,12 +40,14 @@
 #include "common/ltc/ltc_gv11b.h"
 #include "common/fuse/fuse_gm20b.h"
 #include "common/fuse/fuse_gp10b.h"
+#include "common/mc/mc_gm20b.h"
+#include "common/mc/mc_gp10b.h"
+#include "common/mc/mc_gv11b.h"
 
 #include "gk20a/gk20a.h"
 #include "gk20a/fifo_gk20a.h"
 #include "gk20a/fecs_trace_gk20a.h"
 #include "gk20a/css_gr_gk20a.h"
-#include "gk20a/mc_gk20a.h"
 #include "gk20a/mm_gk20a.h"
 #include "gk20a/dbg_gpu_gk20a.h"
 #include "gk20a/flcn_gk20a.h"
@@ -59,7 +61,6 @@
 #include "gm20b/acr_gm20b.h"
 #include "gm20b/pmu_gm20b.h"
 
-#include "gp10b/mc_gp10b.h"
 #include "gp10b/ce_gp10b.h"
 #include "gp10b/fifo_gp10b.h"
 #include "gp10b/fecs_trace_gp10b.h"
@@ -76,7 +77,6 @@
 #include "hal_gv11b.h"
 #include "css_gr_gv11b.h"
 #include "gr_gv11b.h"
-#include "mc_gv11b.h"
 #include "gv11b.h"
 #include "ce_gv11b.h"
 #include "gr_ctx_gv11b.h"
@@ -736,11 +736,10 @@ static const struct gpu_ops gv11b_ops = {
                 .intr_nonstall = mc_gp10b_intr_nonstall,
                 .intr_nonstall_pause = mc_gp10b_intr_nonstall_pause,
                 .intr_nonstall_resume = mc_gp10b_intr_nonstall_resume,
-                .isr_nonstall = mc_gk20a_isr_nonstall,
-                .enable = gk20a_mc_enable,
-                .disable = gk20a_mc_disable,
-                .reset = gk20a_mc_reset,
-                .boot_0 = gk20a_mc_boot_0,
+                .isr_nonstall = gm20b_mc_isr_nonstall,
+                .enable = gm20b_mc_enable,
+                .disable = gm20b_mc_disable,
+                .reset = gm20b_mc_reset,
                 .is_intr1_pending = mc_gp10b_is_intr1_pending,
                 .log_pending_intrs = mc_gp10b_log_pending_intrs,
                 .is_intr_hub_pending = gv11b_mc_is_intr_hub_pending,
diff --git a/drivers/gpu/nvgpu/gv11b/mc_gv11b.c b/drivers/gpu/nvgpu/gv11b/mc_gv11b.c
deleted file mode 100644
index c8072d13..00000000
--- a/drivers/gpu/nvgpu/gv11b/mc_gv11b.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * GV11B master
- *
- * Copyright (c) 2016-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/types.h>
-#include <nvgpu/io.h>
-
-#include "gk20a/gk20a.h"
-
-#include "gp10b/mc_gp10b.h"
-
-#include "mc_gv11b.h"
-
-#include <nvgpu/hw/gv11b/hw_mc_gv11b.h>
-
-void mc_gv11b_intr_enable(struct gk20a *g)
-{
-        u32 eng_intr_mask = gk20a_fifo_engine_interrupt_mask(g);
-
-        gk20a_writel(g, mc_intr_en_clear_r(NVGPU_MC_INTR_STALLING),
-                                0xffffffffU);
-        gk20a_writel(g, mc_intr_en_clear_r(NVGPU_MC_INTR_NONSTALLING),
-                                0xffffffffU);
-
-        g->mc_intr_mask_restore[NVGPU_MC_INTR_STALLING] =
-                                mc_intr_pfifo_pending_f() |
-                                mc_intr_hub_pending_f() |
-                                mc_intr_priv_ring_pending_f() |
-                                mc_intr_pbus_pending_f() |
-                                mc_intr_ltc_pending_f() |
-                                eng_intr_mask;
-
-        g->mc_intr_mask_restore[NVGPU_MC_INTR_NONSTALLING] =
-                                mc_intr_pfifo_pending_f()
-                             | eng_intr_mask;
-
-        gk20a_writel(g, mc_intr_en_set_r(NVGPU_MC_INTR_STALLING),
-                        g->mc_intr_mask_restore[NVGPU_MC_INTR_STALLING]);
-
-        gk20a_writel(g, mc_intr_en_set_r(NVGPU_MC_INTR_NONSTALLING),
-                        g->mc_intr_mask_restore[NVGPU_MC_INTR_NONSTALLING]);
-
-}
-
-bool gv11b_mc_is_intr_hub_pending(struct gk20a *g, u32 mc_intr_0)
-{
-        return (((mc_intr_0 & mc_intr_hub_pending_f()) != 0U) ? true : false);
-}
-
-bool gv11b_mc_is_stall_and_eng_intr_pending(struct gk20a *g, u32 act_eng_id,
-                        u32 *eng_intr_pending)
-{
-        u32 mc_intr_0 = gk20a_readl(g, mc_intr_r(0));
-        u32 stall_intr, eng_intr_mask;
-
-        eng_intr_mask = gk20a_fifo_act_eng_interrupt_mask(g, act_eng_id);
-        *eng_intr_pending = mc_intr_0 & eng_intr_mask;
-
-        stall_intr = mc_intr_pfifo_pending_f() |
-                        mc_intr_hub_pending_f() |
-                        mc_intr_priv_ring_pending_f() |
-                        mc_intr_pbus_pending_f() |
-                        mc_intr_ltc_pending_f();
-
-        nvgpu_log(g, gpu_dbg_info | gpu_dbg_intr,
-                "mc_intr_0 = 0x%08x, eng_intr = 0x%08x",
-                mc_intr_0 & stall_intr, *eng_intr_pending);
-
-        return (mc_intr_0 & (eng_intr_mask | stall_intr)) != 0U;
-}
diff --git a/drivers/gpu/nvgpu/gv11b/mc_gv11b.h b/drivers/gpu/nvgpu/gv11b/mc_gv11b.h
deleted file mode 100644
index faa4d38d..00000000
--- a/drivers/gpu/nvgpu/gv11b/mc_gv11b.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2016-2017, 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.
- */
-
-#ifndef MC_GV11B_H
-#define MC_GV11B_H
-struct gk20a;
-
-void mc_gv11b_intr_enable(struct gk20a *g);
-bool gv11b_mc_is_intr_hub_pending(struct gk20a *g, u32 mc_intr_0);
-bool gv11b_mc_is_stall_and_eng_intr_pending(struct gk20a *g, u32 act_eng_id,
-                        u32 *eng_intr_pending);
-#endif
diff --git a/drivers/gpu/nvgpu/gv11b/mm_gv11b.c b/drivers/gpu/nvgpu/gv11b/mm_gv11b.c
index ceadc1c1..5d5aed94 100644
--- a/drivers/gpu/nvgpu/gv11b/mm_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/mm_gv11b.c
@@ -32,7 +32,6 @@
 #include "gk20a/mm_gk20a.h"
 
 #include "gp10b/mm_gp10b.h"
-#include "gp10b/mc_gp10b.h"
 
 #include "mm_gv11b.h"
 #include "subctx_gv11b.h"