Make PlatformInitPreMem independent to IntelSiliconPkg and IntelFsp2W…

…rapperPkg

This driver is shared across different Silicon vendors.
It should not use Intel specific packages
To achieve this, added a new lib `FspSupportLib` to isolate silicon related PCDs

MinPlatformPkg/Include/Library/FspSupportLib.h

@@ -0,0 +1,35 @@
+/** @file FspSupportLib.c
+
+  Library to report FSP support state
+
+  Copyright (c) Microsoft Corporation. All rights reserved.
+
+**/
+
+#ifndef _FSP_SUPPORT_LIB_H_
+#define _FSP_SUPPORT_LIB_H_
+
+/**
+  Return if platform is boot in FSP wrapper enabled
+
+  @retval     TRUE  FSP binary is used.
+              FALSE FSP binary is not used.
+**/
+BOOLEAN
+EFIAPI
+FspGetWrapperBootMode (
+  VOID
+  );
+
+/**
+  Return FSP mode selection. Only valid on certain platforms
+
+  @retval  FSP mode.
+**/
+UINT8
+EFIAPI
+FspGetModeSelection (
+  VOID
+  );
+
+#endif // _FSP_SUPPORT_LIB_H_

MinPlatformPkg/Library/FspSupportLib/FspSupportLib.c

@@ -0,0 +1,41 @@
+/** @file FspSupportLib.c
+
+  Library to report FSP support state
+
+  Copyright (c) Microsoft Corporation. All rights reserved.
+
+**/
+
+#include <Uefi.h>
+
+#include <Library/FspSupportLib.h>
+#include <Library/PcdLib.h>
+
+/**
+  Return if platform is boot in FSP wrapper enabled
+
+  @retval     TRUE  FSP binary is used.
+              FALSE FSP binary is not used.
+**/
+BOOLEAN
+EFIAPI
+FspGetWrapperBootMode (
+  VOID
+  )
+{
+  return PcdGetBool (PcdFspWrapperBootMode);
+}
+
+/**
+  Return FSP mode selection. Only valid on certain platforms
+
+  @retval  FSP mode.
+**/
+UINT8
+EFIAPI
+FspGetModeSelection (
+  VOID
+  )
+{
+  return PcdGet8 (PcdFspModeSelection);
+}

MinPlatformPkg/Library/FspSupportLib/FspSupportLib.inf

@@ -0,0 +1,31 @@
+# @file FspSupportLib.inf
+#
+# Default implementation of FspSupportLib.
+# Library to report FSP support state
+#
+#
+# Copyright (c) Microsoft Corporation. All rights reserved.
+#
+
+[Defines]
+  INF_VERSION         = 0x00010006
+  BASE_NAME           = FspSupportLib
+  FILE_GUID           = 9D79825F-C6A5-4D94-AF26-23AF2BD6BEC7
+  VERSION_STRING      = 1.0
+  MODULE_TYPE         = BASE
+  LIBRARY_CLASS       = FspSupportLib
+
+[Sources]
+  FspSupportLib.c
+
+[Packages]
+  MdePkg/MdePkg.dec
+  MinPlatformPkg/MinPlatformPkg.dec
+  IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec
+
+[LibraryClasses]
+  PcdLib
+
+[Pcd]
+  gMinPlatformPkgTokenSpaceGuid.PcdFspWrapperBootMode
+  gIntelFsp2WrapperTokenSpaceGuid.PcdFspModeSelection

MinPlatformPkg/MinPlatformPkg.dec

@@ -93,6 +93,9 @@
   TestPointPciSpeedInfoLib|Include/Library/TestPointPciSpeedInfoLib.h
 
   PhatAcpiLib|Include/Library/PhatAcpiLib.h
+  # MU_CHANGE Make PlatformInitPreMem silicon independent
+  FspSupportLib|Include/Library/FspSupportLib.h
+  # MU_CHANGE end
 
 [PcdsFixedAtBuild, PcdsPatchableInModule]
 

MinPlatformPkg/MinPlatformPkg.dsc

