gpu: nvgpu: Move PMU code to common/pmu

Move code interfacing with PMU tasks to common/pmu.

JIRA NVGPU-961

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

drivers/gpu/nvgpu/Makefile

@@ -83,7 +83,56 @@ nvgpu-y += common/bus/bus_gk20a.o \
 	common/netlist/netlist_gv11b.o \
 	common/netlist/netlist_tu104.o \
 	common/nvdec/nvdec_gp106.o \
-	common/nvdec/nvdec_tu104.o
+	common/nvdec/nvdec_tu104.o \
+	common/init/nvgpu_init.o \
+	common/pmu/pmu.o \
+	common/pmu/pmu_ipc.o \
+	common/pmu/pmu_fw.o \
+	common/pmu/pmu_pg.o \
+	common/pmu/pmu_perfmon.o \
+	common/pmu/pmu_debug.o \
+	common/pmu/pmu_gk20a.o \
+	common/pmu/pmu_gm20b.o \
+	common/pmu/pmu_gp10b.o \
+	common/pmu/pmu_gp106.o \
+	common/pmu/pmu_gv11b.o \
+	common/pmu/pmu_gv100.o \
+	common/pmu/pmu_tu104.o \
+	common/pmu/acr_gm20b.o \
+	common/pmu/acr_gp106.o \
+	common/pmu/acr_gv11b.o \
+	common/pmu/acr_tu104.o \
+	common/pmu/perf/vfe_var.o \
+	common/pmu/perf/vfe_equ.o \
+	common/pmu/perf/pmu_perf.o \
+	common/pmu/perf/perf_gv100.o \
+	common/pmu/perf/perf_tu104.o \
+	common/pmu/perf/change_seq.o \
+	common/pmu/pmgr/pwrdev.o \
+	common/pmu/pmgr/pmgr.o \
+	common/pmu/pmgr/pmgrpmu.o \
+	common/pmu/pmgr/pwrmonitor.o \
+	common/pmu/pmgr/pwrpolicy.o \
+	common/pmu/volt/volt_rail.o \
+	common/pmu/volt/volt_dev.o \
+	common/pmu/volt/volt_policy.o \
+	common/pmu/volt/volt_pmu.o \
+	common/pmu/therm/thrm.o \
+	common/pmu/therm/thrmdev.o \
+	common/pmu/therm/thrmchannel.o \
+	common/pmu/therm/thrmpmu.o \
+	common/pmu/lpwr/rppg.o \
+	common/pmu/lpwr/lpwr.o \
+	common/pmu/pstate/pstate.o \
+	common/pmu/clk/clk_vin.o \
+	common/pmu/clk/clk_fll.o \
+	common/pmu/clk/clk_domain.o \
+	common/pmu/clk/clk_freq_domain.o \
+	common/pmu/clk/clk_prog.o \
+	common/pmu/clk/clk_vf_point.o \
+	common/pmu/clk/clk_arb.o \
+	common/pmu/clk/clk_freq_controller.o \
+	common/pmu/clk/clk.o
 
 # Linux specific parts of nvgpu.
 nvgpu-y += \
@@ -247,24 +296,6 @@ nvgpu-y += \
 	common/falcon/falcon_gv100.o \
 	common/falcon/falcon_tu104.o \
 	common/init/hal_init.o \
-	common/init/nvgpu_init.o \
-	common/pmu/pmu.o \
-	common/pmu/pmu_ipc.o \
-	common/pmu/pmu_fw.o \
-	common/pmu/pmu_pg.o \
-	common/pmu/pmu_perfmon.o \
-	common/pmu/pmu_debug.o \
-	common/pmu/pmu_gk20a.o \
-	common/pmu/pmu_gm20b.o \
-	common/pmu/pmu_gp10b.o \
-	common/pmu/pmu_gp106.o \
-	common/pmu/pmu_gv11b.o \
-	common/pmu/pmu_gv100.o \
-	common/pmu/pmu_tu104.o \
-	common/pmu/acr_gm20b.o \
-	common/pmu/acr_gp106.o \
-	common/pmu/acr_gv11b.o \
-	common/pmu/acr_tu104.o \
 	common/sec2/sec2.o \
 	common/sec2/sec2_ipc.o \
 	common/io_common.o \
@@ -366,6 +397,7 @@ nvgpu-y += \
 	gv100/hal_gv100.o \
 	gv100/gsp_gv100.o \
 	gv100/clk_gv100.o \
+	gv100/clk_arb_gv100.o \
 	tu104/hal_tu104.o \
 	tu104/fifo_tu104.o \
 	tu104/gr_tu104.o \
@@ -375,36 +407,4 @@ nvgpu-y += \
 	tu104/sec2_tu104.o \
 	tu104/ecc_tu104.o \
 	tu104/regops_tu104.o \
