|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [PATCH 08/10] xen/arm: ffa: move message function into ffa_msg.c
Move the direct message handling function in its own source file and
rename it to have a ffa_ prefix.
This is a preparation to add support for indirect messages which will
go into this newly created source file.
Signed-off-by: Bertrand Marquis <bertrand.marquis@xxxxxxx>
---
xen/arch/arm/tee/Makefile | 1 +
xen/arch/arm/tee/ffa.c | 69 +----------------------------
xen/arch/arm/tee/ffa_msg.c | 80 ++++++++++++++++++++++++++++++++++
xen/arch/arm/tee/ffa_private.h | 2 +
4 files changed, 84 insertions(+), 68 deletions(-)
create mode 100644 xen/arch/arm/tee/ffa_msg.c
diff --git a/xen/arch/arm/tee/Makefile b/xen/arch/arm/tee/Makefile
index 7c0f46f7f446..0848c833fec3 100644
--- a/xen/arch/arm/tee/Makefile
+++ b/xen/arch/arm/tee/Makefile
@@ -3,5 +3,6 @@ obj-$(CONFIG_FFA) += ffa_shm.o
obj-$(CONFIG_FFA) += ffa_partinfo.o
obj-$(CONFIG_FFA) += ffa_rxtx.o
obj-$(CONFIG_FFA) += ffa_notif.o
+obj-$(CONFIG_FFA) += ffa_msg.o
obj-y += tee.o
obj-$(CONFIG_OPTEE) += optee.o
diff --git a/xen/arch/arm/tee/ffa.c b/xen/arch/arm/tee/ffa.c
index 4a769e20007b..89c6a1cf06a1 100644
--- a/xen/arch/arm/tee/ffa.c
+++ b/xen/arch/arm/tee/ffa.c
@@ -164,73 +164,6 @@ static void handle_version(struct cpu_user_regs *regs)
ffa_set_regs_error(regs, FFA_RET_NOT_SUPPORTED);
}
-static void handle_msg_send_direct_req(struct cpu_user_regs *regs, uint32_t
fid)
-{
- struct arm_smccc_1_2_regs arg = { .a0 = fid, };
- struct arm_smccc_1_2_regs resp = { };
- struct domain *d = current->domain;
- uint32_t src_dst;
- uint64_t mask;
-
- if ( smccc_is_conv_64(fid) )
- mask = GENMASK_ULL(63, 0);
- else
- mask = GENMASK_ULL(31, 0);
-
- if ( !ffa_fw_supports_fid(fid) )
- {
- resp.a0 = FFA_ERROR;
- resp.a2 = FFA_RET_NOT_SUPPORTED;
- goto out;
- }
-
- src_dst = get_user_reg(regs, 1);
- if ( (src_dst >> 16) != ffa_get_vm_id(d) )
- {
- resp.a0 = FFA_ERROR;
- resp.a2 = FFA_RET_INVALID_PARAMETERS;
- goto out;
- }
-
- /* we do not support direct messages to VMs */
- if ( !FFA_ID_IS_SECURE(src_dst & GENMASK(15,0)) )
- {
- resp.a0 = FFA_ERROR;
- resp.a2 = FFA_RET_NOT_SUPPORTED;
- goto out;
- }
-
- arg.a1 = src_dst;
- arg.a2 = get_user_reg(regs, 2) & mask;
- arg.a3 = get_user_reg(regs, 3) & mask;
- arg.a4 = get_user_reg(regs, 4) & mask;
- arg.a5 = get_user_reg(regs, 5) & mask;
- arg.a6 = get_user_reg(regs, 6) & mask;
- arg.a7 = get_user_reg(regs, 7) & mask;
-
- arm_smccc_1_2_smc(&arg, &resp);
- switch ( resp.a0 )
- {
- case FFA_ERROR:
- case FFA_SUCCESS_32:
- case FFA_SUCCESS_64:
- case FFA_MSG_SEND_DIRECT_RESP_32:
- case FFA_MSG_SEND_DIRECT_RESP_64:
- break;
- default:
- /* Bad fid, report back to the caller. */
- memset(&resp, 0, sizeof(resp));
- resp.a0 = FFA_ERROR;
- resp.a1 = src_dst;
- resp.a2 = FFA_RET_ABORTED;
- }
-
-out:
- ffa_set_regs(regs, resp.a0, resp.a1 & mask, resp.a2 & mask, resp.a3 & mask,
- resp.a4 & mask, resp.a5 & mask, resp.a6 & mask,
- resp.a7 & mask);
-}
-
static void handle_features(struct cpu_user_regs *regs)
{
struct domain *d = current->domain;
@@ -348,7 +281,7 @@ static bool ffa_handle_call(struct cpu_user_regs *regs)
break;
case FFA_MSG_SEND_DIRECT_REQ_32:
case FFA_MSG_SEND_DIRECT_REQ_64:
- handle_msg_send_direct_req(regs, fid);
+ ffa_handle_msg_send_direct_req(regs, fid);
return true;
case FFA_MEM_SHARE_32:
case FFA_MEM_SHARE_64:
diff --git a/xen/arch/arm/tee/ffa_msg.c b/xen/arch/arm/tee/ffa_msg.c
new file mode 100644
index 000000000000..ae263e54890e
--- /dev/null
+++ b/xen/arch/arm/tee/ffa_msg.c
@@ -0,0 +1,80 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Copyright (C) 2024 Linaro Limited
+ */
+
+#include <xen/const.h>
+#include <xen/sizes.h>
+#include <xen/types.h>
+
+#include <asm/smccc.h>
+#include <asm/regs.h>
+
+#include "ffa_private.h"
+
+void ffa_handle_msg_send_direct_req(struct cpu_user_regs *regs, uint32_t fid)
+{
+ struct arm_smccc_1_2_regs arg = { .a0 = fid, };
+ struct arm_smccc_1_2_regs resp = { };
+ struct domain *d = current->domain;
+ uint32_t src_dst;
+ uint64_t mask;
+
+ if ( smccc_is_conv_64(fid) )
+ mask = GENMASK_ULL(63, 0);
+ else
+ mask = GENMASK_ULL(31, 0);
+
+ if ( !ffa_fw_supports_fid(fid) )
+ {
+ resp.a0 = FFA_ERROR;
+ resp.a2 = FFA_RET_NOT_SUPPORTED;
+ goto out;
+ }
+
+ src_dst = get_user_reg(regs, 1);
+ if ( (src_dst >> 16) != ffa_get_vm_id(d) )
+ {
+ resp.a0 = FFA_ERROR;
+ resp.a2 = FFA_RET_INVALID_PARAMETERS;
+ goto out;
+ }
+
+ /* we do not support direct messages to VMs */
+ if ( !FFA_ID_IS_SECURE(src_dst & GENMASK(15,0)) )
+ {
+ resp.a0 = FFA_ERROR;
+ resp.a2 = FFA_RET_NOT_SUPPORTED;
+ goto out;
+ }
+
+ arg.a1 = src_dst;
+ arg.a2 = get_user_reg(regs, 2) & mask;
+ arg.a3 = get_user_reg(regs, 3) & mask;
+ arg.a4 = get_user_reg(regs, 4) & mask;
+ arg.a5 = get_user_reg(regs, 5) & mask;
+ arg.a6 = get_user_reg(regs, 6) & mask;
+ arg.a7 = get_user_reg(regs, 7) & mask;
+
+ arm_smccc_1_2_smc(&arg, &resp);
+ switch ( resp.a0 )
+ {
+ case FFA_ERROR:
+ case FFA_SUCCESS_32:
+ case FFA_SUCCESS_64:
+ case FFA_MSG_SEND_DIRECT_RESP_32:
+ case FFA_MSG_SEND_DIRECT_RESP_64:
+ break;
+ default:
+ /* Bad fid, report back to the caller. */
+ memset(&resp, 0, sizeof(resp));
+ resp.a0 = FFA_ERROR;
+ resp.a1 = src_dst;
+ resp.a2 = FFA_RET_ABORTED;
+ }
+
+out:
+ ffa_set_regs(regs, resp.a0, resp.a1 & mask, resp.a2 & mask, resp.a3 & mask,
+ resp.a4 & mask, resp.a5 & mask, resp.a6 & mask,
+ resp.a7 & mask);
+}
diff --git a/xen/arch/arm/tee/ffa_private.h b/xen/arch/arm/tee/ffa_private.h
index 84b0f866a71e..0be246ff0ae7 100644
--- a/xen/arch/arm/tee/ffa_private.h
+++ b/xen/arch/arm/tee/ffa_private.h
@@ -358,6 +358,8 @@ void ffa_handle_notification_info_get(struct cpu_user_regs
*regs);
void ffa_handle_notification_get(struct cpu_user_regs *regs);
int ffa_handle_notification_set(struct cpu_user_regs *regs);
+void ffa_handle_msg_send_direct_req(struct cpu_user_regs *regs, uint32_t fid);
+
static inline uint16_t ffa_get_vm_id(const struct domain *d)
{
/* +1 since 0 is reserved for the hypervisor in FF-A */
--
2.39.5 (Apple Git-154)
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |