Fixed compilation of all packages tracked by CI after rebasing upon edk2-stable202502 tag.

.github/workflows/build_arm.yaml

@@ -17,7 +17,7 @@ env:
 jobs:
   build-linux-gcc5:
     name: Linux GCC
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
         with:

.github/workflows/build_nolto.yaml

@@ -17,7 +17,7 @@ env:
 jobs:
   build-linux-arm:
     name: Linux GCC ARM
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
         with:

BaseTools/Source/C/VolInfo/VolInfo.h

@@ -9,8 +9,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #ifndef _VOLINFO_H_
 #define _VOLINFO_H_ 1
 
-#define PI_SPECIFICATION_VERSION  0x00010000
-
 #define EFI_DEP_BEFORE    0x00
 #define EFI_DEP_AFTER     0x01
 #define EFI_DEP_PUSH      0x02

Ext4Pkg/Ext4Pkg.dsc

@@ -47,11 +47,6 @@
   OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf
   BaseUcs2Utf8Lib|RedfishPkg/Library/BaseUcs2Utf8Lib/BaseUcs2Utf8Lib.inf
 
-  #
-  # Required for stack protector support
-  #
-  NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf
-
 ###################################################################################################
 #
 # Components Section - list of the modules and components that will be processed by compilation

MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLibStandaloneMm.c

@@ -54,6 +54,8 @@ VarCheckHiiLibReceiveHiiBinHandler (
 {
   EFI_STATUS  Status;
 
+  Status = EFI_INVALID_PARAMETER;
+
   //
   // If input is invalid, stop processing this SMI
   //

MdePkg/Library/SmmServicesTableLib/SmmServicesTableLib.c

@@ -55,6 +55,34 @@ SmmServicesTableLibConstructor (
   return EFI_SUCCESS;
 }
 
+EFI_STATUS
+EFIAPI
+StandaloneSmmServicesTableLibConstructor (
+  IN EFI_HANDLE           ImageHandle,
+  IN EFI_MM_SYSTEM_TABLE  *MmSystemTable
+  )
+{
+  EFI_STATUS              Status;
+  EFI_SMM_BASE2_PROTOCOL  *InternalSmmBase2;
+
+  InternalSmmBase2 = NULL;
+  Status           = MmSystemTable->MmLocateProtocol (
+                                      &gEfiSmmBase2ProtocolGuid,
+                                      NULL,
+                                      (VOID **)&InternalSmmBase2
+                                      );
+  ASSERT_EFI_ERROR (Status);
+  ASSERT (InternalSmmBase2 != NULL);
+
+  //
+  // We are in SMM, retrieve the pointer to SMM System Table
+  //
+  InternalSmmBase2->GetSmstLocation (InternalSmmBase2, &gSmst);
+  ASSERT (gSmst != NULL);
+
+  return EFI_SUCCESS;
+}
+
 /**
   This function allows the caller to determine if the driver is executing in
   System Management Mode(SMM).

MdePkg/Library/SmmServicesTableLib/StandaloneSmmServicesTableLib.inf

@@ -0,0 +1,39 @@
+## @file
+# SMM Services Table Library.
+#
+# Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
+#
+#  SPDX-License-Identifier: BSD-2-Clause-Patent
+#
+#
+##
+
+[Defines]
+  INF_VERSION                    = 0x00010005
+  BASE_NAME                      = SmmServicesTableLib
+  MODULE_UNI_FILE                = SmmServicesTableLib.uni
+  FILE_GUID                      = CC74318B-16F5-4165-B9E5-7B19F335D0D7
+  MODULE_TYPE                    = MM_STANDALONE
+  VERSION_STRING                 = 1.0
+  LIBRARY_CLASS                  = SmmServicesTableLib|MM_STANDALONE
+  PI_SPECIFICATION_VERSION       = 0x00010032
+  CONSTRUCTOR                    = StandaloneSmmServicesTableLibConstructor
+
+#
+#  VALID_ARCHITECTURES           = IA32 X64
+#
+
+[Sources]
+  SmmServicesTableLib.c
+
+[Packages]
+  MdePkg/MdePkg.dec
+
+[LibraryClasses]
+  DebugLib
+
+[Protocols]
+  gEfiSmmBase2ProtocolGuid                      ## CONSUMES
+
+[Depex]
+  gEfiSmmBase2ProtocolGuid

OvmfPkg/OvmfPkgX64.fdf

@@ -103,11 +103,11 @@ gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecApicPageTableBase|gUefiOvmfPkgTokenSpaceGui
 0x011000|0x00F000
 gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPeiTempRamBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPeiTempRamSize
 
-0x020000|0x120000
+0x020000|0x130000
 gUefiOvmfPkgTokenSpaceGuid.PcdOvmfPeiMemFvBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfPeiMemFvSize
 FV = PEIFV
 
-0x140000|0xE40000
+0x150000|0xE30000
 gUefiOvmfPkgTokenSpaceGuid.PcdOvmfDxeMemFvBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfDxeMemFvSize
 FV = DXEFV
 

SecurityPkg/Tcg/Tcg2Acpi/Tcg2Acpi.inf

@@ -58,6 +58,7 @@
   Tcg2PhysicalPresenceLib
   PcdLib
   HobLib
+  IntrinsicLib
 
 [Guids]
   gEfiTpmDeviceInstanceTpm20DtpmGuid                            ## PRODUCES           ## GUID       # TPM device identifier

UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf

@@ -51,6 +51,7 @@
   PrintLib
   SerialPortLib
   SynchronizationLib
+  SmmServicesTableLib
 
 [Pcd]
   gEfiMdeModulePkgTokenSpaceGuid.PcdCpuStackGuard

UefiCpuPkg/PiSmmCpuDxeSmm/SmramSaveState.c

@@ -14,7 +14,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 #include <Library/BaseLib.h>
 #include <Library/BaseMemoryLib.h>
-#include <Library/SmmServicesTableLib.h>
 #include <Library/DebugLib.h>
 
 #include "PiSmmCpuCommon.h"

UefiCpuPkg/UefiCpuPkg.dsc

@@ -110,6 +110,7 @@
   HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf
 
 [LibraryClasses.common.MM_STANDALONE]
+  SmmServicesTableLib|MdePkg/Library/SmmServicesTableLib/StandaloneSmmServicesTableLib.inf
   MmServicesTableLib|MdePkg/Library/StandaloneMmServicesTableLib/StandaloneMmServicesTableLib.inf
   SmmCpuFeaturesLib|UefiCpuPkg/Library/SmmCpuFeaturesLib/StandaloneMmCpuFeaturesLib.inf