Retire the duplicate StatusCode PCD:

gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseEfiSerial, PcdStatusCodeUseHardSerial, PcdStatusCodeUseRuntimeMemory, PcdStatusCodeReplayInSerial, PcdStatusCodeReplayInRuntimeMemory, PcdStatusCodeReplayInDataHub, PcdStatusCodeReplayInOEM, PcdStatusCodeRuntimeMemorySize

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8566 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
index 1b346989be64c5280149f02bfad8a297a48338ec..8dde600283a897000525bedeec4e46ad6fb83060 100644 (file)
--- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
+++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
@@ -115,41 +115,53 @@
   gEfiOEMBadgingProtocolGuid     = { 0x170E13C0, 0xBF1B, 0x4218, { 0x87, 0x1D, 0x2A, 0xBD, 0xC6, 0xF8, 0x87, 0xBC }}\r
 \r
 [PcdsFeatureFlag]\r
-  ## if required, only one mask PCD to support all features to reduces PCD number.\r
+  ## This PCD specifies whether StatusCode is reported to Serial port.\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|TRUE|BOOLEAN|0x00010022\r
+\r
+  ## This PCD specifies whether StatusCode is stored in memory.\r
+  #  Pei Phase Memory is boot time memory. Dxe Phase memory is runtime memory.\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|FALSE|BOOLEAN|0x00010023\r
+\r
+  ## This PCD specifies whether StatusCode is reported to OEM device.\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseOEM|FALSE|BOOLEAN|0x00010024\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseEfiSerial|FALSE|BOOLEAN|0x00010026\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseHardSerial|TRUE|BOOLEAN|0x00010027\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseRuntimeMemory|FALSE|BOOLEAN|0x00010028\r
+\r
+  ## This PCD specifies whether StatusCode is loged into DataHub.\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseDataHub|FALSE|BOOLEAN|0x00010029\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeReplayInSerial|FALSE|BOOLEAN|0x0001002a\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeReplayInRuntimeMemory|FALSE|BOOLEAN|0x0001002b\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeReplayInDataHub|FALSE|BOOLEAN|0x0001002c\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeReplayInOEM|FALSE|BOOLEAN|0x0001002d\r
+\r
+  ## This PCD specifies whether Peiphase StatusCode is replayed in DxePhase.\r
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeReplayIn|FALSE|BOOLEAN|0x0001002d\r
   \r
   ## \r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPciIsaEnable|FALSE|BOOLEAN|0x00010039\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPciVgaEnable|FALSE|BOOLEAN|0x0001003a\r
+  \r
+  ## This PCD specifies whether PciBus supports the hot plug device.\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPciBusHotplugDeviceSupport|TRUE|BOOLEAN|0x0001003d\r
   \r
-  ## \r
+  ## ISA bus related PCD can be merged into one.\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdIsaBusSupportDma|TRUE|BOOLEAN|0x00010040\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdIsaBusOnlySupportSlaveDma|FALSE|BOOLEAN|0x00010041\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdIsaBusSupportIsaMemory|TRUE|BOOLEAN|0x00010042\r
-  \r
+\r
 [PcdsFixedAtBuild]\r
+  ## PCD marks PCI support incompatible operations: AcpiResource, Read, Write, RegisterUpdate, AccessWidth.\r
+  #  BIT0:AcpiResource, BIT1:Read, BIT2:Write, BIT3:RegisterUpdate, BIT4:AccessWidth\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPciIncompatibleDeviceSupportMask|0|UINT8|0x0001003f\r
 \r
 [PcdsFixedAtBuild,PcdsPatchableInModule,PcdsDynamic]\r
+  ## PcdStatusCodeMemorySize is used when PcdStatusCodeUseMemory is set to true\r
+  #  (PcdStatusCodeMemorySize * KBytes) is the total taken memory size.\r
+  #  The default value in PeiPhase is 1 KBytes.\r
+  #  The default value in DxePhase is 128 KBytes.\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|1|UINT16|0x00010025\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeRuntimeMemorySize|128|UINT16|0x0001002e\r
 \r
 [PcdsDynamic]\r
