From 1040ad18c7e226fef589f352bc153aa22b0ab157 Mon Sep 17 00:00:00 2001
From: Kun Qin <kuqin@microsoft.com>
Date: Tue, 26 Nov 2024 12:43:20 -0800
Subject: [PATCH] Supporting full 18 registers through DIRECT_REQ2 for
 Standalone MM

The existing solution for Standalone MM over FF-A does not support full 18-register
communication over FF-A.

This change updated the Standalone MM core to dispatch content with full 18 registers.

Signed-off-by: Kun Qin <kun.qin@microsoft.com>
---
 .../Include/Library/Arm/StandaloneMmCoreEntryPoint.h      | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/StandaloneMmPkg/Include/Library/Arm/StandaloneMmCoreEntryPoint.h b/StandaloneMmPkg/Include/Library/Arm/StandaloneMmCoreEntryPoint.h
index 1549211613..bb5d169c05 100644
--- a/StandaloneMmPkg/Include/Library/Arm/StandaloneMmCoreEntryPoint.h
+++ b/StandaloneMmPkg/Include/Library/Arm/StandaloneMmCoreEntryPoint.h
@@ -23,8 +23,10 @@
 #ifndef __STANDALONEMMCORE_ENTRY_POINT_H__
 #define __STANDALONEMMCORE_ENTRY_POINT_H__
 
+#include <Library/PcdLib.h>
 #include <Library/ArmSvcLib.h>
 #include <Library/ArmFfaLib.h>
+#include <Library/ArmFfaLibEx.h>
 #include <Library/PeCoffLib.h>
 #include <Library/FvLib.h>
 
@@ -136,13 +138,13 @@ typedef struct FfaMsgInfo {
  */
 typedef struct {
   /// Service guid
-  EFI_GUID           HeaderGuid;
+  EFI_GUID              HeaderGuid;
 
   /// Length of Message. In case of misc service, sizeof (EventSvcArgs)
-  UINTN              MessageLength;
+  UINTN                 MessageLength;
 
   /// Delivered register values.
-  DIRECT_MSG_ARGS    DirectMsgArgs;
+  DIRECT_MSG_ARGS_EX    DirectMsgArgs;
 } MISC_MM_COMMUNICATE_BUFFER;
 
 typedef struct {