From de3ad1a94974b08268a485136f04b8e436ef2579 Mon Sep 17 00:00:00 2001 From: Sunny He Date: Wed, 28 Jun 2017 14:16:53 -0700 Subject: gpu: nvgpu: Remove securegpccs flag from gpu_ops Replace securegpccs boolean flag in gpu_ops with entry in common flag system. The new common flag is NVGPU_SEC_SECUREGPCCS Jira NVGPU-74 Change-Id: I46430f95063f617531cf0e5aba472051b41f4a9d Signed-off-by: Sunny He Reviewed-on: https://git-master.nvidia.com/r/1514060 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Alex Waterman GVS: Gerrit_Virtual_Submit Reviewed-by: Vijayakumar Subbu --- drivers/gpu/nvgpu/gp106/acr_gp106.c | 3 ++- drivers/gpu/nvgpu/gp106/hal_gp106.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'drivers/gpu/nvgpu/gp106') diff --git a/drivers/gpu/nvgpu/gp106/acr_gp106.c b/drivers/gpu/nvgpu/gp106/acr_gp106.c index dce297bd..929036a3 100644 --- a/drivers/gpu/nvgpu/gp106/acr_gp106.c +++ b/drivers/gpu/nvgpu/gp106/acr_gp106.c @@ -21,6 +21,7 @@ #include #include #include +#include #include "gk20a/gk20a.h" #include "gk20a/pmu_gk20a.h" @@ -286,7 +287,7 @@ int gpccs_ucode_details(struct gk20a *g, struct flcn_ucode_img_v1 *p_img) struct nvgpu_firmware *gpccs_sig = NULL; int err; - if (g->ops.securegpccs == false) + if (!nvgpu_is_enabled(g, NVGPU_SEC_SECUREGPCCS)) return -ENOENT; switch (ver) { diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c index 2a661734..80117ede 100644 --- a/drivers/gpu/nvgpu/gp106/hal_gp106.c +++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c @@ -417,7 +417,7 @@ int gp106_init_hal(struct gk20a *g) gops->bios_init = gp106_ops.bios_init; gops->privsecurity = 1; - gops->securegpccs = 1; + __nvgpu_set_enabled(g, NVGPU_SEC_SECUREGPCCS, true); __nvgpu_set_enabled(g, NVGPU_PMU_PSTATE, true); g->bootstrap_owner = LSF_FALCON_ID_SEC2; -- cgit v1.2.2