[PATCH] MdeModulePkg: Correct memory type in PrePiDxeCis.h

[PATCH] MdeModulePkg: Correct memory type in PrePiDxeCis.h

[Dionna Glaze]

The enumeration in MdePkg/Include/Pi/PiDxeCis.h has a duplicated entry,
so the 8th position in the list doesn't count as index 7. The value
EfiGcdMemoryTypeUnaccepted will have when added before
EfiGcdMemoryTypeMaximum will be 6.

Cc: Min M Xu <min.m.xu@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>

Signed-off-by: Dionna Glaze <dionnaglaze@google.com>
---
 MdeModulePkg/Include/Pi/PrePiDxeCis.h | 2 +-
 MdePkg/Include/Pi/PiDxeCis.h          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/MdeModulePkg/Include/Pi/PrePiDxeCis.h b/MdeModulePkg/Include/Pi/PrePiDxeCis.h
index 113ac37924..9be71d2618 100644
--- a/MdeModulePkg/Include/Pi/PrePiDxeCis.h
+++ b/MdeModulePkg/Include/Pi/PrePiDxeCis.h
@@ -20,6 +20,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 /// After this memory region is defined in PI spec, it should be a value in
 /// EFI_GCD_MEMORY_TYPE in PiDxeCis.h.
 ///
-#define  EFI_GCD_MEMORY_TYPE_UNACCEPTED  7
+#define  EFI_GCD_MEMORY_TYPE_UNACCEPTED  6
 
 #endif
diff --git a/MdePkg/Include/Pi/PiDxeCis.h b/MdePkg/Include/Pi/PiDxeCis.h
index 27b219aa3f..bb7fb2c38a 100644
--- a/MdePkg/Include/Pi/PiDxeCis.h
+++ b/MdePkg/Include/Pi/PiDxeCis.h
@@ -64,7 +64,7 @@ typedef enum {
   // /// EfiGcdMemoryTypeUnaccepted is defined in PrePiDxeCis.h because it has not been
   // /// defined in PI spec.
   // EfiGcdMemoryTypeUnaccepted,
-  EfiGcdMemoryTypeMaximum = 8
+  EfiGcdMemoryTypeMaximum = 7
 } EFI_GCD_MEMORY_TYPE;
 
 ///
-- 
2.39.1.456.gfc5497dd1b-goog

Re: [edk2-devel] [PATCH] MdeModulePkg: Correct memory type in PrePiDxeCis.h

[Min Xu]

On January 28, 2023 3:21 AM, Dionna Glaze wrote:
> The enumeration in MdePkg/Include/Pi/PiDxeCis.h has a duplicated entry, so
> the 8th position in the list doesn't count as index 7. The value
> EfiGcdMemoryTypeUnaccepted will have when added before
> EfiGcdMemoryTypeMaximum will be 6.
> 
> Cc: Min M Xu <min.m.xu@intel.com>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> 
> Signed-off-by: Dionna Glaze <dionnaglaze@google.com>
> ---
>  MdeModulePkg/Include/Pi/PrePiDxeCis.h | 2 +-
>  MdePkg/Include/Pi/PiDxeCis.h          | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/MdeModulePkg/Include/Pi/PrePiDxeCis.h
> b/MdeModulePkg/Include/Pi/PrePiDxeCis.h
> index 113ac37924..9be71d2618 100644
> --- a/MdeModulePkg/Include/Pi/PrePiDxeCis.h
> +++ b/MdeModulePkg/Include/Pi/PrePiDxeCis.h
> @@ -20,6 +20,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent  /// After
> this memory region is defined in PI spec, it should be a value in  ///
> EFI_GCD_MEMORY_TYPE in PiDxeCis.h.
>  ///
> -#define  EFI_GCD_MEMORY_TYPE_UNACCEPTED  7
> +#define  EFI_GCD_MEMORY_TYPE_UNACCEPTED  6
> 
>  #endif
> diff --git a/MdePkg/Include/Pi/PiDxeCis.h b/MdePkg/Include/Pi/PiDxeCis.h
> index 27b219aa3f..bb7fb2c38a 100644
> --- a/MdePkg/Include/Pi/PiDxeCis.h
> +++ b/MdePkg/Include/Pi/PiDxeCis.h
> @@ -64,7 +64,7 @@ typedef enum {
>    // /// EfiGcdMemoryTypeUnaccepted is defined in PrePiDxeCis.h because it
> has not been
>    // /// defined in PI spec.
>    // EfiGcdMemoryTypeUnaccepted,
> -  EfiGcdMemoryTypeMaximum = 8
> +  EfiGcdMemoryTypeMaximum = 7
>  } EFI_GCD_MEMORY_TYPE;
> 
>  ///
Thanks Dionna.
Reviewed-by: Min Xu <min.m.xu@intel.com>

BTW, you need to add below guys in the CC list because they're the reviewers/maintainers of the pkgs.

MdePkg:
M: Michael D Kinney <michael.d.kinney@intel.com> [mdkinney]
M: Liming Gao <gaoliming@byosoft.com.cn> [lgao4]
R: Zhiguang Liu <zhiguang.liu@intel.com> [LiuZhiguang001]

MdeModulePkg
M: Jian J Wang <jian.j.wang@intel.com> [jwang36]
M: Liming Gao <gaoliming@byosoft.com.cn> [lgao4]

Re: [edk2-devel] [PATCH] MdeModulePkg: Correct memory type in PrePiDxeCis.h

[Dionna Glaze]

> BTW, you need to add below guys in the CC list because they're the reviewers/maintainers of the pkgs.
>
> MdePkg:
> M: Michael D Kinney <michael.d.kinney@intel.com> [mdkinney]
> M: Liming Gao <gaoliming@byosoft.com.cn> [lgao4]
> R: Zhiguang Liu <zhiguang.liu@intel.com> [LiuZhiguang001]
>
> MdeModulePkg
> M: Jian J Wang <jian.j.wang@intel.com> [jwang36]
> M: Liming Gao <gaoliming@byosoft.com.cn> [lgao4]
>

CC'd, thanks.

-- 
-Dionna Glaze, PhD (she/her)

回复: [edk2-devel] [PATCH] MdeModulePkg: Correct memory type in PrePiDxeCis.h

[gaoliming]

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

> -----邮件原件-----
> 发件人: Dionna Amalie Glaze <dionnaglaze@google.com>
> 发送时间: 2023年1月28日 8:02
> 收件人: Xu, Min M <min.m.xu@intel.com>
> 抄送: devel@edk2.groups.io; Yao, Jiewen <jiewen.yao@intel.com>; Kinney,
> Michael D <michael.d.kinney@intel.com>; Gao, Liming
> <gaoliming@byosoft.com.cn>; Liu, Zhiguang <zhiguang.liu@intel.com>; Wang,
> Jian J <jian.j.wang@intel.com>
> 主题: Re: [edk2-devel] [PATCH] MdeModulePkg: Correct memory type in
> PrePiDxeCis.h
> 
> > BTW, you need to add below guys in the CC list because they're the
> reviewers/maintainers of the pkgs.
> >
> > MdePkg:
> > M: Michael D Kinney <michael.d.kinney@intel.com> [mdkinney]
> > M: Liming Gao <gaoliming@byosoft.com.cn> [lgao4]
> > R: Zhiguang Liu <zhiguang.liu@intel.com> [LiuZhiguang001]
> >
> > MdeModulePkg
> > M: Jian J Wang <jian.j.wang@intel.com> [jwang36]
> > M: Liming Gao <gaoliming@byosoft.com.cn> [lgao4]
> >
> 
> CC'd, thanks.
> 
> --
> -Dionna Glaze, PhD (she/her)

Re: [edk2-devel] [PATCH] MdeModulePkg: Correct memory type in PrePiDxeCis.h

[Ard Biesheuvel]

On Sun, 29 Jan 2023 at 06:16, gaoliming via groups.io
<gaoliming=byosoft.com.cn@groups.io> wrote:
>
> Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
>


Merged as #3970

Thanks all


> > -----邮件原件-----
> > 发件人: Dionna Amalie Glaze <dionnaglaze@google.com>
> > 发送时间: 2023年1月28日 8:02
> > 收件人: Xu, Min M <min.m.xu@intel.com>
> > 抄送: devel@edk2.groups.io; Yao, Jiewen <jiewen.yao@intel.com>; Kinney,
> > Michael D <michael.d.kinney@intel.com>; Gao, Liming
> > <gaoliming@byosoft.com.cn>; Liu, Zhiguang <zhiguang.liu@intel.com>; Wang,
> > Jian J <jian.j.wang@intel.com>
> > 主题: Re: [edk2-devel] [PATCH] MdeModulePkg: Correct memory type in
> > PrePiDxeCis.h
> >
> > > BTW, you need to add below guys in the CC list because they're the
> > reviewers/maintainers of the pkgs.
> > >
> > > MdePkg:
> > > M: Michael D Kinney <michael.d.kinney@intel.com> [mdkinney]
> > > M: Liming Gao <gaoliming@byosoft.com.cn> [lgao4]
> > > R: Zhiguang Liu <zhiguang.liu@intel.com> [LiuZhiguang001]
> > >
> > > MdeModulePkg
> > > M: Jian J Wang <jian.j.wang@intel.com> [jwang36]
> > > M: Liming Gao <gaoliming@byosoft.com.cn> [lgao4]
> > >
> >
> > CC'd, thanks.
> >
> > --
> > -Dionna Glaze, PhD (she/her)
>
>
>
>
> 
>
>

