From 82c5ff8712f288fae29b461dd75c601a8ce3c39e Mon Sep 17 00:00:00 2001 From: Mahantesh Kumbar Date: Mon, 5 Aug 2019 15:47:33 +0530 Subject: [PATCH] gpu: nvgpu: Deleting GSP HAL's GV100 support -Deleting GV100 from GSP HAL as GV100 is not supported anymore. -Renamed all GSP related code to tu104 to deprecate GV100 GSP support JIRA NVGPU-3243 Change-Id: I2ce321ee045797133456d04871a3d7bb8a223911 Signed-off-by: Mahantesh Kumbar Reviewed-on: https://git-master.nvidia.com/r/2168245 Reviewed-by: Vijayakumar Subbu Reviewed-by: mobile promotions Tested-by: mobile promotions --- arch/nvgpu-hal-new.yaml | 4 ++-- drivers/gpu/nvgpu/Makefile | 2 +- drivers/gpu/nvgpu/Makefile.sources | 2 +- .../gpu/nvgpu/hal/gsp/{gsp_gv100.c => gsp_tu104.c} | 10 +++++----- .../gpu/nvgpu/hal/gsp/{gsp_gv100.h => gsp_tu104.h} | 12 ++++++------ drivers/gpu/nvgpu/hal/init/hal_tu104.c | 8 ++++---- 6 files changed, 19 insertions(+), 19 deletions(-) rename drivers/gpu/nvgpu/hal/gsp/{gsp_gv100.c => gsp_tu104.c} (94%) rename drivers/gpu/nvgpu/hal/gsp/{gsp_gv100.h => gsp_tu104.h} (85%) diff --git a/arch/nvgpu-hal-new.yaml b/arch/nvgpu-hal-new.yaml index f0a58ad44..0a3055fe4 100644 --- a/arch/nvgpu-hal-new.yaml +++ b/arch/nvgpu-hal-new.yaml @@ -340,8 +340,8 @@ fuse: gsp: safe: no - sources: [ hal/gsp/gsp_gv100.c, - hal/gsp/gsp_gv100.h ] + sources: [ hal/gsp/gsp_tu104.c, + hal/gsp/gsp_tu104.h ] mm: safe: yes diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile index 35c6b7dc9..2db19565c 100644 --- a/drivers/gpu/nvgpu/Makefile +++ b/drivers/gpu/nvgpu/Makefile @@ -286,7 +286,7 @@ nvgpu-y += \ hal/nvlink/minion_tu104.o \ hal/nvlink/link_mode_transitions_gv100.o \ hal/nvlink/link_mode_transitions_tu104.o \ - hal/gsp/gsp_gv100.o \ + hal/gsp/gsp_tu104.o \ hal/sec2/sec2_tu104.o \ hal/sync/sema_cmdbuf_gk20a.o \ hal/sync/sema_cmdbuf_gv11b.o \ diff --git a/drivers/gpu/nvgpu/Makefile.sources b/drivers/gpu/nvgpu/Makefile.sources index ec0f5edfb..16532a6d4 100644 --- a/drivers/gpu/nvgpu/Makefile.sources +++ b/drivers/gpu/nvgpu/Makefile.sources @@ -614,7 +614,7 @@ srcs += common/sec2/sec2.c \ hal/netlist/netlist_tu104.c \ hal/nvdec/nvdec_gp106.c \ hal/nvdec/nvdec_tu104.c \ - hal/gsp/gsp_gv100.c \ + hal/gsp/gsp_tu104.c \ hal/sec2/sec2_tu104.c \ hal/pramin/pramin_gp10b.c \ hal/pramin/pramin_gv100.c \ diff --git a/drivers/gpu/nvgpu/hal/gsp/gsp_gv100.c b/drivers/gpu/nvgpu/hal/gsp/gsp_tu104.c similarity index 94% rename from drivers/gpu/nvgpu/hal/gsp/gsp_gv100.c rename to drivers/gpu/nvgpu/hal/gsp/gsp_tu104.c index c087dbc2d..9dc3a5fe7 100644 --- a/drivers/gpu/nvgpu/hal/gsp/gsp_gv100.c +++ b/drivers/gpu/nvgpu/hal/gsp/gsp_tu104.c @@ -27,11 +27,11 @@ #include #include -#include "gsp_gv100.h" +#include "gsp_tu104.h" -#include +#include -int gv100_gsp_reset(struct gk20a *g) +int tu104_gsp_reset(struct gk20a *g) { if (g->is_fusa_sku) { return 0; @@ -46,7 +46,7 @@ int gv100_gsp_reset(struct gk20a *g) return 0; } -void gv100_gsp_flcn_setup_boot_config(struct gk20a *g) +void tu104_gsp_flcn_setup_boot_config(struct gk20a *g) { struct mm_gk20a *mm = &g->mm; u32 inst_block_ptr; @@ -102,7 +102,7 @@ void gv100_gsp_flcn_setup_boot_config(struct gk20a *g) gk20a_writel(g, pgsp_falcon_engctl_r(), data); } -u32 gv100_gsp_falcon_base_addr(void) +u32 tu104_gsp_falcon_base_addr(void) { return pgsp_falcon_irqsset_r(); } diff --git a/drivers/gpu/nvgpu/hal/gsp/gsp_gv100.h b/drivers/gpu/nvgpu/hal/gsp/gsp_tu104.h similarity index 85% rename from drivers/gpu/nvgpu/hal/gsp/gsp_gv100.h rename to drivers/gpu/nvgpu/hal/gsp/gsp_tu104.h index 0874b6d8f..018a92d93 100644 --- a/drivers/gpu/nvgpu/hal/gsp/gsp_gv100.h +++ b/drivers/gpu/nvgpu/hal/gsp/gsp_tu104.h @@ -20,11 +20,11 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef GSP_GV100_H -#define GSP_GV100_H +#ifndef GSP_TU104_H +#define GSP_TU104_H -int gv100_gsp_reset(struct gk20a *g); -void gv100_gsp_flcn_setup_boot_config(struct gk20a *g); -u32 gv100_gsp_falcon_base_addr(void); +int tu104_gsp_reset(struct gk20a *g); +void tu104_gsp_flcn_setup_boot_config(struct gk20a *g); +u32 tu104_gsp_falcon_base_addr(void); -#endif /*GSP_GV100_H */ +#endif /* GSP_TU104_H */ diff --git a/drivers/gpu/nvgpu/hal/init/hal_tu104.c b/drivers/gpu/nvgpu/hal/init/hal_tu104.c index fb25fb711..62b299a8f 100644 --- a/drivers/gpu/nvgpu/hal/init/hal_tu104.c +++ b/drivers/gpu/nvgpu/hal/init/hal_tu104.c @@ -145,7 +145,7 @@ #include "hal/pmu/pmu_tu104.h" #include "hal/falcon/falcon_gk20a.h" #include "hal/nvdec/nvdec_tu104.h" -#include "hal/gsp/gsp_gv100.h" +#include "hal/gsp/gsp_tu104.h" #include "hal/perf/perf_gv11b.h" #ifdef CONFIG_NVGPU_DGPU #include "hal/sec2/sec2_tu104.h" @@ -1423,9 +1423,9 @@ static const struct gpu_ops tu104_ops = { }, #endif .gsp = { - .falcon_base_addr = gv100_gsp_falcon_base_addr, - .falcon_setup_boot_config = gv100_gsp_flcn_setup_boot_config, - .gsp_reset = gv100_gsp_reset, + .falcon_base_addr = tu104_gsp_falcon_base_addr, + .falcon_setup_boot_config = tu104_gsp_flcn_setup_boot_config, + .gsp_reset = tu104_gsp_reset, }, .top = { .device_info_parse_enum = gm20b_device_info_parse_enum,