summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a
diff options
context:
space:
mode:
authorMahantesh Kumbar <mkumbar@nvidia.com>2018-09-06 11:14:27 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2018-09-24 11:11:49 -0400
commit5d30a5cda37ca349b4d9cb7e1985c7a0849001b6 (patch)
tree89a37078480d7cec42d9a8c7bc869aae8bb28279 /drivers/gpu/nvgpu/gk20a
parent7465926ccdcdad87c22c788fe04fc11961df53ba (diff)
gpu: nvgpu: ACR code refactor
-Created struct nvgpu_acr to hold acr module related member within single struct which are currently spread across multiple structs like nvgpu_pmu, pmu_ops & gk20a. -Created struct hs_flcn_bl struct to hold ACR HS bootloader specific members -Created struct hs_acr to hold ACR ucode specific members like bootloader data using struct hs_flcn_bl, acr type & falcon info on which ACR ucode need to run. -Created acr ops under struct nvgpu_acr to perform ACR specific operation, currently ACR ops were part PMU which caused to have always dependence on PMU even though ACR was not executing on PMU. -Added acr_remove_support ops which will be called as part of gk20a_remove_support() method, earlier acr cleanup was part of pmu remove_support method. -Created define for ACR types, -Ops acr_sw_init() function helps to set ACR properties statically for chip currently in execution & assign ops to point to needed functions as per chip. -Ops acr_sw_init execute at early as nvgpu_init_mm_support calls acr function to alloc blob space. -Created ops to fill bootloader descriptor & to patch WPR info to ACR uocde based on interfaces used to bootstrap ACR ucode. -Created function gm20b_bootstrap_hs_acr() function which is now common HAL for all chips to bootstrap ACR, earlier had 3 different function for gm20b/gp10b, gv11b & for all dgpu based on interface needed. -Removed duplicate code for falcon engine wherever common falcon code can be used. -Removed ACR code dependent on PMU & made changes to use from nvgpu_acr. JIRA NVGPU-1148 Change-Id: I39951d2fc9a0bb7ee6057e0fa06da78045d47590 Signed-off-by: Mahantesh Kumbar <mkumbar@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/1813231 GVS: Gerrit_Virtual_Submit Reviewed-by: svc-misra-checker <svc-misra-checker@nvidia.com> Reviewed-by: Vijayakumar Subbu <vsubbu@nvidia.com> Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a')
-rw-r--r--drivers/gpu/nvgpu/gk20a/gk20a.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c
index 223c7727..2dfe9e58 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.c
@@ -165,6 +165,11 @@ int gk20a_finalize_poweron(struct gk20a *g)
165 goto done; 165 goto done;
166 } 166 }
167 167
168 if (g->ops.acr.acr_sw_init != NULL &&
169 nvgpu_is_enabled(g, NVGPU_SEC_PRIVSECURITY)) {
170 g->ops.acr.acr_sw_init(g, &g->acr);
171 }
172
168 if (g->ops.bios.init) { 173 if (g->ops.bios.init) {
169 err = g->ops.bios.init(g); 174 err = g->ops.bios.init(g);
170 } 175 }
@@ -273,6 +278,15 @@ int gk20a_finalize_poweron(struct gk20a *g)
273 } 278 }
274 } 279 }
275 280
281 if (g->acr.bootstrap_hs_acr != NULL &&
282 nvgpu_is_enabled(g, NVGPU_SEC_PRIVSECURITY)) {
283 err = g->acr.bootstrap_hs_acr(g, &g->acr, &g->acr.acr);
284 if (err != 0) {
285 nvgpu_err(g, "ACR bootstrap failed");
286 goto done;
287 }
288 }
289
276 if (g->ops.pmu.is_pmu_supported(g)) { 290 if (g->ops.pmu.is_pmu_supported(g)) {
277 err = nvgpu_init_pmu_support(g); 291 err = nvgpu_init_pmu_support(g);
278 if (err) { 292 if (err) {