-	pstate/pstate.o \
-	clk/clk_vin.o \
-	clk/clk_fll.o \
-	clk/clk_domain.o \
-	clk/clk_freq_domain.o \
-	clk/clk_prog.o \
-	clk/clk_vf_point.o \
-	clk/clk_arb.o \
-	clk/clk_freq_controller.o \
-	pmu_perf/vfe_var.o \
-	pmu_perf/vfe_equ.o \
-	pmu_perf/pmu_perf.o \
-	pmu_perf/perf_gv100.o \
-	pmu_perf/perf_tu104.o \
-	pmu_perf/change_seq.o \
-	clk/clk.o \
-	gp106/clk_gp106.o \
-	pmgr/pwrdev.o \
-	pmgr/pmgr.o \
-	pmgr/pmgrpmu.o \
-	pmgr/pwrmonitor.o \
-	pmgr/pwrpolicy.o \
-	volt/volt_rail.o \
-	volt/volt_dev.o \
-	volt/volt_policy.o \
-	volt/volt_pmu.o \
-	therm/thrm.o \
-	therm/thrmdev.o \
-	therm/thrmchannel.o \
-	therm/thrmpmu.o \
-	lpwr/rppg.o \
-	lpwr/lpwr.o \
-	gv100/clk_arb_gv100.o
+	gp106/clk_gp106.o

drivers/gpu/nvgpu/Makefile.sources

@@ -164,36 +164,36 @@ srcs :=	os/posix/nvgpu.c \
 	common/boardobj/boardobjgrp_e32.c \
 	common/nvdec/nvdec_gp106.c \
 	common/nvdec/nvdec_tu104.c \
-	pstate/pstate.c \
-	volt/volt_dev.c \
-	volt/volt_pmu.c \
-	volt/volt_policy.c \
-	volt/volt_rail.c \
-	clk/clk.c \
-	clk/clk_domain.c \
-	clk/clk_freq_domain.c \
-	clk/clk_fll.c \
-	clk/clk_freq_controller.c \
-	clk/clk_prog.c \
-	clk/clk_vf_point.c \
-	clk/clk_vin.c \
-	therm/thrm.c \
-	therm/thrmchannel.c \
-	therm/thrmdev.c \
-	therm/thrmpmu.c \
-	pmu_perf/pmu_perf.c \
-	pmu_perf/vfe_equ.c \
-	pmu_perf/vfe_var.c \
-	pmu_perf/perf_gv100.c \
-	pmu_perf/perf_tu104.c \
-	pmu_perf/change_seq.c \
-	pmgr/pmgr.c \
-	pmgr/pmgrpmu.c \
-	pmgr/pwrdev.c \
-	pmgr/pwrmonitor.c \
-	pmgr/pwrpolicy.c \
-	lpwr/lpwr.c \
-	lpwr/rppg.c \
+	common/pmu/pstate/pstate.c \
+	common/pmu/volt/volt_dev.c \
+	common/pmu/volt/volt_pmu.c \
+	common/pmu/volt/volt_policy.c \
+	common/pmu/volt/volt_rail.c \
+	common/pmu/clk/clk.c \
+	common/pmu/clk/clk_domain.c \
+	common/pmu/clk/clk_freq_domain.c \
+	common/pmu/clk/clk_fll.c \
+	common/pmu/clk/clk_freq_controller.c \
+	common/pmu/clk/clk_prog.c \
+	common/pmu/clk/clk_vf_point.c \
+	common/pmu/clk/clk_vin.c \
+	common/pmu/therm/thrm.c \
+	common/pmu/therm/thrmchannel.c \
+	common/pmu/therm/thrmdev.c \
+	common/pmu/therm/thrmpmu.c \
+	common/pmu/perf/pmu_perf.c \
+	common/pmu/perf/vfe_equ.c \
+	common/pmu/perf/vfe_var.c \
+	common/pmu/perf/perf_gv100.c \
+	common/pmu/perf/perf_tu104.c \
+	common/pmu/perf/change_seq.c \
+	common/pmu/pmgr/pmgr.c \
+	common/pmu/pmgr/pmgrpmu.c \
+	common/pmu/pmgr/pwrdev.c \
+	common/pmu/pmgr/pwrmonitor.c \
+	common/pmu/pmgr/pwrpolicy.c \
+	common/pmu/lpwr/lpwr.c \
+	common/pmu/lpwr/rppg.c \
 	common/ptimer/ptimer_gk20a.c \
 	gk20a/ce2_gk20a.c \
 	gk20a/fifo_gk20a.c \

drivers/gpu/nvgpu/common/pmu/perf/perf_tu104.c

@@ -29,7 +29,7 @@
 #include <nvgpu/pmu/perf.h>
 
 #include "perf_tu104.h"
