From 161f074850c13b8efb89c717c437ab2e638867a6 Mon Sep 17 00:00:00 2001
From: Deepak Nibade <dnibade@nvidia.com>
Date: Mon, 7 Oct 2019 20:44:26 +0530
Subject: [PATCH] gpu: nvgpu: make therm unit safe

Separate out common.therm as safe unit since it is being used for
gv11b.

Create new hal.therm_fusa as safe unit since it is needed for gv11b.
Create hal.therm as non-safe unit.

Change-Id: Ife1cd17364d703db5e6be662625286356a8d966e
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/2212927
GVS: Gerrit_Virtual_Submit
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Seshendra Gadagottu <sgadagottu@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
---
 arch/nvgpu-common.yaml  | 12 +++++++-----
 arch/nvgpu-hal-new.yaml | 17 ++++++++++-------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/arch/nvgpu-common.yaml b/arch/nvgpu-common.yaml
index ef37b1701..395cf77e3 100644
--- a/arch/nvgpu-common.yaml
+++ b/arch/nvgpu-common.yaml
@@ -606,6 +606,12 @@ clk_arb:
              common/clk_arb/clk_arb_gv100.c,
              common/clk_arb/clk_arb_gv100.h ]
 
+therm:
+  safe: yes
+  owner: Seshendra G
+  sources: [ common/therm/therm.c,
+             include/nvgpu/therm.h ]
+
 pmu:
   children:
     pmuif:
@@ -882,10 +888,7 @@ pmu:
       safe: yes
       gpu: dgpu
       owner: Abdul S
-      # This common/therm/therm.c file should most likely just be deleted. It has one
-      # function that just calls some HALs and that's it.
-      sources: [ common/therm/therm.c,
-                 common/pmu/therm/thrm.c,
+      sources: [ common/pmu/therm/thrm.c,
                  common/pmu/therm/thrm.h,
                  common/pmu/therm/thrmchannel.c,
                  common/pmu/therm/thrmchannel.h,
@@ -893,7 +896,6 @@ pmu:
                  common/pmu/therm/thrmdev.h,
                  common/pmu/therm/thrmpmu.c,
                  common/pmu/therm/thrmpmu.h,
-                 include/nvgpu/therm.h,
                  include/nvgpu/pmu/therm.h ]
 
     volt:
diff --git a/arch/nvgpu-hal-new.yaml b/arch/nvgpu-hal-new.yaml
index 11bd38054..4692efb92 100644
--- a/arch/nvgpu-hal-new.yaml
+++ b/arch/nvgpu-hal-new.yaml
@@ -410,19 +410,22 @@ sync:
                  hal/sync/syncpt_cmdbuf_gv11b_fusa.c,
                  hal/sync/syncpt_cmdbuf_gv11b.h ]
 
-therm:
+therm_fusa:
   safe: yes
-  gpu: dgpu
+  owner: Seshendra G
+  sources: [ hal/therm/therm_gm20b_fusa.c,
+             hal/therm/therm_gm20b.h,
+             hal/therm/therm_gv11b_fusa.c,
+             hal/therm/therm_gv11b.h ]
+
+therm:
+  safe: no
   owner: Seshendra G
   sources: [ hal/therm/therm_gm20b.c,
-             hal/therm/therm_gm20b_fusa.c,
-             hal/therm/therm_gm20b.h,
              hal/therm/therm_tu104.c,
              hal/therm/therm_tu104.h,
              hal/therm/therm_gp10b.c,
-             hal/therm/therm_gp10b.h,
-             hal/therm/therm_gv11b_fusa.c,
-             hal/therm/therm_gv11b.h ]
+             hal/therm/therm_gp10b.h ]
 
 cbc:
   safe: no