From 61c6aeec41a5378840e0ea86c4d2fa2677d0ef21 Mon Sep 17 00:00:00 2001 From: mkumbar Date: Mon, 22 Nov 2021 16:42:05 +0530 Subject: [PATCH] gpu: nvgpu: disable LSPMU for ga10b safety Bug 3456240 Change-Id: I0bb9581d2df46e5cb2dea57794ee0c918394eb66 Signed-off-by: mkumbar Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2645646 (cherry picked from commit aab86a06485c94546e11809cdeeefe9906e9b680) Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2629878 Reviewed-by: svc-mobile-coverity Reviewed-by: svc-mobile-misra Reviewed-by: svc-mobile-cert Reviewed-by: Deepak Nibade Reviewed-by: mobile promotions GVS: Gerrit_Virtual_Submit Tested-by: Shashank Singh Tested-by: mobile promotions --- drivers/gpu/nvgpu/common/acr/acr_sw_ga10b.c | 11 ----------- drivers/gpu/nvgpu/hal/pmu/pmu_ga10b.c | 5 +++++ 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/nvgpu/common/acr/acr_sw_ga10b.c b/drivers/gpu/nvgpu/common/acr/acr_sw_ga10b.c index 78b73bbb2..88d19c396 100644 --- a/drivers/gpu/nvgpu/common/acr/acr_sw_ga10b.c +++ b/drivers/gpu/nvgpu/common/acr/acr_sw_ga10b.c @@ -336,22 +336,11 @@ void nvgpu_ga10b_acr_sw_init(struct gk20a *g, struct nvgpu_acr *acr) nvgpu_log_fn(g, " "); acr->g = g; -#ifdef CONFIG_NVGPU_NON_FUSA if (nvgpu_falcon_is_falcon2_enabled(&g->gsp_flcn)) { nvgpu_set_enabled(g, NVGPU_ACR_NEXT_CORE_ENABLED, true); nvgpu_set_enabled(g, NVGPU_PKC_LS_SIG_ENABLED, true); nvgpu_acr_dbg(g, "enabling PKC and next core for GSP/n"); } -#else - if (nvgpu_falcon_is_falcon2_enabled(&g->pmu_flcn)) { - /* - * ACR will be booting on PMU engine so need changes - * in ACR unit - */ - nvgpu_set_enabled(g, NVGPU_ACR_NEXT_CORE_ENABLED, true); - nvgpu_set_enabled(g, NVGPU_PKC_LS_SIG_ENABLED, false); - } -#endif /* TODO: Make it generic for PMU/GSP */ if (nvgpu_is_enabled(g, NVGPU_ACR_NEXT_CORE_ENABLED)) { diff --git a/drivers/gpu/nvgpu/hal/pmu/pmu_ga10b.c b/drivers/gpu/nvgpu/hal/pmu/pmu_ga10b.c index 1d5ccc8ba..8a772db4d 100644 --- a/drivers/gpu/nvgpu/hal/pmu/pmu_ga10b.c +++ b/drivers/gpu/nvgpu/hal/pmu/pmu_ga10b.c @@ -36,7 +36,12 @@ bool ga10b_is_pmu_supported(struct gk20a *g) { +#ifdef CONFIG_NVGPU_LS_PMU return nvgpu_platform_is_simulation(g) ? false : true; +#else + /* set to false to disable LS PMU ucode support */ + return false; +#endif } u32 ga10b_pmu_falcon2_base_addr(void)