From dce78f7332e73394c887400ac9e4e18885906bc0 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Wed, 14 Nov 2018 14:56:40 -0800 Subject: [PATCH] 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 Reviewed-on: https://git-master.nvidia.com/r/1950991 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/Makefile | 104 +++++++++--------- drivers/gpu/nvgpu/Makefile.sources | 60 +++++----- drivers/gpu/nvgpu/{ => common/pmu}/clk/clk.c | 0 drivers/gpu/nvgpu/{ => common/pmu}/clk/clk.h | 0 .../gpu/nvgpu/{ => common/pmu}/clk/clk_arb.c | 0 .../nvgpu/{ => common/pmu}/clk/clk_domain.c | 0 .../nvgpu/{ => common/pmu}/clk/clk_domain.h | 0 .../gpu/nvgpu/{ => common/pmu}/clk/clk_fll.c | 0 .../gpu/nvgpu/{ => common/pmu}/clk/clk_fll.h | 0 .../pmu}/clk/clk_freq_controller.c | 0 .../pmu}/clk/clk_freq_controller.h | 0 .../{ => common/pmu}/clk/clk_freq_domain.c | 0 .../{ => common/pmu}/clk/clk_freq_domain.h | 0 .../gpu/nvgpu/{ => common/pmu}/clk/clk_mclk.h | 0 .../gpu/nvgpu/{ => common/pmu}/clk/clk_prog.c | 0 .../gpu/nvgpu/{ => common/pmu}/clk/clk_prog.h | 0 .../nvgpu/{ => common/pmu}/clk/clk_vf_point.c | 0 .../nvgpu/{ => common/pmu}/clk/clk_vf_point.h | 0 .../gpu/nvgpu/{ => common/pmu}/clk/clk_vin.c | 0 .../gpu/nvgpu/{ => common/pmu}/clk/clk_vin.h | 0 .../gpu/nvgpu/{ => common/pmu}/lpwr/lpwr.c | 0 .../gpu/nvgpu/{ => common/pmu}/lpwr/lpwr.h | 0 .../gpu/nvgpu/{ => common/pmu}/lpwr/rppg.c | 0 .../pmu/perf}/change_seq.c | 0 .../pmu/perf}/change_seq.h | 0 .../pmu/perf}/perf_gv100.c | 0 .../pmu/perf}/perf_gv100.h | 0 .../pmu/perf}/perf_tu104.c | 2 +- .../pmu/perf}/perf_tu104.h | 0 .../{pmu_perf => common/pmu/perf}/pmu_perf.c | 0 .../{pmu_perf => common/pmu/perf}/pmu_perf.h | 0 .../{pmu_perf => common/pmu/perf}/vfe_equ.c | 0 .../{pmu_perf => common/pmu/perf}/vfe_equ.h | 0 .../{pmu_perf => common/pmu/perf}/vfe_var.c | 0 .../{pmu_perf => common/pmu/perf}/vfe_var.h | 0 .../gpu/nvgpu/{ => common/pmu}/pmgr/pmgr.c | 1 + .../gpu/nvgpu/{ => common/pmu}/pmgr/pmgr.h | 0 .../gpu/nvgpu/{ => common/pmu}/pmgr/pmgrpmu.c | 0 .../gpu/nvgpu/{ => common/pmu}/pmgr/pmgrpmu.h | 0 .../gpu/nvgpu/{ => common/pmu}/pmgr/pwrdev.c | 0 .../gpu/nvgpu/{ => common/pmu}/pmgr/pwrdev.h | 0 .../nvgpu/{ => common/pmu}/pmgr/pwrmonitor.c | 0 .../nvgpu/{ => common/pmu}/pmgr/pwrmonitor.h | 0 .../nvgpu/{ => common/pmu}/pmgr/pwrpolicy.c | 0 .../nvgpu/{ => common/pmu}/pmgr/pwrpolicy.h | 0 .../nvgpu/{ => common/pmu}/pstate/pstate.c | 0 .../nvgpu/{ => common/pmu}/pstate/pstate.h | 0 .../gpu/nvgpu/{ => common/pmu}/therm/thrm.c | 1 + .../gpu/nvgpu/{ => common/pmu}/therm/thrm.h | 0 .../{ => common/pmu}/therm/thrmchannel.c | 0 .../{ => common/pmu}/therm/thrmchannel.h | 0 .../nvgpu/{ => common/pmu}/therm/thrmdev.c | 0 .../nvgpu/{ => common/pmu}/therm/thrmdev.h | 0 .../nvgpu/{ => common/pmu}/therm/thrmpmu.c | 1 + .../nvgpu/{ => common/pmu}/therm/thrmpmu.h | 2 - .../gpu/nvgpu/{ => common/pmu}/volt/volt.h | 0 .../nvgpu/{ => common/pmu}/volt/volt_dev.c | 0 .../nvgpu/{ => common/pmu}/volt/volt_dev.h | 0 .../nvgpu/{ => common/pmu}/volt/volt_pmu.c | 0 .../nvgpu/{ => common/pmu}/volt/volt_pmu.h | 0 .../nvgpu/{ => common/pmu}/volt/volt_policy.c | 0 .../nvgpu/{ => common/pmu}/volt/volt_policy.h | 0 .../nvgpu/{ => common/pmu}/volt/volt_rail.c | 0 .../nvgpu/{ => common/pmu}/volt/volt_rail.h | 0 drivers/gpu/nvgpu/gp106/clk_gp106.c | 3 +- drivers/gpu/nvgpu/gp106/mclk_gp106.c | 4 +- drivers/gpu/nvgpu/gv100/clk_arb_gv100.c | 2 +- drivers/gpu/nvgpu/gv100/hal_gv100.c | 2 +- drivers/gpu/nvgpu/os/linux/debug_clk_gp106.c | 2 +- drivers/gpu/nvgpu/os/linux/debug_clk_gv100.c | 2 +- drivers/gpu/nvgpu/tu104/hal_tu104.c | 2 +- 71 files changed, 95 insertions(+), 93 deletions(-) rename drivers/gpu/nvgpu/{ => common/pmu}/clk/clk.c (100%) rename drivers/gpu/nvgpu/{ => common/pmu}/clk/clk.h (100%) rename drivers/gpu/nvgpu/{ => common/pmu}/clk/clk_arb.c (100%) rename drivers/gpu/nvgpu/{ => common/pmu}/clk/clk_domain.c (100%) rename drivers/gpu/nvgpu/{ => common/pmu}/clk/clk_domain.h (100%) rename drivers/gpu/nvgpu/{ => common/pmu}/clk/clk_fll.c (100%) rename drivers/gpu/nvgpu/{ => common/pmu}/clk/clk_fll.h (100%) rename drivers/gpu/nvgpu/{ => common/pmu}/clk/clk_freq_controller.c (100%) rename drivers/gpu/nvgpu/{ => common/pmu}/clk/clk_freq_controller.h (100%) rename drivers/gpu/nvgpu/{ => common/pmu}/clk/clk_freq_domain.c (100%) rename drivers/gpu/nvgpu/{ => common/pmu}/clk/clk_freq_domain.h (100%) rename drivers/gpu/nvgpu/{ => common/pmu}/clk/clk_mclk.h (100%) rename drivers/gpu/nvgpu/{ => common/pmu}/clk/clk_prog.c (100%) rename drivers/gpu/nvgpu/{ => common/pmu}/clk/clk_prog.h (100%) rename drivers/gpu/nvgpu/{ => common/pmu}/clk/clk_vf_point.c (100%) rename drivers/gpu/nvgpu/{ => common/pmu}/clk/clk_vf_point.h (100%) rename drivers/gpu/nvgpu/{ => common/pmu}/clk/clk_vin.c (100%) rename drivers/gpu/nvgpu/{ => common/pmu}/clk/clk_vin.h (100%) rename drivers/gpu/nvgpu/{ => common/pmu}/lpwr/lpwr.c (100%) rename drivers/gpu/nvgpu/{ => common/pmu}/lpwr/lpwr.h (100%) rename drivers/gpu/nvgpu/{ => common/pmu}/lpwr/rppg.c (100%) rename drivers/gpu/nvgpu/{pmu_perf => common/pmu/perf}/change_seq.c (100%) rename drivers/gpu/nvgpu/{pmu_perf => common/pmu/perf}/change_seq.h (100%) rename drivers/gpu/nvgpu/{pmu_perf => common/pmu/perf}/perf_gv100.c (100%) rename drivers/gpu/nvgpu/{pmu_perf => common/pmu/perf}/perf_gv100.h (100%) rename drivers/gpu/nvgpu/{pmu_perf => common/pmu/perf}/perf_tu104.c (99%) rename drivers/gpu/nvgpu/{pmu_perf => common/pmu/perf}/perf_tu104.h (100%) rename drivers/gpu/nvgpu/{pmu_perf => common/pmu/perf}/pmu_perf.c (100%) rename drivers/gpu/nvgpu/{pmu_perf => common/pmu/perf}/pmu_perf.h (100%) rename drivers/gpu/nvgpu/{pmu_perf => common/pmu/perf}/vfe_equ.c (100%) rename drivers/gpu/nvgpu/{pmu_perf => common/pmu/perf}/vfe_equ.h (100%) rename drivers/gpu/nvgpu/{pmu_perf => common/pmu/perf}/vfe_var.c (100%) rename drivers/gpu/nvgpu/{pmu_perf => common/pmu/perf}/vfe_var.h (100%) rename drivers/gpu/nvgpu/{ => common/pmu}/pmgr/pmgr.c (99%) rename drivers/gpu/nvgpu/{ => common/pmu}/pmgr/pmgr.h (100%) rename drivers/gpu/nvgpu/{ => common/pmu}/pmgr/pmgrpmu.c (100%) rename drivers/gpu/nvgpu/{ => common/pmu}/pmgr/pmgrpmu.h (100%) rename drivers/gpu/nvgpu/{ => common/pmu}/pmgr/pwrdev.c (100%) rename drivers/gpu/nvgpu/{ => common/pmu}/pmgr/pwrdev.h (100%) rename drivers/gpu/nvgpu/{ => common/pmu}/pmgr/pwrmonitor.c (100%) rename drivers/gpu/nvgpu/{ => common/pmu}/pmgr/pwrmonitor.h (100%) rename drivers/gpu/nvgpu/{ => common/pmu}/pmgr/pwrpolicy.c (100%) rename drivers/gpu/nvgpu/{ => common/pmu}/pmgr/pwrpolicy.h (100%) rename drivers/gpu/nvgpu/{ => common/pmu}/pstate/pstate.c (100%) rename drivers/gpu/nvgpu/{ => common/pmu}/pstate/pstate.h (100%) rename drivers/gpu/nvgpu/{ => common/pmu}/therm/thrm.c (98%) rename drivers/gpu/nvgpu/{ => common/pmu}/therm/thrm.h (100%) rename drivers/gpu/nvgpu/{ => common/pmu}/therm/thrmchannel.c (100%) rename drivers/gpu/nvgpu/{ => common/pmu}/therm/thrmchannel.h (100%) rename drivers/gpu/nvgpu/{ => common/pmu}/therm/thrmdev.c (100%) rename drivers/gpu/nvgpu/{ => common/pmu}/therm/thrmdev.h (100%) rename drivers/gpu/nvgpu/{ => common/pmu}/therm/thrmpmu.c (99%) rename drivers/gpu/nvgpu/{ => common/pmu}/therm/thrmpmu.h (96%) rename drivers/gpu/nvgpu/{ => common/pmu}/volt/volt.h (100%) rename drivers/gpu/nvgpu/{ => common/pmu}/volt/volt_dev.c (100%) rename drivers/gpu/nvgpu/{ => common/pmu}/volt/volt_dev.h (100%) rename drivers/gpu/nvgpu/{ => common/pmu}/volt/volt_pmu.c (100%) rename drivers/gpu/nvgpu/{ => common/pmu}/volt/volt_pmu.h (100%) rename drivers/gpu/nvgpu/{ => common/pmu}/volt/volt_policy.c (100%) rename drivers/gpu/nvgpu/{ => common/pmu}/volt/volt_policy.h (100%) rename drivers/gpu/nvgpu/{ => common/pmu}/volt/volt_rail.c (100%) rename drivers/gpu/nvgpu/{ => common/pmu}/volt/volt_rail.h (100%) diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile index 2ddb9ab9a..efa848273 100644 --- a/drivers/gpu/nvgpu/Makefile +++ b/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 diff --git a/drivers/gpu/nvgpu/Makefile.sources b/drivers/gpu/nvgpu/Makefile.sources index 3a543946b..675605aef 100644 --- a/drivers/gpu/nvgpu/Makefile.sources +++ b/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 \ diff --git a/drivers/gpu/nvgpu/clk/clk.c b/drivers/gpu/nvgpu/common/pmu/clk/clk.c similarity index 100% rename from drivers/gpu/nvgpu/clk/clk.c rename to drivers/gpu/nvgpu/common/pmu/clk/clk.c diff --git a/drivers/gpu/nvgpu/clk/clk.h b/drivers/gpu/nvgpu/common/pmu/clk/clk.h similarity index 100% rename from drivers/gpu/nvgpu/clk/clk.h rename to drivers/gpu/nvgpu/common/pmu/clk/clk.h diff --git a/drivers/gpu/nvgpu/clk/clk_arb.c b/drivers/gpu/nvgpu/common/pmu/clk/clk_arb.c similarity index 100% rename from drivers/gpu/nvgpu/clk/clk_arb.c rename to drivers/gpu/nvgpu/common/pmu/clk/clk_arb.c diff --git a/drivers/gpu/nvgpu/clk/clk_domain.c b/drivers/gpu/nvgpu/common/pmu/clk/clk_domain.c similarity index 100% rename from drivers/gpu/nvgpu/clk/clk_domain.c rename to drivers/gpu/nvgpu/common/pmu/clk/clk_domain.c diff --git a/drivers/gpu/nvgpu/clk/clk_domain.h b/drivers/gpu/nvgpu/common/pmu/clk/clk_domain.h similarity index 100% rename from drivers/gpu/nvgpu/clk/clk_domain.h rename to drivers/gpu/nvgpu/common/pmu/clk/clk_domain.h diff --git a/drivers/gpu/nvgpu/clk/clk_fll.c b/drivers/gpu/nvgpu/common/pmu/clk/clk_fll.c similarity index 100% rename from drivers/gpu/nvgpu/clk/clk_fll.c rename to drivers/gpu/nvgpu/common/pmu/clk/clk_fll.c diff --git a/drivers/gpu/nvgpu/clk/clk_fll.h b/drivers/gpu/nvgpu/common/pmu/clk/clk_fll.h similarity index 100% rename from drivers/gpu/nvgpu/clk/clk_fll.h rename to drivers/gpu/nvgpu/common/pmu/clk/clk_fll.h diff --git a/drivers/gpu/nvgpu/clk/clk_freq_controller.c b/drivers/gpu/nvgpu/common/pmu/clk/clk_freq_controller.c similarity index 100% rename from drivers/gpu/nvgpu/clk/clk_freq_controller.c rename to drivers/gpu/nvgpu/common/pmu/clk/clk_freq_controller.c diff --git a/drivers/gpu/nvgpu/clk/clk_freq_controller.h b/drivers/gpu/nvgpu/common/pmu/clk/clk_freq_controller.h similarity index 100% rename from drivers/gpu/nvgpu/clk/clk_freq_controller.h rename to drivers/gpu/nvgpu/common/pmu/clk/clk_freq_controller.h diff --git a/drivers/gpu/nvgpu/clk/clk_freq_domain.c b/drivers/gpu/nvgpu/common/pmu/clk/clk_freq_domain.c similarity index 100% rename from drivers/gpu/nvgpu/clk/clk_freq_domain.c rename to drivers/gpu/nvgpu/common/pmu/clk/clk_freq_domain.c diff --git a/drivers/gpu/nvgpu/clk/clk_freq_domain.h b/drivers/gpu/nvgpu/common/pmu/clk/clk_freq_domain.h similarity index 100% rename from drivers/gpu/nvgpu/clk/clk_freq_domain.h rename to drivers/gpu/nvgpu/common/pmu/clk/clk_freq_domain.h diff --git a/drivers/gpu/nvgpu/clk/clk_mclk.h b/drivers/gpu/nvgpu/common/pmu/clk/clk_mclk.h similarity index 100% rename from drivers/gpu/nvgpu/clk/clk_mclk.h rename to drivers/gpu/nvgpu/common/pmu/clk/clk_mclk.h diff --git a/drivers/gpu/nvgpu/clk/clk_prog.c b/drivers/gpu/nvgpu/common/pmu/clk/clk_prog.c similarity index 100% rename from drivers/gpu/nvgpu/clk/clk_prog.c rename to drivers/gpu/nvgpu/common/pmu/clk/clk_prog.c diff --git a/drivers/gpu/nvgpu/clk/clk_prog.h b/drivers/gpu/nvgpu/common/pmu/clk/clk_prog.h similarity index 100% rename from drivers/gpu/nvgpu/clk/clk_prog.h rename to drivers/gpu/nvgpu/common/pmu/clk/clk_prog.h diff --git a/drivers/gpu/nvgpu/clk/clk_vf_point.c b/drivers/gpu/nvgpu/common/pmu/clk/clk_vf_point.c similarity index 100% rename from drivers/gpu/nvgpu/clk/clk_vf_point.c rename to drivers/gpu/nvgpu/common/pmu/clk/clk_vf_point.c diff --git a/drivers/gpu/nvgpu/clk/clk_vf_point.h b/drivers/gpu/nvgpu/common/pmu/clk/clk_vf_point.h similarity index 100% rename from drivers/gpu/nvgpu/clk/clk_vf_point.h rename to drivers/gpu/nvgpu/common/pmu/clk/clk_vf_point.h diff --git a/drivers/gpu/nvgpu/clk/clk_vin.c b/drivers/gpu/nvgpu/common/pmu/clk/clk_vin.c similarity index 100% rename from drivers/gpu/nvgpu/clk/clk_vin.c rename to drivers/gpu/nvgpu/common/pmu/clk/clk_vin.c diff --git a/drivers/gpu/nvgpu/clk/clk_vin.h b/drivers/gpu/nvgpu/common/pmu/clk/clk_vin.h similarity index 100% rename from drivers/gpu/nvgpu/clk/clk_vin.h rename to drivers/gpu/nvgpu/common/pmu/clk/clk_vin.h diff --git a/drivers/gpu/nvgpu/lpwr/lpwr.c b/drivers/gpu/nvgpu/common/pmu/lpwr/lpwr.c similarity index 100% rename from drivers/gpu/nvgpu/lpwr/lpwr.c rename to drivers/gpu/nvgpu/common/pmu/lpwr/lpwr.c diff --git a/drivers/gpu/nvgpu/lpwr/lpwr.h b/drivers/gpu/nvgpu/common/pmu/lpwr/lpwr.h similarity index 100% rename from drivers/gpu/nvgpu/lpwr/lpwr.h rename to drivers/gpu/nvgpu/common/pmu/lpwr/lpwr.h diff --git a/drivers/gpu/nvgpu/lpwr/rppg.c b/drivers/gpu/nvgpu/common/pmu/lpwr/rppg.c similarity index 100% rename from drivers/gpu/nvgpu/lpwr/rppg.c rename to drivers/gpu/nvgpu/common/pmu/lpwr/rppg.c diff --git a/drivers/gpu/nvgpu/pmu_perf/change_seq.c b/drivers/gpu/nvgpu/common/pmu/perf/change_seq.c similarity index 100% rename from drivers/gpu/nvgpu/pmu_perf/change_seq.c rename to drivers/gpu/nvgpu/common/pmu/perf/change_seq.c diff --git a/drivers/gpu/nvgpu/pmu_perf/change_seq.h b/drivers/gpu/nvgpu/common/pmu/perf/change_seq.h similarity index 100% rename from drivers/gpu/nvgpu/pmu_perf/change_seq.h rename to drivers/gpu/nvgpu/common/pmu/perf/change_seq.h diff --git a/drivers/gpu/nvgpu/pmu_perf/perf_gv100.c b/drivers/gpu/nvgpu/common/pmu/perf/perf_gv100.c similarity index 100% rename from drivers/gpu/nvgpu/pmu_perf/perf_gv100.c rename to drivers/gpu/nvgpu/common/pmu/perf/perf_gv100.c diff --git a/drivers/gpu/nvgpu/pmu_perf/perf_gv100.h b/drivers/gpu/nvgpu/common/pmu/perf/perf_gv100.h similarity index 100% rename from drivers/gpu/nvgpu/pmu_perf/perf_gv100.h rename to drivers/gpu/nvgpu/common/pmu/perf/perf_gv100.h diff --git a/drivers/gpu/nvgpu/pmu_perf/perf_tu104.c b/drivers/gpu/nvgpu/common/pmu/perf/perf_tu104.c similarity index 99% rename from drivers/gpu/nvgpu/pmu_perf/perf_tu104.c rename to drivers/gpu/nvgpu/common/pmu/perf/perf_tu104.c index faa92a64a..3bd0d142c 100644 --- a/drivers/gpu/nvgpu/pmu_perf/perf_tu104.c +++ b/drivers/gpu/nvgpu/common/pmu/perf/perf_tu104.c @@ -29,7 +29,7 @@ #include #include "perf_tu104.h" -#include "pmu_perf/pmu_perf.h" +#include "pmu_perf.h" static int pmu_set_boot_clk_runcb_fn(void *arg) { diff --git a/drivers/gpu/nvgpu/pmu_perf/perf_tu104.h b/drivers/gpu/nvgpu/common/pmu/perf/perf_tu104.h similarity index 100% rename from drivers/gpu/nvgpu/pmu_perf/perf_tu104.h rename to drivers/gpu/nvgpu/common/pmu/perf/perf_tu104.h diff --git a/drivers/gpu/nvgpu/pmu_perf/pmu_perf.c b/drivers/gpu/nvgpu/common/pmu/perf/pmu_perf.c similarity index 100% rename from drivers/gpu/nvgpu/pmu_perf/pmu_perf.c rename to drivers/gpu/nvgpu/common/pmu/perf/pmu_perf.c diff --git a/drivers/gpu/nvgpu/pmu_perf/pmu_perf.h b/drivers/gpu/nvgpu/common/pmu/perf/pmu_perf.h similarity index 100% rename from drivers/gpu/nvgpu/pmu_perf/pmu_perf.h rename to drivers/gpu/nvgpu/common/pmu/perf/pmu_perf.h diff --git a/drivers/gpu/nvgpu/pmu_perf/vfe_equ.c b/drivers/gpu/nvgpu/common/pmu/perf/vfe_equ.c similarity index 100% rename from drivers/gpu/nvgpu/pmu_perf/vfe_equ.c rename to drivers/gpu/nvgpu/common/pmu/perf/vfe_equ.c diff --git a/drivers/gpu/nvgpu/pmu_perf/vfe_equ.h b/drivers/gpu/nvgpu/common/pmu/perf/vfe_equ.h similarity index 100% rename from drivers/gpu/nvgpu/pmu_perf/vfe_equ.h rename to drivers/gpu/nvgpu/common/pmu/perf/vfe_equ.h diff --git a/drivers/gpu/nvgpu/pmu_perf/vfe_var.c b/drivers/gpu/nvgpu/common/pmu/perf/vfe_var.c similarity index 100% rename from drivers/gpu/nvgpu/pmu_perf/vfe_var.c rename to drivers/gpu/nvgpu/common/pmu/perf/vfe_var.c diff --git a/drivers/gpu/nvgpu/pmu_perf/vfe_var.h b/drivers/gpu/nvgpu/common/pmu/perf/vfe_var.h similarity index 100% rename from drivers/gpu/nvgpu/pmu_perf/vfe_var.h rename to drivers/gpu/nvgpu/common/pmu/perf/vfe_var.h diff --git a/drivers/gpu/nvgpu/pmgr/pmgr.c b/drivers/gpu/nvgpu/common/pmu/pmgr/pmgr.c similarity index 99% rename from drivers/gpu/nvgpu/pmgr/pmgr.c rename to drivers/gpu/nvgpu/common/pmu/pmgr/pmgr.c index 276d4c29b..78748513e 100644 --- a/drivers/gpu/nvgpu/pmgr/pmgr.c +++ b/drivers/gpu/nvgpu/common/pmu/pmgr/pmgr.c @@ -21,6 +21,7 @@ */ #include +#include #include "pmgr.h" #include "pwrdev.h" diff --git a/drivers/gpu/nvgpu/pmgr/pmgr.h b/drivers/gpu/nvgpu/common/pmu/pmgr/pmgr.h similarity index 100% rename from drivers/gpu/nvgpu/pmgr/pmgr.h rename to drivers/gpu/nvgpu/common/pmu/pmgr/pmgr.h diff --git a/drivers/gpu/nvgpu/pmgr/pmgrpmu.c b/drivers/gpu/nvgpu/common/pmu/pmgr/pmgrpmu.c similarity index 100% rename from drivers/gpu/nvgpu/pmgr/pmgrpmu.c rename to drivers/gpu/nvgpu/common/pmu/pmgr/pmgrpmu.c diff --git a/drivers/gpu/nvgpu/pmgr/pmgrpmu.h b/drivers/gpu/nvgpu/common/pmu/pmgr/pmgrpmu.h similarity index 100% rename from drivers/gpu/nvgpu/pmgr/pmgrpmu.h rename to drivers/gpu/nvgpu/common/pmu/pmgr/pmgrpmu.h diff --git a/drivers/gpu/nvgpu/pmgr/pwrdev.c b/drivers/gpu/nvgpu/common/pmu/pmgr/pwrdev.c similarity index 100% rename from drivers/gpu/nvgpu/pmgr/pwrdev.c rename to drivers/gpu/nvgpu/common/pmu/pmgr/pwrdev.c diff --git a/drivers/gpu/nvgpu/pmgr/pwrdev.h b/drivers/gpu/nvgpu/common/pmu/pmgr/pwrdev.h similarity index 100% rename from drivers/gpu/nvgpu/pmgr/pwrdev.h rename to drivers/gpu/nvgpu/common/pmu/pmgr/pwrdev.h diff --git a/drivers/gpu/nvgpu/pmgr/pwrmonitor.c b/drivers/gpu/nvgpu/common/pmu/pmgr/pwrmonitor.c similarity index 100% rename from drivers/gpu/nvgpu/pmgr/pwrmonitor.c rename to drivers/gpu/nvgpu/common/pmu/pmgr/pwrmonitor.c diff --git a/drivers/gpu/nvgpu/pmgr/pwrmonitor.h b/drivers/gpu/nvgpu/common/pmu/pmgr/pwrmonitor.h similarity index 100% rename from drivers/gpu/nvgpu/pmgr/pwrmonitor.h rename to drivers/gpu/nvgpu/common/pmu/pmgr/pwrmonitor.h diff --git a/drivers/gpu/nvgpu/pmgr/pwrpolicy.c b/drivers/gpu/nvgpu/common/pmu/pmgr/pwrpolicy.c similarity index 100% rename from drivers/gpu/nvgpu/pmgr/pwrpolicy.c rename to drivers/gpu/nvgpu/common/pmu/pmgr/pwrpolicy.c diff --git a/drivers/gpu/nvgpu/pmgr/pwrpolicy.h b/drivers/gpu/nvgpu/common/pmu/pmgr/pwrpolicy.h similarity index 100% rename from drivers/gpu/nvgpu/pmgr/pwrpolicy.h rename to drivers/gpu/nvgpu/common/pmu/pmgr/pwrpolicy.h diff --git a/drivers/gpu/nvgpu/pstate/pstate.c b/drivers/gpu/nvgpu/common/pmu/pstate/pstate.c similarity index 100% rename from drivers/gpu/nvgpu/pstate/pstate.c rename to drivers/gpu/nvgpu/common/pmu/pstate/pstate.c diff --git a/drivers/gpu/nvgpu/pstate/pstate.h b/drivers/gpu/nvgpu/common/pmu/pstate/pstate.h similarity index 100% rename from drivers/gpu/nvgpu/pstate/pstate.h rename to drivers/gpu/nvgpu/common/pmu/pstate/pstate.h diff --git a/drivers/gpu/nvgpu/therm/thrm.c b/drivers/gpu/nvgpu/common/pmu/therm/thrm.c similarity index 98% rename from drivers/gpu/nvgpu/therm/thrm.c rename to drivers/gpu/nvgpu/common/pmu/therm/thrm.c index 69276982a..9d3aa725f 100644 --- a/drivers/gpu/nvgpu/therm/thrm.c +++ b/drivers/gpu/nvgpu/common/pmu/therm/thrm.c @@ -21,6 +21,7 @@ */ #include +#include #include "thrm.h" #include "thrmpmu.h" diff --git a/drivers/gpu/nvgpu/therm/thrm.h b/drivers/gpu/nvgpu/common/pmu/therm/thrm.h similarity index 100% rename from drivers/gpu/nvgpu/therm/thrm.h rename to drivers/gpu/nvgpu/common/pmu/therm/thrm.h diff --git a/drivers/gpu/nvgpu/therm/thrmchannel.c b/drivers/gpu/nvgpu/common/pmu/therm/thrmchannel.c similarity index 100% rename from drivers/gpu/nvgpu/therm/thrmchannel.c rename to drivers/gpu/nvgpu/common/pmu/therm/thrmchannel.c diff --git a/drivers/gpu/nvgpu/therm/thrmchannel.h b/drivers/gpu/nvgpu/common/pmu/therm/thrmchannel.h similarity index 100% rename from drivers/gpu/nvgpu/therm/thrmchannel.h rename to drivers/gpu/nvgpu/common/pmu/therm/thrmchannel.h diff --git a/drivers/gpu/nvgpu/therm/thrmdev.c b/drivers/gpu/nvgpu/common/pmu/therm/thrmdev.c similarity index 100% rename from drivers/gpu/nvgpu/therm/thrmdev.c rename to drivers/gpu/nvgpu/common/pmu/therm/thrmdev.c diff --git a/drivers/gpu/nvgpu/therm/thrmdev.h b/drivers/gpu/nvgpu/common/pmu/therm/thrmdev.h similarity index 100% rename from drivers/gpu/nvgpu/therm/thrmdev.h rename to drivers/gpu/nvgpu/common/pmu/therm/thrmdev.h diff --git a/drivers/gpu/nvgpu/therm/thrmpmu.c b/drivers/gpu/nvgpu/common/pmu/therm/thrmpmu.c similarity index 99% rename from drivers/gpu/nvgpu/therm/thrmpmu.c rename to drivers/gpu/nvgpu/common/pmu/therm/thrmpmu.c index 4f7fc1db1..464ae1dcf 100644 --- a/drivers/gpu/nvgpu/therm/thrmpmu.c +++ b/drivers/gpu/nvgpu/common/pmu/therm/thrmpmu.c @@ -22,6 +22,7 @@ #include #include #include +#include #include "thrmpmu.h" #include "thrm.h" diff --git a/drivers/gpu/nvgpu/therm/thrmpmu.h b/drivers/gpu/nvgpu/common/pmu/therm/thrmpmu.h similarity index 96% rename from drivers/gpu/nvgpu/therm/thrmpmu.h rename to drivers/gpu/nvgpu/common/pmu/therm/thrmpmu.h index fdaffe998..ed53ac527 100644 --- a/drivers/gpu/nvgpu/therm/thrmpmu.h +++ b/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 */ diff --git a/drivers/gpu/nvgpu/volt/volt.h b/drivers/gpu/nvgpu/common/pmu/volt/volt.h similarity index 100% rename from drivers/gpu/nvgpu/volt/volt.h rename to drivers/gpu/nvgpu/common/pmu/volt/volt.h diff --git a/drivers/gpu/nvgpu/volt/volt_dev.c b/drivers/gpu/nvgpu/common/pmu/volt/volt_dev.c similarity index 100% rename from drivers/gpu/nvgpu/volt/volt_dev.c rename to drivers/gpu/nvgpu/common/pmu/volt/volt_dev.c diff --git a/drivers/gpu/nvgpu/volt/volt_dev.h b/drivers/gpu/nvgpu/common/pmu/volt/volt_dev.h similarity index 100% rename from drivers/gpu/nvgpu/volt/volt_dev.h rename to drivers/gpu/nvgpu/common/pmu/volt/volt_dev.h diff --git a/drivers/gpu/nvgpu/volt/volt_pmu.c b/drivers/gpu/nvgpu/common/pmu/volt/volt_pmu.c similarity index 100% rename from drivers/gpu/nvgpu/volt/volt_pmu.c rename to drivers/gpu/nvgpu/common/pmu/volt/volt_pmu.c diff --git a/drivers/gpu/nvgpu/volt/volt_pmu.h b/drivers/gpu/nvgpu/common/pmu/volt/volt_pmu.h similarity index 100% rename from drivers/gpu/nvgpu/volt/volt_pmu.h rename to drivers/gpu/nvgpu/common/pmu/volt/volt_pmu.h diff --git a/drivers/gpu/nvgpu/volt/volt_policy.c b/drivers/gpu/nvgpu/common/pmu/volt/volt_policy.c similarity index 100% rename from drivers/gpu/nvgpu/volt/volt_policy.c rename to drivers/gpu/nvgpu/common/pmu/volt/volt_policy.c diff --git a/drivers/gpu/nvgpu/volt/volt_policy.h b/drivers/gpu/nvgpu/common/pmu/volt/volt_policy.h similarity index 100% rename from drivers/gpu/nvgpu/volt/volt_policy.h rename to drivers/gpu/nvgpu/common/pmu/volt/volt_policy.h diff --git a/drivers/gpu/nvgpu/volt/volt_rail.c b/drivers/gpu/nvgpu/common/pmu/volt/volt_rail.c similarity index 100% rename from drivers/gpu/nvgpu/volt/volt_rail.c rename to drivers/gpu/nvgpu/common/pmu/volt/volt_rail.c diff --git a/drivers/gpu/nvgpu/volt/volt_rail.h b/drivers/gpu/nvgpu/common/pmu/volt/volt_rail.h similarity index 100% rename from drivers/gpu/nvgpu/volt/volt_rail.h rename to drivers/gpu/nvgpu/common/pmu/volt/volt_rail.h diff --git a/drivers/gpu/nvgpu/gp106/clk_gp106.c b/drivers/gpu/nvgpu/gp106/clk_gp106.c index 2eba653b8..670718524 100644 --- a/drivers/gpu/nvgpu/gp106/clk_gp106.c +++ b/drivers/gpu/nvgpu/gp106/clk_gp106.c @@ -29,9 +29,10 @@ #include #include #include +#include -#include "clk/clk.h" #include "gp106/mclk_gp106.h" +#include "common/pmu/clk/clk.h" #include "clk_gp106.h" diff --git a/drivers/gpu/nvgpu/gp106/mclk_gp106.c b/drivers/gpu/nvgpu/gp106/mclk_gp106.c index e315a169d..3298f854d 100644 --- a/drivers/gpu/nvgpu/gp106/mclk_gp106.c +++ b/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 #include diff --git a/drivers/gpu/nvgpu/gv100/clk_arb_gv100.c b/drivers/gpu/nvgpu/gv100/clk_arb_gv100.c index a7d8c9799..c25906a24 100644 --- a/drivers/gpu/nvgpu/gv100/clk_arb_gv100.c +++ b/drivers/gpu/nvgpu/gv100/clk_arb_gv100.c @@ -25,7 +25,7 @@ #include #include "clk_arb_gv100.h" -#include "clk/clk.h" +#include "common/pmu/clk/clk.h" u32 gv100_get_arbiter_clk_domains(struct gk20a *g) { diff --git a/drivers/gpu/nvgpu/gv100/hal_gv100.c b/drivers/gpu/nvgpu/gv100/hal_gv100.c index c1a71f67a..73df2811f 100644 --- a/drivers/gpu/nvgpu/gv100/hal_gv100.c +++ b/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" diff --git a/drivers/gpu/nvgpu/os/linux/debug_clk_gp106.c b/drivers/gpu/nvgpu/os/linux/debug_clk_gp106.c index b7e1eaeae..0a9cec1f1 100644 --- a/drivers/gpu/nvgpu/os/linux/debug_clk_gp106.c +++ b/drivers/gpu/nvgpu/os/linux/debug_clk_gp106.c @@ -20,7 +20,7 @@ #include #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); diff --git a/drivers/gpu/nvgpu/os/linux/debug_clk_gv100.c b/drivers/gpu/nvgpu/os/linux/debug_clk_gv100.c index 68b35f1ec..6b3c537fe 100644 --- a/drivers/gpu/nvgpu/os/linux/debug_clk_gv100.c +++ b/drivers/gpu/nvgpu/os/linux/debug_clk_gv100.c @@ -18,7 +18,7 @@ #include -#include "clk/clk.h" +#include "common/pmu/clk/clk.h" #include "gv100/clk_gv100.h" #include "os_linux.h" diff --git a/drivers/gpu/nvgpu/tu104/hal_tu104.c b/drivers/gpu/nvgpu/tu104/hal_tu104.c index 5efa9e00e..79d11c14f 100644 --- a/drivers/gpu/nvgpu/tu104/hal_tu104.c +++ b/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"