From c80f456ef40d6bb8a12688106941193b2e7b4627 Mon Sep 17 00:00:00 2001 From: "INDIA\\sachinganesh" Date: Wed, 18 Sep 2024 21:31:41 +0530 Subject: MdePkg: Define PI Specification Version Macro Defined PI specification version. Used them to define revisions of PEI/DXE/MM system tables. Cc: Felix Polyudov Cc: Dhanaraj V Cc: Liming Gao Signed-off-by: Sachin Ganesh --- MdePkg/Include/Pi/PiDxeCis.h | 6 +++--- MdePkg/Include/Pi/PiMmCis.h | 9 +++------ MdePkg/Include/Pi/PiMultiPhase.h | 9 ++++++++- MdePkg/Include/Pi/PiPeiCis.h | 6 +++--- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/MdePkg/Include/Pi/PiDxeCis.h b/MdePkg/Include/Pi/PiDxeCis.h index 04410c5a1a..bb903f045c 100644 --- a/MdePkg/Include/Pi/PiDxeCis.h +++ b/MdePkg/Include/Pi/PiDxeCis.h @@ -5,7 +5,7 @@ Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent @par Revision Reference: - PI Version 1.7 + PI Version 1.8.A **/ @@ -691,8 +691,8 @@ EFI_STATUS // DXE Services Table // #define DXE_SERVICES_SIGNATURE 0x565245535f455844ULL -#define DXE_SPECIFICATION_MAJOR_REVISION 1 -#define DXE_SPECIFICATION_MINOR_REVISION 70 +#define DXE_SPECIFICATION_MAJOR_REVISION PI_SPECIFICATION_MAJOR_REVISION +#define DXE_SPECIFICATION_MINOR_REVISION PI_SPECIFICATION_MINOR_REVISION #define DXE_SERVICES_REVISION ((DXE_SPECIFICATION_MAJOR_REVISION<<16) | (DXE_SPECIFICATION_MINOR_REVISION)) typedef struct { diff --git a/MdePkg/Include/Pi/PiMmCis.h b/MdePkg/Include/Pi/PiMmCis.h index 01340952d8..9adffffd71 100644 --- a/MdePkg/Include/Pi/PiMmCis.h +++ b/MdePkg/Include/Pi/PiMmCis.h @@ -18,12 +18,9 @@ typedef struct _EFI_MM_SYSTEM_TABLE EFI_MM_SYSTEM_TABLE; /// /// The Management Mode System Table (MMST) signature /// -#define MM_MMST_SIGNATURE SIGNATURE_32 ('S', 'M', 'S', 'T') -/// -/// The Management Mode System Table (MMST) revision is 1.6 -/// -#define MM_SPECIFICATION_MAJOR_REVISION 1 -#define MM_SPECIFICATION_MINOR_REVISION 60 +#define MM_MMST_SIGNATURE SIGNATURE_32 ('S', 'M', 'S', 'T') +#define MM_SPECIFICATION_MAJOR_REVISION PI_SPECIFICATION_MAJOR_REVISION +#define MM_SPECIFICATION_MINOR_REVISION PI_SPECIFICATION_MINOR_REVISION #define EFI_MM_SYSTEM_TABLE_REVISION ((MM_SPECIFICATION_MAJOR_REVISION<<16) | (MM_SPECIFICATION_MINOR_REVISION)) /** diff --git a/MdePkg/Include/Pi/PiMultiPhase.h b/MdePkg/Include/Pi/PiMultiPhase.h index a7e95820ef..1c7332e733 100644 --- a/MdePkg/Include/Pi/PiMultiPhase.h +++ b/MdePkg/Include/Pi/PiMultiPhase.h @@ -5,7 +5,7 @@ Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent @par Revision Reference: - These elements are defined in UEFI Platform Initialization Specification 1.2. + These elements are defined in UEFI Platform Initialization Specification 1.8.A **/ @@ -20,6 +20,13 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include #include +// +// PI Specification Version Information +// +#define PI_SPECIFICATION_MAJOR_REVISION 1 +#define PI_SPECIFICATION_MINOR_REVISION 80 +#define PI_SPECIFICATION_VERSION ((PI_SPECIFICATION_MAJOR_REVISION << 16) | (PI_SPECIFICATION_MINOR_REVISION)) + /** Produces an error code in the range reserved for use by the Platform Initialization Architecture Specification. diff --git a/MdePkg/Include/Pi/PiPeiCis.h b/MdePkg/Include/Pi/PiPeiCis.h index 69eec2c473..ad4be384bc 100644 --- a/MdePkg/Include/Pi/PiPeiCis.h +++ b/MdePkg/Include/Pi/PiPeiCis.h @@ -5,7 +5,7 @@ Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent @par Revision Reference: - PI Version 1.7. + PI Version 1.8.A **/ @@ -846,8 +846,8 @@ EFI_STATUS // // PEI Specification Revision information // -#define PEI_SPECIFICATION_MAJOR_REVISION 1 -#define PEI_SPECIFICATION_MINOR_REVISION 70 +#define PEI_SPECIFICATION_MAJOR_REVISION PI_SPECIFICATION_MAJOR_REVISION +#define PEI_SPECIFICATION_MINOR_REVISION PI_SPECIFICATION_MINOR_REVISION /// /// Specification inconsistency here: /// In the PI1.0 spec, PEI_SERVICES_SIGNATURE is defined as 0x5652455320494550. But -- cgit