diff options
author | Mahantesh Kumbar <mkumbar@nvidia.com> | 2018-06-07 16:50:59 -0400 |
---|---|---|
committer | Tejal Kudav <tkudav@nvidia.com> | 2018-06-14 09:44:07 -0400 |
commit | 37160e6a77c8bdb76bf5a5021b01ffa7829f755a (patch) | |
tree | ead1a1c07fa4919692a48a1688b1bf3681e7ec3a /drivers/gpu | |
parent | ebc8b262500a55d55acca627db9db0e11760375b (diff) |
gpu: nvgpu: Include NEXT gpu fecs/gpccs sign support
Added support to get fecs/gpcss sign file
based on GPU ID for sign verification by ACR
for the NEXT gpu.
Change-Id: I8e12d74ae70c6635049dd1a2248685f1382ad2a2
Signed-off-by: Mahantesh Kumbar <mkumbar@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1742976
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Vijayakumar Subbu <vsubbu@nvidia.com>
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/nvgpu/gp106/acr_gp106.c | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gp106/acr_gp106.c b/drivers/gpu/nvgpu/gp106/acr_gp106.c index 70296757..6cb505d4 100644 --- a/drivers/gpu/nvgpu/gp106/acr_gp106.c +++ b/drivers/gpu/nvgpu/gp106/acr_gp106.c | |||
@@ -38,6 +38,9 @@ | |||
38 | #include "gv100/acr_gv100.h" | 38 | #include "gv100/acr_gv100.h" |
39 | 39 | ||
40 | #include "sec2_gp106.h" | 40 | #include "sec2_gp106.h" |
41 | #if defined(CONFIG_TEGRA_GPU_NEXT) | ||
42 | #include "nvgpu_gpuid_next.h" | ||
43 | #endif | ||
41 | 44 | ||
42 | #include <nvgpu/hw/gp106/hw_psec_gp106.h> | 45 | #include <nvgpu/hw/gp106/hw_psec_gp106.h> |
43 | #include <nvgpu/hw/gp106/hw_pwr_gp106.h> | 46 | #include <nvgpu/hw/gp106/hw_pwr_gp106.h> |
@@ -206,6 +209,18 @@ int fecs_ucode_details(struct gk20a *g, struct flcn_ucode_img_v1 *p_img) | |||
206 | GV100_FECS_UCODE_SIG, | 209 | GV100_FECS_UCODE_SIG, |
207 | NVGPU_REQUEST_FIRMWARE_NO_SOC); | 210 | NVGPU_REQUEST_FIRMWARE_NO_SOC); |
208 | break; | 211 | break; |
212 | #if defined(CONFIG_TEGRA_GPU_NEXT) | ||
213 | case NVGPU_GPUID_NEXT: | ||
214 | fecs_sig = nvgpu_request_firmware(g, | ||
215 | NVGPU_GPU_NEXT_FECS_UCODE_SIG, | ||
216 | NVGPU_REQUEST_FIRMWARE_NO_SOC); | ||
217 | break; | ||
218 | case NVGPU_GPUID_NEXT_2: | ||
219 | fecs_sig = nvgpu_request_firmware(g, | ||
220 | NVGPU_GPU_NEXT_FECS_UCODE_SIG_2, | ||
221 | NVGPU_REQUEST_FIRMWARE_NO_SOC); | ||
222 | break; | ||
223 | #endif | ||
209 | default: | 224 | default: |
210 | nvgpu_err(g, "no support for GPUID %x", ver); | 225 | nvgpu_err(g, "no support for GPUID %x", ver); |
211 | } | 226 | } |
@@ -302,6 +317,18 @@ int gpccs_ucode_details(struct gk20a *g, struct flcn_ucode_img_v1 *p_img) | |||
302 | GV100_GPCCS_UCODE_SIG, | 317 | GV100_GPCCS_UCODE_SIG, |
303 | NVGPU_REQUEST_FIRMWARE_NO_SOC); | 318 | NVGPU_REQUEST_FIRMWARE_NO_SOC); |
304 | break; | 319 | break; |
320 | #if defined(CONFIG_TEGRA_GPU_NEXT) | ||
321 | case NVGPU_GPUID_NEXT: | ||
322 | gpccs_sig = nvgpu_request_firmware(g, | ||
323 | NVGPU_GPU_NEXT_GPCCS_UCODE_SIG, | ||
324 | NVGPU_REQUEST_FIRMWARE_NO_SOC); | ||
325 | break; | ||
326 | case NVGPU_GPUID_NEXT_2: | ||
327 | gpccs_sig = nvgpu_request_firmware(g, | ||
328 | NVGPU_GPU_NEXT_GPCCS_UCODE_SIG_2, | ||
329 | NVGPU_REQUEST_FIRMWARE_NO_SOC); | ||
330 | break; | ||
331 | #endif | ||
305 | default: | 332 | default: |
306 | nvgpu_err(g, "no support for GPUID %x", ver); | 333 | nvgpu_err(g, "no support for GPUID %x", ver); |
307 | } | 334 | } |