drm/nouveau/secboot: add missing fields to BL structure
authorAlexandre Courbot <acourbot@nvidia.com>
Wed, 14 Dec 2016 08:02:47 +0000 (17:02 +0900)
committerBen Skeggs <bskeggs@redhat.com>
Fri, 17 Feb 2017 05:14:32 +0000 (15:14 +1000)
Since DMEM was initialized to zero, these fields went unnoticed. Add
them for safety.

Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.c

index ef8ff7f67e7adc9c4f6768653a4b7be575b59a21..82e325bb14315219ce2b035d2bccfac080ee4f64 100644 (file)
@@ -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;
 }