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>

1 files changed, 17 insertions, 18 deletions

diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
index ca7081cf..f863aa72 100644
--- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
@@ -32,6 +32,7 @@
 #include "common/therm/therm_gm20b.h"
 #include "common/ltc/ltc_gm20b.h"
 #include "common/fuse/fuse_gm20b.h"
+#include "common/mc/mc_gm20b.h"
 
 #include "gk20a/gk20a.h"
 #include "gk20a/ce2_gk20a.h"
@@ -39,7 +40,6 @@
 #include "gk20a/fifo_gk20a.h"
 #include "gk20a/mm_gk20a.h"
 #include "gk20a/css_gr_gk20a.h"
-#include "gk20a/mc_gk20a.h"
 #include "gk20a/flcn_gk20a.h"
 #include "gk20a/regops_gk20a.h"
 #include "gk20a/pmu_gk20a.h"
@@ -578,23 +578,22 @@ static const struct gpu_ops gm20b_ops = {
                 .get_qctl_whitelist_count = gm20b_get_qctl_whitelist_count,
         },
         .mc = {
-                .intr_mask = mc_gk20a_intr_mask,
-                .intr_enable = mc_gk20a_intr_enable,
-                .intr_unit_config = mc_gk20a_intr_unit_config,
-                .isr_stall = mc_gk20a_isr_stall,
-                .intr_stall = mc_gk20a_intr_stall,
-                .intr_stall_pause = mc_gk20a_intr_stall_pause,
-                .intr_stall_resume = mc_gk20a_intr_stall_resume,
-                .intr_nonstall = mc_gk20a_intr_nonstall,
-                .intr_nonstall_pause = mc_gk20a_intr_nonstall_pause,
-                .intr_nonstall_resume = mc_gk20a_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,
-                .is_intr1_pending = mc_gk20a_is_intr1_pending,
-                .log_pending_intrs = mc_gk20a_log_pending_intrs,
+                .intr_mask = gm20b_mc_intr_mask,
+                .intr_enable = gm20b_mc_intr_enable,
+                .intr_unit_config = gm20b_mc_intr_unit_config,
+                .isr_stall = gm20b_mc_isr_stall,
+                .intr_stall = gm20b_mc_intr_stall,
+                .intr_stall_pause = gm20b_mc_intr_stall_pause,
+                .intr_stall_resume = gm20b_mc_intr_stall_resume,
+                .intr_nonstall = gm20b_mc_intr_nonstall,
+                .intr_nonstall_pause = gm20b_mc_intr_nonstall_pause,
+                .intr_nonstall_resume = gm20b_mc_intr_nonstall_resume,
+                .isr_nonstall = gm20b_mc_isr_nonstall,
+                .enable = gm20b_mc_enable,
+                .disable = gm20b_mc_disable,
+                .reset = gm20b_mc_reset,
+                .is_intr1_pending = gm20b_mc_is_intr1_pending,
+                .log_pending_intrs = gm20b_mc_log_pending_intrs,
         },
         .debug = {
                 .show_dump = gk20a_debug_show_dump,