KVM: arm64: Mark optional FF-A 1.2 interfaces as unsupported

Mark FF-A 1.2 interfaces as unsupported lest they get proxied.

Acked-by: Will Deacon <will@kernel.org>
Signed-off-by: Per Larsen <perlarsen@google.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>

diff --git a/arch/arm64/kvm/hyp/nvhe/ffa.c b/arch/arm64/kvm/hyp/nvhe/ffa.c
index 40a785b6ed063f9de31f51f1e82ebd9c70b13de9..96109aa99c48741e45a2b85d8e7bf26440597398 100644 (file)
--- a/arch/arm64/kvm/hyp/nvhe/ffa.c
+++ b/arch/arm64/kvm/hyp/nvhe/ffa.c
@@ -678,6 +678,11 @@ static bool ffa_call_supported(u64 func_id)
        case FFA_NOTIFICATION_SET:
        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;
        }