style(memory share): helper function renamed
To the helper function 'ffa_memory_region_init' appended the suffix
'_single_receiver' to distinguish between current function, and incoming
function for multiple endpoint memory share.
Change-Id: I6228c9edde19c7b80769598a72cf784ed0eeef0c
Signed-off-by: J-Alves <joao.alves@arm.com>
diff --git a/inc/vmapi/hf/ffa.h b/inc/vmapi/hf/ffa.h
index 50b0e6c..32e1df2 100644
--- a/inc/vmapi/hf/ffa.h
+++ b/inc/vmapi/hf/ffa.h
@@ -952,7 +952,7 @@
desc->tx_offset);
}
-uint32_t ffa_memory_region_init(
+uint32_t ffa_memory_region_init_single_receiver(
struct ffa_memory_region *memory_region, size_t memory_region_max_size,
ffa_vm_id_t sender, ffa_vm_id_t receiver,
const struct ffa_memory_region_constituent constituents[],
diff --git a/test/vmapi/arch/aarch64/trusty/trusty.c b/test/vmapi/arch/aarch64/trusty/trusty.c
index 2478b43..7b171f1 100644
--- a/test/vmapi/arch/aarch64/trusty/trusty.c
+++ b/test/vmapi/arch/aarch64/trusty/trusty.c
@@ -32,7 +32,7 @@
struct ffa_value ret;
ffa_memory_handle_t handle;
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE, HF_PRIMARY_VM_ID,
HF_TEE_VM_ID, constituents, constituents_count, 0, 0,
FFA_DATA_ACCESS_RW,
@@ -99,7 +99,7 @@
/* Dirty the memory before sharing it. */
memset_s(pages, sizeof(pages), 'b', PAGE_SIZE * 2);
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE, HF_PRIMARY_VM_ID,
HF_TEE_VM_ID, constituents, ARRAY_SIZE(constituents),
0, 0, FFA_DATA_ACCESS_RW,
@@ -220,7 +220,7 @@
constituent->reserved = 0;
}
- remaining_constituent_count = ffa_memory_region_init(
+ remaining_constituent_count = ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE, HF_PRIMARY_VM_ID, HF_TEE_VM_ID,
constituents_reclaim_reshare_fragmented,
ARRAY_SIZE(constituents_reclaim_reshare_fragmented), 0, 0,
@@ -263,7 +263,7 @@
EXPECT_EQ(ret.func, FFA_SUCCESS_32);
/* Share it again. */
- remaining_constituent_count = ffa_memory_region_init(
+ remaining_constituent_count = ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE, HF_PRIMARY_VM_ID, HF_TEE_VM_ID,
constituents_reclaim_reshare_fragmented,
ARRAY_SIZE(constituents_reclaim_reshare_fragmented), 0, 0,
diff --git a/test/vmapi/common/ffa.c b/test/vmapi/common/ffa.c
index e840b2f..5622ee9 100644
--- a/test/vmapi/common/ffa.c
+++ b/test/vmapi/common/ffa.c
@@ -61,7 +61,7 @@
uint32_t sent_length;
/* Send the first fragment of the memory. */
- remaining_constituent_count = ffa_memory_region_init(
+ remaining_constituent_count = ffa_memory_region_init_single_receiver(
tx_buffer, HF_MAILBOX_SIZE, sender, recipient, constituents,
constituent_count, 0, send_flags, send_data_access,
send_instruction_access,
@@ -161,7 +161,7 @@
ffa_memory_handle_t handle;
/* Send everything except the last constituent in the first fragment. */
- remaining_constituent_count = ffa_memory_region_init(
+ remaining_constituent_count = ffa_memory_region_init_single_receiver(
tx_buffer, HF_MAILBOX_SIZE, sender, recipient, constituents,
constituent_count, 0, flags, send_data_access,
send_instruction_access,
diff --git a/test/vmapi/el0_partitions/memory_sharing.c b/test/vmapi/el0_partitions/memory_sharing.c
index 3a67cc5..65775fc 100644
--- a/test/vmapi/el0_partitions/memory_sharing.c
+++ b/test/vmapi/el0_partitions/memory_sharing.c
@@ -70,7 +70,7 @@
++m) {
uint32_t msg_size;
EXPECT_EQ(
- ffa_memory_region_init(
+ ffa_memory_region_init_single_receiver(
mb.send,
HF_MAILBOX_SIZE,
HF_PRIMARY_VM_ID,
@@ -103,7 +103,7 @@
++m) {
uint32_t msg_size;
EXPECT_EQ(
- ffa_memory_region_init(
+ ffa_memory_region_init_single_receiver(
mb.send,
HF_MAILBOX_SIZE,
HF_PRIMARY_VM_ID,
@@ -184,7 +184,7 @@
if (vms[i] == avoid_vm) {
continue;
}
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE, HF_PRIMARY_VM_ID,
vms[i], constituents, constituent_count, 0, 0,
FFA_DATA_ACCESS_NOT_SPECIFIED,
@@ -266,7 +266,7 @@
};
uint32_t msg_size;
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE, HF_PRIMARY_VM_ID,
SERVICE_VM1, constituents, ARRAY_SIZE(constituents),
0, 0, FFA_DATA_ACCESS_NOT_SPECIFIED,
@@ -292,7 +292,7 @@
};
uint32_t msg_size;
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE, HF_PRIMARY_VM_ID,
SERVICE_VM1, constituents, ARRAY_SIZE(constituents),
0, 0, FFA_DATA_ACCESS_RW,
@@ -318,7 +318,7 @@
};
uint32_t msg_size;
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE, HF_PRIMARY_VM_ID,
SERVICE_VM1, constituents, ARRAY_SIZE(constituents),
0, 0, FFA_DATA_ACCESS_RW,
@@ -1109,7 +1109,7 @@
{.address = (uint64_t)pages, .page_count = 1},
};
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE, HF_PRIMARY_VM_ID,
HF_PRIMARY_VM_ID, constituents,
ARRAY_SIZE(constituents), 0, 0,
@@ -1138,7 +1138,7 @@
{.address = (uint64_t)pages, .page_count = 1},
};
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE, HF_PRIMARY_VM_ID,
HF_PRIMARY_VM_ID, constituents,
ARRAY_SIZE(constituents), 0, 0, FFA_DATA_ACCESS_RW,
@@ -1165,7 +1165,7 @@
{.address = (uint64_t)pages, .page_count = 1},
};
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE, HF_PRIMARY_VM_ID,
HF_PRIMARY_VM_ID, constituents,
ARRAY_SIZE(constituents), 0, 0, FFA_DATA_ACCESS_RW,
@@ -1198,7 +1198,7 @@
/* Try invalid configurations. */
EXPECT_EQ(
- ffa_memory_region_init(
+ ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE, SERVICE_VM1, HF_PRIMARY_VM_ID,
constituents, ARRAY_SIZE(constituents), 0, 0,
FFA_DATA_ACCESS_NOT_SPECIFIED,
@@ -1208,7 +1208,7 @@
0);
EXPECT_FFA_ERROR(ffa_mem_donate(msg_size, msg_size), FFA_DENIED);
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE, SERVICE_VM1, SERVICE_VM1,
constituents, ARRAY_SIZE(constituents), 0, 0,
FFA_DATA_ACCESS_NOT_SPECIFIED,
@@ -1218,7 +1218,7 @@
0);
EXPECT_FFA_ERROR(ffa_mem_donate(msg_size, msg_size), FFA_DENIED);
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE, SERVICE_VM2, SERVICE_VM1,
constituents, ARRAY_SIZE(constituents), 0, 0,
FFA_DATA_ACCESS_NOT_SPECIFIED,
@@ -1270,7 +1270,7 @@
};
uint32_t msg_size;
EXPECT_EQ(
- ffa_memory_region_init(
+ ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE,
HF_PRIMARY_VM_ID, SERVICE_VM1,
constituents, ARRAY_SIZE(constituents),
@@ -1284,7 +1284,7 @@
EXPECT_FFA_ERROR(ffa_mem_donate(msg_size, msg_size),
FFA_INVALID_PARAMETERS);
EXPECT_EQ(
- ffa_memory_region_init(
+ ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE,
HF_PRIMARY_VM_ID, SERVICE_VM1,
constituents, ARRAY_SIZE(constituents),
@@ -1321,7 +1321,7 @@
};
/* Check cannot swap VM IDs. */
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE, SERVICE_VM1,
HF_PRIMARY_VM_ID, constituents,
ARRAY_SIZE(constituents), 0, 0, FFA_DATA_ACCESS_RW,
@@ -1691,7 +1691,7 @@
constituents[0].page_count = 1;
for (int i = 1; i < PAGE_SIZE * 2; i++) {
constituents[0].address = (uint64_t)pages + PAGE_SIZE;
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE, HF_PRIMARY_VM_ID,
SERVICE_VM2, constituents,
ARRAY_SIZE(constituents), 0, 0,
@@ -1706,7 +1706,7 @@
}
/* Ensure we can't donate to the only borrower. */
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE, HF_PRIMARY_VM_ID,
SERVICE_VM1, constituents, ARRAY_SIZE(constituents),
0, 0, FFA_DATA_ACCESS_NOT_SPECIFIED,
@@ -1758,7 +1758,7 @@
constituents[0].page_count = 1;
for (int i = 1; i < PAGE_SIZE * 2; i++) {
constituents[0].address = (uint64_t)pages + PAGE_SIZE;
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE, HF_PRIMARY_VM_ID,
SERVICE_VM2, constituents,
ARRAY_SIZE(constituents), 0, 0,
@@ -1773,7 +1773,7 @@
}
/* Ensure we can't donate to the only borrower. */
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE, HF_PRIMARY_VM_ID,
SERVICE_VM1, constituents, ARRAY_SIZE(constituents),
0, 0, FFA_DATA_ACCESS_NOT_SPECIFIED,
@@ -1844,7 +1844,7 @@
constituents[0].page_count = 1;
for (int i = 0; i < 2; i++) {
constituents[0].address = (uint64_t)pages + i * PAGE_SIZE;
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE, HF_PRIMARY_VM_ID,
SERVICE_VM2, constituents,
ARRAY_SIZE(constituents), 0, 0,
@@ -1908,7 +1908,7 @@
constituents[0].page_count = 1;
for (int i = 0; i < 2; i++) {
constituents[0].address = (uint64_t)pages + i * PAGE_SIZE;
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE, HF_PRIMARY_VM_ID,
SERVICE_VM2, constituents,
ARRAY_SIZE(constituents), 0, 0,
@@ -1976,7 +1976,7 @@
{.address = (uint64_t)pages, .page_count = 2},
};
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE, HF_PRIMARY_VM_ID,
SERVICE_VM1, constituents, ARRAY_SIZE(constituents),
0, FFA_MEMORY_REGION_FLAG_CLEAR, FFA_DATA_ACCESS_RO,
@@ -2136,7 +2136,7 @@
};
/* Prepare memory region, and set all flags */
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE, HF_PRIMARY_VM_ID,
SERVICE_VM1, constituents, ARRAY_SIZE(constituents),
0, 0xffffffff, FFA_DATA_ACCESS_NOT_SPECIFIED,
@@ -2187,7 +2187,7 @@
for (uint32_t i = 0; i < ARRAY_SIZE(invalid_attributes); ++i) {
/* Prepare memory region, and set all flags */
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE, HF_PRIMARY_VM_ID,
SERVICE_VM1, constituents,
ARRAY_SIZE(constituents), 0, 0,
@@ -2232,7 +2232,7 @@
for (unsigned int i = 0; i < ARRAY_SIZE(send_function); i++) {
/* Prepare memory region, and set all flags */
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE, HF_PRIMARY_VM_ID,
SERVICE_VM1, constituents,
ARRAY_SIZE(constituents), 0, 0,
@@ -2312,7 +2312,7 @@
for (uint32_t i = 0; i < ARRAY_SIZE(send_function); i++) {
/* Prepare memory region, and set all flags */
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE, HF_PRIMARY_VM_ID,
SERVICE_VM1, constituents,
ARRAY_SIZE(constituents), 0, 0,
@@ -2373,7 +2373,7 @@
mb.send);
/* If mem share can't clear memory before sharing. */
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE, HF_PRIMARY_VM_ID,
SERVICE_VM1, constituents, ARRAY_SIZE(constituents),
0, FFA_MEMORY_REGION_FLAG_CLEAR, FFA_DATA_ACCESS_RW,
@@ -2391,7 +2391,7 @@
* Attempt to successfully share, and validate error return in the
* receiver.
*/
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE, HF_PRIMARY_VM_ID,
SERVICE_VM1, constituents, ARRAY_SIZE(constituents),
0, 0, FFA_DATA_ACCESS_RW,
@@ -2443,7 +2443,7 @@
SERVICE_SELECT(SERVICE_VM1, "ffa_memory_share_fail", mb.send);
/* Call FFA_MEM_SEND, setting FFA_DATA_ACCESS_RO. */
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE, HF_PRIMARY_VM_ID,
SERVICE_VM1, constituents, ARRAY_SIZE(constituents),
0, 0, FFA_DATA_ACCESS_RO,
diff --git a/test/vmapi/el0_partitions/services/memory.c b/test/vmapi/el0_partitions/services/memory.c
index cc0782b..52966b5 100644
--- a/test/vmapi/el0_partitions/services/memory.c
+++ b/test/vmapi/el0_partitions/services/memory.c
@@ -276,7 +276,7 @@
/* Attempt to donate the memory to another VM. */
EXPECT_EQ(
- ffa_memory_region_init(
+ ffa_memory_region_init_single_receiver(
send_buf, HF_MAILBOX_SIZE, hf_vm_get_id(), SERVICE_VM2,
&constituent, 1, 0, 0, FFA_DATA_ACCESS_NOT_SPECIFIED,
FFA_INSTRUCTION_ACCESS_NOT_SPECIFIED,
@@ -346,7 +346,7 @@
FFA_INSTRUCTION_ACCESS_NOT_SPECIFIED, FFA_INSTRUCTION_ACCESS_X);
/* Fail to donate the memory from the primary to VM2. */
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
send_buf, HF_MAILBOX_SIZE, HF_PRIMARY_VM_ID,
SERVICE_VM2, composite->constituents,
composite->constituent_count, 0, 0,
@@ -572,7 +572,7 @@
FFA_SUCCESS_32);
/* Ensure we cannot lend from the primary to another secondary. */
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
send_buf, HF_MAILBOX_SIZE, HF_PRIMARY_VM_ID,
SERVICE_VM2, composite->constituents,
composite->constituent_count, 0, 0,
@@ -583,7 +583,7 @@
EXPECT_FFA_ERROR(ffa_mem_lend(msg_size, msg_size), FFA_DENIED);
/* Ensure we cannot share from the primary to another secondary. */
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
send_buf, HF_MAILBOX_SIZE, HF_PRIMARY_VM_ID,
SERVICE_VM2, composite->constituents,
composite->constituent_count, 0, 0,
@@ -766,7 +766,7 @@
constituent_copy.address = (uint64_t)ptr + i;
/* Fail to lend or share the memory from the primary. */
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
send_buf, HF_MAILBOX_SIZE, HF_PRIMARY_VM_ID,
SERVICE_VM2, &constituent_copy, 1, 0, 0,
FFA_DATA_ACCESS_RW, FFA_INSTRUCTION_ACCESS_X,
@@ -775,7 +775,7 @@
FFA_MEMORY_INNER_SHAREABLE, NULL, &msg_size),
0);
EXPECT_FFA_ERROR(ffa_mem_lend(msg_size, msg_size), FFA_DENIED);
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
send_buf, HF_MAILBOX_SIZE, HF_PRIMARY_VM_ID,
SERVICE_VM2, &constituent_copy, 1, 0, 0,
FFA_DATA_ACCESS_RW, FFA_INSTRUCTION_ACCESS_X,
diff --git a/test/vmapi/primary_with_secondaries/memory_sharing.c b/test/vmapi/primary_with_secondaries/memory_sharing.c
index 9752d8c..27d3997 100644
--- a/test/vmapi/primary_with_secondaries/memory_sharing.c
+++ b/test/vmapi/primary_with_secondaries/memory_sharing.c
@@ -70,7 +70,7 @@
++m) {
uint32_t msg_size;
EXPECT_EQ(
- ffa_memory_region_init(
+ ffa_memory_region_init_single_receiver(
mb.send,
HF_MAILBOX_SIZE,
HF_PRIMARY_VM_ID,
@@ -103,7 +103,7 @@
++m) {
uint32_t msg_size;
EXPECT_EQ(
- ffa_memory_region_init(
+ ffa_memory_region_init_single_receiver(
mb.send,
HF_MAILBOX_SIZE,
HF_PRIMARY_VM_ID,
@@ -184,7 +184,7 @@
if (vms[i] == avoid_vm) {
continue;
}
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE, HF_PRIMARY_VM_ID,
vms[i], constituents, constituent_count, 0, 0,
FFA_DATA_ACCESS_NOT_SPECIFIED,
@@ -266,7 +266,7 @@
};
uint32_t msg_size;
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE, HF_PRIMARY_VM_ID,
SERVICE_VM1, constituents, ARRAY_SIZE(constituents),
0, 0, FFA_DATA_ACCESS_NOT_SPECIFIED,
@@ -292,7 +292,7 @@
};
uint32_t msg_size;
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE, HF_PRIMARY_VM_ID,
SERVICE_VM1, constituents, ARRAY_SIZE(constituents),
0, 0, FFA_DATA_ACCESS_RW,
@@ -318,7 +318,7 @@
};
uint32_t msg_size;
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE, HF_PRIMARY_VM_ID,
SERVICE_VM1, constituents, ARRAY_SIZE(constituents),
0, 0, FFA_DATA_ACCESS_RW,
@@ -353,7 +353,7 @@
memset_s(ptr, sizeof(pages), 'a', PAGE_SIZE);
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE, HF_PRIMARY_VM_ID,
SERVICE_VM1, constituents, ARRAY_SIZE(constituents),
0, 0, FFA_DATA_ACCESS_RW,
@@ -1188,7 +1188,7 @@
{.address = (uint64_t)pages, .page_count = 1},
};
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE, HF_PRIMARY_VM_ID,
HF_PRIMARY_VM_ID, constituents,
ARRAY_SIZE(constituents), 0, 0,
@@ -1217,7 +1217,7 @@
{.address = (uint64_t)pages, .page_count = 1},
};
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE, HF_PRIMARY_VM_ID,
HF_PRIMARY_VM_ID, constituents,
ARRAY_SIZE(constituents), 0, 0, FFA_DATA_ACCESS_RW,
@@ -1244,7 +1244,7 @@
{.address = (uint64_t)pages, .page_count = 1},
};
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE, HF_PRIMARY_VM_ID,
HF_PRIMARY_VM_ID, constituents,
ARRAY_SIZE(constituents), 0, 0, FFA_DATA_ACCESS_RW,
@@ -1277,7 +1277,7 @@
/* Try invalid configurations. */
EXPECT_EQ(
- ffa_memory_region_init(
+ ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE, SERVICE_VM1, HF_PRIMARY_VM_ID,
constituents, ARRAY_SIZE(constituents), 0, 0,
FFA_DATA_ACCESS_NOT_SPECIFIED,
@@ -1287,7 +1287,7 @@
0);
EXPECT_FFA_ERROR(ffa_mem_donate(msg_size, msg_size), FFA_DENIED);
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE, SERVICE_VM1, SERVICE_VM1,
constituents, ARRAY_SIZE(constituents), 0, 0,
FFA_DATA_ACCESS_NOT_SPECIFIED,
@@ -1297,7 +1297,7 @@
0);
EXPECT_FFA_ERROR(ffa_mem_donate(msg_size, msg_size), FFA_DENIED);
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE, SERVICE_VM2, SERVICE_VM1,
constituents, ARRAY_SIZE(constituents), 0, 0,
FFA_DATA_ACCESS_NOT_SPECIFIED,
@@ -1349,7 +1349,7 @@
};
uint32_t msg_size;
EXPECT_EQ(
- ffa_memory_region_init(
+ ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE,
HF_PRIMARY_VM_ID, SERVICE_VM1,
constituents, ARRAY_SIZE(constituents),
@@ -1363,7 +1363,7 @@
EXPECT_FFA_ERROR(ffa_mem_donate(msg_size, msg_size),
FFA_INVALID_PARAMETERS);
EXPECT_EQ(
- ffa_memory_region_init(
+ ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE,
HF_PRIMARY_VM_ID, SERVICE_VM1,
constituents, ARRAY_SIZE(constituents),
@@ -1400,7 +1400,7 @@
};
/* Check cannot swap VM IDs. */
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE, SERVICE_VM1,
HF_PRIMARY_VM_ID, constituents,
ARRAY_SIZE(constituents), 0, 0, FFA_DATA_ACCESS_RW,
@@ -1787,7 +1787,7 @@
constituents[0].page_count = 1;
for (int i = 1; i < PAGE_SIZE * 2; i++) {
constituents[0].address = (uint64_t)pages + PAGE_SIZE;
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE, HF_PRIMARY_VM_ID,
SERVICE_VM2, constituents,
ARRAY_SIZE(constituents), 0, 0,
@@ -1802,7 +1802,7 @@
}
/* Ensure we can't donate to the only borrower. */
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE, HF_PRIMARY_VM_ID,
SERVICE_VM1, constituents, ARRAY_SIZE(constituents),
0, 0, FFA_DATA_ACCESS_NOT_SPECIFIED,
@@ -1854,7 +1854,7 @@
constituents[0].page_count = 1;
for (int i = 1; i < PAGE_SIZE * 2; i++) {
constituents[0].address = (uint64_t)pages + PAGE_SIZE;
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE, HF_PRIMARY_VM_ID,
SERVICE_VM2, constituents,
ARRAY_SIZE(constituents), 0, 0,
@@ -1869,7 +1869,7 @@
}
/* Ensure we can't donate to the only borrower. */
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE, HF_PRIMARY_VM_ID,
SERVICE_VM1, constituents, ARRAY_SIZE(constituents),
0, 0, FFA_DATA_ACCESS_NOT_SPECIFIED,
@@ -1940,7 +1940,7 @@
constituents[0].page_count = 1;
for (int i = 0; i < 2; i++) {
constituents[0].address = (uint64_t)pages + i * PAGE_SIZE;
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE, HF_PRIMARY_VM_ID,
SERVICE_VM2, constituents,
ARRAY_SIZE(constituents), 0, 0,
@@ -2004,7 +2004,7 @@
constituents[0].page_count = 1;
for (int i = 0; i < 2; i++) {
constituents[0].address = (uint64_t)pages + i * PAGE_SIZE;
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE, HF_PRIMARY_VM_ID,
SERVICE_VM2, constituents,
ARRAY_SIZE(constituents), 0, 0,
@@ -2072,7 +2072,7 @@
{.address = (uint64_t)pages, .page_count = 2},
};
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE, HF_PRIMARY_VM_ID,
SERVICE_VM1, constituents, ARRAY_SIZE(constituents),
0, FFA_MEMORY_REGION_FLAG_CLEAR, FFA_DATA_ACCESS_RO,
@@ -2235,7 +2235,7 @@
};
/* Prepare memory region, and set all flags */
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE, HF_PRIMARY_VM_ID,
SERVICE_VM1, constituents, ARRAY_SIZE(constituents),
0, 0xffffffff, FFA_DATA_ACCESS_NOT_SPECIFIED,
@@ -2286,7 +2286,7 @@
for (uint32_t i = 0; i < ARRAY_SIZE(invalid_attributes); ++i) {
/* Prepare memory region, and set all flags */
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE, HF_PRIMARY_VM_ID,
SERVICE_VM1, constituents,
ARRAY_SIZE(constituents), 0, 0,
@@ -2338,7 +2338,7 @@
for (unsigned int i = 0; i < ARRAY_SIZE(send_function); i++) {
/* Prepare memory region, and set all flags */
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE, HF_PRIMARY_VM_ID,
SERVICE_VM1, constituents,
ARRAY_SIZE(constituents), 0, 0,
@@ -2421,7 +2421,7 @@
for (uint32_t i = 0; i < ARRAY_SIZE(send_function); i++) {
/* Prepare memory region, and set all flags */
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE, HF_PRIMARY_VM_ID,
SERVICE_VM1, constituents,
ARRAY_SIZE(constituents), 0, 0,
@@ -2482,7 +2482,7 @@
mb.send);
/* If mem share can't clear memory before sharing. */
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE, HF_PRIMARY_VM_ID,
SERVICE_VM1, constituents, ARRAY_SIZE(constituents),
0, FFA_MEMORY_REGION_FLAG_CLEAR, FFA_DATA_ACCESS_RW,
@@ -2500,7 +2500,7 @@
* Attempt to successfully share, and validate error return in the
* receiver.
*/
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE, HF_PRIMARY_VM_ID,
SERVICE_VM1, constituents, ARRAY_SIZE(constituents),
0, 0, FFA_DATA_ACCESS_RW,
@@ -2552,7 +2552,7 @@
SERVICE_SELECT(SERVICE_VM1, "ffa_memory_share_fail_denied", mb.send);
/* Call FFA_MEM_SEND, setting FFA_DATA_ACCESS_RO. */
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE, HF_PRIMARY_VM_ID,
SERVICE_VM1, constituents, ARRAY_SIZE(constituents),
0, 0, FFA_DATA_ACCESS_RO,
@@ -2615,7 +2615,7 @@
* Call FF-A memory send interface, not setting the
* FFA_MEMORY_REGION_FLAG_CLEAR.
*/
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE, HF_PRIMARY_VM_ID,
SERVICE_VM1, constituents,
ARRAY_SIZE(constituents), 0, 0,
@@ -2689,7 +2689,7 @@
for (uint32_t i = 0; i < ARRAY_SIZE(send_function); i++) {
/* Call the memory share interface. */
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
mb.send, HF_MAILBOX_SIZE, HF_PRIMARY_VM_ID,
SERVICE_VM1, constituents,
ARRAY_SIZE(constituents), 0, 0,
diff --git a/test/vmapi/primary_with_secondaries/services/memory.c b/test/vmapi/primary_with_secondaries/services/memory.c
index bba71ad..87432c3 100644
--- a/test/vmapi/primary_with_secondaries/services/memory.c
+++ b/test/vmapi/primary_with_secondaries/services/memory.c
@@ -335,7 +335,7 @@
/* Attempt to donate the memory to another VM. */
EXPECT_EQ(
- ffa_memory_region_init(
+ ffa_memory_region_init_single_receiver(
send_buf, HF_MAILBOX_SIZE, hf_vm_get_id(), SERVICE_VM2,
&constituent, 1, 0, 0, FFA_DATA_ACCESS_NOT_SPECIFIED,
FFA_INSTRUCTION_ACCESS_NOT_SPECIFIED,
@@ -404,7 +404,7 @@
FFA_INSTRUCTION_ACCESS_NOT_SPECIFIED, FFA_INSTRUCTION_ACCESS_X);
/* Fail to donate the memory from the primary to VM2. */
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
send_buf, HF_MAILBOX_SIZE, HF_PRIMARY_VM_ID,
SERVICE_VM2, composite->constituents,
composite->constituent_count, 0, 0,
@@ -625,7 +625,7 @@
FFA_SUCCESS_32);
/* Ensure we cannot lend from the primary to another secondary. */
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
send_buf, HF_MAILBOX_SIZE, HF_PRIMARY_VM_ID,
SERVICE_VM2, composite->constituents,
composite->constituent_count, 0, 0,
@@ -636,7 +636,7 @@
EXPECT_FFA_ERROR(ffa_mem_lend(msg_size, msg_size), FFA_DENIED);
/* Ensure we cannot share from the primary to another secondary. */
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
send_buf, HF_MAILBOX_SIZE, HF_PRIMARY_VM_ID,
SERVICE_VM2, composite->constituents,
composite->constituent_count, 0, 0,
@@ -816,7 +816,7 @@
constituent_copy.address = (uint64_t)ptr + i;
/* Fail to lend or share the memory from the primary. */
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
send_buf, HF_MAILBOX_SIZE, HF_PRIMARY_VM_ID,
SERVICE_VM2, &constituent_copy, 1, 0, 0,
FFA_DATA_ACCESS_RW, FFA_INSTRUCTION_ACCESS_X,
@@ -825,7 +825,7 @@
FFA_MEMORY_INNER_SHAREABLE, NULL, &msg_size),
0);
EXPECT_FFA_ERROR(ffa_mem_lend(msg_size, msg_size), FFA_DENIED);
- EXPECT_EQ(ffa_memory_region_init(
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
send_buf, HF_MAILBOX_SIZE, HF_PRIMARY_VM_ID,
SERVICE_VM2, &constituent_copy, 1, 0, 0,
FFA_DATA_ACCESS_RW, FFA_INSTRUCTION_ACCESS_X,
diff --git a/test/vmapi/primary_with_secondaries/services/unmapped.c b/test/vmapi/primary_with_secondaries/services/unmapped.c
index 0385b2d..8affcbb 100644
--- a/test/vmapi/primary_with_secondaries/services/unmapped.c
+++ b/test/vmapi/primary_with_secondaries/services/unmapped.c
@@ -36,15 +36,15 @@
{.address = (uint64_t)(&pages[PAGE_SIZE]), .page_count = 1},
};
uint32_t msg_size;
- EXPECT_EQ(ffa_memory_region_init(send_buf, HF_MAILBOX_SIZE,
- hf_vm_get_id(), HF_PRIMARY_VM_ID,
- constituents, ARRAY_SIZE(constituents),
- 0, 0, FFA_DATA_ACCESS_NOT_SPECIFIED,
- FFA_INSTRUCTION_ACCESS_NOT_SPECIFIED,
- FFA_MEMORY_NOT_SPECIFIED_MEM,
- FFA_MEMORY_CACHE_WRITE_BACK,
- FFA_MEMORY_INNER_SHAREABLE, NULL,
- &msg_size),
+ EXPECT_EQ(ffa_memory_region_init_single_receiver(
+ send_buf, HF_MAILBOX_SIZE, hf_vm_get_id(),
+ HF_PRIMARY_VM_ID, constituents,
+ ARRAY_SIZE(constituents), 0, 0,
+ FFA_DATA_ACCESS_NOT_SPECIFIED,
+ FFA_INSTRUCTION_ACCESS_NOT_SPECIFIED,
+ FFA_MEMORY_NOT_SPECIFIED_MEM,
+ FFA_MEMORY_CACHE_WRITE_BACK,
+ FFA_MEMORY_INNER_SHAREABLE, NULL, &msg_size),
0);
exception_setup(NULL, exception_handler_yield_data_abort);
diff --git a/vmlib/ffa.c b/vmlib/ffa.c
index 5cf2fb4..7c3fbfc 100644
--- a/vmlib/ffa.c
+++ b/vmlib/ffa.c
@@ -68,7 +68,7 @@
* `memory_region` (attributes, constituents and memory region header size), and
* the total size of the memory sharing message including all constituents.
*/
-uint32_t ffa_memory_region_init(
+uint32_t ffa_memory_region_init_single_receiver(
struct ffa_memory_region *memory_region, size_t memory_region_max_size,
ffa_vm_id_t sender, ffa_vm_id_t receiver,
const struct ffa_memory_region_constituent constituents[],