diff options
author | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2018-08-16 16:46:06 +0100 |
---|---|---|
committer | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2018-08-22 10:26:05 +0100 |
commit | 39b6cc66d670be41d6b51b644beb675f386a4240 (patch) | |
tree | ddf5b68804ea9548ea75fe38108eeb6c790afd8c /lib/xlat_tables_v2 | |
parent | 870ce3ddd3b33c59418a7dba703e8a66ec75f98f (diff) |
libc: Use printf and snprintf across codebase
tf_printf and tf_snprintf are now called printf and snprintf, so the
code needs to be updated.
Change-Id: Iffeee97afcd6328c4c2d30830d4923b964682d71
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
Diffstat (limited to 'lib/xlat_tables_v2')
-rw-r--r-- | lib/xlat_tables_v2/xlat_tables_utils.c | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/lib/xlat_tables_v2/xlat_tables_utils.c b/lib/xlat_tables_v2/xlat_tables_utils.c index aef3c9a1..41c01aee 100644 --- a/lib/xlat_tables_v2/xlat_tables_utils.c +++ b/lib/xlat_tables_v2/xlat_tables_utils.c @@ -11,6 +11,7 @@ #include <platform_def.h> #include <stdbool.h> #include <stdint.h> +#include <stdio.h> #include <utils_def.h> #include <xlat_tables_defs.h> #include <xlat_tables_v2.h> @@ -33,16 +34,16 @@ void xlat_tables_print(__unused xlat_ctx_t *ctx) void xlat_mmap_print(const mmap_region_t *mmap) { - tf_printf("mmap:\n"); + printf("mmap:\n"); const mmap_region_t *mm = mmap; while (mm->size != 0U) { - tf_printf(" VA:0x%lx PA:0x%llx size:0x%zx attr:0x%x " - "granularity:0x%zx\n", mm->base_va, mm->base_pa, - mm->size, mm->attr, mm->granularity); + printf(" VA:0x%lx PA:0x%llx size:0x%zx attr:0x%x granularity:0x%zx\n", + mm->base_va, mm->base_pa, mm->size, mm->attr, + mm->granularity); ++mm; }; - tf_printf("\n"); + printf("\n"); } /* Print the attributes of the specified block descriptor. */ @@ -52,18 +53,18 @@ static void xlat_desc_print(const xlat_ctx_t *ctx, uint64_t desc) int xlat_regime = ctx->xlat_regime; if (mem_type_index == ATTR_IWBWA_OWBWA_NTR_INDEX) { - tf_printf("MEM"); + printf("MEM"); } else if (mem_type_index == ATTR_NON_CACHEABLE_INDEX) { - tf_printf("NC"); + printf("NC"); } else { assert(mem_type_index == ATTR_DEVICE_INDEX); - tf_printf("DEV"); + printf("DEV"); } if ((xlat_regime == EL3_REGIME) || (xlat_regime == EL2_REGIME)) { /* For EL3 and EL2 only check the AP[2] and XN bits. */ - tf_printf(((desc & LOWER_ATTRS(AP_RO)) != 0ULL) ? "-RO" : "-RW"); - tf_printf(((desc & UPPER_ATTRS(XN)) != 0ULL) ? "-XN" : "-EXEC"); + printf(((desc & LOWER_ATTRS(AP_RO)) != 0ULL) ? "-RO" : "-RW"); + printf(((desc & UPPER_ATTRS(XN)) != 0ULL) ? "-XN" : "-EXEC"); } else { assert(xlat_regime == EL1_EL0_REGIME); /* @@ -81,18 +82,18 @@ static void xlat_desc_print(const xlat_ctx_t *ctx, uint64_t desc) assert((xn_perm == xn_mask) || (xn_perm == 0ULL)); #endif - tf_printf(((desc & LOWER_ATTRS(AP_RO)) != 0ULL) ? "-RO" : "-RW"); + printf(((desc & LOWER_ATTRS(AP_RO)) != 0ULL) ? "-RO" : "-RW"); /* Only check one of PXN and UXN, the other one is the same. */ - tf_printf(((desc & UPPER_ATTRS(PXN)) != 0ULL) ? "-XN" : "-EXEC"); + printf(((desc & UPPER_ATTRS(PXN)) != 0ULL) ? "-XN" : "-EXEC"); /* * Privileged regions can only be accessed from EL1, user * regions can be accessed from EL1 and EL0. */ - tf_printf(((desc & LOWER_ATTRS(AP_ACCESS_UNPRIVILEGED)) != 0ULL) + printf(((desc & LOWER_ATTRS(AP_ACCESS_UNPRIVILEGED)) != 0ULL) ? "-USER" : "-PRIV"); } - tf_printf(((LOWER_ATTRS(NS) & desc) != 0ULL) ? "-NS" : "-S"); + printf(((LOWER_ATTRS(NS) & desc) != 0ULL) ? "-NS" : "-S"); } static const char * const level_spacers[] = { @@ -135,18 +136,18 @@ static void xlat_tables_print_internal(xlat_ctx_t *ctx, uintptr_t table_base_va, if ((desc & DESC_MASK) == INVALID_DESC) { if (invalid_row_count == 0) { - tf_printf("%sVA:0x%lx size:0x%zx\n", - level_spacers[level], - table_idx_va, level_size); + printf("%sVA:0x%lx size:0x%zx\n", + level_spacers[level], + table_idx_va, level_size); } invalid_row_count++; } else { if (invalid_row_count > 1) { - tf_printf(invalid_descriptors_ommited, - level_spacers[level], - invalid_row_count - 1); + printf(invalid_descriptors_ommited, + level_spacers[level], + invalid_row_count - 1); } invalid_row_count = 0; @@ -163,9 +164,9 @@ static void xlat_tables_print_internal(xlat_ctx_t *ctx, uintptr_t table_base_va, * but instead points to the next translation * table in the translation table walk. */ - tf_printf("%sVA:0x%lx size:0x%zx\n", - level_spacers[level], - table_idx_va, level_size); + printf("%sVA:0x%lx size:0x%zx\n", + level_spacers[level], + table_idx_va, level_size); uintptr_t addr_inner = desc & TABLE_ADDR_MASK; @@ -173,13 +174,12 @@ static void xlat_tables_print_internal(xlat_ctx_t *ctx, uintptr_t table_base_va, (uint64_t *)addr_inner, XLAT_TABLE_ENTRIES, level + 1U); } else { - tf_printf("%sVA:0x%lx PA:0x%llx size:0x%zx ", - level_spacers[level], - table_idx_va, - (uint64_t)(desc & TABLE_ADDR_MASK), - level_size); + printf("%sVA:0x%lx PA:0x%llx size:0x%zx ", + level_spacers[level], table_idx_va, + (uint64_t)(desc & TABLE_ADDR_MASK), + level_size); xlat_desc_print(ctx, desc); - tf_printf("\n"); + printf("\n"); } } @@ -188,8 +188,8 @@ static void xlat_tables_print_internal(xlat_ctx_t *ctx, uintptr_t table_base_va, } if (invalid_row_count > 1) { - tf_printf(invalid_descriptors_ommited, - level_spacers[level], invalid_row_count - 1); + printf(invalid_descriptors_ommited, + level_spacers[level], invalid_row_count - 1); } } @@ -364,7 +364,7 @@ static int xlat_get_mem_attributes_internal(const xlat_ctx_t *ctx, #if LOG_LEVEL >= LOG_LEVEL_VERBOSE VERBOSE("Attributes: "); xlat_desc_print(ctx, desc); - tf_printf("\n"); + printf("\n"); #endif /* LOG_LEVEL >= LOG_LEVEL_VERBOSE */ assert(attributes != NULL); |