From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by ml01.01.org (Postfix) with ESMTP id BA51D1A1E13 for ; Tue, 2 Aug 2016 11:23:59 -0700 (PDT) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga103.fm.intel.com with ESMTP; 02 Aug 2016 11:24:00 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.28,461,1464678000"; d="scan'208";a="858426896" Received: from mskhizri-mobl1.amr.corp.intel.com (HELO localhost) ([10.252.131.141]) by orsmga003.jf.intel.com with ESMTP; 02 Aug 2016 11:24:00 -0700 MIME-Version: 1.0 To: lersek@redhat.com, Cinnamon Shia , edk2-devel@lists.01.org Message-ID: <147016223891.9848.2530802500112770528@jljusten-ivb> From: Jordan Justen In-Reply-To: <20160802172510.18264-1-cinnamon.shia@hpe.com> Cc: liming.gao@intel.com, "Cinnamon Shia" References: <20160802172510.18264-1-cinnamon.shia@hpe.com> User-Agent: alot/0.3.7 Date: Tue, 02 Aug 2016 11:23:58 -0700 Subject: Re: [PATCH v2] OvmfPkg: use StatusCode Router and Handler from MdeModulePkg X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Aug 2016 18:24:00 -0000 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable On 2016-08-02 10:25:10, Cinnamon Shia wrote: > In the Platform Init v1.4a spec, > - Volume 1 "4.7 Status Code Service" defines the > EFI_PEI_SERVICES.ReportStatusCode() service, > - Volume 1 "6.3.5 Status Code PPI (Optional)" defines the > EFI_PEI_PROGRESS_CODE_PPI (equivalent to the above), > - Volume 2 "14.2 Status Code Runtime Protocol" defines the > EFI_STATUS_CODE_PROTOCOL. > = > These allow PEIMs and DXE (and later) modules to report status codes. > = > Currently OvmfPkg uses modules from under "IntelFrameworkModulePkg/ > Universal/StatusCode/", which produce the above abstractions (PPI and > 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. > = > In the Platform Init v1.4a spec, > - Volume 3 "7.2.2 Report Status Code Handler PPI" defines > EFI_PEI_RSC_HANDLER_PPI, > - Volume 3 "7.2.1 Report Status Code Handler Protocol" defines > EFI_RSC_HANDLER_PROTOCOL. > = > These allow several PEIMs and runtime DXE drivers to register callbacks > for status code handling. > = > 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 ReportStatusCodeRo= uter > 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 ReportStatusCodeR= outer > 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 IntelFareworkModulePkg modules with the MdeModulePkg ones, > so we can decrease our dependency on IntelFareworkModulePkg. Noting two typos of 'Farework' here. We can fix during commit. Reviewed-by: Jordan Justen I'll give Laszlo some time to respond too since he's already spent some time on it previously. -Jordan > = > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Cinnamon Shia > Suggested-by: Liming Gao > Fixes: https://tianocore.acgmultimedia.com/show_bug.cgi?id=3D63 > --- > OvmfPkg/OvmfPkgIa32.dsc | 7 +++++-- > OvmfPkg/OvmfPkgIa32.fdf | 7 +++++-- > OvmfPkg/OvmfPkgIa32X64.dsc | 7 +++++-- > OvmfPkg/OvmfPkgIa32X64.fdf | 7 +++++-- > OvmfPkg/OvmfPkgX64.dsc | 7 +++++-- > OvmfPkg/OvmfPkgX64.fdf | 7 +++++-- > 6 files changed, 30 insertions(+), 12 deletions(-) > = > diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc > index 8af3267..aeb87b9 100644 > --- a/OvmfPkg/OvmfPkgIa32.dsc > +++ b/OvmfPkg/OvmfPkgIa32.dsc > @@ -2,6 +2,7 @@ > # EFI/Framework Open Virtual Machine Firmware (OVMF) platform > # > # Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.
> +# (C) Copyright 2016 Hewlett Packard Enterprise Development LP
> # > # This program and the accompanying materials > # are licensed and made available under the terms and conditions of the= BSD License > @@ -497,7 +498,8 @@ > > PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf > } > - IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf > + MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRout= erPei.inf > + MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf > MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf { > > PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf > @@ -534,7 +536,8 @@ > DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.i= nf > } > = > - IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRunt= imeDxe.inf > + MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusC= odeRouterRuntimeDxe.inf > + MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerR= untimeDxe.inf > MdeModulePkg/Universal/PCD/Dxe/Pcd.inf { > > PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf > diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf > index 1369734..b4b0a22 100644 > --- a/OvmfPkg/OvmfPkgIa32.fdf > +++ b/OvmfPkg/OvmfPkgIa32.fdf > @@ -2,6 +2,7 @@ > # Open Virtual Machine Firmware: FDF > # > # Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.
> +# (C) Copyright 2016 Hewlett Packard Enterprise Development LP
> # > # This program and the accompanying materials > # are licensed and made available under the terms and conditions of the= BSD License > @@ -154,7 +155,8 @@ APRIORI PEI { > # > INF MdeModulePkg/Core/Pei/PeiMain.inf > INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf > -INF IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf > +INF MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeR= outerPei.inf > +INF MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.i= nf > INF OvmfPkg/PlatformPei/PlatformPei.inf > INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf > INF UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf > @@ -198,7 +200,8 @@ APRIORI DXE { > # > INF MdeModulePkg/Core/Dxe/DxeMain.inf > = > -INF IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeR= untimeDxe.inf > +INF MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStat= usCodeRouterRuntimeDxe.inf > +INF MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandl= erRuntimeDxe.inf > INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf > = > INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf > diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc > index 4bb38d0..44da638 100644 > --- a/OvmfPkg/OvmfPkgIa32X64.dsc > +++ b/OvmfPkg/OvmfPkgIa32X64.dsc > @@ -2,6 +2,7 @@ > # EFI/Framework Open Virtual Machine Firmware (OVMF) platform > # > # Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.
> +# (C) Copyright 2016 Hewlett Packard Enterprise Development LP
> # > # This program and the accompanying materials > # are licensed and made available under the terms and conditions of the= BSD License > @@ -505,7 +506,8 @@ > > PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf > } > - IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf > + MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRout= erPei.inf > + MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf > MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf { > > PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf > @@ -543,7 +545,8 @@ > DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.i= nf > } > = > - IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRunt= imeDxe.inf > + MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusC= odeRouterRuntimeDxe.inf > + MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerR= untimeDxe.inf > MdeModulePkg/Universal/PCD/Dxe/Pcd.inf { > > PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf > diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf > index 34f8938..552ab2a 100644 > --- a/OvmfPkg/OvmfPkgIa32X64.fdf > +++ b/OvmfPkg/OvmfPkgIa32X64.fdf > @@ -2,6 +2,7 @@ > # Open Virtual Machine Firmware: FDF > # > # Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.
> +# (C) Copyright 2016 Hewlett Packard Enterprise Development LP
> # > # This program and the accompanying materials > # are licensed and made available under the terms and conditions of the= BSD License > @@ -154,7 +155,8 @@ APRIORI PEI { > # > INF MdeModulePkg/Core/Pei/PeiMain.inf > INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf > -INF IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf > +INF MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeR= outerPei.inf > +INF MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.i= nf > INF OvmfPkg/PlatformPei/PlatformPei.inf > INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf > INF UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf > @@ -198,7 +200,8 @@ APRIORI DXE { > # > INF MdeModulePkg/Core/Dxe/DxeMain.inf > = > -INF IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeR= untimeDxe.inf > +INF MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStat= usCodeRouterRuntimeDxe.inf > +INF MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandl= erRuntimeDxe.inf > INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf > = > INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf > diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc > index be3aa1f..89cd3a1 100644 > --- a/OvmfPkg/OvmfPkgX64.dsc > +++ b/OvmfPkg/OvmfPkgX64.dsc > @@ -2,6 +2,7 @@ > # EFI/Framework Open Virtual Machine Firmware (OVMF) platform > # > # Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.
> +# (C) Copyright 2016 Hewlett Packard Enterprise Development LP
> # > # This program and the accompanying materials > # are licensed and made available under the terms and conditions of the= BSD License > @@ -504,7 +505,8 @@ > > PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf > } > - IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf > + MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRout= erPei.inf > + MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf > MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf { > > PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf > @@ -541,7 +543,8 @@ > DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.i= nf > } > = > - IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRunt= imeDxe.inf > + MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusC= odeRouterRuntimeDxe.inf > + MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerR= untimeDxe.inf > MdeModulePkg/Universal/PCD/Dxe/Pcd.inf { > > PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf > diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf > index 630c295..28b98a9 100644 > --- a/OvmfPkg/OvmfPkgX64.fdf > +++ b/OvmfPkg/OvmfPkgX64.fdf > @@ -2,6 +2,7 @@ > # Open Virtual Machine Firmware: FDF > # > # Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.
> +# (C) Copyright 2016 Hewlett Packard Enterprise Development LP
> # > # This program and the accompanying materials > # are licensed and made available under the terms and conditions of the= BSD License > @@ -154,7 +155,8 @@ APRIORI PEI { > # > INF MdeModulePkg/Core/Pei/PeiMain.inf > INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf > -INF IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf > +INF MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeR= outerPei.inf > +INF MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.i= nf > INF OvmfPkg/PlatformPei/PlatformPei.inf > INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf > INF UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf > @@ -198,7 +200,8 @@ APRIORI DXE { > # > INF MdeModulePkg/Core/Dxe/DxeMain.inf > = > -INF IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeR= untimeDxe.inf > +INF MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStat= usCodeRouterRuntimeDxe.inf > +INF MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandl= erRuntimeDxe.inf > INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf > = > INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf > -- = > 2.9.0.windows.1 >=20