PR Update: Only support MM Supervisor Standalone MM on X64

CryptoBinPkg/CryptoBinPkg.dsc

@@ -229,7 +229,7 @@
       FILE_GUID = $(RUNTIMEDXE_CRYPTO_DRIVER_FILE_GUID)
   }
 
-[Components.AARCH64, Components.X64]
+[Components.X64]
   # Note: MmSupervisorPkg/Library/StandaloneMmDriverEntryPoint/StandaloneMmDriverEntryPoint.inf has instructions
   #       that are not supported in 32-bit. Only 64-bit is practically needed, so only build for 64-bit here.
   CryptoBinPkg/Driver/CryptoMmSupervisorStandaloneMm.inf {
@@ -245,6 +245,7 @@
       gEfiMdePkgTokenSpaceGuid.PcdStackCookieExceptionVector|0x0F
   }
 
+[Components.AARCH64, Components.X64]
   # Note: Only 64-bit is practically needed, so only build for 64-bit here.
   CryptoBinPkg/Driver/CryptoStandaloneMm.inf {
     <Defines>

CryptoBinPkg/Driver/Bin/CryptoDriver.inc.dsc

@@ -2,7 +2,7 @@
 # AUTOGENERATED BY CryptoBinPkg\Driver\Packaging\generate_cryptodriver.py
 # AUTOGENED AS CryptoDriver.inc.dsc
 # DO NOT MODIFY
-# GENERATED ON: 2024-12-10 14:11:00.374706
+# GENERATED ON: 2024-12-10 18:09:09.623528
 
 # this is to be included by a platform :)
 [Defines]
@@ -181,10 +181,6 @@
   [Components.X64]
     $(SHARED_CRYPTO_PATH)/Driver/Bin/CryptoDriverBin_TINY_SHA_StandaloneMm_MmSupv_$(TARGET)_X64.inf 
  !endif
- !if $(STANDALONEMM_MMSUPV_CRYPTO_ARCH) == AARCH64
-  [Components.AARCH64]
-    $(SHARED_CRYPTO_PATH)/Driver/Bin/CryptoDriverBin_TINY_SHA_StandaloneMm_MmSupv_$(TARGET)_AARCH64.inf 
- !endif
 
  [Components]
    CryptoPkg/Library/BaseCryptLibOnProtocolPpi/StandaloneMmCryptLib.inf {
@@ -295,10 +291,6 @@
   [Components.X64]
     $(SHARED_CRYPTO_PATH)/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_StandaloneMm_MmSupv_$(TARGET)_X64.inf 
  !endif
- !if $(STANDALONEMM_MMSUPV_CRYPTO_ARCH) == AARCH64
-  [Components.AARCH64]
-    $(SHARED_CRYPTO_PATH)/Driver/Bin/CryptoDriverBin_MINIMAL_SHA_SM3_StandaloneMm_MmSupv_$(TARGET)_AARCH64.inf 
- !endif
 
  [Components]
    CryptoPkg/Library/BaseCryptLibOnProtocolPpi/StandaloneMmCryptLib.inf {
@@ -409,10 +401,6 @@
   [Components.X64]
     $(SHARED_CRYPTO_PATH)/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_StandaloneMm_MmSupv_$(TARGET)_X64.inf 
  !endif
- !if $(STANDALONEMM_MMSUPV_CRYPTO_ARCH) == AARCH64
-  [Components.AARCH64]
-    $(SHARED_CRYPTO_PATH)/Driver/Bin/CryptoDriverBin_SMALL_SHA_RSA_StandaloneMm_MmSupv_$(TARGET)_AARCH64.inf 
- !endif
 
  [Components]
    CryptoPkg/Library/BaseCryptLibOnProtocolPpi/StandaloneMmCryptLib.inf {
@@ -523,10 +511,6 @@
   [Components.X64]
     $(SHARED_CRYPTO_PATH)/Driver/Bin/CryptoDriverBin_STANDARD_StandaloneMm_MmSupv_$(TARGET)_X64.inf 
  !endif
- !if $(STANDALONEMM_MMSUPV_CRYPTO_ARCH) == AARCH64
-  [Components.AARCH64]
-    $(SHARED_CRYPTO_PATH)/Driver/Bin/CryptoDriverBin_STANDARD_StandaloneMm_MmSupv_$(TARGET)_AARCH64.inf 
- !endif
 
  [Components]
    CryptoPkg/Library/BaseCryptLibOnProtocolPpi/StandaloneMmCryptLib.inf {
@@ -621,13 +605,7 @@
 !endif
 
 !if $(STANDALONEMM_MMSUPV_CRYPTO_ARCH) == X64
-  [LibraryClasses.X64.]
-    BaseCryptLib|CryptoPkg/Library/BaseCryptLibOnProtocolPpi/StandaloneMmCryptLib.inf
-    TlsLib|CryptoPkg/Library/BaseCryptLibOnProtocolPpi/StandaloneMmCryptLib.inf
-!endif
-
-!if $(STANDALONEMM_MMSUPV_CRYPTO_ARCH) == AARCH64
-  [LibraryClasses.AARCH64.]
+  [LibraryClasses.X64.MM_STANDALONE, LibraryClasses.X64.MM_CORE_STANDALONE]
     BaseCryptLib|CryptoPkg/Library/BaseCryptLibOnProtocolPpi/StandaloneMmCryptLib.inf
     TlsLib|CryptoPkg/Library/BaseCryptLibOnProtocolPpi/StandaloneMmCryptLib.inf
 !endif

CryptoBinPkg/Driver/Packaging/generate_cryptodriver.py

@@ -712,6 +712,8 @@ class options():
                         continue
                     if arch in ["ARM","IA32"] and "StandaloneMm" in phase:
                         continue
+                    if arch == "AARCH64" and phase == "StandaloneMm_MmSupv":
+                        continue
                     inf_files.append((flavor, phase, target, arch))
     print(f"Generating {len(inf_files)} inf files")
     # first delete any files that we don't need
@@ -848,6 +850,8 @@ class options():
                     continue
                 if arch in ["ARM","AARCH64"] and phase == "Smm":
                     continue
+                if arch == "AARCH64" and phase == "StandaloneMm_MmSupv":
+                    continue
                 comp_str = f"Components.{arch}"
                 dsc_lines.append(
                     f" !if $({upper_phase}_CRYPTO_ARCH) == {arch}")
@@ -877,6 +881,8 @@ class options():
                 continue
             if arch in ["ARM","AARCH64"] and phase == "Smm":
                 continue
+            if arch == "AARCH64" and phase == "StandaloneMm_MmSupv":
+                continue
             dsc_lines.append(f"!if $({upper_phase}_CRYPTO_ARCH) == {arch}")
             lib_class_str = ", ".join(map(lambda x: ".".join(
                 ["LibraryClasses", arch, x.upper()]), comp_types))

CryptoBinPkg/Driver/readme.md

@@ -177,6 +177,9 @@ the process.
     - [`StandaloneMmPkg`](https://github.com/tianocore/edk2/tree/master/StandaloneMmPkg/Core) - Use `STANDALONEMM_CRYPTO_SERVICES`
     - [`MmSupervisorPkg`](https://github.com/microsoft/mu_feature_mm_supv/tree/main/MmSupervisorPkg/Core) - Use `STANDALONEMM_MMSUPV_CRYPTO_SERVICES`
 
+    Since the MM Supervisor currently does not support `AARCH64`, only a `X64` MM Supervisor Standalone MM binary is
+    available.
+
 3. Add the DSC include
 
     ```ini