nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-22 17:36:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: Change dependency for err inj CONFIG

Browse Source 
HSI Error injection utility on QNX is compiled only when
NV_BUILD_CONFIGURATION_IS_DEBUG or NV_BUILD_CONFIGURATION_IS_VLTEST
build options are enabled. Remove the NvGPU error injection support
dependency on CONFIG_TEGRA_HSIERRRPTINJ as it is used only on Linux.

Also, the safety build support will be moved to Mon, so enable
CONFIG_NVGPU_FSI_ERR_INJECTION only on regular build.

JIRA NVGPU-7440

Change-Id: Ibbdd0aabfa7c5a4f3aee51cdf6bdadbb814bdfeb
Signed-off-by: Tejal Kudav <tkudav@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2820579
Reviewed-by: svcacv <svcacv@nvidia.com>
Reviewed-by: Vaibhav Kachore <vkachore@nvidia.com>
Reviewed-by: Richard Zhao <rizhao@nvidia.com>
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
This commit is contained in:
Tejal Kudav
2022-12-04 15:08:30 +00:00
committed by mobile promotions
parent 204285e03f
commit 1840b95aca
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/gpu/nvgpu/Makefile.shared.configs
View File

@@ -191,16 +191,6 @@ endif
CONFIG_NVGPU_FALCON_DEBUG := 1 CONFIG_NVGPU_FALCON_DEBUG := 1
NVGPU_COMMON_CFLAGS += -DCONFIG_NVGPU_FALCON_DEBUG NVGPU_COMMON_CFLAGS += -DCONFIG_NVGPU_FALCON_DEBUG
# Enable FSI Error injection support on safety debug and regular build
# when the HSI error injection utility and NVGPU's MISC_EC support is
# enabled.
ifeq ($(CONFIG_TEGRA_HSIERRRPTINJ),1)
ifeq ($(CONFIG_NVGPU_ENABLE_MISC_EC),1)
CONFIG_NVGPU_FSI_ERR_INJECTION := 1
NVGPU_COMMON_CFLAGS += -DCONFIG_NVGPU_FSI_ERR_INJECTION
endif
endif
# #
# Flags enabled only for regular build profile. # Flags enabled only for regular build profile.
# #
@@ -211,6 +201,21 @@ CONFIG_NVGPU_SYSFS := 1
NVGPU_COMMON_CFLAGS += -DCONFIG_NVGPU_SYSFS NVGPU_COMMON_CFLAGS += -DCONFIG_NVGPU_SYSFS
endif endif
# Enable FSI Error injection support only on regular build when the
# build configuartion is VLTest. The safety build will use
# Mon process, so error injection on safety build is part of Mon
# Makefile.
# Also, enable this HSI error injection when NVGPU's MISC_EC support
# is enabled and Server support is not present.
ifeq ($(NV_BUILD_CONFIGURATION_IS_VLTEST),1)
ifeq ($(CONFIG_NVGPU_ENABLE_MISC_EC),1)
ifneq ($(NVGPU_HVRTOS),1)
CONFIG_NVGPU_FSI_ERR_INJECTION := 1
NVGPU_COMMON_CFLAGS += -DCONFIG_NVGPU_FSI_ERR_INJECTION
endif
endif
endif
# ACR feature to enable old tegra ACR profile support # ACR feature to enable old tegra ACR profile support
CONFIG_NVGPU_ACR_LEGACY := 1 CONFIG_NVGPU_ACR_LEGACY := 1
NVGPU_COMMON_CFLAGS += -DCONFIG_NVGPU_ACR_LEGACY NVGPU_COMMON_CFLAGS += -DCONFIG_NVGPU_ACR_LEGACY