From f48c4e1887d5b4c94dc9ff26891715ea29a5728a Mon Sep 17 00:00:00 2001 From: smadhavan Date: Fri, 26 Jun 2020 12:58:56 +0530 Subject: [PATCH] gpu: nvgpu: remove fmodel check in secure boot This patch removes fmodel check in functions nvgpu_acr_init, nvgpu_acr_construct_execute and nvgpu_acr_hs_bootstrap_acr since these are called based on NVGPU_SEC_PRIVSECURITY flag and are independent of platform for secure boot path. JIRA NVGPU-5323 Change-Id: I8647ecc1de80900995dae953b4645bc8d281b829 Signed-off-by: smadhavan Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2367219 Reviewed-by: automaticguardword Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: svc-mobile-coverity Reviewed-by: svc-mobile-misra Reviewed-by: svc-mobile-cert Reviewed-by: Deepak Goyal Reviewed-by: Seema Khowala Reviewed-by: Deepak Nibade Reviewed-by: mobile promotions GVS: Gerrit_Virtual_Submit Tested-by: mobile promotions --- drivers/gpu/nvgpu/common/acr/acr.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/drivers/gpu/nvgpu/common/acr/acr.c b/drivers/gpu/nvgpu/common/acr/acr.c index fb69c2759..7b8ac8abb 100644 --- a/drivers/gpu/nvgpu/common/acr/acr.c +++ b/drivers/gpu/nvgpu/common/acr/acr.c @@ -86,12 +86,6 @@ int nvgpu_acr_bootstrap_hs_acr(struct gk20a *g, struct nvgpu_acr *acr) { int err = 0; -#ifdef CONFIG_NVGPU_SIM - if (nvgpu_is_enabled(g, NVGPU_IS_FMODEL)) { - return 0; - } -#endif - if (acr == NULL) { return -EINVAL; } @@ -108,11 +102,6 @@ int nvgpu_acr_construct_execute(struct gk20a *g) { int err = 0; -#ifdef CONFIG_NVGPU_SIM - if (nvgpu_is_enabled(g, NVGPU_IS_FMODEL)) { - return 0; - } -#endif if (g->acr == NULL) { return -EINVAL; } @@ -139,12 +128,6 @@ int nvgpu_acr_init(struct gk20a *g) g->params.gpu_impl); int err = 0; -#ifdef CONFIG_NVGPU_SIM - if (nvgpu_is_enabled(g, NVGPU_IS_FMODEL)) { - goto done; - } -#endif - if (g->acr != NULL) { /* * Recovery/unrailgate case, we do not need to do ACR init as ACR is