From cfe935ff5cf0726b0de4e4780abe37b1d62f863e Mon Sep 17 00:00:00 2001 From: Sagar Kamble Date: Thu, 14 Mar 2019 11:11:39 +0530 Subject: [PATCH] gpu: nvgpu: move falcon_gk20a.c|h to hal/falcon/ Move falcon_gk20a.c|h to hal/falcon/falcon_gk20a.c as per new unit separation requirement. JIRA NVGPU-2038 Change-Id: If2b7ff78293fc1bd9983399d2bc5261d2365e7f2 Signed-off-by: Sagar Kamble Reviewed-on: https://git-master.nvidia.com/r/2072380 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/Makefile | 4 ++-- drivers/gpu/nvgpu/Makefile.sources | 4 ++-- drivers/gpu/nvgpu/gm20b/hal_gm20b.c | 2 +- drivers/gpu/nvgpu/gp10b/hal_gp10b.c | 2 +- drivers/gpu/nvgpu/gv100/hal_gv100.c | 2 +- drivers/gpu/nvgpu/gv11b/hal_gv11b.c | 2 +- drivers/gpu/nvgpu/{common => hal}/falcon/falcon_gk20a.c | 3 ++- drivers/gpu/nvgpu/{common => hal}/falcon/falcon_gk20a.h | 2 ++ drivers/gpu/nvgpu/tu104/hal_tu104.c | 2 +- 9 files changed, 13 insertions(+), 10 deletions(-) rename drivers/gpu/nvgpu/{common => hal}/falcon/falcon_gk20a.c (99%) rename drivers/gpu/nvgpu/{common => hal}/falcon/falcon_gk20a.h (99%) diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile index 9bf6c0418..83fb39f50 100644 --- a/drivers/gpu/nvgpu/Makefile +++ b/drivers/gpu/nvgpu/Makefile @@ -191,7 +191,8 @@ nvgpu-y += \ hal/fuse/fuse_gp10b.o \ hal/fuse/fuse_gp106.o \ hal/fifo/engines_gm20b.o \ - hal/fifo/engines_gv11b.o + hal/fifo/engines_gv11b.o \ + hal/falcon/falcon_gk20a.o # Linux specific parts of nvgpu. nvgpu-y += \ @@ -354,7 +355,6 @@ nvgpu-y += \ common/rbtree.o \ common/vbios/bios.o \ common/falcon/falcon.o \ - common/falcon/falcon_gk20a.o \ common/falcon/falcon_sw_gk20a.o \ common/falcon/falcon_sw_gp106.o \ common/falcon/falcon_sw_gv100.o \ diff --git a/drivers/gpu/nvgpu/Makefile.sources b/drivers/gpu/nvgpu/Makefile.sources index 957a8734d..8f44f3612 100644 --- a/drivers/gpu/nvgpu/Makefile.sources +++ b/drivers/gpu/nvgpu/Makefile.sources @@ -105,7 +105,6 @@ srcs += common/sim.c \ common/ce2.c \ common/vbios/bios.c \ common/falcon/falcon.c \ - common/falcon/falcon_gk20a.c \ common/falcon/falcon_sw_gk20a.c \ common/falcon/falcon_sw_gp106.c \ common/falcon/falcon_sw_gv100.c \ @@ -357,7 +356,8 @@ srcs += common/sim.c \ hal/fuse/fuse_gp10b.c \ hal/fuse/fuse_gp106.c \ hal/fifo/engines_gm20b.c \ - hal/fifo/engines_gv11b.c + hal/fifo/engines_gv11b.c \ + hal/falcon/falcon_gk20a.c ifeq ($(NVGPU_DEBUGGER),1) srcs += common/debugger.c diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c index 02b75aa2f..9497c6555 100644 --- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c @@ -46,6 +46,7 @@ #include "hal/fuse/fuse_gm20b.h" #include "hal/fifo/engines_gm20b.h" #include "hal/gr/init/gr_init_gm20b.h" +#include "hal/falcon/falcon_gk20a.h" #include "common/ptimer/ptimer_gk20a.h" #include "common/fb/fb_gm20b.h" @@ -58,7 +59,6 @@ #include "common/perf/perf_gm20b.h" #include "common/pmu/pmu_gk20a.h" #include "common/pmu/pmu_gm20b.h" -#include "common/falcon/falcon_gk20a.h" #include "common/top/top_gm20b.h" #include "common/sync/syncpt_cmdbuf_gk20a.h" #include "common/sync/sema_cmdbuf_gk20a.h" diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c index 3bf773084..bea43f128 100644 --- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c @@ -53,6 +53,7 @@ #include "hal/fuse/fuse_gp10b.h" #include "hal/fifo/engines_gm20b.h" #include "hal/gr/init/gr_init_gm20b.h" +#include "hal/falcon/falcon_gk20a.h" #include "common/ptimer/ptimer_gk20a.h" #include "common/fb/fb_gm20b.h" @@ -72,7 +73,6 @@ #include "common/pmu/pmu_gk20a.h" #include "common/pmu/pmu_gm20b.h" #include "common/pmu/pmu_gp10b.h" -#include "common/falcon/falcon_gk20a.h" #include "common/top/top_gm20b.h" #include "common/top/top_gp10b.h" #include "common/sync/syncpt_cmdbuf_gk20a.h" diff --git a/drivers/gpu/nvgpu/gv100/hal_gv100.c b/drivers/gpu/nvgpu/gv100/hal_gv100.c index 3c471dba1..ced0c576f 100644 --- a/drivers/gpu/nvgpu/gv100/hal_gv100.c +++ b/drivers/gpu/nvgpu/gv100/hal_gv100.c @@ -40,6 +40,7 @@ #include "hal/fifo/engines_gv11b.h" #include "hal/gr/init/gr_init_gm20b.h" #include "hal/gr/hwpm_map/hwpm_map_gv100.h" +#include "hal/falcon/falcon_gk20a.h" #include "common/ptimer/ptimer_gk20a.h" #include "common/fb/fb_gm20b.h" @@ -73,7 +74,6 @@ #include "common/pmu/pmu_gp106.h" #include "common/pmu/pmu_gv11b.h" #include "common/pmu/pmu_gv100.h" -#include "common/falcon/falcon_gk20a.h" #include "common/nvdec/nvdec_gp106.h" #include "common/nvlink/init/device_reginit_gv100.h" #include "common/nvlink/intr_and_err_handling_gv100.h" diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c index 718838785..0785043e4 100644 --- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c @@ -42,6 +42,7 @@ #include "hal/fifo/engines_gv11b.h" #include "hal/gr/init/gr_init_gm20b.h" #include "hal/gr/hwpm_map/hwpm_map_gv100.h" +#include "hal/falcon/falcon_gk20a.h" #include "common/ptimer/ptimer_gk20a.h" #include "common/fb/fb_gm20b.h" @@ -68,7 +69,6 @@ #include "common/pmu/pmu_gp10b.h" #include "common/pmu/pmu_gp106.h" #include "common/pmu/pmu_gv11b.h" -#include "common/falcon/falcon_gk20a.h" #include "common/top/top_gm20b.h" #include "common/top/top_gp10b.h" #include "common/sync/syncpt_cmdbuf_gv11b.h" diff --git a/drivers/gpu/nvgpu/common/falcon/falcon_gk20a.c b/drivers/gpu/nvgpu/hal/falcon/falcon_gk20a.c similarity index 99% rename from drivers/gpu/nvgpu/common/falcon/falcon_gk20a.c rename to drivers/gpu/nvgpu/hal/falcon/falcon_gk20a.c index e5d55c9e4..8bd6d4a1f 100644 --- a/drivers/gpu/nvgpu/common/falcon/falcon_gk20a.c +++ b/drivers/gpu/nvgpu/hal/falcon/falcon_gk20a.c @@ -421,7 +421,8 @@ static void gk20a_falcon_dump_pc_trace(struct nvgpu_falcon *flcn) u32 pc = 0; u32 i = 0; - if ((gk20a_readl(g, base_addr + falcon_falcon_sctl_r()) & 0x02U) != 0U) { + if ((gk20a_readl(g, + base_addr + falcon_falcon_sctl_r()) & 0x02U) != 0U) { nvgpu_err(g, " falcon is in HS mode, PC TRACE dump not supported"); return; } diff --git a/drivers/gpu/nvgpu/common/falcon/falcon_gk20a.h b/drivers/gpu/nvgpu/hal/falcon/falcon_gk20a.h similarity index 99% rename from drivers/gpu/nvgpu/common/falcon/falcon_gk20a.h rename to drivers/gpu/nvgpu/hal/falcon/falcon_gk20a.h index 0458885ab..c3ec25a0d 100644 --- a/drivers/gpu/nvgpu/common/falcon/falcon_gk20a.h +++ b/drivers/gpu/nvgpu/hal/falcon/falcon_gk20a.h @@ -22,6 +22,8 @@ #ifndef NVGPU_FALCON_GK20A_H #define NVGPU_FALCON_GK20A_H +#include + /* Falcon Register index */ #define FALCON_REG_R0 (0U) #define FALCON_REG_R1 (1U) diff --git a/drivers/gpu/nvgpu/tu104/hal_tu104.c b/drivers/gpu/nvgpu/tu104/hal_tu104.c index 31e82583b..a9188794b 100644 --- a/drivers/gpu/nvgpu/tu104/hal_tu104.c +++ b/drivers/gpu/nvgpu/tu104/hal_tu104.c @@ -42,6 +42,7 @@ #include "hal/fifo/engines_gv11b.h" #include "hal/gr/init/gr_init_gm20b.h" #include "hal/gr/hwpm_map/hwpm_map_gv100.h" +#include "hal/falcon/falcon_gk20a.h" #include "common/ptimer/ptimer_gk20a.h" #include "common/fb/fb_gm20b.h" @@ -77,7 +78,6 @@ #include "common/pmu/pmu_gv100.h" #include "common/pmu/pmu_gv11b.h" #include "common/pmu/pmu_tu104.h" -#include "common/falcon/falcon_gk20a.h" #include "common/nvdec/nvdec_tu104.h" #include "common/top/top_gm20b.h" #include "common/top/top_gp10b.h"