@@ -88,6 +88,9 @@
   NULL|MdePkg/Library/StackCheckLibNull/StackCheckLibNull.inf # MU_CHANGE: /GS and -fstack-protector support
   TestPointCheckLib|MinPlatformPkg/Test/Library/TestPointCheckLibNull/TestPointCheckLibNull.inf
   TestPointPciSpeedInfoLib|MinPlatformPkg/Library/TestPointPciSpeedInfoLibNull/TestPointPciSpeedInfoLibNull.inf
+  # MU_CHANGE Make PlatformInitPreMem silicon independent
+  FspSupportLib|MinPlatformPkg/Library/FspSupportLib/FspSupportLib.inf
+  # MU_CHANGE end
 
 [LibraryClasses.common.SEC]
   TestPointCheckLib|MinPlatformPkg/Test/Library/TestPointCheckLib/SecTestPointCheckLib.inf
@@ -237,6 +240,9 @@
   MinPlatformPkg/Library/BaseLargeVariableLib/BaseLargeVariableWriteLib.inf
 
   MinPlatformPkg/Acpi/Library/PhatAcpiLib/DxePhatAcpiLib.inf
+  # MU_CHANGE Make PlatformInitPreMem silicon independent
+  MinPlatformPkg/Library/FspSupportLib/FspSupportLib.inf
+  # MU_CHANGE end
 
 [BuildOptions]
   *_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES

MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPreMem.c

@@ -30,6 +30,9 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Ppi/PlatformMemorySize.h>
 #include <Ppi/BaseMemoryTest.h>
 #include <Ppi/PlatformInitTempRamExitPpi.h>
+// MU_CHANGE Make PlatformInitPreMem silicon independent
+#include <Library/FspSupportLib.h>
+// MU_CHANGE end
 
 EFI_STATUS
 EFIAPI
@@ -516,7 +519,10 @@ PlatformInitPreMem (
 
   BuildMemoryTypeInformation ();
 
-  if ((!PcdGetBool (PcdFspWrapperBootMode)) || (PcdGet8 (PcdFspModeSelection) == 0)) {
+// MU_CHANGE Make PlatformInitPreMem silicon independent
+//if ((!PcdGetBool (PcdFspWrapperBootMode)) || (PcdGet8 (PcdFspModeSelection) == 0)) {
+  if ((!FspGetWrapperBootMode()) || (FspGetModeSelection() == 0)) {
+// MU_CHANGE end
     //
     // Install memory relating PPIs for EDKII native build and FSP dispatch mode
     //

MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPreMem.inf

@@ -28,19 +28,28 @@
   TimerLib
   SetCacheMtrrLib
   ReportCpuHobLib
+  # MU_CHANGE Make PlatformInitPreMem silicon independent
+  FspSupportLib
+  # MU_CHANGE end
 
 [Packages]
   MinPlatformPkg/MinPlatformPkg.dec
   MdeModulePkg/MdeModulePkg.dec
   MdePkg/MdePkg.dec
-  IntelSiliconPkg/IntelSiliconPkg.dec
-  IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec
+  # MU_CHANGE Make PlatformInitPreMem silicon independent
+  # IntelSiliconPkg/IntelSiliconPkg.dec
+  # IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec
+  # MU_CHANGE end
 
 [Pcd]
-  gMinPlatformPkgTokenSpaceGuid.PcdFspWrapperBootMode          ## CONSUMES
+  # MU_CHANGE Make PlatformInitPreMem silicon independent
+  # gMinPlatformPkgTokenSpaceGuid.PcdFspWrapperBootMode          ## CONSUMES
+  # MU_CHANGE end
   gMinPlatformPkgTokenSpaceGuid.PcdStopAfterDebugInit          ## CONSUMES
   gMinPlatformPkgTokenSpaceGuid.PcdStopAfterMemInit            ## CONSUMES
-  gIntelFsp2WrapperTokenSpaceGuid.PcdFspModeSelection          ## CONSUMES
+  # MU_CHANGE Make PlatformInitPreMem silicon independent
+  # gIntelFsp2WrapperTokenSpaceGuid.PcdFspModeSelection          ## CONSUMES
+  # MU_CHANGE end
 
 [FixedPcd]
   gMinPlatformPkgTokenSpaceGuid.PcdPlatformEfiAcpiReclaimMemorySize  ## CONSUMES