[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-Id: <20260109-host-direct-messages-v4-2-95da4221d186@google.com>
Date: Fri, 09 Jan 2026 22:34:26 +0000
From: Per Larsen via B4 Relay <devnull+perlarsen.google.com@...nel.org>
To: Marc Zyngier <maz@...nel.org>, Joey Gouly <joey.gouly@....com>,
Suzuki K Poulose <suzuki.poulose@....com>,
Zenghui Yu <yuzenghui@...wei.com>,
Catalin Marinas <catalin.marinas@....com>, Will Deacon <will@...nel.org>,
Yeoreum Yun <yeoreum.yun@....com>, Ben Horgan <ben.horgan@....com>,
Oliver Upton <oupton@...nel.org>
Cc: Armelle Laine <armellel@...gle.com>,
Sebastien Ene <sebastianene@...gle.com>,
linux-arm-kernel@...ts.infradead.org, kvmarm@...ts.linux.dev,
linux-kernel@...r.kernel.org, Per Larsen <perlarsen@...gle.com>
Subject: [PATCH v4 2/2] KVM: arm64: Support FFA_MSG_SEND_DIRECT_REQ2 in
host handler
From: Per Larsen <perlarsen@...gle.com>
FF-A 1.2 adds the DIRECT_REQ2 messaging interface which is similar to
the existing FFA_MSG_SEND_DIRECT_{REQ,RESP} functions and can use the
existing handler function. Add support for FFA_MSG_SEND_DIRECT_REQ2 in
the host ffa handler.
Reviewed-by: Yeoreum Yun <yeoreum.yun@....com>
Signed-off-by: Per Larsen <perlarsen@...gle.com>
---
arch/arm64/kvm/hyp/nvhe/ffa.c | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/arch/arm64/kvm/hyp/nvhe/ffa.c b/arch/arm64/kvm/hyp/nvhe/ffa.c
index fc84595007f310004def7d525371fa7c128f244a..bc4a6ee8f9c815d93e53024653f23a8c903a1b88 100644
--- a/arch/arm64/kvm/hyp/nvhe/ffa.c
+++ b/arch/arm64/kvm/hyp/nvhe/ffa.c
@@ -684,11 +684,12 @@ static bool ffa_call_supported(u64 func_id)
case FFA_NOTIFICATION_GET:
case FFA_NOTIFICATION_INFO_GET:
/* Optional interfaces added in FF-A 1.2 */
- case FFA_MSG_SEND_DIRECT_REQ2: /* Optional per 7.5.1 */
case FFA_MSG_SEND_DIRECT_RESP2: /* Optional per 7.5.1 */
case FFA_CONSOLE_LOG: /* Optional per 13.1: not in Table 13.1 */
case FFA_PARTITION_INFO_GET_REGS: /* Optional for virtual instances per 13.1 */
return false;
+ case FFA_MSG_SEND_DIRECT_REQ2: /* Optional per 7.5.1 */
+ return hyp_ffa_version >= FFA_VERSION_1_2;
}
return true;
@@ -865,12 +866,17 @@ static void do_ffa_part_get(struct arm_smccc_1_2_regs *res,
static void do_ffa_direct_msg(struct arm_smccc_1_2_regs *res,
struct kvm_cpu_context *ctxt)
{
+ DECLARE_REG(u64, func_id, ctxt, 0);
DECLARE_REG(u32, flags, ctxt, 2);
struct arm_smccc_1_2_regs *args = (void *)&ctxt->regs.regs[0];
- /* filter out framework messages and validate SBZ/MBZ bits */
- if (flags) {
+ /*
+ * filter out framework messages and validate SBZ/MBZ flag bits.
+ * FFA_MSG_SEND_DIRECT_REQ2 implies flag-less partition message.
+ */
+ if ((func_id == FFA_MSG_SEND_DIRECT_REQ ||
+ func_id == FFA_FN64_MSG_SEND_DIRECT_REQ) && flags) {
ffa_to_smccc_error(res, FFA_RET_INVALID_PARAMETERS);
return;
}
@@ -936,6 +942,10 @@ bool kvm_host_ffa_handler(struct kvm_cpu_context *host_ctxt, u32 func_id)
case FFA_PARTITION_INFO_GET:
do_ffa_part_get(&res, host_ctxt);
goto out_handled;
+ case FFA_MSG_SEND_DIRECT_REQ2:
+ if (!ffa_call_supported(func_id))
+ goto out_not_supported;
+ fallthrough;
case FFA_MSG_SEND_DIRECT_REQ:
case FFA_FN64_MSG_SEND_DIRECT_REQ:
do_ffa_direct_msg(&res, host_ctxt);
@@ -945,6 +955,7 @@ bool kvm_host_ffa_handler(struct kvm_cpu_context *host_ctxt, u32 func_id)
if (ffa_call_supported(func_id))
return false; /* Pass through */
+out_not_supported:
ffa_to_smccc_error(&res, FFA_RET_NOT_SUPPORTED);
out_handled:
ffa_set_retval(host_ctxt, &res);
--
2.52.0.457.g6b5491de43-goog
Powered by blists - more mailing lists