diff options
author | mpoojary <mpoojary@nvidia.com> | 2021-09-28 07:56:36 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2021-10-07 09:56:10 -0400 |
commit | 3af391e862bd580b9748b383c808d5ed63d52c1b (patch) | |
tree | c6d04f5c134cc0916cb9e369fbd5d87c45ad5dfc /drivers/gpu/nvgpu/vgpu/gp10b | |
parent | d87030e73048073d4bf1dd52a461b1efc1f04867 (diff) |
gpu: nvgpu: adds support for ACR dbg/prod.
ACR ucode is encrypted using different keys for prod/dbg boards.
This change adds a check to select ACR ucode based on board type.
Note: This support is added for t18x. In the sub-sequent CL, support
for T210 will be added and since ACR binaries are different for
gp10b and gm20b, a new ACR init function is created for gp10b to
accept new ACR prod/dbg binaries.
Bug 2672836
dev-main reference patch:
https://git-master.nvidia.com/r/c/linux-nvgpu/+/2471590
Change-Id: Ib0a01bce4f3a3187aa15a669649f8510c88dfd0a
Signed-off-by: mpoojary <mpoojary@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2601970
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Reviewed-by: Mahantesh Kumbar <mkumbar@nvidia.com>
Reviewed-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'drivers/gpu/nvgpu/vgpu/gp10b')
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c index a13b8681..3f87a629 100644 --- a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c +++ b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2015-2020, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2015-2021, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * Permission is hereby granted, free of charge, to any person obtaining a | 4 | * Permission is hereby granted, free of charge, to any person obtaining a |
5 | * copy of this software and associated documentation files (the "Software"), | 5 | * copy of this software and associated documentation files (the "Software"), |
@@ -53,6 +53,7 @@ | |||
53 | #include "gk20a/dbg_gpu_gk20a.h" | 53 | #include "gk20a/dbg_gpu_gk20a.h" |
54 | #include "gk20a/pmu_gk20a.h" | 54 | #include "gk20a/pmu_gk20a.h" |
55 | 55 | ||
56 | #include "gp10b/acr_gp10b.h" | ||
56 | #include "gp10b/mm_gp10b.h" | 57 | #include "gp10b/mm_gp10b.h" |
57 | #include "gp10b/ce_gp10b.h" | 58 | #include "gp10b/ce_gp10b.h" |
58 | #include "gp10b/pmu_gp10b.h" | 59 | #include "gp10b/pmu_gp10b.h" |
@@ -568,7 +569,7 @@ static const struct gpu_ops vgpu_gp10b_ops = { | |||
568 | .read_vin_cal_gain_offset_fuse = NULL, | 569 | .read_vin_cal_gain_offset_fuse = NULL, |
569 | }, | 570 | }, |
570 | .acr = { | 571 | .acr = { |
571 | .acr_sw_init = nvgpu_gm20b_acr_sw_init, | 572 | .acr_sw_init = nvgpu_gp10b_acr_sw_init, |
572 | }, | 573 | }, |
573 | .chip_init_gpu_characteristics = vgpu_init_gpu_characteristics, | 574 | .chip_init_gpu_characteristics = vgpu_init_gpu_characteristics, |
574 | .get_litter_value = gp10b_get_litter_value, | 575 | .get_litter_value = gp10b_get_litter_value, |