gpu: nvgpu: Move priv_ring HAL to common

Move implementation of priv_ring HAL to common/priv_ring. Implement
two new HAL APIs to remove illegal dependencies: enable_priv_ring and
enum_ltc.

As enum_ltc can be implemented only gm20b onwards, bump gk20a
implementation to base on gm20b.

JIRA NVGPU-964

Change-Id: I160c2216132aadbcd98bb4a688aeeb2c520a9bc0
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1797025
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

2 files changed, 10 insertions, 4 deletions

diff --git a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c
index a8aa023b..15e2717d 100644
--- a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c
+++ b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c
@@ -22,6 +22,8 @@
 
 #include "common/bus/bus_gk20a.h"
 #include "common/bus/bus_gm20b.h"
+#include "common/priv_ring/priv_ring_gm20b.h"
+#include "common/priv_ring/priv_ring_gp10b.h"
 #include "common/clock_gating/gp10b_gating_reglist.h"
 #include "common/fb/fb_gk20a.h"
 #include "common/fb/fb_gm20b.h"
@@ -55,7 +57,6 @@
 #include "gp10b/fifo_gp10b.h"
 #include "gp10b/regops_gp10b.h"
 #include "gp10b/therm_gp10b.h"
-#include "gp10b/priv_ring_gp10b.h"
 #include "gp10b/fuse_gp10b.h"
 
 #include "gm20b/ltc_gm20b.h"
@@ -552,9 +553,11 @@ static const struct gpu_ops vgpu_gp10b_ops = {
                 .falcon_hal_sw_init = gk20a_falcon_hal_sw_init,
         },
         .priv_ring = {
+                .enable_priv_ring = gm20b_priv_ring_enable,
                 .isr = gp10b_priv_ring_isr,
                 .set_ppriv_timeout_settings =
-                        gk20a_priv_set_timeout_settings,
+                        gm20b_priv_set_timeout_settings,
+                .enum_ltc = gm20b_priv_ring_enum_ltc,
         },
         .fuse = {
                 .check_priv_security = vgpu_gp10b_fuse_check_priv_security,
diff --git a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c
index b91691e2..995a2c2c 100644
--- a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c
+++ b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c
@@ -22,6 +22,8 @@
 
 #include "common/bus/bus_gk20a.h"
 #include "common/bus/bus_gm20b.h"
+#include "common/priv_ring/priv_ring_gm20b.h"
+#include "common/priv_ring/priv_ring_gp10b.h"
 #include "common/clock_gating/gv11b_gating_reglist.h"
 #include "common/fb/fb_gk20a.h"
 #include "common/fb/fb_gm20b.h"
@@ -62,7 +64,6 @@
 #include "gp10b/gr_gp10b.h"
 #include <gp10b/fifo_gp10b.h>
 #include <gp10b/therm_gp10b.h>
-#include <gp10b/priv_ring_gp10b.h>
 #include <gp10b/ltc_gp10b.h>
 #include <gp10b/fuse_gp10b.h>
 
@@ -622,9 +623,11 @@ static const struct gpu_ops vgpu_gv11b_ops = {
                 .falcon_hal_sw_init = gk20a_falcon_hal_sw_init,
         },
         .priv_ring = {
+                .enable_priv_ring = gm20b_priv_ring_enable,
                 .isr = gp10b_priv_ring_isr,
                 .set_ppriv_timeout_settings =
-                        gk20a_priv_set_timeout_settings,
+                        gm20b_priv_set_timeout_settings,
+                .enum_ltc = gm20b_priv_ring_enum_ltc,
         },
         .fuse = {
                 .is_opt_ecc_enable = gp10b_fuse_is_opt_ecc_enable,