chore(lib/arch): rename PA range defines
This patch renames the PARange defines various PA sizes
from Arch defined bit patterns to user readable size based
name.
Change-Id: I17dc23ea24707ae8cf1499d498bd90946e37daff
Signed-off-by: Soby Mathew <soby.mathew@arm.com>
diff --git a/lib/xlat/tests/xlat_tests_base_g2.cpp b/lib/xlat/tests/xlat_tests_base_g2.cpp
index 26e569f..1beb2f9 100644
--- a/lib/xlat/tests/xlat_tests_base_g2.cpp
+++ b/lib/xlat/tests/xlat_tests_base_g2.cpp
@@ -1748,10 +1748,14 @@
uint64_t tte, val_tte;
uint64_t *tbl_ptr;
int base_lvl, end_lvl;
- unsigned int pa_range_bits_arr[] = {
- PARANGE_0000_WIDTH, PARANGE_0001_WIDTH, PARANGE_0010_WIDTH,
- PARANGE_0011_WIDTH, PARANGE_0100_WIDTH, PARANGE_0101_WIDTH,
- PARANGE_0110_WIDTH
+ const unsigned int pa_range_bits_arr[] = {
+ [0x0] = PARANGE_WIDTH_32BITS,
+ [0x1] = PARANGE_WIDTH_36BITS,
+ [0x2] = PARANGE_WIDTH_40BITS,
+ [0x3] = PARANGE_WIDTH_42BITS,
+ [0x4] = PARANGE_WIDTH_44BITS,
+ [0x5] = PARANGE_WIDTH_48BITS,
+ [0x6] = PARANGE_WIDTH_52BITS
};
unsigned int parange_index =
(unsigned int)test_helpers_get_rand_in_range(0UL,
@@ -2143,10 +2147,14 @@
struct xlat_mmap_region init_mmap[2U];
unsigned int pa_index, max_pa_index;
bool lpa2 = is_feat_lpa2_4k_present();
- unsigned int pa_range_bits_arr[] = {
- PARANGE_0000_WIDTH, PARANGE_0001_WIDTH, PARANGE_0010_WIDTH,
- PARANGE_0011_WIDTH, PARANGE_0100_WIDTH, PARANGE_0101_WIDTH,
- PARANGE_0110_WIDTH
+ const unsigned int pa_range_bits_arr[] = {
+ [0x0] = PARANGE_WIDTH_32BITS,
+ [0x1] = PARANGE_WIDTH_36BITS,
+ [0x2] = PARANGE_WIDTH_40BITS,
+ [0x3] = PARANGE_WIDTH_42BITS,
+ [0x4] = PARANGE_WIDTH_44BITS,
+ [0x5] = PARANGE_WIDTH_48BITS,
+ [0x6] = PARANGE_WIDTH_52BITS
};
uint64_t max_va_size = XLAT_TEST_MAX_VA_SIZE();
struct xlat_mmu_cfg mmu_config;