-#include "pmu_perf/pmu_perf.h"
+#include "pmu_perf.h"
 
 static int pmu_set_boot_clk_runcb_fn(void *arg)
 {

drivers/gpu/nvgpu/common/pmu/pmgr/pmgr.c

@@ -21,6 +21,7 @@
  */
 
 #include <nvgpu/gk20a.h>
+#include <nvgpu/pmu/pmgr.h>
 
 #include "pmgr.h"
 #include "pwrdev.h"

drivers/gpu/nvgpu/common/pmu/therm/thrm.c

@@ -21,6 +21,7 @@
  */
 
 #include <nvgpu/gk20a.h>
+#include <nvgpu/pmu/therm.h>
 
 #include "thrm.h"
 #include "thrmpmu.h"

drivers/gpu/nvgpu/common/pmu/therm/thrmpmu.c

@@ -22,6 +22,7 @@
 #include <nvgpu/gk20a.h>
 #include <nvgpu/boardobjgrp.h>
 #include <nvgpu/boardobjgrp_e32.h>
+#include <nvgpu/pmu/therm.h>
 
 #include "thrmpmu.h"
 #include "thrm.h"

drivers/gpu/nvgpu/common/pmu/therm/thrmpmu.h

@@ -28,6 +28,4 @@ struct gk20a;
 
 int therm_send_pmgr_tables_to_pmu(struct gk20a *g);
 
-int therm_configure_therm_alert(struct gk20a *g);
-
 #endif /* NVGPU_THERM_THRMPMU_H */

drivers/gpu/nvgpu/gp106/clk_gp106.c

@@ -29,9 +29,10 @@
 #include <nvgpu/timers.h>
 #include <nvgpu/pmu.h>
 #include <nvgpu/gk20a.h>
+#include <nvgpu/boardobjgrp.h>
 
-#include "clk/clk.h"
 #include "gp106/mclk_gp106.h"
+#include "common/pmu/clk/clk.h"
 
 #include "clk_gp106.h"
 

drivers/gpu/nvgpu/gp106/mclk_gp106.c

@@ -35,8 +35,8 @@
 #include "os/linux/os_linux.h"
 #endif
 #include "gp106/mclk_gp106.h"
-#include "clk/clk.h"
-#include "clk/clk_mclk.h"
+#include "common/pmu/clk/clk.h"
+#include "common/pmu/clk/clk_mclk.h"
 
 #include <nvgpu/hw/gk20a/hw_pwr_gk20a.h>
 #include <nvgpu/hw/gp106/hw_fb_gp106.h>

drivers/gpu/nvgpu/gv100/clk_arb_gv100.c

@@ -25,7 +25,7 @@
 #include <nvgpu/pmu/clk.h>
 
 #include "clk_arb_gv100.h"
-#include "clk/clk.h"
+#include "common/pmu/clk/clk.h"
 
 u32 gv100_get_arbiter_clk_domains(struct gk20a *g)
 {

drivers/gpu/nvgpu/gv100/hal_gv100.c

@@ -70,7 +70,7 @@
 #include "common/nvdec/nvdec_gp106.h"
 #include "common/nvlink/nvlink_gv100.h"
 #include "common/nvlink/nvlink_tu104.h"
-#include "pmu_perf/perf_gv100.h"
+#include "common/pmu/perf/perf_gv100.h"
 
 #include "gk20a/fifo_gk20a.h"
 #include "gk20a/fecs_trace_gk20a.h"

drivers/gpu/nvgpu/os/linux/debug_clk_gp106.c

@@ -20,7 +20,7 @@
 #include <nvgpu/boardobjgrpmask.h>
 
 #include "os_linux.h"
-#include "clk/clk.h"
+#include "common/pmu/clk/clk.h"
 
 void nvgpu_clk_arb_pstate_change_lock(struct gk20a *g, bool lock);
 

drivers/gpu/nvgpu/os/linux/debug_clk_gv100.c

@@ -18,7 +18,7 @@
 
 #include <nvgpu/clk.h>
 
-#include "clk/clk.h"
+#include "common/pmu/clk/clk.h"
 #include "gv100/clk_gv100.h"
 
 #include "os_linux.h"

drivers/gpu/nvgpu/tu104/hal_tu104.c

@@ -68,6 +68,7 @@
 #include "common/pmu/acr_gm20b.h"
 #include "common/pmu/acr_gp106.h"
 #include "common/pmu/acr_tu104.h"
+#include "common/pmu/perf/perf_tu104.h"
 #include "common/falcon/falcon_gk20a.h"
 #include "common/falcon/falcon_tu104.h"
 #include "common/nvdec/nvdec_tu104.h"
@@ -115,7 +116,6 @@
 #include "gv100/mm_gv100.h"
 #include "gv100/regops_gv100.h"
 #include "gv100/clk_arb_gv100.h"
-#include "pmu_perf/perf_tu104.h"
 
 #include "tu104/fifo_tu104.h"
 #include "tu104/gr_tu104.h"