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 <Protocol/MmConfiguration.h>.

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 <michael.d.kinney@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Zhiguang Liu <zhiguang.liu@intel.com>
Cc: Michael Kubacki <michael.kubacki@microsoft.com>
Signed-off-by: Kun Qin <kuqin12@gmail.com>
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>

diff --git a/MdePkg/Include/Pi/PiMultiPhase.h b/MdePkg/Include/Pi/PiMultiPhase.h
index a5056799e1dde92a75d99a3174c5552a02d7ba54..89280d9d3506b51599281dc4911981dc8908b383 100644 (file)
--- a/MdePkg/Include/Pi/PiMultiPhase.h
+++ b/MdePkg/Include/Pi/PiMultiPhase.h
@@ -133,6 +133,22 @@ typedef struct {
 \r
 typedef EFI_MMRAM_DESCRIPTOR  EFI_SMRAM_DESCRIPTOR;\r
 \r
+///\r
+/// Structure describing a MMRAM region which cannot be used for the MMRAM heap.\r
+///\r
+typedef struct _EFI_MM_RESERVED_MMRAM_REGION {\r
+  ///\r
+  /// Starting address of the reserved MMRAM area, as it appears while MMRAM is open.\r
+  /// Ignored if MmramReservedSize is 0.\r
+  ///\r
+  EFI_PHYSICAL_ADDRESS    MmramReservedStart;\r
+  ///\r
+  /// Number of bytes occupied by the reserved MMRAM area. A size of zero indicates the\r
+  /// last MMRAM area.\r
+  ///\r
+  UINT64                  MmramReservedSize;\r
+} EFI_MM_RESERVED_MMRAM_REGION;\r
+\r
 typedef enum {\r
   EFI_PCD_TYPE_8,\r
   EFI_PCD_TYPE_16,\r

diff --git a/MdePkg/Include/Protocol/MmConfiguration.h b/MdePkg/Include/Protocol/MmConfiguration.h
index eeb94f64bdf7219ae439a6b4256c169e724d25f2..d2fb6a13d4af4e78c90f6e89148969782a756d32 100644 (file)
--- 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 }  \\r
   }\r
 \r
-///\r
-/// Structure describing a MMRAM region which cannot be used for the MMRAM heap.\r
-///\r
-typedef struct _EFI_MM_RESERVED_MMRAM_REGION {\r
-  ///\r
-  /// Starting address of the reserved MMRAM area, as it appears while MMRAM is open.\r
-  /// Ignored if MmramReservedSize is 0.\r
-  ///\r
-  EFI_PHYSICAL_ADDRESS    MmramReservedStart;\r
-  ///\r
-  /// Number of bytes occupied by the reserved MMRAM area. A size of zero indicates the\r
-  /// last MMRAM area.\r
-  ///\r
-  UINT64                  MmramReservedSize;\r
-} EFI_MM_RESERVED_MMRAM_REGION;\r
-\r
 typedef struct _EFI_MM_CONFIGURATION_PROTOCOL  EFI_MM_CONFIGURATION_PROTOCOL;\r
 \r
 /**\r