nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-23 09:57:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: Move HAL gsp code to hal/gsp folder

Browse Source 
Moved GSP HAL code from gv100/gsp_gv100.* to hal/gsp/gsp_gv100.*

JIRA NVGPU-2039

Change-Id: Id85d5355dcb2b0831afd177568a9a2ba3faec664
Signed-off-by: Mahantesh Kumbar <mkumbar@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/2073675
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Mahantesh Kumbar
2019-03-15 16:40:47 +05:30
committed by mobile promotions
parent 005c9858fb
commit a299b8857f
8 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/nvgpu/Makefile
View File

@@ -218,7 +218,8 @@ nvgpu-y += \
hal/nvlink/minion_gv100.o \ hal/nvlink/minion_gv100.o \
hal/nvlink/minion_tu104.o \ hal/nvlink/minion_tu104.o \
hal/nvlink/link_mode_transitions_gv100.o \ hal/nvlink/link_mode_transitions_gv100.o \
hal/nvlink/link_mode_transitions_tu104.o hal/nvlink/link_mode_transitions_tu104.o \
hal/gsp/gsp_gv100.o
# Linux specific parts of nvgpu. # Linux specific parts of nvgpu.
nvgpu-y += \ nvgpu-y += \
@@ -485,7 +486,6 @@ nvgpu-y += \
gv100/fifo_gv100.o \ gv100/fifo_gv100.o \
gv100/gr_gv100.o \ gv100/gr_gv100.o \
gv100/hal_gv100.o \ gv100/hal_gv100.o \
gv100/gsp_gv100.o \
gv100/clk_gv100.o \ gv100/clk_gv100.o \
tu104/mm_tu104.o \ tu104/mm_tu104.o \
tu104/hal_tu104.o \ tu104/hal_tu104.o \

4
drivers/gpu/nvgpu/Makefile.sources
View File

@@ -278,7 +278,6 @@ srcs += common/sim.c \
gv100/fifo_gv100.c \ gv100/fifo_gv100.c \
gv100/gr_gv100.c \ gv100/gr_gv100.c \
gv100/hal_gv100.c \ gv100/hal_gv100.c \
gv100/gsp_gv100.c \
gv100/clk_gv100.c \ gv100/clk_gv100.c \
common/mc/mc_tu104.c \ common/mc/mc_tu104.c \
tu104/bios_tu104.c \ tu104/bios_tu104.c \
@@ -373,7 +372,8 @@ srcs += common/sim.c \
hal/nvlink/minion_gv100.c \ hal/nvlink/minion_gv100.c \
hal/nvlink/minion_tu104.c \ hal/nvlink/minion_tu104.c \
hal/nvlink/link_mode_transitions_gv100.c \ hal/nvlink/link_mode_transitions_gv100.c \
hal/nvlink/link_mode_transitions_tu104.c hal/nvlink/link_mode_transitions_tu104.c \
hal/gsp/gsp_gv100.c
ifeq ($(NVGPU_DEBUGGER),1) ifeq ($(NVGPU_DEBUGGER),1)
srcs += common/debugger.c srcs += common/debugger.c

3
drivers/gpu/nvgpu/common/acr/acr_tu104.c
View File

@@ -29,7 +29,6 @@
#include "acr_gv100.h" #include "acr_gv100.h"
#include "acr_tu104.h" #include "acr_tu104.h"
#include "gv100/gsp_gv100.h"
#include "tu104/sec2_tu104.h" #include "tu104/sec2_tu104.h"
@@ -114,7 +113,7 @@ static void nvgpu_tu104_acr_asb_sw_init(struct gk20a *g,
acr_asb->bl_dmem_desc_size = (u32)sizeof(struct flcn_bl_dmem_desc_v1); acr_asb->bl_dmem_desc_size = (u32)sizeof(struct flcn_bl_dmem_desc_v1);
acr_asb->acr_flcn = &g->gsp_flcn; acr_asb->acr_flcn = &g->gsp_flcn;
acr_asb->acr_flcn_setup_boot_config = gv100_gsp_flcn_setup_boot_config; acr_asb->acr_flcn_setup_boot_config = g->ops.gsp.falcon_setup_boot_config;
} }
void nvgpu_tu104_acr_sw_init(struct gk20a *g, struct nvgpu_acr *acr) void nvgpu_tu104_acr_sw_init(struct gk20a *g, struct nvgpu_acr *acr)

3
drivers/gpu/nvgpu/gv100/hal_gv100.c
View File

