diff options
author | danh-arm <dan.handley@arm.com> | 2017-06-28 13:46:46 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-28 13:46:46 +0100 |
commit | 267d4bf9467e6d5d9850286e411bdcca43d99bf0 (patch) | |
tree | 602e96d6ee222636460027bc15756e7109e8a292 /lib | |
parent | d70a7d0ce02c0b73891cc1e26fc2c568d7120b84 (diff) | |
parent | 0dd4195114c8d2b6f8be5b00c3b8011a548fe1ae (diff) |
Merge pull request #1001 from davidcunado-arm/dc/fix-signed-comparisons
Resolve signed-unsigned comparison issues
Diffstat (limited to 'lib')
-rw-r--r-- | lib/cpus/errata_report.c | 2 | ||||
-rw-r--r-- | lib/xlat_tables/xlat_tables_common.c | 14 | ||||
-rw-r--r-- | lib/xlat_tables/xlat_tables_private.h | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/lib/cpus/errata_report.c b/lib/cpus/errata_report.c index 1e1fc786..8d9f704a 100644 --- a/lib/cpus/errata_report.c +++ b/lib/cpus/errata_report.c @@ -72,7 +72,7 @@ void errata_print_msg(unsigned int status, const char *cpu, const char *id) const char *msg __unused; - assert(status >= 0 && status < ARRAY_SIZE(errata_status_str)); + assert(status < ARRAY_SIZE(errata_status_str)); assert(cpu); assert(id); diff --git a/lib/xlat_tables/xlat_tables_common.c b/lib/xlat_tables/xlat_tables_common.c index 17e7e6e0..c6fa10ee 100644 --- a/lib/xlat_tables/xlat_tables_common.c +++ b/lib/xlat_tables/xlat_tables_common.c @@ -23,9 +23,9 @@ #define LVL2_SPACER " " #define LVL3_SPACER " " #define get_level_spacer(level) \ - (((level) == 0) ? LVL0_SPACER : \ - (((level) == 1) ? LVL1_SPACER : \ - (((level) == 2) ? LVL2_SPACER : LVL3_SPACER))) + (((level) == U(0)) ? LVL0_SPACER : \ + (((level) == U(1)) ? LVL1_SPACER : \ + (((level) == U(2)) ? LVL2_SPACER : LVL3_SPACER))) #define debug_print(...) tf_printf(__VA_ARGS__) #else #define debug_print(...) ((void)0) @@ -36,7 +36,7 @@ static uint64_t xlat_tables[MAX_XLAT_TABLES][XLAT_TABLE_ENTRIES] __aligned(XLAT_TABLE_SIZE) __section("xlat_table"); -static unsigned next_xlat; +static unsigned int next_xlat; static unsigned long long xlat_max_pa; static uintptr_t xlat_max_va; @@ -178,7 +178,7 @@ void mmap_add(const mmap_region_t *mm) } static uint64_t mmap_desc(mmap_attr_t attr, unsigned long long addr_pa, - int level) + unsigned int level) { uint64_t desc; int mem_type; @@ -309,7 +309,7 @@ static int mmap_region_attr(mmap_region_t *mm, uintptr_t base_va, static mmap_region_t *init_xlation_table_inner(mmap_region_t *mm, uintptr_t base_va, uint64_t *table, - int level) + unsigned int level) { assert(level >= XLAT_TABLE_LEVEL_MIN && level <= XLAT_TABLE_LEVEL_MAX); @@ -378,7 +378,7 @@ static mmap_region_t *init_xlation_table_inner(mmap_region_t *mm, } void init_xlation_table(uintptr_t base_va, uint64_t *table, - int level, uintptr_t *max_va, + unsigned int level, uintptr_t *max_va, unsigned long long *max_pa) { execute_never_mask = xlat_arch_get_xn_desc(xlat_arch_current_el()); diff --git a/lib/xlat_tables/xlat_tables_private.h b/lib/xlat_tables/xlat_tables_private.h index 92078525..b5c3ac84 100644 --- a/lib/xlat_tables/xlat_tables_private.h +++ b/lib/xlat_tables/xlat_tables_private.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2016-2017, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -77,7 +77,7 @@ int xlat_arch_current_el(void); uint64_t xlat_arch_get_xn_desc(int el); void init_xlation_table(uintptr_t base_va, uint64_t *table, - int level, uintptr_t *max_va, + unsigned int level, uintptr_t *max_va, unsigned long long *max_pa); #endif /* __XLAT_TABLES_PRIVATE_H__ */ |