[PATCH v1 0/1] Fix function and structure definition mismatches in Ppi/MmControl.h

[PATCH v1 0/1] Fix function and structure definition mismatches in Ppi/MmControl.h

[Kun Qin]

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

The current MdePkg/Include/Ppi/MmControl.h file contains function and
structure definitions mismatch with those in Platform Initialization
Specification v1.7 (Errata A). These discrepancies will cause build
failure during usage.

This change corrected the name discrepancies in this header file.

Patch v1 branch: https://github.com/kuqin12/edk2/tree/mm_control_ppi_v1

Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Zhiguang Liu <zhiguang.liu@intel.com>

Kun Qin (1):
  MdePkg: MmControl: Fix function and structure definition mismatches

 MdePkg/Include/Ppi/MmControl.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

-- 
2.31.1.windows.1

[PATCH v1 1/1] MdePkg: MmControl: Fix function and structure definition mismatches

[Kun Qin]

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

Current Ppi/MmControl.h file has structure definition of "struct
_PEI_MM_CONTROL_PPI". This name mismatches with its definition in PI
Specification v1.7 (Errata) as "struct _EFI_PEI_MM_CONTROL_PPI".

In addition, field types "PEI_MM_ACTIVATE" and "PEI_MM_DEACTIVATE" used
in "struct _PEI_MM_CONTROL_PPI" mismatches with the definition of
"EFI_PEI_MM_ACTIVATE" and "EFI_PEI_MM_DEACTIVATE" in the PI spec.

This change fixes these mismatches by using the PI spec defined names.

Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Zhiguang Liu <zhiguang.liu@intel.com>

Fixes: 6f33f7a262314af35e2b99c849e08928ea49aa55
Signed-off-by: Kun Qin <kuqin12@gmail.com>
---
 MdePkg/Include/Ppi/MmControl.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/MdePkg/Include/Ppi/MmControl.h b/MdePkg/Include/Ppi/MmControl.h
index 983ed95cd53d..17586f437b4b 100644
--- a/MdePkg/Include/Ppi/MmControl.h
+++ b/MdePkg/Include/Ppi/MmControl.h
@@ -69,7 +69,7 @@ EFI_STATUS
 **/
 typedef
 EFI_STATUS