Re: [edk2-devel] [PATCH] MdeModulePkg: Correct memory type in PrePiDxeCis.h

[Michael D Kinney]

Hi Ard,

Can you explain the process being followed here for content like this.

The EDK II Code First Process as detailed below requires all content to only
be added to edk2-staging repo and used from there before spec changes become
public.  Content is only added to the edk2 repo until after the spec with the
change is public.

https://github.com/tianocore/tianocore.github.io/wiki/EDK-II-Code-First-Process

This process was reviewed and approved by the community.  If there is a need
for an alternate process, then that needs to be proposed, reviewed, and accepted.

Thanks,

Mike



> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Ard Biesheuvel
> Sent: Monday, January 30, 2023 6:01 AM
> To: devel@edk2.groups.io; Gao, Liming <gaoliming@byosoft.com.cn>
> Cc: Dionna Amalie Glaze <dionnaglaze@google.com>; Xu, Min M <min.m.xu@intel.com>; Yao, Jiewen
> <jiewen.yao@intel.com>; Kinney, Michael D <michael.d.kinney@intel.com>; Liu, Zhiguang <zhiguang.liu@intel.com>;
> Wang, Jian J <jian.j.wang@intel.com>
> Subject: Re: [edk2-devel] [PATCH] MdeModulePkg: Correct memory type in PrePiDxeCis.h
> 
> On Sun, 29 Jan 2023 at 06:16, gaoliming via groups.io
> <gaoliming=byosoft.com.cn@groups.io> wrote:
> >
> > Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
> >
> 
> 
> Merged as #3970
> 
> Thanks all
> 
> 
> > > -----邮件原件-----
> > > 发件人: Dionna Amalie Glaze <dionnaglaze@google.com>
> > > 发送时间: 2023年1月28日 8:02
> > > 收件人: Xu, Min M <min.m.xu@intel.com>
> > > 抄送: devel@edk2.groups.io; Yao, Jiewen <jiewen.yao@intel.com>; Kinney,
> > > Michael D <michael.d.kinney@intel.com>; Gao, Liming
> > > <gaoliming@byosoft.com.cn>; Liu, Zhiguang <zhiguang.liu@intel.com>; Wang,
> > > Jian J <jian.j.wang@intel.com>
> > > 主题: Re: [edk2-devel] [PATCH] MdeModulePkg: Correct memory type in
> > > PrePiDxeCis.h
> > >
> > > > BTW, you need to add below guys in the CC list because they're the
> > > reviewers/maintainers of the pkgs.
> > > >
> > > > MdePkg:
> > > > M: Michael D Kinney <michael.d.kinney@intel.com> [mdkinney]
> > > > M: Liming Gao <gaoliming@byosoft.com.cn> [lgao4]
> > > > R: Zhiguang Liu <zhiguang.liu@intel.com> [LiuZhiguang001]
> > > >
> > > > MdeModulePkg
> > > > M: Jian J Wang <jian.j.wang@intel.com> [jwang36]
> > > > M: Liming Gao <gaoliming@byosoft.com.cn> [lgao4]
> > > >
> > >
> > > CC'd, thanks.
> > >
> > > --
> > > -Dionna Glaze, PhD (she/her)
> >
> >
> >
> >
> >
> >
> >
> 
> 
> 
> 

Re: [edk2-devel] [PATCH] MdeModulePkg: Correct memory type in PrePiDxeCis.h

[Ard Biesheuvel]

On Mon, 30 Jan 2023 at 17:27, Kinney, Michael D
<michael.d.kinney@intel.com> wrote:
>
> Hi Ard,
>
> Can you explain the process being followed here for content like this.
>
> The EDK II Code First Process as detailed below requires all content to only
> be added to edk2-staging repo and used from there before spec changes become
> public.  Content is only added to the edk2 repo until after the spec with the
> change is public.
>
> https://github.com/tianocore/tianocore.github.io/wiki/EDK-II-Code-First-Process
>
> This process was reviewed and approved by the community.  If there is a need
> for an alternate process, then that needs to be proposed, reviewed, and accepted.
>

