SecurityPkg OpalPasswordSmm: Consume SmmIoLib.

[mirror_edk2.git] / SecurityPkg / Tcg / Opal / OpalPasswordSmm / OpalAhciMode.c

diff --git a/SecurityPkg/Tcg/Opal/OpalPasswordSmm/OpalAhciMode.c b/SecurityPkg/Tcg/Opal/OpalPasswordSmm/OpalAhciMode.c
index 33f77bd8a248248baa75c61b45fca88a7fdc1f38..e38acfd052b50fc197120f4f8464a28e36d4354c 100644 (file)
--- a/SecurityPkg/Tcg/Opal/OpalPasswordSmm/OpalAhciMode.c
+++ b/SecurityPkg/Tcg/Opal/OpalPasswordSmm/OpalAhciMode.c
@@ -1022,34 +1022,6 @@ GetAhciBarSize (
   return Size;\r
 }\r
 \r
-/**\r
-  This function check if the memory region is in GCD MMIO region.\r
-\r
-  @param Addr  The memory region start address to be checked.\r
-  @param Size  The memory region length to be checked.\r
-\r
-  @retval TRUE  This memory region is in GCD MMIO region.\r
-  @retval FALSE This memory region is not in GCD MMIO region.\r
-**/\r
-BOOLEAN\r
-EFIAPI\r
-OpalIsValidMmioSpace (\r
-  IN  EFI_PHYSICAL_ADDRESS       Addr,\r
-  IN  UINTN                      Size\r
-  )\r
-{\r
-  UINTN                           Index;\r
-  EFI_GCD_MEMORY_SPACE_DESCRIPTOR *Desc;\r
-\r
-  for (Index = 0; Index < mNumberOfDescriptors; Index ++) {\r
-    Desc = &mGcdMemSpace[Index];\r
-    if ((Desc->GcdMemoryType == EfiGcdMemoryTypeMemoryMappedIo) && (Addr >= Desc->BaseAddress) && ((Addr + Size) <= (Desc->BaseAddress + Desc->Length))) {\r
-      return TRUE;\r
-    }\r
-  }\r
-\r
-  return FALSE;\r
-}\r
 /**\r
   Get AHCI mode base address registers' Value.\r
 \r
@@ -1083,7 +1055,7 @@ GetAhciBaseAddress (
   //\r
   // Check if the AHCI Bar region is in SMRAM to avoid malicious attack by modifying MMIO Bar to point to SMRAM.\r
   //\r
-  if (!OpalIsValidMmioSpace ((EFI_PHYSICAL_ADDRESS)mAhciBar, Size)) {\r
+  if (!SmmIsMmioValid ((EFI_PHYSICAL_ADDRESS)mAhciBar, Size, NULL)) {\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r