From 2dbf961365822e38ac6b7266388fcfa503f6e52f Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Fri, 6 Apr 2018 14:16:10 -0700 Subject: [PATCH] gpu: nvgpu: Move bus HAL to common Move implementation of bus HAL to common/bus. Change-Id: Ia89350f9d94f3ccfd5500a340e6a677cd7d4cfaa Signed-off-by: Terje Bergstrom Reviewed-on: https://git-master.nvidia.com/r/1726337 GVS: Gerrit_Virtual_Submit Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/Makefile | 12 ++++++++---- drivers/gpu/nvgpu/Makefile.sources | 6 +++--- drivers/gpu/nvgpu/common/{ => bus}/bus.c | 0 drivers/gpu/nvgpu/{gk20a => common/bus}/bus_gk20a.c | 2 +- drivers/gpu/nvgpu/{gk20a => common/bus}/bus_gk20a.h | 0 drivers/gpu/nvgpu/{gm20b => common/bus}/bus_gm20b.c | 5 +++-- drivers/gpu/nvgpu/{gm20b => common/bus}/bus_gm20b.h | 0 drivers/gpu/nvgpu/gk20a/gk20a.c | 2 +- drivers/gpu/nvgpu/gk20a/mm_gk20a.c | 2 +- drivers/gpu/nvgpu/gm20b/hal_gm20b.c | 4 ++-- drivers/gpu/nvgpu/gp106/hal_gp106.c | 3 ++- drivers/gpu/nvgpu/gp10b/hal_gp10b.c | 3 ++- drivers/gpu/nvgpu/gv100/hal_gv100.c | 3 ++- drivers/gpu/nvgpu/gv11b/hal_gv11b.c | 3 ++- drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c | 3 ++- drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c | 3 ++- 16 files changed, 31 insertions(+), 20 deletions(-) rename drivers/gpu/nvgpu/common/{ => bus}/bus.c (100%) rename drivers/gpu/nvgpu/{gk20a => common/bus}/bus_gk20a.c (99%) rename drivers/gpu/nvgpu/{gk20a => common/bus}/bus_gk20a.h (100%) rename drivers/gpu/nvgpu/{gm20b => common/bus}/bus_gm20b.c (98%) rename drivers/gpu/nvgpu/{gm20b => common/bus}/bus_gm20b.h (100%) diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile index e180ad1d2..0aacc1e65 100644 --- a/drivers/gpu/nvgpu/Makefile +++ b/drivers/gpu/nvgpu/Makefile @@ -21,7 +21,14 @@ ccflags-y += -D__NVGPU_PREVENT_UNTRUSTED_SPECULATION obj-$(CONFIG_GK20A) := nvgpu.o -nvgpu-y := \ +# OS independent parts of nvgpu. The work to collect files here +# is in progress. + +nvgpu-y += common/bus/bus.o \ + common/bus/bus_gk20a.o \ + common/bus/bus_gm20b.o + +nvgpu-y += \ common/linux/kmem.o \ common/linux/timers.o \ common/linux/ioctl.o \ @@ -65,7 +72,6 @@ nvgpu-y := \ common/mm/nvgpu_mem.o \ common/mm/comptags.o \ common/mm/mm.o \ - common/bus.o \ common/enabled.o \ common/nvlink.o \ common/pramin.o \ @@ -87,7 +93,6 @@ nvgpu-y := \ common/clock_gating/gv100_gating_reglist.o \ common/clock_gating/gv11b_gating_reglist.o \ gk20a/gk20a.o \ - gk20a/bus_gk20a.o \ gk20a/pramin_gk20a.o \ gk20a/ce2_gk20a.o \ gk20a/fifo_gk20a.o \ @@ -110,7 +115,6 @@ nvgpu-y := \ gk20a/fecs_trace_gk20a.o \ gk20a/mc_gk20a.o \ gm20b/hal_gm20b.o \ - gm20b/bus_gm20b.o \ gm20b/ltc_gm20b.o \ gm20b/gr_gm20b.o \ gm20b/clk_gm20b.o \ diff --git a/drivers/gpu/nvgpu/Makefile.sources b/drivers/gpu/nvgpu/Makefile.sources index 06f10c208..ad788f499 100644 --- a/drivers/gpu/nvgpu/Makefile.sources +++ b/drivers/gpu/nvgpu/Makefile.sources @@ -32,7 +32,7 @@ srcs := common/mm/nvgpu_allocator.c \ common/mm/nvgpu_mem.c \ common/mm/comptags.c \ common/mm/mm.c \ - common/bus.c \ + common/bus/bus.c \ common/enabled.c \ common/pramin.c \ common/semaphore.c \ @@ -108,7 +108,7 @@ srcs := common/mm/nvgpu_allocator.c \ lpwr/lpwr.c \ lpwr/rppg.c \ gk20a/gk20a.c \ - gk20a/bus_gk20a.c \ + common/bus/bus_gk20a.c \ gk20a/pramin_gk20a.c \ gk20a/ce2_gk20a.c \ gk20a/fifo_gk20a.c \ @@ -130,7 +130,7 @@ srcs := common/mm/nvgpu_allocator.c \ gk20a/tsg_gk20a.c \ gk20a/mc_gk20a.c \ gm20b/hal_gm20b.c \ - gm20b/bus_gm20b.c \ + common/bus/bus_gm20b.c \ gm20b/ltc_gm20b.c \ gm20b/gr_gm20b.c \ gm20b/clk_gm20b.c \ diff --git a/drivers/gpu/nvgpu/common/bus.c b/drivers/gpu/nvgpu/common/bus/bus.c similarity index 100% rename from drivers/gpu/nvgpu/common/bus.c rename to drivers/gpu/nvgpu/common/bus/bus.c diff --git a/drivers/gpu/nvgpu/gk20a/bus_gk20a.c b/drivers/gpu/nvgpu/common/bus/bus_gk20a.c similarity index 99% rename from drivers/gpu/nvgpu/gk20a/bus_gk20a.c rename to drivers/gpu/nvgpu/common/bus/bus_gk20a.c index ab75e8d7c..010f8a7f3 100644 --- a/drivers/gpu/nvgpu/gk20a/bus_gk20a.c +++ b/drivers/gpu/nvgpu/common/bus/bus_gk20a.c @@ -27,7 +27,7 @@ #include #include -#include "gk20a.h" +#include "gk20a/gk20a.h" #include "bus_gk20a.h" #include diff --git a/drivers/gpu/nvgpu/gk20a/bus_gk20a.h b/drivers/gpu/nvgpu/common/bus/bus_gk20a.h similarity index 100% rename from drivers/gpu/nvgpu/gk20a/bus_gk20a.h rename to drivers/gpu/nvgpu/common/bus/bus_gk20a.h diff --git a/drivers/gpu/nvgpu/gm20b/bus_gm20b.c b/drivers/gpu/nvgpu/common/bus/bus_gm20b.c similarity index 98% rename from drivers/gpu/nvgpu/gm20b/bus_gm20b.c rename to drivers/gpu/nvgpu/common/bus/bus_gm20b.c index ca2a40bf2..3e27053a9 100644 --- a/drivers/gpu/nvgpu/gm20b/bus_gm20b.c +++ b/drivers/gpu/nvgpu/common/bus/bus_gm20b.c @@ -27,9 +27,10 @@ #include #include -#include "bus_gm20b.h" #include "gk20a/gk20a.h" -#include "gk20a/bus_gk20a.h" + +#include "bus_gk20a.h" +#include "bus_gm20b.h" #include diff --git a/drivers/gpu/nvgpu/gm20b/bus_gm20b.h b/drivers/gpu/nvgpu/common/bus/bus_gm20b.h similarity index 100% rename from drivers/gpu/nvgpu/gm20b/bus_gm20b.h rename to drivers/gpu/nvgpu/common/bus/bus_gm20b.h diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c index 9c95dc849..c48d7cf8e 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gk20a.c @@ -44,7 +44,7 @@ #include "dbg_gpu_gk20a.h" #include "mc_gk20a.h" #include "hal.h" -#include "bus_gk20a.h" +#include "common/bus/bus_gk20a.h" #include "pstate/pstate.h" void __nvgpu_check_gpu_state(struct gk20a *g) diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c index dfdcc3a4b..9429fe2ec 100644 --- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c @@ -44,7 +44,7 @@ #include "gk20a.h" #include "mm_gk20a.h" #include "fence_gk20a.h" -#include "bus_gk20a.h" +#include "common/bus/bus_gk20a.h" #include #include diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c index f96c576ba..ccceab038 100644 --- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c @@ -23,6 +23,8 @@ */ #include "common/clock_gating/gm20b_gating_reglist.h" +#include "common/bus/bus_gm20b.h" +#include "common/bus/bus_gk20a.h" #include "gk20a/gk20a.h" #include "gk20a/ce2_gk20a.h" @@ -33,7 +35,6 @@ #include "gk20a/mm_gk20a.h" #include "gk20a/css_gr_gk20a.h" #include "gk20a/mc_gk20a.h" -#include "gk20a/bus_gk20a.h" #include "gk20a/flcn_gk20a.h" #include "gk20a/priv_ring_gk20a.h" #include "gk20a/regops_gk20a.h" @@ -52,7 +53,6 @@ #include "clk_gm20b.h" #include "regops_gm20b.h" #include "therm_gm20b.h" -#include "bus_gm20b.h" #include "hal_gm20b.h" #include "acr_gm20b.h" #include "fuse_gm20b.h" diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c index 7a8a8e16b..3ac1d79be 100644 --- a/drivers/gpu/nvgpu/gp106/hal_gp106.c +++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c @@ -22,13 +22,14 @@ * DEALINGS IN THE SOFTWARE. */ +#include "common/bus/bus_gk20a.h" + #include "gk20a/gk20a.h" #include "gk20a/fifo_gk20a.h" #include "gk20a/fecs_trace_gk20a.h" #include "gk20a/mm_gk20a.h" #include "gk20a/dbg_gpu_gk20a.h" #include "gk20a/css_gr_gk20a.h" -#include "gk20a/bus_gk20a.h" #include "gk20a/pramin_gk20a.h" #include "gk20a/flcn_gk20a.h" #include "gk20a/regops_gk20a.h" diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c index 6d7d32ac1..a6ddc27fc 100644 --- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c @@ -22,13 +22,14 @@ * DEALINGS IN THE SOFTWARE. */ +#include "common/bus/bus_gk20a.h" + #include "gk20a/gk20a.h" #include "gk20a/fifo_gk20a.h" #include "gk20a/fecs_trace_gk20a.h" #include "gk20a/mm_gk20a.h" #include "gk20a/dbg_gpu_gk20a.h" #include "gk20a/css_gr_gk20a.h" -#include "gk20a/bus_gk20a.h" #include "gk20a/pramin_gk20a.h" #include "gk20a/flcn_gk20a.h" #include "gk20a/regops_gk20a.h" diff --git a/drivers/gpu/nvgpu/gv100/hal_gv100.c b/drivers/gpu/nvgpu/gv100/hal_gv100.c index 23a3d78fa..a3ad70512 100644 --- a/drivers/gpu/nvgpu/gv100/hal_gv100.c +++ b/drivers/gpu/nvgpu/gv100/hal_gv100.c @@ -22,13 +22,14 @@ * DEALINGS IN THE SOFTWARE. */ +#include "common/bus/bus_gk20a.h" + #include "gk20a/gk20a.h" #include "gk20a/fifo_gk20a.h" #include "gk20a/fecs_trace_gk20a.h" #include "gk20a/css_gr_gk20a.h" #include "gk20a/mc_gk20a.h" #include "gk20a/dbg_gpu_gk20a.h" -#include "gk20a/bus_gk20a.h" #include "gk20a/pramin_gk20a.h" #include "gk20a/flcn_gk20a.h" #include "gk20a/regops_gk20a.h" diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c index 5a5aed8ea..a47b3ce69 100644 --- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c @@ -22,6 +22,8 @@ * DEALINGS IN THE SOFTWARE. */ +#include "common/bus/bus_gk20a.h" + #include "gk20a/gk20a.h" #include "gk20a/fifo_gk20a.h" #include "gk20a/fecs_trace_gk20a.h" @@ -29,7 +31,6 @@ #include "gk20a/mc_gk20a.h" #include "gk20a/mm_gk20a.h" #include "gk20a/dbg_gpu_gk20a.h" -#include "gk20a/bus_gk20a.h" #include "gk20a/flcn_gk20a.h" #include "gk20a/regops_gk20a.h" #include "gk20a/fb_gk20a.h" diff --git a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c index 43bf6766f..1ed576f98 100644 --- a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c +++ b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c @@ -20,6 +20,8 @@ * DEALINGS IN THE SOFTWARE. */ +#include "common/bus/bus_gk20a.h" + #include "vgpu/fifo_vgpu.h" #include "vgpu/gr_vgpu.h" #include "vgpu/ltc_vgpu.h" @@ -34,7 +36,6 @@ #include "vgpu_mm_gp10b.h" #include "vgpu_fuse_gp10b.h" -#include "gk20a/bus_gk20a.h" #include "gk20a/pramin_gk20a.h" #include "gk20a/flcn_gk20a.h" #include "gk20a/mc_gk20a.h" diff --git a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c index b7bb23a7f..3a4af601c 100644 --- a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c +++ b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c @@ -20,6 +20,8 @@ * DEALINGS IN THE SOFTWARE. */ +#include "common/bus/bus_gk20a.h" + #include #include #include @@ -38,7 +40,6 @@ #include #include -#include #include #include "gk20a/dbg_gpu_gk20a.h"