diff options
| author | Alexandre Courbot <acourbot@nvidia.com> | 2015-12-11 16:28:59 +0900 |
|---|---|---|
| committer | Alexandre Courbot <acourbot@nvidia.com> | 2015-12-11 17:56:11 +0900 |
| commit | 83d8d87f68d02bd3002afc38c7e7d0dd2f3a9c38 (patch) | |
| tree | a7452b4d7612bc8127388e4e36b63644bd38e294 | |
| parent | 6a78bdc5953ac02655e2ad7fc6e3daec944b1e24 (diff) | |
| download | nouveau-83d8d87f68d02bd3002afc38c7e7d0dd2f3a9c38.tar.gz | |
sb: align resident code and data size
Otherwise ACR will complain when copying. Shouldn't that be fixed in
ACR?
| -rw-r--r-- | drm/nouveau/nvkm/core/secure_boot.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drm/nouveau/nvkm/core/secure_boot.c b/drm/nouveau/nvkm/core/secure_boot.c index 81e0d4d46..0897d2929 100644 --- a/drm/nouveau/nvkm/core/secure_boot.c +++ b/drm/nouveau/nvkm/core/secure_boot.c @@ -557,11 +557,11 @@ lsf_ucode_img_build(const struct firmware *bl, const struct firmware *code, desc->app_imem_entry = 0; desc->app_dmem_offset = 0; desc->app_resident_code_offset = 0; - desc->app_resident_code_size = code->size; + desc->app_resident_code_size = ALIGN(code->size, BL_DESC_BLK_SIZE); pos = ALIGN(pos + desc->app_resident_code_size, BL_DESC_BLK_SIZE); desc->app_resident_data_offset = pos - desc->app_start_offset; - desc->app_resident_data_size = data->size; + desc->app_resident_data_size = ALIGN(data->size, BL_DESC_BLK_SIZE); desc->image_size = ALIGN(bl_desc->size, BL_DESC_BLK_SIZE) + desc->app_size; |