-(EFIAPI *PEI_MM_DEACTIVATE) (
+(EFIAPI *EFI_PEI_MM_DEACTIVATE) (
   IN EFI_PEI_SERVICES                      **PeiServices,
   IN EFI_PEI_MM_CONTROL_PPI                * This,
   IN BOOLEAN                               Periodic OPTIONAL
@@ -80,9 +80,9 @@ EFI_STATUS
 ///  platform hardware that generates an MMI. There are often I/O ports that, when accessed, will
 ///  generate the MMI. Also, the hardware optionally supports the periodic generation of these signals.
 ///
-struct _PEI_MM_CONTROL_PPI {
-  PEI_MM_ACTIVATE    Trigger;
-  PEI_MM_DEACTIVATE  Clear;
+struct _EFI_PEI_MM_CONTROL_PPI {
+  EFI_PEI_MM_ACTIVATE    Trigger;
+  EFI_PEI_MM_DEACTIVATE  Clear;
 };
 
 extern EFI_GUID gEfiPeiMmControlPpiGuid;
-- 
2.31.1.windows.1

回复: [edk2-devel] [PATCH v1 1/1] MdePkg: MmControl: Fix function and structure definition mismatches

[gaoliming]

Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>

> -----邮件原件-----
> 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Kun Qin
> 发送时间: 2021年5月27日 16:17
> 收件人: devel@edk2.groups.io
> 抄送: Michael D Kinney <michael.d.kinney@intel.com>; Liming Gao
> <gaoliming@byosoft.com.cn>; Zhiguang Liu <zhiguang.liu@intel.com>
> 主题: [edk2-devel] [PATCH v1 1/1] MdePkg: MmControl: Fix function and
> structure definition mismatches
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3397
> 
> Current Ppi/MmControl.h file has structure definition of "struct
> _PEI_MM_CONTROL_PPI". This name mismatches with its definition in PI
> Specification v1.7 (Errata) as "struct _EFI_PEI_MM_CONTROL_PPI".
> 
> In addition, field types "PEI_MM_ACTIVATE" and "PEI_MM_DEACTIVATE"
> used
> in "struct _PEI_MM_CONTROL_PPI" mismatches with the definition of
> "EFI_PEI_MM_ACTIVATE" and "EFI_PEI_MM_DEACTIVATE" in the PI spec.
> 
> This change fixes these mismatches by using the PI spec defined names.
> 
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Cc: Zhiguang Liu <zhiguang.liu@intel.com>
> 
> Fixes: 6f33f7a262314af35e2b99c849e08928ea49aa55
> Signed-off-by: Kun Qin <kuqin12@gmail.com>
> ---
>  MdePkg/Include/Ppi/MmControl.h | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/MdePkg/Include/Ppi/MmControl.h
> b/MdePkg/Include/Ppi/MmControl.h
> index 983ed95cd53d..17586f437b4b 100644
> --- a/MdePkg/Include/Ppi/MmControl.h
> +++ b/MdePkg/Include/Ppi/MmControl.h
> @@ -69,7 +69,7 @@ EFI_STATUS
>  **/
>  typedef
>  EFI_STATUS
> -(EFIAPI *PEI_MM_DEACTIVATE) (
> +(EFIAPI *EFI_PEI_MM_DEACTIVATE) (
>    IN EFI_PEI_SERVICES                      **PeiServices,
>    IN EFI_PEI_MM_CONTROL_PPI                * This,
>    IN BOOLEAN                               Periodic OPTIONAL
> @@ -80,9 +80,9 @@ EFI_STATUS
>  ///  platform hardware that generates an MMI. There are often I/O ports
> that, when accessed, will
>  ///  generate the MMI. Also, the hardware optionally supports the
periodic
> generation of these signals.
>  ///
> -struct _PEI_MM_CONTROL_PPI {
> -  PEI_MM_ACTIVATE    Trigger;
> -  PEI_MM_DEACTIVATE  Clear;
> +struct _EFI_PEI_MM_CONTROL_PPI {
> +  EFI_PEI_MM_ACTIVATE    Trigger;
> +  EFI_PEI_MM_DEACTIVATE  Clear;
>  };
> 
>  extern EFI_GUID gEfiPeiMmControlPpiGuid;
> --
> 2.31.1.windows.1
> 
> 
> 
> 
> 

回复: [edk2-devel] [PATCH v1 1/1] MdePkg: MmControl: Fix function and structure definition mismatches

[gaoliming]

Merge at d3ff5dbe1dfc3420e5254d290500c0b6f6282d17

> -----邮件原件-----
> 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 gaoliming
> 发送时间: 2021年6月1日 9:26
> 收件人: devel@edk2.groups.io; kuqin12@gmail.com
> 抄送: 'Michael D Kinney' <michael.d.kinney@intel.com>; 'Zhiguang Liu'
> <zhiguang.liu@intel.com>
> 主题: 回复: [edk2-devel] [PATCH v1 1/1] MdePkg: MmControl: Fix function
> and structure definition mismatches
> 
> Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
> 
> > -----邮件原件-----
> > 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Kun Qin
> > 发送时间: 2021年5月27日 16:17
> > 收件人: devel@edk2.groups.io
> > 抄送: Michael D Kinney <michael.d.kinney@intel.com>; Liming Gao
> > <gaoliming@byosoft.com.cn>; Zhiguang Liu <zhiguang.liu@intel.com>
> > 主题: [edk2-devel] [PATCH v1 1/1] MdePkg: MmControl: Fix function and
> > structure definition mismatches
> >
> > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3397
> >
> > Current Ppi/MmControl.h file has structure definition of "struct
> > _PEI_MM_CONTROL_PPI". This name mismatches with its definition in PI
> > Specification v1.7 (Errata) as "struct _EFI_PEI_MM_CONTROL_PPI".
> >
> > In addition, field types "PEI_MM_ACTIVATE" and "PEI_MM_DEACTIVATE"
> > used
> > in "struct _PEI_MM_CONTROL_PPI" mismatches with the definition of
> > "EFI_PEI_MM_ACTIVATE" and "EFI_PEI_MM_DEACTIVATE" in the PI spec.
> >
> > This change fixes these mismatches by using the PI spec defined names.
> >
> > Cc: Michael D Kinney <michael.d.kinney@intel.com>
> > Cc: Liming Gao <gaoliming@byosoft.com.cn>
> > Cc: Zhiguang Liu <zhiguang.liu@intel.com>
> >
> > Fixes: 6f33f7a262314af35e2b99c849e08928ea49aa55
> > Signed-off-by: Kun Qin <kuqin12@gmail.com>
> > ---
> >  MdePkg/Include/Ppi/MmControl.h | 8 ++++----
> >  1 file changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/MdePkg/Include/Ppi/MmControl.h
> > b/MdePkg/Include/Ppi/MmControl.h
> > index 983ed95cd53d..17586f437b4b 100644
> > --- a/MdePkg/Include/Ppi/MmControl.h
> > +++ b/MdePkg/Include/Ppi/MmControl.h
> > @@ -69,7 +69,7 @@ EFI_STATUS
> >  **/
> >  typedef
> >  EFI_STATUS
> > -(EFIAPI *PEI_MM_DEACTIVATE) (
> > +(EFIAPI *EFI_PEI_MM_DEACTIVATE) (
> >    IN EFI_PEI_SERVICES                      **PeiServices,
> >    IN EFI_PEI_MM_CONTROL_PPI                * This,
> >    IN BOOLEAN                               Periodic OPTIONAL
> > @@ -80,9 +80,9 @@ EFI_STATUS
> >  ///  platform hardware that generates an MMI. There are often I/O ports
> > that, when accessed, will
> >  ///  generate the MMI. Also, the hardware optionally supports the
> periodic
> > generation of these signals.
> >  ///
> > -struct _PEI_MM_CONTROL_PPI {
> > -  PEI_MM_ACTIVATE    Trigger;
> > -  PEI_MM_DEACTIVATE  Clear;
> > +struct _EFI_PEI_MM_CONTROL_PPI {
> > +  EFI_PEI_MM_ACTIVATE    Trigger;
> > +  EFI_PEI_MM_DEACTIVATE  Clear;
> >  };
> >
> >  extern EFI_GUID gEfiPeiMmControlPpiGuid;
> > --
> > 2.31.1.windows.1
> >
> >
> >
> >
> >
> 
> 
> 
> 
> 
> 
>