@@ -61,6 +61,7 @@
#include "hal/gr/init/gr_init_gv11b.h" #include "hal/gr/init/gr_init_gv11b.h"
#include "hal/gr/hwpm_map/hwpm_map_gv100.h" #include "hal/gr/hwpm_map/hwpm_map_gv100.h"
#include "hal/falcon/falcon_gk20a.h" #include "hal/falcon/falcon_gk20a.h"
#include "hal/gsp/gsp_gv100.h"
#include "common/ptimer/ptimer_gk20a.h" #include "common/ptimer/ptimer_gk20a.h"
#include "common/xve/xve_gp106.h" #include "common/xve/xve_gp106.h"
@@ -130,7 +131,6 @@
#include "gv100.h" #include "gv100.h"
#include "hal_gv100.h" #include "hal_gv100.h"
#include "gsp_gv100.h"
#include "gv100/bios_gv100.h" #include "gv100/bios_gv100.h"
#include "gv100/fifo_gv100.h" #include "gv100/fifo_gv100.h"
#include "gv100/gr_gv100.h" #include "gv100/gr_gv100.h"
@@ -1241,6 +1241,7 @@ static const struct gpu_ops gv100_ops = {
}, },
.gsp = { .gsp = {
.falcon_base_addr = gv100_gsp_falcon_base_addr, .falcon_base_addr = gv100_gsp_falcon_base_addr,
.falcon_setup_boot_config = gv100_gsp_flcn_setup_boot_config,
.gsp_reset = gv100_gsp_reset, .gsp_reset = gv100_gsp_reset,
}, },
.chip_init_gpu_characteristics = gv100_init_gpu_characteristics, .chip_init_gpu_characteristics = gv100_init_gpu_characteristics,

4
drivers/gpu/nvgpu/gv100/gsp_gv100.c → drivers/gpu/nvgpu/hal/gsp/gsp_gv100.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2018-2019, NVIDIA CORPORATION. All rights reserved. * Copyright (c) 2019, NVIDIA CORPORATION. All rights reserved.
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),
@@ -26,7 +26,7 @@
#include <nvgpu/gk20a.h> #include <nvgpu/gk20a.h>
#include <nvgpu/bug.h> #include <nvgpu/bug.h>
#include "gv100/gsp_gv100.h" #include "gsp_gv100.h"
#include <nvgpu/hw/gv100/hw_pgsp_gv100.h> #include <nvgpu/hw/gv100/hw_pgsp_gv100.h>

2
drivers/gpu/nvgpu/gv100/gsp_gv100.h → drivers/gpu/nvgpu/hal/gsp/gsp_gv100.h
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2018, NVIDIA CORPORATION. All rights reserved. * Copyright (c) 2019, NVIDIA CORPORATION. All rights reserved.
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),

1
drivers/gpu/nvgpu/include/nvgpu/gk20a.h
View File

@@ -1712,6 +1712,7 @@ struct gpu_ops {
} sec2; } sec2;
struct { struct {
u32 (*falcon_base_addr)(void); u32 (*falcon_base_addr)(void);
void (*falcon_setup_boot_config)(struct gk20a *g);
int (*gsp_reset)(struct gk20a *g); int (*gsp_reset)(struct gk20a *g);
} gsp; } gsp;
void (*semaphore_wakeup)(struct gk20a *g, bool post_events); void (*semaphore_wakeup)(struct gk20a *g, bool post_events);

3
drivers/gpu/nvgpu/tu104/hal_tu104.c
View File

@@ -66,6 +66,7 @@
#include "hal/gr/init/gr_init_tu104.h" #include "hal/gr/init/gr_init_tu104.h"
#include "hal/gr/hwpm_map/hwpm_map_gv100.h" #include "hal/gr/hwpm_map/hwpm_map_gv100.h"
#include "hal/falcon/falcon_gk20a.h" #include "hal/falcon/falcon_gk20a.h"
#include "hal/gsp/gsp_gv100.h"
#include "common/ptimer/ptimer_gk20a.h" #include "common/ptimer/ptimer_gk20a.h"
#include "common/xve/xve_gp106.h" #include "common/xve/xve_gp106.h"
@@ -122,7 +123,6 @@
#include "gm20b/mm_gm20b.h" #include "gm20b/mm_gm20b.h"
#include "gv100/clk_gv100.h" #include "gv100/clk_gv100.h"
#include "gv100/gsp_gv100.h"
#include "gp106/sec2_gp106.h" #include "gp106/sec2_gp106.h"
#include "gp106/bios_gp106.h" #include "gp106/bios_gp106.h"
@@ -1269,6 +1269,7 @@ static const struct gpu_ops tu104_ops = {
}, },
.gsp = { .gsp = {
.falcon_base_addr = gv100_gsp_falcon_base_addr, .falcon_base_addr = gv100_gsp_falcon_base_addr,
.falcon_setup_boot_config = gv100_gsp_flcn_setup_boot_config,
.gsp_reset = gv100_gsp_reset, .gsp_reset = gv100_gsp_reset,
}, },
.top = { .top = {