diff options
author | Mahantesh Kumbar <mkumbar@nvidia.com> | 2018-09-06 11:14:27 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-09-24 11:11:49 -0400 |
commit | 5d30a5cda37ca349b4d9cb7e1985c7a0849001b6 (patch) | |
tree | 89a37078480d7cec42d9a8c7bc869aae8bb28279 /drivers/gpu/nvgpu/gp10b | |
parent | 7465926ccdcdad87c22c788fe04fc11961df53ba (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/gp10b')
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/hal_gp10b.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c index d8a430fa..759d271e 100644 --- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c | |||
@@ -723,6 +723,9 @@ static const struct gpu_ops gp10b_ops = { | |||
723 | .read_vin_cal_slope_intercept_fuse = NULL, | 723 | .read_vin_cal_slope_intercept_fuse = NULL, |
724 | .read_vin_cal_gain_offset_fuse = NULL, | 724 | .read_vin_cal_gain_offset_fuse = NULL, |
725 | }, | 725 | }, |
726 | .acr = { | ||
727 | .acr_sw_init = nvgpu_gm20b_acr_sw_init, | ||
728 | }, | ||
726 | .chip_init_gpu_characteristics = gp10b_init_gpu_characteristics, | 729 | .chip_init_gpu_characteristics = gp10b_init_gpu_characteristics, |
727 | .get_litter_value = gp10b_get_litter_value, | 730 | .get_litter_value = gp10b_get_litter_value, |
728 | }; | 731 | }; |
@@ -761,6 +764,7 @@ int gp10b_init_hal(struct gk20a *g) | |||
761 | gops->priv_ring = gp10b_ops.priv_ring; | 764 | gops->priv_ring = gp10b_ops.priv_ring; |
762 | 765 | ||
763 | gops->fuse = gp10b_ops.fuse; | 766 | gops->fuse = gp10b_ops.fuse; |
767 | gops->acr = gp10b_ops.acr; | ||
764 | 768 | ||
765 | /* Lone Functions */ | 769 | /* Lone Functions */ |
766 | gops->chip_init_gpu_characteristics = | 770 | gops->chip_init_gpu_characteristics = |
@@ -812,7 +816,6 @@ int gp10b_init_hal(struct gk20a *g) | |||
812 | 816 | ||
813 | __nvgpu_set_enabled(g, NVGPU_PMU_FECS_BOOTSTRAP_DONE, false); | 817 | __nvgpu_set_enabled(g, NVGPU_PMU_FECS_BOOTSTRAP_DONE, false); |
814 | g->pmu_lsf_pmu_wpr_init_done = 0; | 818 | g->pmu_lsf_pmu_wpr_init_done = 0; |
815 | g->bootstrap_owner = LSF_BOOTSTRAP_OWNER_DEFAULT; | ||
816 | 819 | ||
817 | g->name = "gp10b"; | 820 | g->name = "gp10b"; |
818 | 821 | ||