MdeModulePkg.dec: Change PCDs for status code.

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2786

In order to support enable/disable report status code through memory
or serial dynamic, change the following PCDs from [PcdsFeatureFlag] to
[PcdsFixedAtBuild, PcdsPatchableInModule, PcdsDynamic, PcdsDynamicEx]:
  PcdStatusCodeUseSerial
  PcdStatusCodeUseMemory
The original plaforms can use PcdsFixedAtBuild in .dsc files to save size.

Reviewed-by: Jian J Wang <jian.j.wang@intel.com>
Cc: Hao A Wu <hao.a.wu@intel.com>
Signed-off-by: Ming Tan <ming.tan@intel.com>

diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
index 4f44af694862c95e542fea44568ce562e633de93..843e963ad34b4e6e9e1d6c45889bb30604952260 100644 (file)
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -760,19 +760,6 @@
   # @Prompt Enable PCI bridge IO alignment probe.\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdPciBridgeIoAlignmentProbe|FALSE|BOOLEAN|0x0001004e\r
 \r
-  ## Indicates if StatusCode is reported via Serial port.<BR><BR>\r
-  #   TRUE  - Reports StatusCode via Serial port.<BR>\r
-  #   FALSE - Does not report StatusCode via Serial port.<BR>\r
-  # @Prompt Enable StatusCode via Serial port.\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|TRUE|BOOLEAN|0x00010022\r
-\r
-  ## Indicates if StatusCode is stored in memory.\r
-  #  The memory is boot time memory in PEI Phase and is runtime memory in DXE Phase.<BR><BR>\r
-  #   TRUE  - Stores StatusCode in memory.<BR>\r
-  #   FALSE - Does not store StatusCode in memory.<BR>\r
-  # @Prompt Enable StatusCode via memory.\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|FALSE|BOOLEAN|0x00010023\r
-\r
   ## Indicates if PEI phase StatusCode will be replayed in DXE phase.<BR><BR>\r
   #   TRUE  - Replays PEI phase StatusCode in DXE phased.<BR>\r
   #   FALSE - Does not replay PEI phase StatusCode in DXE phase.<BR>\r
@@ -2001,6 +1988,19 @@
   # @Prompt TCG Platform Firmware Profile revision.\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdTcgPfpMeasurementRevision|0|UINT32|0x00010077\r
 \r
+  ## Indicates if StatusCode is reported via Serial port.<BR><BR>\r
+  #   TRUE  - Reports StatusCode via Serial port.<BR>\r
+  #   FALSE - Does not report StatusCode via Serial port.<BR>\r
+  # @Prompt Enable StatusCode via Serial port.\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|TRUE|BOOLEAN|0x00010022\r
+\r
+  ## Indicates if StatusCode is stored in memory.\r
+  #  The memory is boot time memory in PEI Phase and is runtime memory in DXE Phase.<BR><BR>\r
+  #   TRUE  - Stores StatusCode in memory.<BR>\r
+  #   FALSE - Does not store StatusCode in memory.<BR>\r
+  # @Prompt Enable StatusCode via memory.\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|FALSE|BOOLEAN|0x00010023\r
+\r
 [PcdsPatchableInModule]\r
   ## Specify memory size with page number for PEI code when\r
   #  Loading Module at Fixed Address feature is enabled.\r

diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.c b/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.c
index 1b07f92f3ce86d24ed8a0a557abe1c0b41218927..9b2ea4ee84d9f7dfdac68ac5343f41398a23c081 100644 (file)
--- a/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.c
+++ b/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.c
@@ -2,7 +2,7 @@
   Report Status Code Handler PEIM which produces general handlers and hook them\r
   onto the PEI status code router.\r
 \r
-  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2009 - 2020, Intel Corporation. All rights reserved.<BR>\r
   SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
