refactor(lib/s2tt): move the S2TT component to its own library
Minor renames also done as part of the refactor.
Signed-off-by: Javier Almansa Sobrino <javier.almansasobrino@arm.com>
Change-Id: If414cbd2669063853aebaa5d7c0b05ec36dc3c46
diff --git a/lib/realm/tests/buffer.cpp b/lib/realm/tests/buffer.cpp
index 444c61c..74a4d7c 100644
--- a/lib/realm/tests/buffer.cpp
+++ b/lib/realm/tests/buffer.cpp
@@ -348,7 +348,7 @@
cb.buffer_unmap = test_buffer_unmap_aarch64_vmsa;
(void)test_helpers_register_cb(cb, CB_BUFFER_UNMAP);
- test_granule = realm_test_util_granule_struct_base() - 1U;
+ test_granule = test_helpers_granule_struct_base() - 1U;
slot = (enum buffer_slot)test_helpers_get_rand_in_range(
(unsigned long)(SLOT_NS + 1U),
(unsigned long)NR_CPU_SLOTS);
@@ -382,7 +382,7 @@
cb.buffer_unmap = test_buffer_unmap_aarch64_vmsa;
(void)test_helpers_register_cb(cb, CB_BUFFER_UNMAP);
- test_granule = realm_test_util_granule_struct_base() +
+ test_granule = test_helpers_granule_struct_base() +
HOST_NR_GRANULES;
slot = (enum buffer_slot)test_helpers_get_rand_in_range(
(unsigned long)(SLOT_NS + 1U),
diff --git a/lib/realm/tests/granule.cpp b/lib/realm/tests/granule.cpp
index c6b02ae..56ec940 100644
--- a/lib/realm/tests/granule.cpp
+++ b/lib/realm/tests/granule.cpp
@@ -127,7 +127,7 @@
* Clean RMM's internal struct granule array
* for a clean state for the next tests.
*/
- memset((void *)realm_test_util_granule_struct_base(), 0,
+ memset((void *)test_helpers_granule_struct_base(), 0,
sizeof(struct granule) *
test_helpers_get_nr_granules());
@@ -159,7 +159,7 @@
for (unsigned int i = 0U; i < 3; i++) {
/* Calculate the expected granule address */
- expected_granule = realm_test_util_granule_struct_base() +
+ expected_granule = test_helpers_granule_struct_base() +
granule_indexes[i];
/* Calculated the expected PA for the granule */
addr = (granule_indexes[i] * GRANULE_SIZE) +
@@ -254,7 +254,7 @@
* granules in between.
******************************************************************/
for (unsigned int i = 0U; i < 3U; i++) {
- granule = realm_test_util_granule_struct_base() +
+ granule = test_helpers_granule_struct_base() +
granule_indexes[i];
expected_address = (granule_indexes[i] * GRANULE_SIZE) +
host_util_get_granule_base();
@@ -296,7 +296,7 @@
******************************************************************/
idx += (unsigned long)test_helpers_get_rand_in_range(1UL, 10UL);
- granule = realm_test_util_granule_struct_base() + idx;
+ granule = test_helpers_granule_struct_base() + idx;
test_helpers_expect_assert_fail(true);
(void)granule_addr(granule);
test_helpers_fail_if_no_assert_failed();
@@ -313,7 +313,7 @@
* granule[0];
******************************************************************/
- granule = realm_test_util_granule_struct_base() - 1U;
+ granule = test_helpers_granule_struct_base() - 1U;
test_helpers_expect_assert_fail(true);
(void)granule_addr(granule);
test_helpers_fail_if_no_assert_failed();
@@ -331,7 +331,7 @@
* not properly aligned.
******************************************************************/
- granule = (uintptr_t)realm_test_util_granule_struct_base();
+ granule = (uintptr_t)test_helpers_granule_struct_base();
granule += test_helpers_get_rand_in_range(1UL,
sizeof(struct granule) - 1U);
test_helpers_expect_assert_fail(true);
@@ -425,7 +425,7 @@
******************************************************************/
for (unsigned int i = 0U; i < 3U; i++) {
- expected_granule = realm_test_util_granule_struct_base() +
+ expected_granule = test_helpers_granule_struct_base() +
granule_indexes[i];
address = (granule_indexes[i] * GRANULE_SIZE) +
host_util_get_granule_base();
@@ -505,8 +505,8 @@
} while (g1_index == g2_index);
/* Get the expected address for the granules */
- exp_g1 = realm_test_util_granule_struct_base() + g1_index;
- exp_g2 = realm_test_util_granule_struct_base() + g2_index;
+ exp_g1 = test_helpers_granule_struct_base() + g1_index;
+ exp_g2 = test_helpers_granule_struct_base() + g2_index;
/* Get the expected PA for the corresponding granules */
addr1 = (g1_index * GRANULE_SIZE) + host_util_get_granule_base();
diff --git a/lib/realm/tests/realm_test_utils.c b/lib/realm/tests/realm_test_utils.c
index c90ecae..ea17f69 100644
--- a/lib/realm/tests/realm_test_utils.c
+++ b/lib/realm/tests/realm_test_utils.c
@@ -48,11 +48,3 @@
return (uintptr_t)NULL;
}
-/*
- * Function to return the base pointer to granule structure.
- * This function relies on addr_to_granule().
- */
-struct granule *realm_test_util_granule_struct_base(void)
-{
- return addr_to_granule(host_util_get_granule_base());
-}
diff --git a/lib/realm/tests/realm_test_utils.h b/lib/realm/tests/realm_test_utils.h
index 1787907..9dcc56c 100644
--- a/lib/realm/tests/realm_test_utils.h
+++ b/lib/realm/tests/realm_test_utils.h
@@ -10,6 +10,5 @@
uintptr_t realm_test_util_slot_to_pa(enum buffer_slot slot);
uintptr_t realm_test_util_slot_va_from_pa(uintptr_t pa);
-struct granule *realm_test_util_granule_struct_base(void);
#endif /* REALM_TEST_UTILS_H */