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>

7 files changed, 35 insertions, 41 deletions

diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
index 4f44af6948..843e963ad3 100644
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -760,19 +760,6 @@
   # @Prompt Enable PCI bridge IO alignment probe.

   gEfiMdeModulePkgTokenSpaceGuid.PcdPciBridgeIoAlignmentProbe|FALSE|BOOLEAN|0x0001004e

 

-  ## Indicates if StatusCode is reported via Serial port.<BR><BR>

-  #   TRUE  - Reports StatusCode via Serial port.<BR>

-  #   FALSE - Does not report StatusCode via Serial port.<BR>

-  # @Prompt Enable StatusCode via Serial port.

-  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|TRUE|BOOLEAN|0x00010022

-

-  ## Indicates if StatusCode is stored in memory.

-  #  The memory is boot time memory in PEI Phase and is runtime memory in DXE Phase.<BR><BR>

-  #   TRUE  - Stores StatusCode in memory.<BR>

-  #   FALSE - Does not store StatusCode in memory.<BR>

-  # @Prompt Enable StatusCode via memory.

-  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|FALSE|BOOLEAN|0x00010023

-

   ## Indicates if PEI phase StatusCode will be replayed in DXE phase.<BR><BR>

   #   TRUE  - Replays PEI phase StatusCode in DXE phased.<BR>

   #   FALSE - Does not replay PEI phase StatusCode in DXE phase.<BR>

@@ -2001,6 +1988,19 @@
   # @Prompt TCG Platform Firmware Profile revision.

   gEfiMdeModulePkgTokenSpaceGuid.PcdTcgPfpMeasurementRevision|0|UINT32|0x00010077

 

+  ## Indicates if StatusCode is reported via Serial port.<BR><BR>

+  #   TRUE  - Reports StatusCode via Serial port.<BR>

+  #   FALSE - Does not report StatusCode via Serial port.<BR>

+  # @Prompt Enable StatusCode via Serial port.

+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|TRUE|BOOLEAN|0x00010022

+

+  ## Indicates if StatusCode is stored in memory.

+  #  The memory is boot time memory in PEI Phase and is runtime memory in DXE Phase.<BR><BR>

+  #   TRUE  - Stores StatusCode in memory.<BR>

+  #   FALSE - Does not store StatusCode in memory.<BR>

+  # @Prompt Enable StatusCode via memory.

+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|FALSE|BOOLEAN|0x00010023

+

 [PcdsPatchableInModule]

   ## Specify memory size with page number for PEI code when

   #  Loading Module at Fixed Address feature is enabled.

diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.c b/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.c
index 1b07f92f3c..9b2ea4ee84 100644
--- 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

   onto the PEI status code router.

 

-  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2009 - 2020, Intel Corporation. All rights reserved.<BR>

   SPDX-License-Identifier: BSD-2-Clause-Patent

 

 **/

