Hisilicon/D0x: Use StatusCode Router & Handler in MdeModulePkg

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

This commit adopts a similar approach to edk2 commit
a6d594c5fabd8da2273d2794826ec086cf9c3c04.

Currently, Hisilicon platforms use modules from under
"IntelFrameworkModulePkg/Universal/StatusCode/", which produce
EFI_PEI_PROGRESS_CODE_PPI and EFI_STATUS_CODE_PROTOCOL directly, and write
the status codes, as they are reported, to the serial port or to a memory
buffer. This is called "handling" the status codes.

MdeModulePkg offers a PEIM under
"MdeModulePkg/Universal/ReportStatusCodeRouter/Pei" that produces both
EFI_PEI_PROGRESS_CODE_PPI and EFI_PEI_RSC_HANDLER_PPI, and a runtime DXE
driver under "MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe"
that produces both EFI_STATUS_CODE_PROTOCOL and EFI_RSC_HANDLER_PROTOCOL.

MdeModulePkg also offers status code handler modules under
MdeModulePkg/Universal/StatusCodeHandler/ that depend on
EFI_PEI_RSC_HANDLER_PPI and EFI_RSC_HANDLER_PROTOCOL, respectively.

The StatusCodeHandler modules register themselves with
ReportStatusCodeRouter through EFI_PEI_RSC_HANDLER_PPI /
EFI_RSC_HANDLER_PROTOCOL. When another module reports a status code
through EFI_PEI_PROGRESS_CODE_PPI / EFI_STATUS_CODE_PROTOCOL, it reaches
the phase-matching ReportStatusCodeRouter module first, which in turn
passes the status code to the pre-registered, phase-matching
StatusCodeHandler module.

The status code handling in the StatusCodeHandler modules is identical to
the one currently provided by the IntelFrameworkModulePkg modules. Replace
the IntelFrameworkModulePkg modules with the MdeModulePkg ones, so we can
decrease our dependency on IntelFrameworkModulePkg.

OS boot verified by Ming Huang <ming.huang@linaro.org>:
https://edk2.groups.io/g/devel/message/41419

Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Hao A Wu <hao.a.wu@intel.com>
Acked-by: Leif Lindholm <leif.lindholm@linaro.org>

6 files changed, 24 insertions, 12 deletions

diff --git a/Platform/Hisilicon/D03/D03.dsc b/Platform/Hisilicon/D03/D03.dsc
index 7bbe2d59..d4ec3be2 100644
--- a/Platform/Hisilicon/D03/D03.dsc
+++ b/Platform/Hisilicon/D03/D03.dsc
@@ -302,7 +302,8 @@
 

   Platform/Hisilicon/D03/MemoryInitPei/MemoryInitPeim.inf

   ArmPkg/Drivers/CpuPei/CpuPei.inf

-  IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf

+  MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.inf

+  MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf

   MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.inf

   MdeModulePkg/Universal/Variable/Pei/VariablePei.inf

 

@@ -375,7 +376,8 @@
   ArmPkg/Drivers/TimerDxe/TimerDxe.inf

 

   MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf

-  IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.inf

+  MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf

+  MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf

   #

   #ACPI

   #

diff --git a/Platform/Hisilicon/D03/D03.fdf b/Platform/Hisilicon/D03/D03.fdf
index e44cb862..ac311b91 100644
--- a/Platform/Hisilicon/D03/D03.fdf
+++ b/Platform/Hisilicon/D03/D03.fdf
@@ -193,7 +193,8 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf

   INF FatPkg/EnhancedFatDxe/Fat.inf

   INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf

-  INF IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.inf

+  INF MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf

+  INF MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf

 

   #

   # Usb Support

@@ -315,7 +316,8 @@ READ_LOCK_STATUS   = TRUE
   INF Platform/Hisilicon/D03/MemoryInitPei/MemoryInitPeim.inf

   INF ArmPkg/Drivers/CpuPei/CpuPei.inf

   INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf

-  INF IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf

+  INF MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.inf

+  INF MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf

   INF Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.inf

 

   INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf

diff --git a/Platform/Hisilicon/D05/D05.dsc b/Platform/Hisilicon/D05/D05.dsc
index 5ad276b4..31c9fabb 100644
--- a/Platform/Hisilicon/D05/D05.dsc
+++ b/Platform/Hisilicon/D05/D05.dsc
@@ -431,7 +431,8 @@
 

   Platform/Hisilicon/D05/MemoryInitPei/MemoryInitPeim.inf

   ArmPkg/Drivers/CpuPei/CpuPei.inf

-  IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf

+  MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.inf

+  MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf

   MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.inf

   MdeModulePkg/Universal/Variable/Pei/VariablePei.inf

 

@@ -501,7 +502,8 @@
   ArmPkg/Drivers/TimerDxe/TimerDxe.inf

 

   MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf

-  IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.inf

+  MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf

+  MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf

   #

   #ACPI

   #

diff --git a/Platform/Hisilicon/D05/D05.fdf b/Platform/Hisilicon/D05/D05.fdf
index c18f2348..8e22dd76 100644
--- a/Platform/Hisilicon/D05/D05.fdf
+++ b/Platform/Hisilicon/D05/D05.fdf
@@ -197,7 +197,8 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf

   INF FatPkg/EnhancedFatDxe/Fat.inf

   INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf

-  INF IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.inf

+  INF MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf

+  INF MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf

 

   #

   # Usb Support

@@ -324,7 +325,8 @@ READ_LOCK_STATUS   = TRUE
   INF Platform/Hisilicon/D05/MemoryInitPei/MemoryInitPeim.inf

   INF ArmPkg/Drivers/CpuPei/CpuPei.inf

   INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf

-  INF IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf

+  INF MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.inf

+  INF MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf

   INF Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.inf

 

   INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf

diff --git a/Platform/Hisilicon/D06/D06.dsc b/Platform/Hisilicon/D06/D06.dsc
index e3a9b2f3..9772bb2c 100644
--- a/Platform/Hisilicon/D06/D06.dsc
+++ b/Platform/Hisilicon/D06/D06.dsc
@@ -245,7 +245,8 @@
   ArmPlatformPkg/PlatformPei/PlatformPeim.inf

 

   ArmPkg/Drivers/CpuPei/CpuPei.inf

-  IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf

+  MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.inf

+  MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf

   MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.inf

   MdeModulePkg/Universal/Variable/Pei/VariablePei.inf

 

@@ -307,7 +308,8 @@
   ArmPkg/Drivers/TimerDxe/TimerDxe.inf

 

   MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf

-  IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.inf

+  MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf

+  MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf

   #

   #ACPI

   #

diff --git a/Platform/Hisilicon/D06/D06.fdf b/Platform/Hisilicon/D06/D06.fdf
index f6cb3f68..a20540c9 100644
--- a/Platform/Hisilicon/D06/D06.fdf
+++ b/Platform/Hisilicon/D06/D06.fdf
@@ -198,7 +198,8 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf

   INF FatPkg/EnhancedFatDxe/Fat.inf

   INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf

-  INF IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.inf

+  INF MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf

+  INF MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf

 

   #

   # Usb Support

@@ -314,7 +315,8 @@ READ_LOCK_STATUS   = TRUE
   INF Platform/Hisilicon/D06/MemoryInitPei/MemoryInitPeim.inf

   INF ArmPkg/Drivers/CpuPei/CpuPei.inf

   INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf

-  INF IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf

+  INF MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.inf

+  INF MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf

   INF Platform/Hisilicon/D06/EarlyConfigPeim/EarlyConfigPeimD06.inf

 

   INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf