refactor: remove out parameter from `allocate_share_state`
`allocate_share_state` returned a `struct ffa_memory_share_state *` via
an out parameter and indicated success by returning a `bool`. This patch
removes the out parameter and returns the `struct ffa_memory_share_state
*` directly.
Change-Id: I3d0bd0952d39332282b9303c0cb60850317cd8e3
Signed-off-by: Karl Meakin <karl.meakin@arm.com>
diff --git a/inc/hf/ffa_memory_internal.h b/inc/hf/ffa_memory_internal.h
index 7e14765..6ac69c6 100644
--- a/inc/hf/ffa_memory_internal.h
+++ b/inc/hf/ffa_memory_internal.h
@@ -118,11 +118,10 @@
struct ffa_memory_share_state *share_states;
};
-bool allocate_share_state(struct share_states_locked share_states,
- uint32_t share_func,
- struct ffa_memory_region *memory_region,
- uint32_t fragment_length, ffa_memory_handle_t handle,
- struct ffa_memory_share_state **share_state_ret);
+struct ffa_memory_share_state *allocate_share_state(
+ struct share_states_locked share_states, uint32_t share_func,
+ struct ffa_memory_region *memory_region, uint32_t fragment_length,
+ ffa_memory_handle_t handle);
struct share_states_locked share_states_lock(void);
void share_states_unlock(struct share_states_locked *share_states);
void share_state_free(struct share_states_locked share_states,
diff --git a/src/arch/aarch64/plat/ffa/hypervisor.c b/src/arch/aarch64/plat/ffa/hypervisor.c
index bd903ee..ac3dc5e 100644
--- a/src/arch/aarch64/plat/ffa/hypervisor.c
+++ b/src/arch/aarch64/plat/ffa/hypervisor.c
@@ -1247,7 +1247,7 @@
if (!allocate_share_state(share_states, share_func,
memory_region, fragment_length,
- handle, NULL)) {
+ handle)) {
dlog_verbose("Failed to allocate share state.\n");
ret = ffa_error(FFA_NO_MEMORY);
goto out_unlock;
diff --git a/src/ffa_memory.c b/src/ffa_memory.c
index c3b6f10..7de8a7f 100644
--- a/src/ffa_memory.c
+++ b/src/ffa_memory.c
@@ -44,27 +44,23 @@
}
/**
- * Initialises the next available `struct ffa_memory_share_state` and sets
- * `share_state_ret` to a pointer to it. If `handle` is
- * `FFA_MEMORY_HANDLE_INVALID` then allocates an appropriate handle, otherwise
- * uses the provided handle which is assumed to be globally unique.
+ * Initialises the next available `struct ffa_memory_share_state`. If `handle`
+ * is `FFA_MEMORY_HANDLE_INVALID` then allocates an appropriate handle,
+ * otherwise uses the provided handle which is assumed to be globally unique.
*
- * Returns true on success or false if none are available.
+ * Returns a pointer to the allocated `ffa_memory_share_state` on success or
+ * `NULL` if none are available.
*/
-bool allocate_share_state(struct share_states_locked share_states,
- uint32_t share_func,
- struct ffa_memory_region *memory_region,
- uint32_t fragment_length, ffa_memory_handle_t handle,
- struct ffa_memory_share_state **share_state_ret)
+struct ffa_memory_share_state *allocate_share_state(
+ struct share_states_locked share_states, uint32_t share_func,
+ struct ffa_memory_region *memory_region, uint32_t fragment_length,
+ ffa_memory_handle_t handle)
{
- uint64_t i;
-
assert(share_states.share_states != NULL);
assert(memory_region != NULL);
- for (i = 0; i < MAX_MEM_SHARES; ++i) {
+ for (uint64_t i = 0; i < MAX_MEM_SHARES; ++i) {
if (share_states.share_states[i].share_func == 0) {
- uint32_t j;
struct ffa_memory_share_state *allocated_state =
&share_states.share_states[i];
struct ffa_composite_memory_region *composite =
@@ -87,18 +83,16 @@
0)) /
sizeof(struct ffa_memory_region_constituent);
allocated_state->sending_complete = false;
- for (j = 0; j < MAX_MEM_SHARE_RECIPIENTS; ++j) {
+ for (uint32_t j = 0; j < MAX_MEM_SHARE_RECIPIENTS;
+ ++j) {
allocated_state->retrieved_fragment_count[j] =
0;
}
- if (share_state_ret != NULL) {
- *share_state_ret = allocated_state;
- }
- return true;
+ return allocated_state;
}
}
- return false;
+ return NULL;
}
/** Locks the share states lock. */
@@ -1722,9 +1716,10 @@
* failed then it would leave the memory in a state where nobody could
* get it back.
*/
- if (!allocate_share_state(share_states, share_func, memory_region,
- fragment_length, FFA_MEMORY_HANDLE_INVALID,
- &share_state)) {
+ share_state = allocate_share_state(share_states, share_func,
+ memory_region, fragment_length,
+ FFA_MEMORY_HANDLE_INVALID);
+ if (!share_state) {
dlog_verbose("Failed to allocate share state.\n");
mpool_free(page_pool, memory_region);
ret = ffa_error(FFA_NO_MEMORY);
@@ -2387,7 +2382,7 @@
}
share_states = share_states_lock();
- if (!get_share_state(share_states, handle, &share_state)) {
+ if (!get_share_state(share_states, handle, share_state)) {
dlog_verbose("Invalid handle %#x for FFA_MEM_RETRIEVE_REQ.\n",
handle);
ret = ffa_error(FFA_INVALID_PARAMETERS);
@@ -2928,6 +2923,7 @@
dump_share_states();
share_states = share_states_lock();
+
if (get_share_state(share_states, handle, &share_state)) {
memory_region = share_state->memory_region;
} else {