@@ -45,13 +45,13 @@ StatusCodeHandlerPeiEntry (
   // If enable UseSerial, then initialize serial port.\r
   // if enable UseMemory, then initialize memory status code worker.\r
   //\r
-  if (FeaturePcdGet (PcdStatusCodeUseSerial)) {\r
+  if (PcdGetBool (PcdStatusCodeUseSerial)) {\r
     Status = SerialPortInitialize();\r
     ASSERT_EFI_ERROR (Status);\r
     Status = RscHandlerPpi->Register (SerialStatusCodeReportWorker);\r
     ASSERT_EFI_ERROR (Status);\r
   }\r
-  if (FeaturePcdGet (PcdStatusCodeUseMemory)) {\r
+  if (PcdGetBool (PcdStatusCodeUseMemory)) {\r
     Status = MemoryStatusCodeInitializeWorker ();\r
     ASSERT_EFI_ERROR (Status);\r
     Status = RscHandlerPpi->Register (MemoryStatusCodeReportWorker);\r

diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf b/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf
index 8aef9af34a055ca6ee4886b2cacee0e20abbf950..64380ddfacccccad8d121923bc9d95046a075f78 100644 (file)
--- a/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf
+++ b/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf
@@ -53,11 +53,9 @@
 [Ppis]\r
   gEfiPeiRscHandlerPpiGuid                      ## CONSUMES\r
 \r
-[FeaturePcd]\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory ## CONSUMES\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial ## CONSUMES\r
-\r
 [Pcd]\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial ## CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory ## CONSUMES\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|1|gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory    ## SOMETIMES_CONSUMES\r
 \r
 [Depex]\r

diff --git a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.c b/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.c
index 79cc48fa55a44630fc6808d7859c73c38d075289..a8c0fe5b7149b5a71e2dc988f6cdacdf7f12c88a 100644 (file)
--- a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.c
+++ b/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.c
@@ -2,7 +2,7 @@
   Status Code Handler Driver which produces general handlers and hook them\r
   onto the DXE status code router.\r
 \r
-  Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 2020, Intel Corporation. All rights reserved.<BR>\r
   SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
@@ -29,7 +29,7 @@ UnregisterBootTimeHandlers (
   IN VOID             *Context\r
   )\r
 {\r
-  if (FeaturePcdGet (PcdStatusCodeUseSerial)) {\r
+  if (PcdGetBool (PcdStatusCodeUseSerial)) {\r
     mRscHandlerProtocol->Unregister (SerialStatusCodeReportWorker);\r
   }\r
 }\r
@@ -80,14 +80,14 @@ InitializationDispatcherWorker (
   // If enable UseSerial, then initialize serial port.\r
   // if enable UseRuntimeMemory, then initialize runtime memory status code worker.\r
   //\r
-  if (FeaturePcdGet (PcdStatusCodeUseSerial)) {\r
+  if (PcdGetBool (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 (PcdStatusCodeUseMemory)) {\r
+  if (PcdGetBool (PcdStatusCodeUseMemory)) {\r
     Status = RtMemoryStatusCodeInitializeWorker ();\r
     ASSERT_EFI_ERROR (Status);\r
   }\r
@@ -115,7 +115,7 @@ InitializationDispatcherWorker (
         //\r
         // Dispatch records to devices based on feature flag.\r
         //\r
-        if (FeaturePcdGet (PcdStatusCodeUseSerial)) {\r
+        if (PcdGetBool (PcdStatusCodeUseSerial)) {\r
           SerialStatusCodeReportWorker (\r
             Record[Index].CodeType,\r
             Record[Index].Value,\r
@@ -124,7 +124,7 @@ InitializationDispatcherWorker (
             NULL\r
             );\r
         }\r
-        if (FeaturePcdGet (PcdStatusCodeUseMemory)) {\r
+        if (PcdGetBool (PcdStatusCodeUseMemory)) {\r
           RtMemoryStatusCodeReportWorker (\r
             Record[Index].CodeType,\r
             Record[Index].Value,\r
@@ -171,10 +171,10 @@ StatusCodeHandlerRuntimeDxeEntry (
   //\r
   InitializationDispatcherWorker ();\r
 \r
-  if (FeaturePcdGet (PcdStatusCodeUseSerial)) {\r
+  if (PcdGetBool (PcdStatusCodeUseSerial)) {\r
     mRscHandlerProtocol->Register (SerialStatusCodeReportWorker, TPL_HIGH_LEVEL);\r
   }\r
-  if (FeaturePcdGet (PcdStatusCodeUseMemory)) {\r
+  if (PcdGetBool (PcdStatusCodeUseMemory)) {\r
     mRscHandlerProtocol->Register (RtMemoryStatusCodeReportWorker, TPL_HIGH_LEVEL);\r
   }\r
 \r

diff --git a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf b/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf
index d74c2a55dcaf679f839327797474c87d39aa2d4e..faadfd9578fe7ef77873d11a065efd36e453cd63 100644 (file)
--- a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf
+++ b/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf
@@ -58,12 +58,10 @@
 [Protocols]\r
   gEfiRscHandlerProtocolGuid                    ## CONSUMES\r
 \r
-[FeaturePcd]\r
+[Pcd]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeReplayIn  ## CONSUMES\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory ## CONSUMES\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial ## CONSUMES\r
-\r
-[Pcd]\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory ## CONSUMES\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize |128| gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory   ## SOMETIMES_CONSUMES\r
 \r
 [Depex]\r

diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.c b/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.c
index f54991ed3f677e52dab623e2c902e46c36e9548d..20271571ded46e4bf7b4c27fe4ade91d2f24bc44 100644 (file)
--- a/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.c
+++ b/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.c
@@ -2,7 +2,7 @@
   Status Code Handler Driver which produces general handlers and hook them\r
   onto the SMM status code router.\r
 \r
-  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2009 - 2020, Intel Corporation. All rights reserved.<BR>\r
   SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
@@ -28,14 +28,14 @@ InitializationDispatcherWorker (
   // If enable UseSerial, then initialize serial port.\r
   // if enable UseRuntimeMemory, then initialize runtime memory status code worker.\r
   //\r
-  if (FeaturePcdGet (PcdStatusCodeUseSerial)) {\r
+  if (PcdGetBool (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 (PcdStatusCodeUseMemory)) {\r
+  if (PcdGetBool (PcdStatusCodeUseMemory)) {\r
     Status = MemoryStatusCodeInitializeWorker ();\r
     ASSERT_EFI_ERROR (Status);\r
   }\r
@@ -73,10 +73,10 @@ StatusCodeHandlerSmmEntry (
   //\r
   InitializationDispatcherWorker ();\r
 \r
-  if (FeaturePcdGet (PcdStatusCodeUseSerial)) {\r
+  if (PcdGetBool (PcdStatusCodeUseSerial)) {\r
     mRscHandlerProtocol->Register (SerialStatusCodeReportWorker);\r
   }\r
-  if (FeaturePcdGet (PcdStatusCodeUseMemory)) {\r
+  if (PcdGetBool (PcdStatusCodeUseMemory)) {\r
     mRscHandlerProtocol->Register (MemoryStatusCodeReportWorker);\r
   }\r
 \r

diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.inf b/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.inf
index 47d0545f959141d26355ccd697c72b1df50c7b84..4e24d87e55d105455e318aae73dd3d39f029a185 100644 (file)
--- a/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.inf
+++ b/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.inf
@@ -53,11 +53,9 @@
 [Protocols]\r
   gEfiSmmRscHandlerProtocolGuid                 ## CONSUMES\r
 \r
-[FeaturePcd]\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory ## CONSUMES\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial ## CONSUMES\r
-\r
 [Pcd]\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial ## CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory ## CONSUMES\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize |128| gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory   ## SOMETIMES_CONSUMES\r
 \r
 [Depex]\r