@@ -45,13 +45,13 @@ StatusCodeHandlerPeiEntry (
   // If enable UseSerial, then initialize serial port.

   // if enable UseMemory, then initialize memory status code worker.

   //

-  if (FeaturePcdGet (PcdStatusCodeUseSerial)) {

+  if (PcdGetBool (PcdStatusCodeUseSerial)) {

     Status = SerialPortInitialize();

     ASSERT_EFI_ERROR (Status);

     Status = RscHandlerPpi->Register (SerialStatusCodeReportWorker);

     ASSERT_EFI_ERROR (Status);

   }

-  if (FeaturePcdGet (PcdStatusCodeUseMemory)) {

+  if (PcdGetBool (PcdStatusCodeUseMemory)) {

     Status = MemoryStatusCodeInitializeWorker ();

     ASSERT_EFI_ERROR (Status);

     Status = RscHandlerPpi->Register (MemoryStatusCodeReportWorker);

diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf b/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf
index 8aef9af34a..64380ddfac 100644
--- a/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf
+++ b/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf
@@ -53,11 +53,9 @@
 [Ppis]

   gEfiPeiRscHandlerPpiGuid                      ## CONSUMES

 

-[FeaturePcd]

-  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory ## CONSUMES

-  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial ## CONSUMES

-

 [Pcd]

+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial ## CONSUMES

+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory ## CONSUMES

   gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|1|gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory    ## SOMETIMES_CONSUMES

 

 [Depex]

diff --git a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.c b/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.c
index 79cc48fa55..a8c0fe5b71 100644
--- 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

   onto the DXE status code router.

 

-  Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2006 - 2020, Intel Corporation. All rights reserved.<BR>

   SPDX-License-Identifier: BSD-2-Clause-Patent

 

 **/

@@ -29,7 +29,7 @@ UnregisterBootTimeHandlers (
   IN VOID             *Context

   )

 {

-  if (FeaturePcdGet (PcdStatusCodeUseSerial)) {

+  if (PcdGetBool (PcdStatusCodeUseSerial)) {

     mRscHandlerProtocol->Unregister (SerialStatusCodeReportWorker);

   }

 }

@@ -80,14 +80,14 @@ InitializationDispatcherWorker (
   // If enable UseSerial, then initialize serial port.

   // if enable UseRuntimeMemory, then initialize runtime memory status code worker.

   //

-  if (FeaturePcdGet (PcdStatusCodeUseSerial)) {

+  if (PcdGetBool (PcdStatusCodeUseSerial)) {

     //

     // Call Serial Port Lib API to initialize serial port.

     //

     Status = SerialPortInitialize ();

     ASSERT_EFI_ERROR (Status);

   }

-  if (FeaturePcdGet (PcdStatusCodeUseMemory)) {

+  if (PcdGetBool (PcdStatusCodeUseMemory)) {

     Status = RtMemoryStatusCodeInitializeWorker ();

     ASSERT_EFI_ERROR (Status);

   }

@@ -115,7 +115,7 @@ InitializationDispatcherWorker (
         //

         // Dispatch records to devices based on feature flag.

         //

-        if (FeaturePcdGet (PcdStatusCodeUseSerial)) {

+        if (PcdGetBool (PcdStatusCodeUseSerial)) {

           SerialStatusCodeReportWorker (

             Record[Index].CodeType,

             Record[Index].Value,

@@ -124,7 +124,7 @@ InitializationDispatcherWorker (
             NULL

             );

         }

-        if (FeaturePcdGet (PcdStatusCodeUseMemory)) {

+        if (PcdGetBool (PcdStatusCodeUseMemory)) {

           RtMemoryStatusCodeReportWorker (

             Record[Index].CodeType,

             Record[Index].Value,

@@ -171,10 +171,10 @@ StatusCodeHandlerRuntimeDxeEntry (
   //

   InitializationDispatcherWorker ();

 

-  if (FeaturePcdGet (PcdStatusCodeUseSerial)) {

+  if (PcdGetBool (PcdStatusCodeUseSerial)) {

     mRscHandlerProtocol->Register (SerialStatusCodeReportWorker, TPL_HIGH_LEVEL);

   }

-  if (FeaturePcdGet (PcdStatusCodeUseMemory)) {

+  if (PcdGetBool (PcdStatusCodeUseMemory)) {

     mRscHandlerProtocol->Register (RtMemoryStatusCodeReportWorker, TPL_HIGH_LEVEL);

   }

 

diff --git a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf b/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf
index d74c2a55dc..faadfd9578 100644
--- a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf
+++ b/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf
@@ -58,12 +58,10 @@
 [Protocols]

   gEfiRscHandlerProtocolGuid                    ## CONSUMES

 

-[FeaturePcd]

+[Pcd]

   gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeReplayIn  ## CONSUMES

-  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory ## CONSUMES

   gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial ## CONSUMES

-

-[Pcd]

+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory ## CONSUMES

   gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize |128| gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory   ## SOMETIMES_CONSUMES

 

 [Depex]

diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.c b/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.c
index f54991ed3f..20271571de 100644
--- 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

   onto the SMM status code router.

 

-  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2009 - 2020, Intel Corporation. All rights reserved.<BR>

   SPDX-License-Identifier: BSD-2-Clause-Patent

 

 **/

@@ -28,14 +28,14 @@ InitializationDispatcherWorker (
   // If enable UseSerial, then initialize serial port.

   // if enable UseRuntimeMemory, then initialize runtime memory status code worker.

   //

-  if (FeaturePcdGet (PcdStatusCodeUseSerial)) {

+  if (PcdGetBool (PcdStatusCodeUseSerial)) {

     //

     // Call Serial Port Lib API to initialize serial port.

     //

     Status = SerialPortInitialize ();

     ASSERT_EFI_ERROR (Status);

   }

-  if (FeaturePcdGet (PcdStatusCodeUseMemory)) {

+  if (PcdGetBool (PcdStatusCodeUseMemory)) {

     Status = MemoryStatusCodeInitializeWorker ();

     ASSERT_EFI_ERROR (Status);

   }

@@ -73,10 +73,10 @@ StatusCodeHandlerSmmEntry (
   //

   InitializationDispatcherWorker ();

 

-  if (FeaturePcdGet (PcdStatusCodeUseSerial)) {

+  if (PcdGetBool (PcdStatusCodeUseSerial)) {

     mRscHandlerProtocol->Register (SerialStatusCodeReportWorker);

   }

-  if (FeaturePcdGet (PcdStatusCodeUseMemory)) {

+  if (PcdGetBool (PcdStatusCodeUseMemory)) {

     mRscHandlerProtocol->Register (MemoryStatusCodeReportWorker);

   }

 

diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.inf b/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.inf
index 47d0545f95..4e24d87e55 100644
--- a/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.inf
+++ b/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.inf
@@ -53,11 +53,9 @@
 [Protocols]

   gEfiSmmRscHandlerProtocolGuid                 ## CONSUMES

 

-[FeaturePcd]

-  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory ## CONSUMES

-  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial ## CONSUMES

-

 [Pcd]

+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial ## CONSUMES

+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory ## CONSUMES

   gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize |128| gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory   ## SOMETIMES_CONSUMES

 

 [Depex]