diff options
| author | Sandrine Bailleux <sandrine.bailleux@arm.com> | 2019-11-15 07:40:52 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2019-11-15 07:40:52 +0000 |
| commit | b27280a8eeaa1fef46fb627402512080173221fd (patch) | |
| tree | 0119b886fff651e4b2aa3b705c562efb4cb67526 /lib | |
| parent | 90199457870beb623468725d8f013c6ae2c4a912 (diff) | |
| parent | 9afe8cdc06c8e82b83d327978b937e51ade4925a (diff) | |
| download | platform_external_arm-trusted-firmware-b27280a8eeaa1fef46fb627402512080173221fd.tar.gz platform_external_arm-trusted-firmware-b27280a8eeaa1fef46fb627402512080173221fd.tar.bz2 platform_external_arm-trusted-firmware-b27280a8eeaa1fef46fb627402512080173221fd.zip | |
Merge "Coding guideline suggest not to use unsigned long" into integration
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/xlat_tables/aarch32/nonlpae_tables.c | 22 | ||||
| -rw-r--r-- | lib/xlat_tables_v2/xlat_tables_core.c | 3 |
2 files changed, 13 insertions, 12 deletions
diff --git a/lib/xlat_tables/aarch32/nonlpae_tables.c b/lib/xlat_tables/aarch32/nonlpae_tables.c index bd6b152ef..b8c268665 100644 --- a/lib/xlat_tables/aarch32/nonlpae_tables.c +++ b/lib/xlat_tables/aarch32/nonlpae_tables.c @@ -284,10 +284,10 @@ void mmap_add_region(unsigned long long base_pa, uintptr_t base_va, } /* map all memory as shared/global/domain0/no-usr access */ -static unsigned long mmap_desc(unsigned attr, unsigned long addr_pa, - unsigned int level) +static uint32_t mmap_desc(unsigned attr, unsigned int addr_pa, + unsigned int level) { - unsigned long desc; + uint32_t desc; switch (level) { case 1: @@ -380,14 +380,14 @@ static unsigned int mmap_region_attr(const mmap_region_t *mm, uintptr_t base_va, } static mmap_region_t *init_xlation_table_inner(mmap_region_t *mm, - unsigned long base_va, - unsigned long *table, + unsigned int base_va, + uint32_t *table, unsigned int level) { unsigned int level_size_shift = (level == 1) ? ONE_MB_SHIFT : FOUR_KB_SHIFT; unsigned int level_size = 1 << level_size_shift; - unsigned long level_index_mask = (level == 1) ? + unsigned int level_index_mask = (level == 1) ? (NUM_1MB_IN_4GB - 1) << ONE_MB_SHIFT : (NUM_4K_IN_1MB - 1) << FOUR_KB_SHIFT; @@ -396,7 +396,7 @@ static mmap_region_t *init_xlation_table_inner(mmap_region_t *mm, VERBOSE("init xlat table at %p (level%1d)\n", (void *)table, level); do { - unsigned long desc = MMU32B_UNSET_DESC; + uint32_t desc = MMU32B_UNSET_DESC; if (mm->base_va + mm->size <= base_va) { /* Area now after the region so skip it */ @@ -427,7 +427,7 @@ static mmap_region_t *init_xlation_table_inner(mmap_region_t *mm, } if (desc == MMU32B_UNSET_DESC) { - unsigned long xlat_table; + uintptr_t xlat_table; /* * Area not covered by a region so need finer table @@ -443,7 +443,7 @@ static mmap_region_t *init_xlation_table_inner(mmap_region_t *mm, ~(MMU32B_L1_TABLE_ALIGN - 1); desc = *table; } else { - xlat_table = (unsigned long)mmu_l2_base + + xlat_table = (uintptr_t)mmu_l2_base + next_xlat * MMU32B_L2_TABLE_SIZE; next_xlat++; assert(next_xlat <= MAX_XLAT_TABLES); @@ -456,7 +456,7 @@ static mmap_region_t *init_xlation_table_inner(mmap_region_t *mm, } /* Recurse to fill in new table */ mm = init_xlation_table_inner(mm, base_va, - (unsigned long *)xlat_table, + (uint32_t *)xlat_table, level + 1); } #if LOG_LEVEL >= LOG_LEVEL_VERBOSE @@ -480,7 +480,7 @@ void init_xlat_tables(void) memset(mmu_l1_base, 0, MMU32B_L1_TABLE_SIZE); - init_xlation_table_inner(mmap, 0, (unsigned long *)mmu_l1_base, 1); + init_xlation_table_inner(mmap, 0, (uint32_t *)mmu_l1_base, 1); VERBOSE("init xlat - max_va=%p, max_pa=%llx\n", (void *)xlat_max_va, xlat_max_pa); diff --git a/lib/xlat_tables_v2/xlat_tables_core.c b/lib/xlat_tables_v2/xlat_tables_core.c index 4f62f469f..3c0865b81 100644 --- a/lib/xlat_tables_v2/xlat_tables_core.c +++ b/lib/xlat_tables_v2/xlat_tables_core.c @@ -607,7 +607,8 @@ static uintptr_t xlat_tables_map_region(xlat_ctx_t *ctx, mmap_region_t *mm, } /* Point to new subtable from this one. */ - table_base[table_idx] = TABLE_DESC | (unsigned long)subtable; + table_base[table_idx] = + TABLE_DESC | (uintptr_t)subtable; /* Recurse to write into subtable */ end_va = xlat_tables_map_region(ctx, mm, table_idx_va, |