test(realm): remove unwanted arg from realm API
Remove unwanted arg plat_mem_pool_size
from host_create_realm_payload and
host_create_activate_realm_payload API
Change-Id: Id92d77d2ed8944c0e038cb62459247f0d17e516c
Signed-off-by: Shruti Gupta <shruti.gupta@arm.com>
diff --git a/include/runtime_services/host_realm_managment/host_realm_helper.h b/include/runtime_services/host_realm_managment/host_realm_helper.h
index 6a975b7..d7c70a9 100644
--- a/include/runtime_services/host_realm_managment/host_realm_helper.h
+++ b/include/runtime_services/host_realm_managment/host_realm_helper.h
@@ -13,7 +13,6 @@
bool host_create_realm_payload(struct realm *realm_ptr,
u_register_t realm_payload_adr,
u_register_t plat_mem_pool_adr,
- u_register_t plat_mem_pool_size,
u_register_t realm_pages_size,
u_register_t feature_flag,
const u_register_t *rec_flag,
@@ -21,7 +20,6 @@
bool host_create_activate_realm_payload(struct realm *realm_ptr,
u_register_t realm_payload_adr,
u_register_t plat_mem_pool_adr,
- u_register_t plat_mem_pool_size,
u_register_t realm_pages_size,
u_register_t feature_flag,
const u_register_t *rec_flag,
diff --git a/tftf/tests/runtime_services/host_realm_managment/host_realm_helper.c b/tftf/tests/runtime_services/host_realm_managment/host_realm_helper.c
index 17bf0aa..a424b09 100644
--- a/tftf/tests/runtime_services/host_realm_managment/host_realm_helper.c
+++ b/tftf/tests/runtime_services/host_realm_managment/host_realm_helper.c
@@ -108,7 +108,6 @@
bool host_create_realm_payload(struct realm *realm_ptr,
u_register_t realm_payload_adr,
u_register_t plat_mem_pool_adr,
- u_register_t plat_mem_pool_size,
u_register_t realm_pages_size,
u_register_t feature_flag,
const u_register_t *rec_flag,
@@ -122,10 +121,9 @@
}
if (plat_mem_pool_adr == 0UL ||
- plat_mem_pool_size == 0UL ||
realm_pages_size == 0UL) {
ERROR("plat_mem_pool_size or "
- "plat_mem_pool_size or realm_pages_size is NULL\n");
+ "realm_pages_size is NULL\n");
return false;
}
@@ -259,7 +257,6 @@
bool host_create_activate_realm_payload(struct realm *realm_ptr,
u_register_t realm_payload_adr,
u_register_t plat_mem_pool_adr,
- u_register_t plat_mem_pool_size,
u_register_t realm_pages_size,
u_register_t feature_flag,
const u_register_t *rec_flag,
@@ -271,7 +268,6 @@
ret = host_create_realm_payload(realm_ptr,
realm_payload_adr,
plat_mem_pool_adr,
- plat_mem_pool_size,
realm_pages_size,
feature_flag,
rec_flag,
diff --git a/tftf/tests/runtime_services/realm_payload/host_realm_payload_multiple_rec_tests.c b/tftf/tests/runtime_services/realm_payload/host_realm_payload_multiple_rec_tests.c
index 321e85d..b840beb 100644
--- a/tftf/tests/runtime_services/realm_payload/host_realm_payload_multiple_rec_tests.c
+++ b/tftf/tests/runtime_services/realm_payload/host_realm_payload_multiple_rec_tests.c
@@ -36,8 +36,6 @@
if (!host_create_activate_realm_payload(&realm, (u_register_t)REALM_IMAGE_BASE,
(u_register_t)PAGE_POOL_BASE,
- (u_register_t)(PAGE_POOL_MAX_SIZE +
- NS_REALM_SHARED_MEM_SIZE),
(u_register_t)PAGE_POOL_MAX_SIZE,
0UL, rec_flag, MAX_REC_COUNT)) {
return TEST_RESULT_FAIL;
@@ -94,8 +92,6 @@
if (!host_create_activate_realm_payload(&realm, (u_register_t)REALM_IMAGE_BASE,
(u_register_t)PAGE_POOL_BASE,
- (u_register_t)(PAGE_POOL_MAX_SIZE +
- NS_REALM_SHARED_MEM_SIZE),
(u_register_t)PAGE_POOL_MAX_SIZE,
0UL, rec_flag, 3U)) {
return TEST_RESULT_FAIL;
@@ -237,8 +233,6 @@
if (!host_create_activate_realm_payload(&realm, (u_register_t)REALM_IMAGE_BASE,
(u_register_t)PAGE_POOL_BASE,
- (u_register_t)(PAGE_POOL_MAX_SIZE +
- NS_REALM_SHARED_MEM_SIZE),
(u_register_t)PAGE_POOL_MAX_SIZE,
0UL, rec_flag, rec_count)) {
return TEST_RESULT_FAIL;
diff --git a/tftf/tests/runtime_services/realm_payload/host_realm_payload_simd_tests.c b/tftf/tests/runtime_services/realm_payload/host_realm_payload_simd_tests.c
index 97b10d5..c190985 100644
--- a/tftf/tests/runtime_services/realm_payload/host_realm_payload_simd_tests.c
+++ b/tftf/tests/runtime_services/realm_payload/host_realm_payload_simd_tests.c
@@ -102,8 +102,6 @@
if (!host_create_activate_realm_payload(&realm,
(u_register_t)REALM_IMAGE_BASE,
(u_register_t)PAGE_POOL_BASE,
- (u_register_t)(PAGE_POOL_MAX_SIZE +
- NS_REALM_SHARED_MEM_SIZE),
(u_register_t)PAGE_POOL_MAX_SIZE,
feature_flag, rec_flag, 1U)) {
return TEST_RESULT_FAIL;
diff --git a/tftf/tests/runtime_services/realm_payload/host_realm_payload_tests.c b/tftf/tests/runtime_services/realm_payload/host_realm_payload_tests.c
index 01de09b..56afafa 100644
--- a/tftf/tests/runtime_services/realm_payload/host_realm_payload_tests.c
+++ b/tftf/tests/runtime_services/realm_payload/host_realm_payload_tests.c
@@ -38,8 +38,6 @@
for (unsigned int i = 0U; i < 5U; i++) {
if (!host_create_activate_realm_payload(&realm, (u_register_t)REALM_IMAGE_BASE,
(u_register_t)PAGE_POOL_BASE,
- (u_register_t)(PAGE_POOL_MAX_SIZE +
- NS_REALM_SHARED_MEM_SIZE),
(u_register_t)PAGE_POOL_MAX_SIZE,
0UL, rec_flag, 1U)) {
return TEST_RESULT_FAIL;
@@ -76,8 +74,6 @@
if (!host_create_activate_realm_payload(&realm, (u_register_t)REALM_IMAGE_BASE,
(u_register_t)PAGE_POOL_BASE,
- (u_register_t)(PAGE_POOL_MAX_SIZE +
- NS_REALM_SHARED_MEM_SIZE),
(u_register_t)PAGE_POOL_MAX_SIZE,
0UL, rec_flag, 1U)) {
return TEST_RESULT_FAIL;
@@ -116,8 +112,6 @@
pauth_test_lib_fill_regs_and_template();
if (!host_create_activate_realm_payload(&realm, (u_register_t)REALM_IMAGE_BASE,
(u_register_t)PAGE_POOL_BASE,
- (u_register_t)(PAGE_POOL_MAX_SIZE +
- NS_REALM_SHARED_MEM_SIZE),
(u_register_t)PAGE_POOL_MAX_SIZE,
0UL, rec_flag, 1U)) {
return TEST_RESULT_FAIL;
@@ -170,8 +164,6 @@
SKIP_TEST_IF_RME_NOT_SUPPORTED_OR_RMM_IS_TRP();
if (!host_create_activate_realm_payload(&realm, (u_register_t)REALM_IMAGE_BASE,
(u_register_t)PAGE_POOL_BASE,
- (u_register_t)(PAGE_POOL_MAX_SIZE +
- NS_REALM_SHARED_MEM_SIZE),
(u_register_t)PAGE_POOL_MAX_SIZE,
0UL, rec_flag, 1U)) {
return TEST_RESULT_FAIL;
@@ -268,8 +260,6 @@
if (!host_create_activate_realm_payload(&realm, (u_register_t)REALM_IMAGE_BASE,
(u_register_t)PAGE_POOL_BASE,
- (u_register_t)(PAGE_POOL_MAX_SIZE +
- NS_REALM_SHARED_MEM_SIZE),
(u_register_t)PAGE_POOL_MAX_SIZE,
feature_flag, rec_flag, 1U)) {
return TEST_RESULT_FAIL;
@@ -373,8 +363,6 @@
if (!host_create_activate_realm_payload(&realm1, (u_register_t)REALM_IMAGE_BASE,
(u_register_t)PAGE_POOL_BASE,
- (u_register_t)(PAGE_POOL_MAX_SIZE +
- NS_REALM_SHARED_MEM_SIZE),
(u_register_t)PAGE_POOL_MAX_SIZE,
0UL, rec_flag, 1U)) {
return TEST_RESULT_FAIL;
@@ -383,8 +371,6 @@
if (!host_create_activate_realm_payload(&realm2, (u_register_t)REALM_IMAGE_BASE,
(u_register_t)PAGE_POOL_BASE + PAGE_POOL_MAX_SIZE,
- (u_register_t)(PAGE_POOL_MAX_SIZE +
- NS_REALM_SHARED_MEM_SIZE),
(u_register_t)PAGE_POOL_MAX_SIZE,
0UL, rec_flag, 1U)) {
ret2 = host_destroy_realm(&realm1);
diff --git a/tftf/tests/runtime_services/realm_payload/host_realm_spm.c b/tftf/tests/runtime_services/realm_payload/host_realm_spm.c
index ccf90d4..51b87e7 100644
--- a/tftf/tests/runtime_services/realm_payload/host_realm_spm.c
+++ b/tftf/tests/runtime_services/realm_payload/host_realm_spm.c
@@ -58,8 +58,6 @@
*/
if (!host_create_activate_realm_payload(&realm, (u_register_t)REALM_IMAGE_BASE,
(u_register_t)PAGE_POOL_BASE,
- (u_register_t)(PAGE_POOL_MAX_SIZE +
- NS_REALM_SHARED_MEM_SIZE),
(u_register_t)PAGE_POOL_MAX_SIZE, 0UL, rec_flag, 1U)) {
return TEST_RESULT_FAIL;
}