+  ## PCD is used to mark if the machine has complete one boot cycle before.\r
+  #  After the complete boot, the variable BootState will be set to TRUE. \r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBootState|TRUE|BOOLEAN|0x0001002f\r
   \r
   ## Timeout value for displaying progressing bar in before boot OS.\r
-  #  According to UEFI 2.0 spec, it should treat the Timeout value as 0xffff.\r
+  #  According to UEFI 2.0 spec, the default TimeOut should be 0xffff.\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformBootTimeOut|0xffff|UINT16|0x40000001\r
 \r
   ## Error level for hardware recorder. If value 0, platform does not support feature of hardware error record.\r

diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc
index dfbe380c9185b2d28ff1cc863d3f7455a5d2d2fb..4e2f5a0fbf4fd8281f9b7272267df9690ef294aa 100644 (file)
--- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc
+++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc
@@ -132,16 +132,6 @@
   gEfiMdePkgTokenSpaceGuid.PcdComponentName2Disable|FALSE\r
   gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnostics2Disable|FALSE\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|FALSE\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseOEM|FALSE\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseEfiSerial|FALSE\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseHardSerial|FALSE\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseRuntimeMemory|FALSE\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseDataHub|FALSE\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeReplayInSerial|FALSE\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeReplayInRuntimeMemory|FALSE\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeReplayInDataHub|FALSE\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeReplayInOEM|FALSE\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPciIsaEnable|FALSE\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPciVgaEnable|FALSE\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPciBusHotplugDeviceSupport|TRUE\r
@@ -169,10 +159,11 @@
   gEfiMdePkgTokenSpaceGuid.PcdUartDefaultStopBits|1\r
   gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|0\r
 \r
-\r
-[PcdsDynamicDefault.common.DEFAULT]\r
+[PcdsDynamicDefault.PEIM.DEFAULT]\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|1\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeRuntimeMemorySize|4\r
+\r
+[PcdsDynamicDefault.DXE_RUNTIME_DRIVER.DEFAULT]\r
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|4\r
 \r
 [PcdsFixedAtBuild.IPF]\r
   gEfiMdePkgTokenSpaceGuid.PcdIoBlockBaseAddressForIpf|0x0ffffc000000\r

diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf
index fade2dec25475f1298aa3fecbf91cf707fa0a0b1..6085cd046670fa3883324a683376765af9352e7a 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf
@@ -68,7 +68,7 @@
 \r
 \r
 [Pcd.common]\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize\r
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|1|PcdStatusCodeUseMemory\r
 \r
 [Depex]\r
   TRUE\r

diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/RtMemoryStatusCodeWorker.c b/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/RtMemoryStatusCodeWorker.c
index e67c31d3e30e5acfc15617a6698fecc203db660a..5949190ea917205c06191a8b1db174ebadf892f7 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/RtMemoryStatusCodeWorker.c
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/RtMemoryStatusCodeWorker.c
@@ -32,15 +32,14 @@ RtMemoryStatusCodeInitializeWorker (
   //\r
   mRtMemoryStatusCodeTable = AllocateRuntimePool (\r
                                sizeof (RUNTIME_MEMORY_STATUSCODE_HEADER) +\r
-                               PcdGet16 (PcdStatusCodeRuntimeMemorySize) *\r
-                               1024\r
+                               PcdGet16 (PcdStatusCodeMemorySize) * 1024\r
                                );\r
   ASSERT (mRtMemoryStatusCodeTable != NULL);\r
 \r
   mRtMemoryStatusCodeTable->RecordIndex      = 0;\r
   mRtMemoryStatusCodeTable->NumberOfRecords  = 0;\r
   mRtMemoryStatusCodeTable->MaxRecordsNumber = \r
-    (PcdGet16 (PcdStatusCodeRuntimeMemorySize) * 1024) / sizeof (MEMORY_STATUSCODE_RECORD);\r
+    (PcdGet16 (PcdStatusCodeMemorySize) * 1024) / sizeof (MEMORY_STATUSCODE_RECORD);\r
 \r
   return EFI_SUCCESS;\r
 }\r

diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/SerialStatusCodeWorker.c b/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/SerialStatusCodeWorker.c
index 1d5f53e47910518ebfb140d2e369d81749da832b..c4e9e3340ba789976e7d83a99698968170e58c02 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/SerialStatusCodeWorker.c
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/SerialStatusCodeWorker.c
@@ -14,33 +14,6 @@
 \r
 #include "StatusCodeRuntimeDxe.h"\r
 \r
-EFI_SERIAL_IO_PROTOCOL *mSerialIoProtocol;\r
-\r
-/**\r
-  Locates Serial I/O Protocol as initialization for serial status code worker.\r
- \r
-  @retval EFI_SUCCESS  Serial I/O Protocol is successfully located.\r
-\r
-**/\r
-EFI_STATUS\r
-EfiSerialStatusCodeInitializeWorker (\r
-  VOID\r
-  )\r
-{\r
-  EFI_STATUS Status;\r
-\r
-  Status = gBS->LocateProtocol (\r
-             &gEfiSerialIoProtocolGuid,\r
-             NULL,\r
-             (VOID **) &mSerialIoProtocol\r
-             );\r
-\r
-  ASSERT_EFI_ERROR (Status);\r
-\r
-  return EFI_SUCCESS;\r
-}\r
-\r
-\r
 /**\r
   Convert status code value and extended data to readable ASCII string, send string to serial I/O device.\r
  \r
@@ -78,15 +51,6 @@ SerialStatusCodeReportWorker (
   UINTN           CharCount;\r
   BASE_LIST       Marker;\r
 \r
-  if (FeaturePcdGet (PcdStatusCodeUseEfiSerial)) {\r
-    if (EfiAtRuntime ()) {\r
-      return EFI_DEVICE_ERROR;\r
-    }\r
-    if (EfiGetCurrentTpl () > TPL_CALLBACK ) {\r
-      return EFI_DEVICE_ERROR;\r
-    }\r
-  }\r
-\r
   Buffer[0] = '\0';\r
 \r
   if (Data != NULL &&\r
@@ -174,20 +138,10 @@ SerialStatusCodeReportWorker (
                   );\r
   }\r
 \r
-\r
-  if (FeaturePcdGet (PcdStatusCodeUseHardSerial)) {\r
-    //\r
-    // Call SerialPort Lib function to do print.\r
-    //\r
-    SerialPortWrite ((UINT8 *) Buffer, CharCount);\r
-  }\r
-  if (FeaturePcdGet (PcdStatusCodeUseEfiSerial)) {\r
-    mSerialIoProtocol->Write (\r
-      mSerialIoProtocol,\r
-      &CharCount,\r
-      Buffer\r
-      );\r
-  }\r
+  //\r
+  // Call SerialPort Lib function to do print.\r
+  //\r
+  SerialPortWrite ((UINT8 *) Buffer, CharCount);\r
 \r
   return EFI_SUCCESS;\r
 }\r

diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.c b/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.c
index 12651153f5c71591aea6f991606d775d2f3b4c81..eb193c8e6ed711ce29778c6f5f0159a6421537b9 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.c
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.c
@@ -119,7 +119,7 @@ ReportDispatcher (
     return EFI_DEVICE_ERROR;\r
   }\r
 \r
-  if (FeaturePcdGet (PcdStatusCodeUseEfiSerial) || FeaturePcdGet (PcdStatusCodeUseHardSerial)) {\r
+  if (FeaturePcdGet (PcdStatusCodeUseSerial)) {\r
     SerialStatusCodeReportWorker (\r
       CodeType,\r
       Value,\r
@@ -128,7 +128,7 @@ ReportDispatcher (
       Data\r
       );\r
   }\r
-  if (FeaturePcdGet (PcdStatusCodeUseRuntimeMemory)) {\r
+  if (FeaturePcdGet (PcdStatusCodeUseMemory)) {\r
     RtMemoryStatusCodeReportWorker (\r
       CodeType,\r
       Value,\r
@@ -214,18 +214,14 @@ InitializationDispatcherWorker (
   // if enable UseRuntimeMemory, then initialize runtime memory status code worker.\r
   // if enable UseDataHub, then initialize data hub status code worker.\r
   //\r
-  if (FeaturePcdGet (PcdStatusCodeUseEfiSerial)) {\r
-    Status = EfiSerialStatusCodeInitializeWorker ();\r
-    ASSERT_EFI_ERROR (Status);\r
-  }\r
-  if (FeaturePcdGet (PcdStatusCodeUseHardSerial)) {\r
+  if (FeaturePcdGet (PcdStatusCodeUseSerial)) {\r
     //\r
     // Call Serial Port Lib API to initialize serial port.\r
     //\r
     Status = SerialPortInitialize ();\r
     ASSERT_EFI_ERROR (Status);\r
   }\r
-  if (FeaturePcdGet (PcdStatusCodeUseRuntimeMemory)) {\r
+  if (FeaturePcdGet (PcdStatusCodeUseMemory)) {\r
     Status = RtMemoryStatusCodeInitializeWorker ();\r
     ASSERT_EFI_ERROR (Status);\r
   }\r
@@ -244,82 +240,78 @@ InitializationDispatcherWorker (
   //\r
   // Replay Status code which saved in GUID'ed HOB to all supported devices. \r
   //\r
-\r
-  // \r
-  // Journal GUID'ed HOBs to find all record entry, if found, \r
-  // then output record to support replay device.\r
-  //\r
-  ExpectedPacketIndex = 0;\r
-  Hob.Raw   = GetFirstGuidHob (&gMemoryStatusCodeRecordGuid);\r
-  HobStart  = Hob.Raw;\r
-  while (Hob.Raw != NULL) {\r
-    PacketHeader = (MEMORY_STATUSCODE_PACKET_HEADER *) GET_GUID_HOB_DATA (Hob.Guid);\r
-    if (PacketHeader->PacketIndex == ExpectedPacketIndex) {\r
-      Record = (MEMORY_STATUSCODE_RECORD *) (PacketHeader + 1);\r
-      for (Index = 0; Index < PacketHeader->RecordIndex; Index++) {\r
-        //\r
-        // Dispatch records to devices based on feature flag.\r
-        //\r
-        if (FeaturePcdGet (PcdStatusCodeReplayInSerial) && \r
-            (FeaturePcdGet (PcdStatusCodeUseHardSerial) ||\r
-             FeaturePcdGet (PcdStatusCodeUseEfiSerial))) {\r
-          SerialStatusCodeReportWorker (\r
-            Record[Index].CodeType,\r
-            Record[Index].Value,\r
-            Record[Index].Instance,\r
-            NULL,\r
-            NULL\r
-            );\r
-        }\r
-        if (FeaturePcdGet (PcdStatusCodeReplayInRuntimeMemory) &&\r
-            FeaturePcdGet (PcdStatusCodeUseRuntimeMemory)) {\r
-          RtMemoryStatusCodeReportWorker (\r
-            Record[Index].CodeType,\r
-            Record[Index].Value,\r
-            Record[Index].Instance\r
-            );\r
-        }\r
-        if (FeaturePcdGet (PcdStatusCodeReplayInDataHub) &&\r
-            FeaturePcdGet (PcdStatusCodeUseDataHub)) {\r
-          DataHubStatusCodeReportWorker (\r
-            Record[Index].CodeType,\r
-            Record[Index].Value,\r
-            Record[Index].Instance,\r
-            NULL,\r
-            NULL\r
-            );\r
-        }\r
-        if (FeaturePcdGet (PcdStatusCodeReplayInOEM) &&\r
-            FeaturePcdGet (PcdStatusCodeUseOEM)) {\r
+  if (FeaturePcdGet (PcdStatusCodeReplayIn)) {\r
+    // \r
+    // Journal GUID'ed HOBs to find all record entry, if found, \r
+    // then output record to support replay device.\r
+    //\r
+    ExpectedPacketIndex = 0;\r
+    Hob.Raw   = GetFirstGuidHob (&gMemoryStatusCodeRecordGuid);\r
+    HobStart  = Hob.Raw;\r
+    while (Hob.Raw != NULL) {\r
+      PacketHeader = (MEMORY_STATUSCODE_PACKET_HEADER *) GET_GUID_HOB_DATA (Hob.Guid);\r
+      if (PacketHeader->PacketIndex == ExpectedPacketIndex) {\r
+        Record = (MEMORY_STATUSCODE_RECORD *) (PacketHeader + 1);\r
+        for (Index = 0; Index < PacketHeader->RecordIndex; Index++) {\r
           //\r
-          // Call OEM hook status code library API to report status code to OEM device\r
+          // Dispatch records to devices based on feature flag.\r
           //\r
-          OemHookStatusCodeReport (\r
-            Record[Index].CodeType,\r
-            Record[Index].Value,\r
-            Record[Index].Instance,\r
-            NULL,\r
-            NULL\r
-            );\r
+          if (FeaturePcdGet (PcdStatusCodeUseSerial)) {\r
+            SerialStatusCodeReportWorker (\r
+              Record[Index].CodeType,\r
+              Record[Index].Value,\r
+              Record[Index].Instance,\r
+              NULL,\r
+              NULL\r
+              );\r
+          }\r
+          if (FeaturePcdGet (PcdStatusCodeUseMemory)) {\r
+            RtMemoryStatusCodeReportWorker (\r
+              Record[Index].CodeType,\r
+              Record[Index].Value,\r
+              Record[Index].Instance\r
+              );\r
+          }\r
+          if (FeaturePcdGet (PcdStatusCodeUseDataHub)) {\r
+            DataHubStatusCodeReportWorker (\r
+              Record[Index].CodeType,\r
+              Record[Index].Value,\r
+              Record[Index].Instance,\r
+              NULL,\r
+              NULL\r
+              );\r
+          }\r
+          if (FeaturePcdGet (PcdStatusCodeUseOEM)) {\r
+            //\r
+            // Call OEM hook status code library API to report status code to OEM device\r
+            //\r
+            OemHookStatusCodeReport (\r
+              Record[Index].CodeType,\r
+              Record[Index].Value,\r
+              Record[Index].Instance,\r
+              NULL,\r
+              NULL\r
+              );\r
+          }\r
         }\r
+        ExpectedPacketIndex++;\r
+  \r
+        //\r
+        // See whether there is gap of packet or not\r
+        //\r
+        if (HobStart != NULL) {\r
+          HobStart  = NULL;\r
+          Hob.Raw   = HobStart;\r
+          continue;\r
+        }\r
+      } else if (HobStart != NULL) {\r
+        //\r
+        // Cache the found packet for improve the performance\r
+        //\r
+        HobStart = Hob.Raw;\r
       }\r
-      ExpectedPacketIndex++;\r
-\r
-      //\r
-      // See whether there is gap of packet or not\r
-      //\r
-      if (HobStart != NULL) {\r
-        HobStart  = NULL;\r
-        Hob.Raw   = HobStart;\r
-        continue;\r
-      }\r
-    } else if (HobStart != NULL) {\r
-      //\r
-      // Cache the found packet for improve the performance\r
-      //\r
-      HobStart = Hob.Raw;\r
+  \r
+      Hob.Raw = GetNextGuidHob (&gMemoryStatusCodeRecordGuid, Hob.Raw);\r
     }\r
-\r
-    Hob.Raw = GetNextGuidHob (&gMemoryStatusCodeRecordGuid, Hob.Raw);\r
   }\r
 }\r

diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.inf b/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.inf
index 1163ff75aeba45fa54d14fb02a3b9c0ff35cd6d7..69382aee011824fdff67aafe82c9cc18e587d0fc 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.inf
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.inf
@@ -71,23 +71,16 @@
 [Protocols]\r
   gEfiStatusCodeRuntimeProtocolGuid             ## PRODUCES\r
   gEfiDataHubProtocolGuid                       ## SOMETIMES_CONSUMES (Needed if Data Hub is supported for status code.)\r
-  gEfiSerialIoProtocolGuid                      ## SOMETIMES_CONSUMES (Needed if Serial is supported for status code.)\r
 \r
-\r
-[FeaturePcd.common]\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeReplayInOEM\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeReplayInRuntimeMemory\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeReplayInDataHub\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeReplayInSerial\r
+[FeaturePcd]\r
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeReplayIn\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseOEM\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseDataHub\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseRuntimeMemory\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseEfiSerial\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseHardSerial\r
-\r
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory\r
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial\r
 \r
-[Pcd.common]\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeRuntimeMemorySize\r
+[Pcd]\r
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize |128| PcdStatusCodeUseMemory\r
 \r
 [Depex]\r
   TRUE
\ No newline at end of file

diff --git a/Nt32Pkg/Nt32Pkg.dsc b/Nt32Pkg/Nt32Pkg.dsc
index 99b7809370920519fe0823cae8b7ae754705cb5f..c7b63340a6a28aff6145780b697663fa89e2f7ff 100644 (file)
--- a/Nt32Pkg/Nt32Pkg.dsc
+++ b/Nt32Pkg/Nt32Pkg.dsc
@@ -240,9 +240,6 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport|TRUE\r
 \r
 [PcdsFixedAtBuild.IA32]\r
-  #gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxPeiStackSize|0x20000\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|1\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeRuntimeMemorySize|128\r
   gEfiNt32PkgTokenSpaceGuid.PcdWinNtMemorySizeForSecMain|L"64!64"|VOID*|12\r
   gEfiNt32PkgTokenSpaceGuid.PcdWinNtFirmwareVolume|L"..\\Fv\\Nt32.fd"|VOID*|52\r
   gEfiNt32PkgTokenSpaceGuid.PcdWinNtBootMode|1\r
@@ -300,18 +297,8 @@
 \r
 [PcdsFeatureFlag.IA32]\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|FALSE\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseOEM|TRUE\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode|FALSE\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseHardSerial|FALSE\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseEfiSerial|FALSE\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseRuntimeMemory|FALSE\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseDataHub|FALSE\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseOEM|TRUE\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeReplayInSerial|FALSE\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeReplayInDataHub|FALSE\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeReplayInRuntimeMemory|FALSE\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeReplayInOEM|FALSE\r
   gEfiMdePkgTokenSpaceGuid.PcdComponentNameDisable|FALSE\r
   gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnosticsDisable|FALSE\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdDevicePathSupportDevicePathToText|TRUE\r

diff --git a/UnixPkg/UnixPkg.dsc b/UnixPkg/UnixPkg.dsc
index 050db8b79ac3136808f6c92b2853cdff9e1be240..0bf9fd0219386fcfa6a1648330ae4fdb353c3745 100644 (file)
--- a/UnixPkg/UnixPkg.dsc
+++ b/UnixPkg/UnixPkg.dsc
@@ -221,9 +221,6 @@
 #\r
 ################################################################################\r
 [PcdsFixedAtBuild.IA32]\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|1\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeRuntimeMemorySize|128\r
-\r
   gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashNvStorageVariableBase|0x280000\r
   gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashNvStorageFtwSpareBase|0x290000\r
   gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashNvStorageFtwWorkingBase|0x28e000\r
@@ -312,21 +309,11 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseExEnabled|TRUE\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseGetSizeEnabled|TRUE\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseSetEnabled|TRUE\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|FALSE\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseOEM|TRUE\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode|FALSE\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportUefiDecompress|TRUE\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdDxePcdDatabaseTraverseEnabled|TRUE\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseHardSerial|FALSE\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseEfiSerial|FALSE\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseRuntimeMemory|FALSE\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseDataHub|FALSE\r
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseOEM|TRUE\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeReplayInSerial|FALSE\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeReplayInDataHub|FALSE\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeReplayInRuntimeMemory|FALSE\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeReplayInOEM|FALSE\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdSupportUpdateCapsuleReset|FALSE\r
   gEfiMdePkgTokenSpaceGuid.PcdComponentNameDisable|FALSE\r
   gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnosticsDisable|FALSE\r