From 62d7c5641f4b1c792965ad4946d6f5bf32f73baa Mon Sep 17 00:00:00 2001 From: Thomas Fleury Date: Fri, 13 Sep 2019 16:41:10 -0400 Subject: [PATCH] gpu: nvgpu: rename recovery capability 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 Reviewed-on: https://git-master.nvidia.com/r/2197427 Reviewed-by: svc-mobile-coverity Reviewed-by: svc-mobile-misra GVS: Gerrit_Virtual_Submit Reviewed-by: Sami Kiminki Reviewed-by: Vinod Gopalakrishnakurup Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/common/init/nvgpu_init.c | 4 ++-- drivers/gpu/nvgpu/include/nvgpu/enabled.h | 4 ++-- drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c | 4 ++-- include/uapi/linux/nvgpu.h | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/nvgpu/common/init/nvgpu_init.c b/drivers/gpu/nvgpu/common/init/nvgpu_init.c index 23c236c89..1be136f96 100644 --- a/drivers/gpu/nvgpu/common/init/nvgpu_init.c +++ b/drivers/gpu/nvgpu/common/init/nvgpu_init.c @@ -250,9 +250,9 @@ int nvgpu_finalize_poweron(struct gk20a *g) g->power_on = true; #ifdef CONFIG_NVGPU_RECOVERY - nvgpu_set_enabled(g, NVGPU_SUPPORT_RECOVERY, true); + nvgpu_set_enabled(g, NVGPU_SUPPORT_FAULT_RECOVERY, true); #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); if (err != 0) { nvgpu_err(g, "failed to init sw-quiesce support"); diff --git a/drivers/gpu/nvgpu/include/nvgpu/enabled.h b/drivers/gpu/nvgpu/include/nvgpu/enabled.h index 220225406..87f5a5031 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/enabled.h +++ b/drivers/gpu/nvgpu/include/nvgpu/enabled.h @@ -207,8 +207,8 @@ struct gk20a; /* DGPU Thermal Alert */ #define NVGPU_SUPPORT_DGPU_THERMAL_ALERT 79U -/* Recovery support */ -#define NVGPU_SUPPORT_RECOVERY 80U +/* Fault recovery support */ +#define NVGPU_SUPPORT_FAULT_RECOVERY 80U /* * Must be greater than the largest bit offset in the above list. diff --git a/drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c b/drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c index bb531e972..a1ee2da5f 100644 --- a/drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c +++ b/drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c @@ -245,8 +245,8 @@ static struct nvgpu_flags_mapping flags_mapping[] = { NVGPU_DRIVER_REDUCED_PROFILE}, {NVGPU_GPU_FLAGS_SUPPORT_SET_CTX_MMU_DEBUG_MODE, NVGPU_SUPPORT_SET_CTX_MMU_DEBUG_MODE}, - {NVGPU_GPU_FLAGS_SUPPORT_RECOVERY, - NVGPU_SUPPORT_RECOVERY} + {NVGPU_GPU_FLAGS_SUPPORT_FAULT_RECOVERY, + NVGPU_SUPPORT_FAULT_RECOVERY} }; static u64 nvgpu_ctrl_ioctl_gpu_characteristics_flags(struct gk20a *g) diff --git a/include/uapi/linux/nvgpu.h b/include/uapi/linux/nvgpu.h index d831bd8d7..b72a9a0e7 100644 --- a/include/uapi/linux/nvgpu.h +++ b/include/uapi/linux/nvgpu.h @@ -170,8 +170,8 @@ struct nvgpu_gpu_zbc_query_table_args { #define NVGPU_GPU_FLAGS_DRIVER_REDUCED_PROFILE (1ULL << 31) /* Set MMU debug mode is available */ #define NVGPU_GPU_FLAGS_SUPPORT_SET_CTX_MMU_DEBUG_MODE (1ULL << 32) -/* Recovery is enabled */ -#define NVGPU_GPU_FLAGS_SUPPORT_RECOVERY (1ULL << 33) +/* Fault recovery is enabled */ +#define NVGPU_GPU_FLAGS_SUPPORT_FAULT_RECOVERY (1ULL << 33) /* SM LRF ECC is enabled */ #define NVGPU_GPU_FLAGS_ECC_ENABLED_SM_LRF (1ULL << 60) /* SM SHM ECC is enabled */