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: rename recovery capability

Browse Source 
Rename "recovery" capability to more specific "fault recovery":
- NVGPU_SUPPORT_FAULT_RECOVERY in UAPI
- NVGPU_GPU_FLAGS_SUPPORT_FAULT_RECOVERY in enabled flags.

Jira NVGPU-3896

Change-Id: I2a60601a7c73ce15e08b65f377e8a27a526d5eb2
Signed-off-by: Thomas Fleury <tfleury@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/2197427
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
Reviewed-by: svc-mobile-misra <svc-mobile-misra@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Sami Kiminki <skiminki@nvidia.com>
Reviewed-by: Vinod Gopalakrishnakurup <vinodg@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Thomas Fleury
2019-09-13 16:41:10 -04:00
committed by Alex Waterman
parent f8a2c53476
commit 62d7c5641f
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/nvgpu/common/init/nvgpu_init.c
View File

@@ -250,9 +250,9 @@ int nvgpu_finalize_poweron(struct gk20a *g)
g->power_on = true; g->power_on = true;
#ifdef CONFIG_NVGPU_RECOVERY #ifdef CONFIG_NVGPU_RECOVERY
nvgpu_set_enabled(g, NVGPU_SUPPORT_RECOVERY, true); nvgpu_set_enabled(g, NVGPU_SUPPORT_FAULT_RECOVERY, true);
#else #else
nvgpu_set_enabled(g, NVGPU_SUPPORT_RECOVERY, false); nvgpu_set_enabled(g, NVGPU_SUPPORT_FAULT_RECOVERY, false);
err = nvgpu_sw_quiesce_init_support(g); err = nvgpu_sw_quiesce_init_support(g);
if (err != 0) { if (err != 0) {
nvgpu_err(g, "failed to init sw-quiesce support"); nvgpu_err(g, "failed to init sw-quiesce support");

4
drivers/gpu/nvgpu/include/nvgpu/enabled.h
View File

@@ -207,8 +207,8 @@ struct gk20a;
/* DGPU Thermal Alert */ /* DGPU Thermal Alert */
#define NVGPU_SUPPORT_DGPU_THERMAL_ALERT 79U #define NVGPU_SUPPORT_DGPU_THERMAL_ALERT 79U
/* Recovery support */ /* Fault recovery support */
#define NVGPU_SUPPORT_RECOVERY 80U #define NVGPU_SUPPORT_FAULT_RECOVERY 80U
/* /*
* Must be greater than the largest bit offset in the above list. * Must be greater than the largest bit offset in the above list.

4
drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c
View File

@@ -245,8 +245,8 @@ static struct nvgpu_flags_mapping flags_mapping[] = {
NVGPU_DRIVER_REDUCED_PROFILE}, NVGPU_DRIVER_REDUCED_PROFILE},
{NVGPU_GPU_FLAGS_SUPPORT_SET_CTX_MMU_DEBUG_MODE, {NVGPU_GPU_FLAGS_SUPPORT_SET_CTX_MMU_DEBUG_MODE,
NVGPU_SUPPORT_SET_CTX_MMU_DEBUG_MODE}, NVGPU_SUPPORT_SET_CTX_MMU_DEBUG_MODE},
{NVGPU_GPU_FLAGS_SUPPORT_RECOVERY, {NVGPU_GPU_FLAGS_SUPPORT_FAULT_RECOVERY,
NVGPU_SUPPORT_RECOVERY} NVGPU_SUPPORT_FAULT_RECOVERY}
}; };
static u64 nvgpu_ctrl_ioctl_gpu_characteristics_flags(struct gk20a *g) static u64 nvgpu_ctrl_ioctl_gpu_characteristics_flags(struct gk20a *g)

4
include/uapi/linux/nvgpu.h
View File

@@ -170,8 +170,8 @@ struct nvgpu_gpu_zbc_query_table_args {
#define NVGPU_GPU_FLAGS_DRIVER_REDUCED_PROFILE (1ULL << 31) #define NVGPU_GPU_FLAGS_DRIVER_REDUCED_PROFILE (1ULL << 31)
/* Set MMU debug mode is available */ /* Set MMU debug mode is available */
#define NVGPU_GPU_FLAGS_SUPPORT_SET_CTX_MMU_DEBUG_MODE (1ULL << 32) #define NVGPU_GPU_FLAGS_SUPPORT_SET_CTX_MMU_DEBUG_MODE (1ULL << 32)
/* Recovery is enabled */ /* Fault recovery is enabled */
#define NVGPU_GPU_FLAGS_SUPPORT_RECOVERY (1ULL << 33) #define NVGPU_GPU_FLAGS_SUPPORT_FAULT_RECOVERY (1ULL << 33)
/* SM LRF ECC is enabled */ /* SM LRF ECC is enabled */
#define NVGPU_GPU_FLAGS_ECC_ENABLED_SM_LRF (1ULL << 60) #define NVGPU_GPU_FLAGS_ECC_ENABLED_SM_LRF (1ULL << 60)
/* SM SHM ECC is enabled */ /* SM SHM ECC is enabled */