[edk2,v2,02/17] OvmfPkg: add MmServicesTableLib resolution

Message ID 20190114132758.24054-3-ard.biesheuvel@linaro.org
State Accepted
Commit 8b3dcd2f9ac9b1da92a18e249e502c777c2afbeb
Headers show
Series
  • implement standalone MM versions of the variable runtime drivers
Related show

Commit Message

Ard Biesheuvel Jan. 14, 2019, 1:27 p.m.
The SMM based FTW and variable drivers are going to depend on
MmServicesTableLib after a subsequent patch, so add a resolution
for it to various OvmfPkg .dsc files.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

---
 OvmfPkg/OvmfPkgIa32.dsc    | 1 +
 OvmfPkg/OvmfPkgIa32X64.dsc | 1 +
 OvmfPkg/OvmfPkgX64.dsc     | 1 +
 3 files changed, 3 insertions(+)

-- 
2.20.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Comments

Laszlo Ersek Jan. 14, 2019, 4:40 p.m. | #1
On 01/14/19 14:27, Ard Biesheuvel wrote:
> The SMM based FTW and variable drivers are going to depend on

> MmServicesTableLib after a subsequent patch, so add a resolution

> for it to various OvmfPkg .dsc files.

> 

> Contributed-under: TianoCore Contribution Agreement 1.1

> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

> ---

>  OvmfPkg/OvmfPkgIa32.dsc    | 1 +

>  OvmfPkg/OvmfPkgIa32X64.dsc | 1 +

>  OvmfPkg/OvmfPkgX64.dsc     | 1 +

>  3 files changed, 3 insertions(+)

> 

> diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc

> index 3f3533e5c163..aee19b75d7ae 100644

> --- a/OvmfPkg/OvmfPkgIa32.dsc

> +++ b/OvmfPkg/OvmfPkgIa32.dsc

> @@ -385,6 +385,7 @@ [LibraryClasses.common.DXE_SMM_DRIVER]

>    ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf

>    HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf

>    SmmMemLib|MdePkg/Library/SmmMemLib/SmmMemLib.inf

> +  MmServicesTableLib|MdePkg/Library/MmServicesTableLib/MmServicesTableLib.inf

>    SmmServicesTableLib|MdePkg/Library/SmmServicesTableLib/SmmServicesTableLib.inf

>  !ifdef $(DEBUG_ON_SERIAL_PORT)

>    DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf

> diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc

> index 6c08b2728d63..90cbd8e34158 100644

> --- a/OvmfPkg/OvmfPkgIa32X64.dsc

> +++ b/OvmfPkg/OvmfPkgIa32X64.dsc

> @@ -390,6 +390,7 @@ [LibraryClasses.common.DXE_SMM_DRIVER]

>    ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf

>    HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf

>    SmmMemLib|MdePkg/Library/SmmMemLib/SmmMemLib.inf

> +  MmServicesTableLib|MdePkg/Library/MmServicesTableLib/MmServicesTableLib.inf

>    SmmServicesTableLib|MdePkg/Library/SmmServicesTableLib/SmmServicesTableLib.inf

>  !ifdef $(DEBUG_ON_SERIAL_PORT)

>    DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf

> diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc

> index 4072c839d73f..83d16eb00b82 100644

> --- a/OvmfPkg/OvmfPkgX64.dsc

> +++ b/OvmfPkg/OvmfPkgX64.dsc

> @@ -390,6 +390,7 @@ [LibraryClasses.common.DXE_SMM_DRIVER]

>    ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf

>    HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf

>    SmmMemLib|MdePkg/Library/SmmMemLib/SmmMemLib.inf

> +  MmServicesTableLib|MdePkg/Library/MmServicesTableLib/MmServicesTableLib.inf

>    SmmServicesTableLib|MdePkg/Library/SmmServicesTableLib/SmmServicesTableLib.inf

>  !ifdef $(DEBUG_ON_SERIAL_PORT)

>    DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf

> 


Reviewed-by: Laszlo Ersek <lersek@redhat.com>


Also, because this patch is clearly equivalent (although not textually
identical) to the one I used in
<http://mid.mail-archive.com/0d229de3-623a-1062-1daf-cce5dec14824@redhat.com>,
I believe we should add:

Regression-tested-by: Laszlo Ersek <lersek@redhat.com>

