IntelFsp2WrapperPkg: Add a PCD to control if signaling PciEnumerationComplete.

PciEnumerationComplete might be signaled to FSP in Coreboot. So FSP
wrapper driver don't need send it again. Add a PCD to control if a
FSP API could be skipped from FspWrapperNotifyDxe driver.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Guo Dong <guo.dong@intel.com>
Reviewed-by: Maurice Ma <maurice.ma@intel.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>
Reviewed-by: Giri P Mudusuru <giri.p.mudusuru@intel.com>

diff --git a/IntelFsp2WrapperPkg/FspWrapperNotifyDxe/FspWrapperNotifyDxe.c b/IntelFsp2WrapperPkg/FspWrapperNotifyDxe/FspWrapperNotifyDxe.c
index a69263278db1c7511d9f3661312d5b2bf6ab241d..a2fe18c2da106fd01d3930da5a91644dcbaf2f40 100644 (file)
--- a/IntelFsp2WrapperPkg/FspWrapperNotifyDxe/FspWrapperNotifyDxe.c
+++ b/IntelFsp2WrapperPkg/FspWrapperNotifyDxe/FspWrapperNotifyDxe.c
@@ -27,6 +27,8 @@
 #include <Library/HobLib.h>\r
 #include <FspStatusCode.h>\r
 \r
 #include <Library/HobLib.h>\r
 #include <FspStatusCode.h>\r
 \r

+#define   FSP_API_NOTIFY_PHASE_AFTER_PCI_ENUMERATION     BIT16\r
+\r

 typedef\r
 EFI_STATUS\r
 (EFIAPI * ADD_PERFORMANCE_RECORDS)(\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI * ADD_PERFORMANCE_RECORDS)(\r


@@ -236,6 +238,7 @@ FspWrapperNotifyDxeEntryPoint (
   EFI_EVENT  ReadyToBootEvent;\r
   VOID       *Registration;\r
   EFI_EVENT  ProtocolNotifyEvent;\r
   EFI_EVENT  ReadyToBootEvent;\r
   VOID       *Registration;\r
   EFI_EVENT  ProtocolNotifyEvent;\r

+  UINT32     FspApiMask;\r

 \r
   //\r
   // Load this driver's image to memory\r
 \r
   //\r
   // Load this driver's image to memory\r


@@ -245,14 +248,17 @@ FspWrapperNotifyDxeEntryPoint (
     return EFI_SUCCESS;\r
   }\r
 \r
     return EFI_SUCCESS;\r
   }\r
 \r

-  ProtocolNotifyEvent = EfiCreateProtocolNotifyEvent (\r
-                          &gEfiPciEnumerationCompleteProtocolGuid,\r
-                          TPL_CALLBACK,\r
-                          OnPciEnumerationComplete,\r
-                          NULL,\r
-                          &Registration\r
-                          );\r
-  ASSERT (ProtocolNotifyEvent != NULL);\r
+  FspApiMask = PcdGet32 (PcdSkipFspApi);\r
+  if ((FspApiMask & FSP_API_NOTIFY_PHASE_AFTER_PCI_ENUMERATION) == 0) {\r
+    ProtocolNotifyEvent = EfiCreateProtocolNotifyEvent (\r
+                            &gEfiPciEnumerationCompleteProtocolGuid,\r
+                            TPL_CALLBACK,\r
+                            OnPciEnumerationComplete,\r
+                            NULL,\r
+                            &Registration\r
+                            );\r
+    ASSERT (ProtocolNotifyEvent != NULL);\r
+  }\r

 \r
   Status = EfiCreateEventReadyToBootEx (\r
              TPL_CALLBACK,\r
 \r
   Status = EfiCreateEventReadyToBootEx (\r
              TPL_CALLBACK,\r

diff --git a/IntelFsp2WrapperPkg/FspWrapperNotifyDxe/FspWrapperNotifyDxe.inf b/IntelFsp2WrapperPkg/FspWrapperNotifyDxe/FspWrapperNotifyDxe.inf
index f851f6881da0d76bd0364316132cd406490589a6..54c2cbf679ec34f7fb38127ec5d5a753397c6397 100644 (file)
--- a/IntelFsp2WrapperPkg/FspWrapperNotifyDxe/FspWrapperNotifyDxe.inf
+++ b/IntelFsp2WrapperPkg/FspWrapperNotifyDxe/FspWrapperNotifyDxe.inf
@@ -62,6 +62,7 @@
 \r
 [Pcd]\r
   gIntelFsp2WrapperTokenSpaceGuid.PcdFspsBaseAddress  ## CONSUMES\r
 \r
 [Pcd]\r
   gIntelFsp2WrapperTokenSpaceGuid.PcdFspsBaseAddress  ## CONSUMES\r

+  gIntelFsp2WrapperTokenSpaceGuid.PcdSkipFspApi       ## CONSUMES\r

 \r
 [Depex]\r
   TRUE\r
 \r
 [Depex]\r
   TRUE\r

diff --git a/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec b/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec
index d9d2d80e12a548a278850109de196be8fd45cdeb..c0881852c577a55ce2e289fb09b9678cd4b1be5d 100644 (file)
--- a/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec
+++ b/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec
@@ -75,6 +75,24 @@
   gIntelFsp2WrapperTokenSpaceGuid.PcdFsptBaseAddress|0x00000000|UINT32|0x00000300\r
   gIntelFsp2WrapperTokenSpaceGuid.PcdFspmBaseAddress|0x00000000|UINT32|0x00000301\r
 \r
   gIntelFsp2WrapperTokenSpaceGuid.PcdFsptBaseAddress|0x00000000|UINT32|0x00000300\r
   gIntelFsp2WrapperTokenSpaceGuid.PcdFspmBaseAddress|0x00000000|UINT32|0x00000301\r
 \r

+  ## This PCD indicates if FSP APIs are skipped from FSP wrapper.<BR><BR>\r
+  #  If a bit is set, that means this FSP API is skipped.<BR>\r
+  #  If a bit is clear, that means this FSP API is NOT skipped.<BR>\r
+  #  NOTE: Only NotifyPhase Post PCI enumeration (BIT16) is implemented.<BR>\r
+  #  BIT[15:0] is for function:<BR>\r
+  #    BIT0    - Skip TempRamInit<BR>\r
+  #    BIT1    - Skip MemoryInit<BR>\r
+  #    BIT2    - Skip TempRamExit<BR>\r
+  #    BIT3    - Skip SiliconInit<BR>\r
+  #    BIT4    - Skip NotifyPhase<BR>\r
+  #  BIT[32:16] is for sub-function:<BR>\r
+  #    BIT16   - Skip NotifyPhase (AfterPciEnumeration)<BR>\r
+  #    BIT17   - Skip NotifyPhase (ReadyToBoot)<BR>\r
+  #    BIT18   - Skip NotifyPhase (EndOfFirmware)<BR>\r
+  #  Any undefined BITs are reserved for future use.<BR>\r
+  # @Prompt Skip FSP API from FSP wrapper.\r
+  gIntelFsp2WrapperTokenSpaceGuid.PcdSkipFspApi|0x00000000|UINT32|0x40000009\r
+\r

 [PcdsFixedAtBuild, PcdsPatchableInModule,PcdsDynamic,PcdsDynamicEx]\r
   gIntelFsp2WrapperTokenSpaceGuid.PcdFspsBaseAddress|0x00000000|UINT32|0x00001001\r
   
\ No newline at end of file
 [PcdsFixedAtBuild, PcdsPatchableInModule,PcdsDynamic,PcdsDynamicEx]\r
   gIntelFsp2WrapperTokenSpaceGuid.PcdFspsBaseAddress|0x00000000|UINT32|0x00001001\r
   
\ No newline at end of file