Hello Mike,

I was not involved at all in the creation of these definitions. This
patch merely fixes the wrong index value that was introduced by

commit 502c01c5028038e4e6b4512e9c66be0ec4d11492
Author: Min M Xu <min.m.xu@intel.com>
Date:   Tue Nov 1 13:13:43 2022 +0800

    MdePkg: Add UEFI Unaccepted memory definition

    RFC: https://bugzilla.tianocore.org/show_bug.cgi?id=3937

    Plase refer to:
      UEFI Spec v2.9 Table 7-5 Memory Type Usage before ExitBootServices()

    Cc: Michael D Kinney <michael.d.kinney@intel.com>
    Cc: Liming Gao <gaoliming@byosoft.com.cn>
    Cc: Zhiguang Liu <zhiguang.liu@intel.com>
    Cc: Erdem Aktas <erdemaktas@google.com>
    Cc: Gerd Hoffmann <kraxel@redhat.com>
    Cc: James Bottomley <jejb@linux.ibm.com>
    Cc: Jiewen Yao <jiewen.yao@intel.com>
    Cc: Tom Lendacky <thomas.lendacky@amd.com>
    Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>
    Acked-by: Gerd Hoffmann <kraxel@redhat.com>
    Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
    Signed-off-by: Min Xu <min.m.xu@intel.com>

Re: [edk2-devel] [PATCH] MdeModulePkg: Correct memory type in PrePiDxeCis.h

[Michael D Kinney]

Thanks for the pointer.

Mike

> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Ard Biesheuvel
> Sent: Monday, January 30, 2023 8:54 AM
> To: Kinney, Michael D <michael.d.kinney@intel.com>
> Cc: devel@edk2.groups.io; Gao, Liming <gaoliming@byosoft.com.cn>; Dionna Amalie Glaze <dionnaglaze@google.com>; Xu,
> Min M <min.m.xu@intel.com>; Yao, Jiewen <jiewen.yao@intel.com>; Liu, Zhiguang <zhiguang.liu@intel.com>; Wang, Jian J
> <jian.j.wang@intel.com>
> Subject: Re: [edk2-devel] [PATCH] MdeModulePkg: Correct memory type in PrePiDxeCis.h
> 
> On Mon, 30 Jan 2023 at 17:27, Kinney, Michael D
> <michael.d.kinney@intel.com> wrote:
> >
> > Hi Ard,
> >
> > Can you explain the process being followed here for content like this.
> >
> > The EDK II Code First Process as detailed below requires all content to only
> > be added to edk2-staging repo and used from there before spec changes become
> > public.  Content is only added to the edk2 repo until after the spec with the
> > change is public.
> >
> > https://github.com/tianocore/tianocore.github.io/wiki/EDK-II-Code-First-Process
> >
> > This process was reviewed and approved by the community.  If there is a need
> > for an alternate process, then that needs to be proposed, reviewed, and accepted.
> >
> 
> Hello Mike,
> 
> I was not involved at all in the creation of these definitions. This
> patch merely fixes the wrong index value that was introduced by
> 
> commit 502c01c5028038e4e6b4512e9c66be0ec4d11492
> Author: Min M Xu <min.m.xu@intel.com>
> Date:   Tue Nov 1 13:13:43 2022 +0800
> 
>     MdePkg: Add UEFI Unaccepted memory definition
> 
>     RFC: https://bugzilla.tianocore.org/show_bug.cgi?id=3937
> 
>     Plase refer to:
>       UEFI Spec v2.9 Table 7-5 Memory Type Usage before ExitBootServices()
> 
>     Cc: Michael D Kinney <michael.d.kinney@intel.com>
>     Cc: Liming Gao <gaoliming@byosoft.com.cn>
>     Cc: Zhiguang Liu <zhiguang.liu@intel.com>
>     Cc: Erdem Aktas <erdemaktas@google.com>
>     Cc: Gerd Hoffmann <kraxel@redhat.com>
>     Cc: James Bottomley <jejb@linux.ibm.com>
>     Cc: Jiewen Yao <jiewen.yao@intel.com>
>     Cc: Tom Lendacky <thomas.lendacky@amd.com>
>     Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>
>     Acked-by: Gerd Hoffmann <kraxel@redhat.com>
>     Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
>     Signed-off-by: Min Xu <min.m.xu@intel.com>
> 
> 
> 
>