(From the blurb, I sought to familiarize myself with the anatomy of this
v2 series, and after checking my R-t-b on patches v2 05/17 and v2 07/17,
I think v2 02/17 -- i.e., this patch -- is the only one where my review
is required. Please correct me if I'm wrong.)

Thanks!
Laszlo
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Ard Biesheuvel Jan. 14, 2019, 5:05 p.m. | #2
On Mon, 14 Jan 2019 at 17:40, Laszlo Ersek <lersek@redhat.com> wrote:
>

> On 01/14/19 14:27, Ard Biesheuvel wrote:

> > The SMM based FTW and variable drivers are going to depend on

> > MmServicesTableLib after a subsequent patch, so add a resolution

> > for it to various OvmfPkg .dsc files.

> >

> > Contributed-under: TianoCore Contribution Agreement 1.1

> > Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

> > ---

> >  OvmfPkg/OvmfPkgIa32.dsc    | 1 +

> >  OvmfPkg/OvmfPkgIa32X64.dsc | 1 +

> >  OvmfPkg/OvmfPkgX64.dsc     | 1 +

> >  3 files changed, 3 insertions(+)

> >

> > diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc

> > index 3f3533e5c163..aee19b75d7ae 100644

> > --- a/OvmfPkg/OvmfPkgIa32.dsc

> > +++ b/OvmfPkg/OvmfPkgIa32.dsc

> > @@ -385,6 +385,7 @@ [LibraryClasses.common.DXE_SMM_DRIVER]

> >    ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf

> >    HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf

> >    SmmMemLib|MdePkg/Library/SmmMemLib/SmmMemLib.inf

> > +  MmServicesTableLib|MdePkg/Library/MmServicesTableLib/MmServicesTableLib.inf

> >    SmmServicesTableLib|MdePkg/Library/SmmServicesTableLib/SmmServicesTableLib.inf

> >  !ifdef $(DEBUG_ON_SERIAL_PORT)

> >    DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf

> > diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc

> > index 6c08b2728d63..90cbd8e34158 100644

> > --- a/OvmfPkg/OvmfPkgIa32X64.dsc

> > +++ b/OvmfPkg/OvmfPkgIa32X64.dsc

> > @@ -390,6 +390,7 @@ [LibraryClasses.common.DXE_SMM_DRIVER]

> >    ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf

> >    HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf

> >    SmmMemLib|MdePkg/Library/SmmMemLib/SmmMemLib.inf

> > +  MmServicesTableLib|MdePkg/Library/MmServicesTableLib/MmServicesTableLib.inf

> >    SmmServicesTableLib|MdePkg/Library/SmmServicesTableLib/SmmServicesTableLib.inf

> >  !ifdef $(DEBUG_ON_SERIAL_PORT)

> >    DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf

> > diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc

> > index 4072c839d73f..83d16eb00b82 100644

> > --- a/OvmfPkg/OvmfPkgX64.dsc

> > +++ b/OvmfPkg/OvmfPkgX64.dsc

> > @@ -390,6 +390,7 @@ [LibraryClasses.common.DXE_SMM_DRIVER]

> >    ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf

> >    HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf

> >    SmmMemLib|MdePkg/Library/SmmMemLib/SmmMemLib.inf

> > +  MmServicesTableLib|MdePkg/Library/MmServicesTableLib/MmServicesTableLib.inf

> >    SmmServicesTableLib|MdePkg/Library/SmmServicesTableLib/SmmServicesTableLib.inf

> >  !ifdef $(DEBUG_ON_SERIAL_PORT)

> >    DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf

> >

>

> Reviewed-by: Laszlo Ersek <lersek@redhat.com>

>


Thanks.

> Also, because this patch is clearly equivalent (although not textually

> identical) to the one I used in

> <http://mid.mail-archive.com/0d229de3-623a-1062-1daf-cce5dec14824@redhat.com>,

> I believe we should add:

>

> Regression-tested-by: Laszlo Ersek <lersek@redhat.com>

>


OK.

> (From the blurb, I sought to familiarize myself with the anatomy of this

> v2 series, and after checking my R-t-b on patches v2 05/17 and v2 07/17,

> I think v2 02/17 -- i.e., this patch -- is the only one where my review

> is required. Please correct me if I'm wrong.)

>


Indeed.
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Patch

diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
index 3f3533e5c163..aee19b75d7ae 100644
--- a/OvmfPkg/OvmfPkgIa32.dsc
+++ b/OvmfPkg/OvmfPkgIa32.dsc
@@ -385,6 +385,7 @@  [LibraryClasses.common.DXE_SMM_DRIVER]
   ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
   HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf
   SmmMemLib|MdePkg/Library/SmmMemLib/SmmMemLib.inf
+  MmServicesTableLib|MdePkg/Library/MmServicesTableLib/MmServicesTableLib.inf
   SmmServicesTableLib|MdePkg/Library/SmmServicesTableLib/SmmServicesTableLib.inf
 !ifdef $(DEBUG_ON_SERIAL_PORT)
   DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
index 6c08b2728d63..90cbd8e34158 100644
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
@@ -390,6 +390,7 @@  [LibraryClasses.common.DXE_SMM_DRIVER]
   ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
   HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf
   SmmMemLib|MdePkg/Library/SmmMemLib/SmmMemLib.inf
+  MmServicesTableLib|MdePkg/Library/MmServicesTableLib/MmServicesTableLib.inf
   SmmServicesTableLib|MdePkg/Library/SmmServicesTableLib/SmmServicesTableLib.inf
 !ifdef $(DEBUG_ON_SERIAL_PORT)
   DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
index 4072c839d73f..83d16eb00b82 100644
--- a/OvmfPkg/OvmfPkgX64.dsc
+++ b/OvmfPkg/OvmfPkgX64.dsc
@@ -390,6 +390,7 @@  [LibraryClasses.common.DXE_SMM_DRIVER]
   ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
   HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf
   SmmMemLib|MdePkg/Library/SmmMemLib/SmmMemLib.inf
+  MmServicesTableLib|MdePkg/Library/MmServicesTableLib/MmServicesTableLib.inf
   SmmServicesTableLib|MdePkg/Library/SmmServicesTableLib/SmmServicesTableLib.inf
 !ifdef $(DEBUG_ON_SERIAL_PORT)
   DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf