From f0640b9d10296514f3af760c6732d47fd596ea7b Mon Sep 17 00:00:00 2001 From: Philip Elcan Date: Tue, 16 Apr 2019 09:51:20 -0400 Subject: [PATCH] gpu: nvgpu: create nvgpu.common.hal.init unit Move hal init from chip-specific paths to hal/init. Update makefiles and include paths to match. JIRA NVGPU-2023 Change-Id: I810c817bb0ba83dcf5ed4d05df502e85c2fd77df Signed-off-by: Philip Elcan Reviewed-on: https://git-master.nvidia.com/r/2098915 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/Makefile | 12 ++++++------ drivers/gpu/nvgpu/Makefile.sources | 12 ++++++------ drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_hal_gp10b.c | 2 +- drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_hal_gv11b.c | 2 +- drivers/gpu/nvgpu/{gm20b => hal/init}/hal_gm20b.c | 6 +++--- drivers/gpu/nvgpu/{gm20b => hal/init}/hal_gm20b.h | 0 drivers/gpu/nvgpu/{gp10b => hal/init}/hal_gp10b.c | 0 drivers/gpu/nvgpu/{gp10b => hal/init}/hal_gp10b.h | 0 drivers/gpu/nvgpu/{gv100 => hal/init}/hal_gv100.c | 2 +- drivers/gpu/nvgpu/{gv100 => hal/init}/hal_gv100.h | 0 drivers/gpu/nvgpu/{gv11b => hal/init}/hal_gv11b.c | 2 +- drivers/gpu/nvgpu/{gv11b => hal/init}/hal_gv11b.h | 0 drivers/gpu/nvgpu/{common => hal}/init/hal_init.c | 12 ++++++------ drivers/gpu/nvgpu/{tu104 => hal/init}/hal_tu104.c | 4 ++-- drivers/gpu/nvgpu/{tu104 => hal/init}/hal_tu104.h | 0 drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c | 1 - 16 files changed, 27 insertions(+), 28 deletions(-) rename drivers/gpu/nvgpu/{gm20b => hal/init}/hal_gm20b.c (99%) rename drivers/gpu/nvgpu/{gm20b => hal/init}/hal_gm20b.h (100%) rename drivers/gpu/nvgpu/{gp10b => hal/init}/hal_gp10b.c (100%) rename drivers/gpu/nvgpu/{gp10b => hal/init}/hal_gp10b.h (100%) rename drivers/gpu/nvgpu/{gv100 => hal/init}/hal_gv100.c (99%) rename drivers/gpu/nvgpu/{gv100 => hal/init}/hal_gv100.h (100%) rename drivers/gpu/nvgpu/{gv11b => hal/init}/hal_gv11b.c (99%) rename drivers/gpu/nvgpu/{gv11b => hal/init}/hal_gv11b.h (100%) rename drivers/gpu/nvgpu/{common => hal}/init/hal_init.c (92%) rename drivers/gpu/nvgpu/{tu104 => hal/init}/hal_tu104.c (99%) rename drivers/gpu/nvgpu/{tu104 => hal/init}/hal_tu104.h (100%) diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile index bdc50ab1b..cc57a4548 100644 --- a/drivers/gpu/nvgpu/Makefile +++ b/drivers/gpu/nvgpu/Makefile @@ -190,6 +190,12 @@ nvgpu-y += \ hal/gr/zbc/zbc_gm20b.o \ hal/gr/zbc/zbc_gp10b.o \ hal/gr/zbc/zbc_gv11b.o \ + hal/init/hal_gm20b.o \ + hal/init/hal_gp10b.o \ + hal/init/hal_gv100.o \ + hal/init/hal_gv11b.o \ + hal/init/hal_tu104.o \ + hal/init/hal_init.o \ hal/perf/perf_gm20b.o \ hal/perf/perf_gv11b.o \ hal/priv_ring/priv_ring_gm20b.o \ @@ -462,7 +468,6 @@ nvgpu-y += \ common/engine_queues/engine_dmem_queue.o \ common/engine_queues/engine_emem_queue.o \ common/engine_queues/engine_fb_queue.o \ - common/init/hal_init.o \ common/sec2/sec2.o \ common/sec2/sec2_allocator.o \ common/sec2/sec2_lsfm.o \ @@ -499,7 +504,6 @@ nvgpu-y += \ gk20a/fifo_gk20a.o \ gk20a/gr_gk20a.o \ gk20a/mm_gk20a.o \ - gm20b/hal_gm20b.o \ gm20b/gr_gm20b.o \ gm20b/clk_gm20b.o \ gm20b/mm_gm20b.o @@ -549,9 +553,7 @@ nvgpu-y += \ gp10b/gr_gp10b.o \ gp10b/ce_gp10b.o \ gp10b/mm_gp10b.o \ - gp10b/hal_gp10b.o \ gp106/bios_gp106.o \ - gv11b/hal_gv11b.o \ gv11b/gr_gv11b.o \ gv11b/fifo_gv11b.o \ gv11b/mm_gv11b.o \ @@ -560,10 +562,8 @@ nvgpu-y += \ gv100/bios_gv100.o \ gv100/fifo_gv100.o \ gv100/gr_gv100.o \ - gv100/hal_gv100.o \ gv100/clk_gv100.o \ tu104/mm_tu104.o \ - tu104/hal_tu104.o \ tu104/fifo_tu104.o \ tu104/gr_tu104.o \ tu104/func_tu104.o \ diff --git a/drivers/gpu/nvgpu/Makefile.sources b/drivers/gpu/nvgpu/Makefile.sources index 732ebd758..4e34c48b4 100644 --- a/drivers/gpu/nvgpu/Makefile.sources +++ b/drivers/gpu/nvgpu/Makefile.sources @@ -77,7 +77,6 @@ srcs += common/sim.c \ common/mm/mm.c \ common/mm/dma.c \ common/mm/vidmem.c \ - common/init/hal_init.c \ common/xve/xve_gp106.c \ common/therm/therm.c \ common/perf/perfbuf.c \ @@ -244,15 +243,12 @@ srcs += common/sim.c \ gk20a/fifo_gk20a.c \ gk20a/gr_gk20a.c \ gk20a/mm_gk20a.c \ - gm20b/hal_gm20b.c \ gm20b/gr_gm20b.c \ gm20b/clk_gm20b.c \ gm20b/mm_gm20b.c \ gp10b/gr_gp10b.c \ gp10b/ce_gp10b.c \ gp10b/mm_gp10b.c \ - gp10b/hal_gp10b.c \ - gv11b/hal_gv11b.c \ gv11b/gr_gv11b.c \ gv11b/fifo_gv11b.c \ gv11b/mm_gv11b.c \ @@ -262,14 +258,12 @@ srcs += common/sim.c \ gv100/bios_gv100.c \ gv100/fifo_gv100.c \ gv100/gr_gv100.c \ - gv100/hal_gv100.c \ gv100/clk_gv100.c \ tu104/bios_tu104.c \ tu104/fbpa_tu104.c \ tu104/fifo_tu104.c \ tu104/gr_tu104.c \ tu104/mm_tu104.c \ - tu104/hal_tu104.c \ tu104/func_tu104.c \ hal/mm/cache/flush_gk20a.c \ hal/mm/cache/flush_gv11b.c \ @@ -314,6 +308,12 @@ srcs += common/sim.c \ hal/gr/zbc/zbc_gm20b.c \ hal/gr/zbc/zbc_gp10b.c \ hal/gr/zbc/zbc_gv11b.c \ + hal/init/hal_gm20b.c \ + hal/init/hal_gp10b.c \ + hal/init/hal_gv100.c \ + hal/init/hal_gv11b.c \ + hal/init/hal_tu104.c \ + hal/init/hal_init.c \ hal/perf/perf_gm20b.c \ hal/perf/perf_gv11b.c \ hal/priv_ring/priv_ring_gm20b.c \ diff --git a/drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_hal_gp10b.c b/drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_hal_gp10b.c index d26dc9a11..67fd92bb9 100644 --- a/drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_hal_gp10b.c +++ b/drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_hal_gp10b.c @@ -59,6 +59,7 @@ #include "hal/gr/ctxsw_prog/ctxsw_prog_gp10b.h" #include "hal/netlist/netlist_gp10b.h" #include "hal/perf/perf_gm20b.h" +#include "hal/init/hal_gp10b.h" #include "common/fifo/channel_gm20b.h" #include "common/clk_arb/clk_arb_gp10b.h" @@ -79,7 +80,6 @@ #include "common/vgpu/ptimer/ptimer_vgpu.h" #include "common/vgpu/init/init_vgpu.h" #include "vgpu_hal_gp10b.h" -#include "gp10b/hal_gp10b.h" #include "common/sync/syncpt_cmdbuf_gk20a.h" #include "common/sync/sema_cmdbuf_gk20a.h" diff --git a/drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_hal_gv11b.c b/drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_hal_gv11b.c index ac99b9d8b..9dcf762c7 100644 --- a/drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_hal_gv11b.c +++ b/drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_hal_gv11b.c @@ -62,6 +62,7 @@ #include "hal/gr/ctxsw_prog/ctxsw_prog_gv11b.h" #include "hal/perf/perf_gv11b.h" #include "hal/netlist/netlist_gv11b.h" +#include "hal/init/hal_gv11b.h" #include "common/sync/syncpt_cmdbuf_gv11b.h" #include "common/sync/sema_cmdbuf_gv11b.h" @@ -69,7 +70,6 @@ #include "common/clk_arb/clk_arb_gp10b.h" #include -#include #include #include diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/hal/init/hal_gm20b.c similarity index 99% rename from drivers/gpu/nvgpu/gm20b/hal_gm20b.c rename to drivers/gpu/nvgpu/hal/init/hal_gm20b.c index 436465ebe..527dde171 100644 --- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c +++ b/drivers/gpu/nvgpu/hal/init/hal_gm20b.c @@ -101,9 +101,9 @@ #include "gk20a/mm_gk20a.h" #include "gk20a/gr_gk20a.h" -#include "gr_gm20b.h" -#include "mm_gm20b.h" -#include "clk_gm20b.h" +#include "gm20b/gr_gm20b.h" +#include "gm20b/mm_gm20b.h" +#include "gm20b/clk_gm20b.h" #include "hal_gm20b.h" #include diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.h b/drivers/gpu/nvgpu/hal/init/hal_gm20b.h similarity index 100% rename from drivers/gpu/nvgpu/gm20b/hal_gm20b.h rename to drivers/gpu/nvgpu/hal/init/hal_gm20b.h diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/hal/init/hal_gp10b.c similarity index 100% rename from drivers/gpu/nvgpu/gp10b/hal_gp10b.c rename to drivers/gpu/nvgpu/hal/init/hal_gp10b.c diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.h b/drivers/gpu/nvgpu/hal/init/hal_gp10b.h similarity index 100% rename from drivers/gpu/nvgpu/gp10b/hal_gp10b.h rename to drivers/gpu/nvgpu/hal/init/hal_gp10b.h diff --git a/drivers/gpu/nvgpu/gv100/hal_gv100.c b/drivers/gpu/nvgpu/hal/init/hal_gv100.c similarity index 99% rename from drivers/gpu/nvgpu/gv100/hal_gv100.c rename to drivers/gpu/nvgpu/hal/init/hal_gv100.c index 7660c6458..a1b1c333a 100644 --- a/drivers/gpu/nvgpu/gv100/hal_gv100.c +++ b/drivers/gpu/nvgpu/hal/init/hal_gv100.c @@ -144,7 +144,7 @@ #include "gp10b/ce_gp10b.h" #include "gp10b/mm_gp10b.h" -#include "gv11b/hal_gv11b.h" +#include "hal_gv11b.h" #include "gv11b/gr_gv11b.h" #include "gv11b/ce_gv11b.h" #include "gv11b/mm_gv11b.h" diff --git a/drivers/gpu/nvgpu/gv100/hal_gv100.h b/drivers/gpu/nvgpu/hal/init/hal_gv100.h similarity index 100% rename from drivers/gpu/nvgpu/gv100/hal_gv100.h rename to drivers/gpu/nvgpu/hal/init/hal_gv100.h diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/hal/init/hal_gv11b.c similarity index 99% rename from drivers/gpu/nvgpu/gv11b/hal_gv11b.c rename to drivers/gpu/nvgpu/hal/init/hal_gv11b.c index 5196a7e6b..aec584e76 100644 --- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c +++ b/drivers/gpu/nvgpu/hal/init/hal_gv11b.c @@ -137,7 +137,7 @@ #include "gv100/gr_gv100.h" -#include "gv11b/hal_gv11b.h" +#include "hal_gv11b.h" #include "gv11b/gr_gv11b.h" #include "gv11b/ce_gv11b.h" #include "gv11b/mm_gv11b.h" diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.h b/drivers/gpu/nvgpu/hal/init/hal_gv11b.h similarity index 100% rename from drivers/gpu/nvgpu/gv11b/hal_gv11b.h rename to drivers/gpu/nvgpu/hal/init/hal_gv11b.h diff --git a/drivers/gpu/nvgpu/common/init/hal_init.c b/drivers/gpu/nvgpu/hal/init/hal_init.c similarity index 92% rename from drivers/gpu/nvgpu/common/init/hal_init.c rename to drivers/gpu/nvgpu/hal/init/hal_init.c index b963ba70b..ab1692907 100644 --- a/drivers/gpu/nvgpu/common/init/hal_init.c +++ b/drivers/gpu/nvgpu/hal/init/hal_init.c @@ -1,7 +1,7 @@ /* * NVIDIA GPU HAL interface. * - * Copyright (c) 2014-2018, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2014-2019, NVIDIA CORPORATION. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -28,11 +28,11 @@ #include #include -#include "gm20b/hal_gm20b.h" -#include "gp10b/hal_gp10b.h" -#include "gv100/hal_gv100.h" -#include "gv11b/hal_gv11b.h" -#include "tu104/hal_tu104.h" +#include "hal_gm20b.h" +#include "hal_gp10b.h" +#include "hal_gv100.h" +#include "hal_gv11b.h" +#include "hal_tu104.h" int nvgpu_init_hal(struct gk20a *g) { diff --git a/drivers/gpu/nvgpu/tu104/hal_tu104.c b/drivers/gpu/nvgpu/hal/init/hal_tu104.c similarity index 99% rename from drivers/gpu/nvgpu/tu104/hal_tu104.c rename to drivers/gpu/nvgpu/hal/init/hal_tu104.c index c3844a29c..73d106125 100644 --- a/drivers/gpu/nvgpu/tu104/hal_tu104.c +++ b/drivers/gpu/nvgpu/hal/init/hal_tu104.c @@ -158,7 +158,7 @@ #include "gp10b/ce_gp10b.h" #include "gp10b/mm_gp10b.h" -#include "gv11b/hal_gv11b.h" +#include "hal_gv11b.h" #include "gv11b/gr_gv11b.h" #include "gv11b/ce_gv11b.h" #include "gv11b/mm_gv11b.h" @@ -173,7 +173,7 @@ #include "tu104/gr_tu104.h" #include "tu104/bios_tu104.h" #include "tu104/fbpa_tu104.h" -#include "tu104/hal_tu104.h" +#include "hal_tu104.h" #include #include diff --git a/drivers/gpu/nvgpu/tu104/hal_tu104.h b/drivers/gpu/nvgpu/hal/init/hal_tu104.h similarity index 100% rename from drivers/gpu/nvgpu/tu104/hal_tu104.h rename to drivers/gpu/nvgpu/hal/init/hal_tu104.h diff --git a/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c b/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c index b7a98232f..11db7df76 100644 --- a/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c +++ b/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c @@ -44,7 +44,6 @@ #include "common/vgpu/ivc/comm_vgpu.h" #include "common/vgpu/intr/intr_vgpu.h" #include "common/vgpu/init/init_vgpu.h" -#include "gm20b/hal_gm20b.h" #include "os/linux/module.h" #include "os/linux/os_linux.h"