Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-22 20:38:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1094 from douglas-raillard-arm/dr/fix_mmap_add_dynamic_region

Browse source 
xlat: Use MAP_REGION macro as compatibility layer
This commit is contained in:
davidcunado-arm 2017-09-15 14:32:08 +01:00 • committed by GitHub
commit 756f9bb86e
2 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
include/lib/xlat_tables/xlat_tables_v2.h
View file

@ -23,7 +23,12 @@
/* Helper macro to define entries for mmap_region_t. It allows to /* Helper macro to define entries for mmap_region_t. It allows to
* re-map address mappings from 'pa' to 'va' for each region. * re-map address mappings from 'pa' to 'va' for each region.
*/ */
#define MAP_REGION(pa, va, sz, attr) {(pa), (va), (sz), (attr)} #define MAP_REGION(_pa, _va, _sz, _attr) ((mmap_region_t){ \
.base_pa = (_pa), \
.base_va = (_va), \
.size = (_sz), \
.attr = (_attr), \
})
/* /*
* Shifts and masks to access fields of an mmap_attr_t * Shifts and masks to access fields of an mmap_attr_t

14
lib/xlat_tables_v2/xlat_tables_internal.c
View file

@ -770,12 +770,7 @@ void mmap_add_region(unsigned long long base_pa,
size_t size, size_t size,
mmap_attr_t attr) mmap_attr_t attr)
{ {
mmap_region_t mm = { mmap_region_t mm = MAP_REGION(base_pa, base_va, size, attr);
.base_va = base_va,
.base_pa = base_pa,
.size = size,
.attr = attr,
};
mmap_add_region_ctx(&tf_xlat_ctx, &mm); mmap_add_region_ctx(&tf_xlat_ctx, &mm);
} }
@ -892,12 +887,7 @@ int mmap_add_dynamic_region_ctx(xlat_ctx_t *ctx, mmap_region_t *mm)
int mmap_add_dynamic_region(unsigned long long base_pa, int mmap_add_dynamic_region(unsigned long long base_pa,
uintptr_t base_va, size_t size, mmap_attr_t attr) uintptr_t base_va, size_t size, mmap_attr_t attr)
{ {
mmap_region_t mm = { mmap_region_t mm = MAP_REGION(base_pa, base_va, size, attr);
.base_va = base_va,
.base_pa = base_pa,
.size = size,
.attr = attr,
};
return mmap_add_dynamic_region_ctx(&tf_xlat_ctx, &mm); return mmap_add_dynamic_region_ctx(&tf_xlat_ctx, &mm);
} }