[v5,13/18] secboot: add missing fields to BL structure

Submitted by Alexandre Courbot on Dec. 14, 2016, 8:02 a.m.

Details

Message ID 1e07b3d9c5f4dd644706544bf1d0c33a0c2d1471.1481702469.git-series.acourbot@nvidia.com
State New
Headers show
Series "Secure Boot refactoring" ( rev: 1 ) in Nouveau

Not browsing as part of any series.

Commit Message

Alexandre Courbot Dec. 14, 2016, 8:02 a.m.
Since DMEM was initialized to zero, these fields went unnoticed. Add
them for safety.

Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
---
 drm/nouveau/nvkm/subdev/secboot/acr_r352.c | 4 ++++
 1 file changed, 4 insertions(+), 0 deletions(-)

Patch hide | download patch | download mbox

diff --git a/drm/nouveau/nvkm/subdev/secboot/acr_r352.c b/drm/nouveau/nvkm/subdev/secboot/acr_r352.c
index ef8ff7f67e7a..82e325bb1431 100644
--- a/drm/nouveau/nvkm/subdev/secboot/acr_r352.c
+++ b/drm/nouveau/nvkm/subdev/secboot/acr_r352.c
@@ -86,6 +86,8 @@  struct acr_r352_flcn_bl_desc {
 	u32 code_entry_point;
 	u32 data_dma_base;
 	u32 data_size;
+	u32 code_dma_base1;
+	u32 data_dma_base1;
 };
 
 /**
@@ -107,10 +109,12 @@  acr_r352_generate_flcn_bl_desc(const struct nvkm_acr *acr,
 
 	desc->ctx_dma = FALCON_DMAIDX_UCODE;
 	desc->code_dma_base = lower_32_bits(addr_code);
+	desc->code_dma_base1 = upper_32_bits(addr_code);
 	desc->non_sec_code_off = pdesc->app_resident_code_offset;
 	desc->non_sec_code_size = pdesc->app_resident_code_size;
 	desc->code_entry_point = pdesc->app_imem_entry;
 	desc->data_dma_base = lower_32_bits(addr_data);
+	desc->data_dma_base1 = upper_32_bits(addr_data);
 	desc->data_size = pdesc->app_resident_data_size;
 }