From a307b6eb77999c12ba80b406bcc809179dafcbca Mon Sep 17 00:00:00 2001 From: Tejal Kudav Date: Tue, 18 Dec 2018 17:09:03 +0530 Subject: [PATCH] gpu: nvgpu: Move nvlink HAL files to common/nvlink Move the nvlink HAL code to unit specific directory as part of nvgpu restructing. This move is done after removing usage of other unit's hardware headers from nvlink. Also confirmed that no other unit files are including nvlink hardware headers. JIRA NVGPU-966 Change-Id: I301e3f8de37c5792a3e1e799b97e5fdfc131f058 Signed-off-by: Tejal Kudav Reviewed-on: https://git-master.nvidia.com/r/1975259 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/Makefile | 6 +++--- drivers/gpu/nvgpu/Makefile.sources | 4 ++-- drivers/gpu/nvgpu/common/{ => nvlink}/nvlink.c | 2 +- drivers/gpu/nvgpu/{gv100 => common/nvlink}/nvlink_gv100.c | 0 drivers/gpu/nvgpu/{gv100 => common/nvlink}/nvlink_gv100.h | 0 drivers/gpu/nvgpu/{tu104 => common/nvlink}/nvlink_tu104.c | 2 +- drivers/gpu/nvgpu/{tu104 => common/nvlink}/nvlink_tu104.h | 0 drivers/gpu/nvgpu/gv100/hal_gv100.c | 3 ++- drivers/gpu/nvgpu/tu104/hal_tu104.c | 4 ++-- 9 files changed, 11 insertions(+), 10 deletions(-) rename drivers/gpu/nvgpu/common/{ => nvlink}/nvlink.c (99%) rename drivers/gpu/nvgpu/{gv100 => common/nvlink}/nvlink_gv100.c (100%) rename drivers/gpu/nvgpu/{gv100 => common/nvlink}/nvlink_gv100.h (100%) rename drivers/gpu/nvgpu/{tu104 => common/nvlink}/nvlink_tu104.c (99%) rename drivers/gpu/nvgpu/{tu104 => common/nvlink}/nvlink_tu104.h (100%) diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile index 5115f22d8..e20be65e8 100644 --- a/drivers/gpu/nvgpu/Makefile +++ b/drivers/gpu/nvgpu/Makefile @@ -233,7 +233,6 @@ nvgpu-y += \ common/mm/dma.o \ common/enabled.o \ common/string.o \ - common/nvlink.o \ common/pramin.o \ common/semaphore.o \ common/as.o \ @@ -281,6 +280,9 @@ nvgpu-y += \ common/ecc.o \ common/ce2.o \ common/debugger.o \ + common/nvlink/nvlink.o \ + common/nvlink/nvlink_gv100.o \ + common/nvlink/nvlink_tu104.o \ gk20a/ce2_gk20a.o \ gk20a/fifo_gk20a.o \ gk20a/regops_gk20a.o \ @@ -355,7 +357,6 @@ nvgpu-y += \ gv100/fifo_gv100.o \ gv100/gr_gv100.o \ gv100/regops_gv100.o \ - gv100/nvlink_gv100.o \ gv100/hal_gv100.o \ gv100/gsp_gv100.o \ gv100/clk_gv100.o \ @@ -364,7 +365,6 @@ nvgpu-y += \ tu104/gr_tu104.o \ tu104/func_tu104.o \ tu104/bios_tu104.o \ - tu104/nvlink_tu104.o \ tu104/fbpa_tu104.o \ tu104/sec2_tu104.o \ tu104/ecc_tu104.o \ diff --git a/drivers/gpu/nvgpu/Makefile.sources b/drivers/gpu/nvgpu/Makefile.sources index 859d3dc7a..763c480ee 100644 --- a/drivers/gpu/nvgpu/Makefile.sources +++ b/drivers/gpu/nvgpu/Makefile.sources @@ -232,7 +232,8 @@ srcs := os/posix/nvgpu.c \ gv100/fifo_gv100.c \ gv100/gr_gv100.c \ gv100/regops_gv100.c \ - gv100/nvlink_gv100.c \ + common/nvlink/nvlink_gv100.c \ + common/nvlink/nvlink_tu104.c \ gv100/hal_gv100.c \ gv100/gsp_gv100.c \ gv100/clk_gv100.c \ @@ -246,7 +247,6 @@ srcs := os/posix/nvgpu.c \ tu104/fifo_tu104.c \ tu104/gr_tu104.c \ tu104/hal_tu104.c \ - tu104/nvlink_tu104.c \ tu104/sec2_tu104.c \ tu104/func_tu104.c \ tu104/regops_tu104.c diff --git a/drivers/gpu/nvgpu/common/nvlink.c b/drivers/gpu/nvgpu/common/nvlink/nvlink.c similarity index 99% rename from drivers/gpu/nvgpu/common/nvlink.c rename to drivers/gpu/nvgpu/common/nvlink/nvlink.c index 023d7d2bd..429766ca8 100644 --- a/drivers/gpu/nvgpu/common/nvlink.c +++ b/drivers/gpu/nvgpu/common/nvlink/nvlink.c @@ -558,7 +558,7 @@ int nvgpu_nvlink_remove(struct gk20a *g) return -ENODEV; ndev = g->nvlink.priv; - if(!ndev) + if (!ndev) return -ENODEV; __nvgpu_set_enabled(g, NVGPU_SUPPORT_NVLINK, false); diff --git a/drivers/gpu/nvgpu/gv100/nvlink_gv100.c b/drivers/gpu/nvgpu/common/nvlink/nvlink_gv100.c similarity index 100% rename from drivers/gpu/nvgpu/gv100/nvlink_gv100.c rename to drivers/gpu/nvgpu/common/nvlink/nvlink_gv100.c diff --git a/drivers/gpu/nvgpu/gv100/nvlink_gv100.h b/drivers/gpu/nvgpu/common/nvlink/nvlink_gv100.h similarity index 100% rename from drivers/gpu/nvgpu/gv100/nvlink_gv100.h rename to drivers/gpu/nvgpu/common/nvlink/nvlink_gv100.h diff --git a/drivers/gpu/nvgpu/tu104/nvlink_tu104.c b/drivers/gpu/nvgpu/common/nvlink/nvlink_tu104.c similarity index 99% rename from drivers/gpu/nvgpu/tu104/nvlink_tu104.c rename to drivers/gpu/nvgpu/common/nvlink/nvlink_tu104.c index 8bd248701..7694821e8 100644 --- a/drivers/gpu/nvgpu/tu104/nvlink_tu104.c +++ b/drivers/gpu/nvgpu/common/nvlink/nvlink_tu104.c @@ -31,7 +31,7 @@ #include #include -#include "gv100/nvlink_gv100.h" +#include "nvlink_gv100.h" #include "nvlink_tu104.h" #include diff --git a/drivers/gpu/nvgpu/tu104/nvlink_tu104.h b/drivers/gpu/nvgpu/common/nvlink/nvlink_tu104.h similarity index 100% rename from drivers/gpu/nvgpu/tu104/nvlink_tu104.h rename to drivers/gpu/nvgpu/common/nvlink/nvlink_tu104.h diff --git a/drivers/gpu/nvgpu/gv100/hal_gv100.c b/drivers/gpu/nvgpu/gv100/hal_gv100.c index f84b5805b..f76f059e2 100644 --- a/drivers/gpu/nvgpu/gv100/hal_gv100.c +++ b/drivers/gpu/nvgpu/gv100/hal_gv100.c @@ -69,6 +69,8 @@ #include "common/falcon/falcon_gp106.h" #include "common/falcon/falcon_gv100.h" #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 "gk20a/fifo_gk20a.h" @@ -107,7 +109,6 @@ #include "gv100/fifo_gv100.h" #include "gv100/gr_gv100.h" #include "gv100/mm_gv100.h" -#include "gv100/nvlink_gv100.h" #include "gv100/regops_gv100.h" #include "gv100/clk_gv100.h" diff --git a/drivers/gpu/nvgpu/tu104/hal_tu104.c b/drivers/gpu/nvgpu/tu104/hal_tu104.c index 5ed65f321..1acaf4e58 100644 --- a/drivers/gpu/nvgpu/tu104/hal_tu104.c +++ b/drivers/gpu/nvgpu/tu104/hal_tu104.c @@ -75,6 +75,8 @@ #include "common/nvdec/nvdec_tu104.h" #include "common/top/top_gm20b.h" #include "common/top/top_gp10b.h" +#include "common/nvlink/nvlink_gv100.h" +#include "common/nvlink/nvlink_tu104.h" #include "gk20a/fifo_gk20a.h" #include "gk20a/fecs_trace_gk20a.h" @@ -113,7 +115,6 @@ #include "gv100/fifo_gv100.h" #include "gv100/gr_gv100.h" #include "gv100/mm_gv100.h" -#include "gv100/nvlink_gv100.h" #include "gv100/regops_gv100.h" #include "tu104/fifo_tu104.h" @@ -121,7 +122,6 @@ #include "tu104/bios_tu104.h" #include "tu104/fbpa_tu104.h" #include "tu104/sec2_tu104.h" -#include "tu104/nvlink_tu104.h" #include "tu104/ecc_tu104.h" #include "tu104/hal_tu104.h" #include "tu104/regops_tu104.h"