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@...>
Cc: Jiewen Yao <jiewen.yao@...>

Signed-off-by: Dionna Glaze <dionnaglaze@...>
---
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

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@...>
Cc: Jiewen Yao <jiewen.yao@...>

Signed-off-by: Dionna Glaze <dionnaglaze@...>
---
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@...>

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@...> [mdkinney]
M: Liming Gao <gaoliming@...> [lgao4]
R: Zhiguang Liu <zhiguang.liu@...> [LiuZhiguang001]

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

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@...> [mdkinney]
M: Liming Gao <gaoliming@...> [lgao4]
R: Zhiguang Liu <zhiguang.liu@...> [LiuZhiguang001]

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

CC'd, thanks.

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