From 27b8a5295768a117528b7a423bb670597fa7bb89 Mon Sep 17 00:00:00 2001 From: Kun Qin Date: Thu, 24 Jun 2021 11:33:07 +0800 Subject: [PATCH] MdePkg: MmConfiguration: Move definition of EFI_MM_RESERVED_MMRAM_REGION REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3440 The definition of EFI_MM_RESERVED_MMRAM_REGION, according to PI Spec 1.5 is also referenced in EFI_PEI_MM_CONFIGURATION_PPI. Defining this structure as is will enforce any potential usage of MM Configuration PPI interface to include . This change moves this structure definition to PiMultiPhase.h, which is already included by Protocol/MmConfiguration.h through PiMmCis.h. It also paves way for introducing Ppi/MmConfiguration.h with proper dependency. Cc: Michael D Kinney Cc: Liming Gao Cc: Zhiguang Liu Cc: Michael Kubacki Signed-off-by: Kun Qin Reviewed-by: Liming Gao --- MdePkg/Include/Pi/PiMultiPhase.h | 16 ++++++++++++++++ MdePkg/Include/Protocol/MmConfiguration.h | 16 ---------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/MdePkg/Include/Pi/PiMultiPhase.h b/MdePkg/Include/Pi/PiMultiPhase.h index a5056799e1..89280d9d35 100644 --- a/MdePkg/Include/Pi/PiMultiPhase.h +++ b/MdePkg/Include/Pi/PiMultiPhase.h @@ -133,6 +133,22 @@ typedef struct { typedef EFI_MMRAM_DESCRIPTOR EFI_SMRAM_DESCRIPTOR; +/// +/// Structure describing a MMRAM region which cannot be used for the MMRAM heap. +/// +typedef struct _EFI_MM_RESERVED_MMRAM_REGION { + /// + /// Starting address of the reserved MMRAM area, as it appears while MMRAM is open. + /// Ignored if MmramReservedSize is 0. + /// + EFI_PHYSICAL_ADDRESS MmramReservedStart; + /// + /// Number of bytes occupied by the reserved MMRAM area. A size of zero indicates the + /// last MMRAM area. + /// + UINT64 MmramReservedSize; +} EFI_MM_RESERVED_MMRAM_REGION; + typedef enum { EFI_PCD_TYPE_8, EFI_PCD_TYPE_16, diff --git a/MdePkg/Include/Protocol/MmConfiguration.h b/MdePkg/Include/Protocol/MmConfiguration.h index eeb94f64bd..d2fb6a13d4 100644 --- a/MdePkg/Include/Protocol/MmConfiguration.h +++ b/MdePkg/Include/Protocol/MmConfiguration.h @@ -21,22 +21,6 @@ 0x26eeb3de, 0xb689, 0x492e, {0x80, 0xf0, 0xbe, 0x8b, 0xd7, 0xda, 0x4b, 0xa7 } \ } -/// -/// Structure describing a MMRAM region which cannot be used for the MMRAM heap. -/// -typedef struct _EFI_MM_RESERVED_MMRAM_REGION { - /// - /// Starting address of the reserved MMRAM area, as it appears while MMRAM is open. - /// Ignored if MmramReservedSize is 0. - /// - EFI_PHYSICAL_ADDRESS MmramReservedStart; - /// - /// Number of bytes occupied by the reserved MMRAM area. A size of zero indicates the - /// last MMRAM area. - /// - UINT64 MmramReservedSize; -} EFI_MM_RESERVED_MMRAM_REGION; - typedef struct _EFI_MM_CONFIGURATION_PROTOCOL EFI_MM_CONFIGURATION_PROTOCOL; /**