MdeModulePkg/PciHostBridge: Move declaration of mIoMmu to header file

The change doesn't have functionality impact.
It just renames the mIoMmuProtocol to mIoMmu and moves the
declaration from PciRootBridgeIo.c to PciHostBridge.h.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Suggested-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>

diff --git a/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridge.c b/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridge.c
index 0c1f75efcbceec7dbdc13ff2bb8b30349e7f524b..a74c6f0d30b8b0b48fb67e02d05603cec890c096 100644 (file)
--- a/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridge.c
+++ b/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridge.c
@@ -26,7 +26,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED CHAR16 *mPciResourceTypeStr[] = {
   L"I/O", L"Mem", L"PMem", L"Mem64", L"PMem64", L"Bus"\r
 };\r
 \r
   L"I/O", L"Mem", L"PMem", L"Mem64", L"PMem64", L"Bus"\r
 };\r
 \r

-EDKII_IOMMU_PROTOCOL        *mIoMmuProtocol;\r
+EDKII_IOMMU_PROTOCOL        *mIoMmu;\r

 EFI_EVENT                   mIoMmuEvent;\r
 VOID                        *mIoMmuRegistration;\r
 \r
 EFI_EVENT                   mIoMmuEvent;\r
 VOID                        *mIoMmuRegistration;\r
 \r


@@ -363,7 +363,7 @@ IoMmuProtocolCallback (
 {\r
   EFI_STATUS   Status;\r
 \r
 {\r
   EFI_STATUS   Status;\r
 \r

-  Status = gBS->LocateProtocol (&gEdkiiIoMmuProtocolGuid, NULL, (VOID **)&mIoMmuProtocol);\r
+  Status = gBS->LocateProtocol (&gEdkiiIoMmuProtocolGuid, NULL, (VOID **)&mIoMmu);\r

   if (!EFI_ERROR(Status)) {\r
     gBS->CloseEvent (mIoMmuEvent);\r
   }\r
   if (!EFI_ERROR(Status)) {\r
     gBS->CloseEvent (mIoMmuEvent);\r
   }\r

diff --git a/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridge.h b/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridge.h
index bc9c7214ddcae257df3e9a0ff1fe787e4ec304b8..e0ed39eebc8a87ebc2656805c47c4613724513a2 100644 (file)
--- a/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridge.h
+++ b/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridge.h
@@ -23,6 +23,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/MemoryAllocationLib.h>\r
 #include <Library/PciHostBridgeLib.h>\r
 #include <Protocol/PciHostBridgeResourceAllocation.h>\r
 #include <Library/MemoryAllocationLib.h>\r
 #include <Library/PciHostBridgeLib.h>\r
 #include <Protocol/PciHostBridgeResourceAllocation.h>\r

+#include <Protocol/IoMmu.h>\r

 \r
 #include "PciRootBridge.h"\r
 \r
 \r
 #include "PciRootBridge.h"\r
 \r


@@ -269,4 +270,6 @@ GetTranslationByResourceType (
   );\r
 \r
 extern EFI_CPU_IO2_PROTOCOL        *mCpuIo;\r
   );\r
 \r
 extern EFI_CPU_IO2_PROTOCOL        *mCpuIo;\r

+extern EDKII_IOMMU_PROTOCOL        *mIoMmu;\r
+\r

 #endif\r
 #endif\r

diff --git a/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciRootBridge.h b/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciRootBridge.h
index 06871052e7cd136b0134b9d4d97af4b1e1fdc325..e8513c906f82a5b462ed85a9226cb54323aaa98e 100644 (file)
--- a/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciRootBridge.h
+++ b/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciRootBridge.h
@@ -26,7 +26,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Protocol/CpuIo2.h>\r
 #include <Protocol/DevicePath.h>\r
 #include <Protocol/PciRootBridgeIo.h>\r
 #include <Protocol/CpuIo2.h>\r
 #include <Protocol/DevicePath.h>\r
 #include <Protocol/PciRootBridgeIo.h>\r

-#include <Protocol/IoMmu.h>\r

 #include <Library/DebugLib.h>\r
 #include <Library/DevicePathLib.h>\r
 #include <Library/BaseMemoryLib.h>\r
 #include <Library/DebugLib.h>\r
 #include <Library/DevicePathLib.h>\r
 #include <Library/BaseMemoryLib.h>\r

diff --git a/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciRootBridgeIo.c b/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciRootBridgeIo.c
index 16413b60a65ec48f6271771f1e15f3e39abda32a..4c908fad885190877f0717efc4b730ecd776744b 100644 (file)
--- a/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciRootBridgeIo.c
+++ b/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciRootBridgeIo.c
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include "PciRootBridge.h"\r
 #include "PciHostResource.h"\r
 \r
 #include "PciRootBridge.h"\r
 #include "PciHostResource.h"\r
 \r

-extern EDKII_IOMMU_PROTOCOL        *mIoMmuProtocol;\r
-\r

 #define NO_MAPPING  (VOID *) (UINTN) -1\r
 \r
 #define RESOURCE_VALID(Resource) ((Resource)->Base <= (Resource)->Limit)\r
 #define NO_MAPPING  (VOID *) (UINTN) -1\r
 \r
 #define RESOURCE_VALID(Resource) ((Resource)->Base <= (Resource)->Limit)\r


@@ -1269,7 +1267,7 @@ RootBridgeIoMap (
 \r
   RootBridge = ROOT_BRIDGE_FROM_THIS (This);\r
 \r
 \r
   RootBridge = ROOT_BRIDGE_FROM_THIS (This);\r
 \r

-  if (mIoMmuProtocol != NULL) {\r
+  if (mIoMmu != NULL) {\r

     if (!RootBridge->DmaAbove4G) {\r
       //\r
       // Clear 64bit support\r
     if (!RootBridge->DmaAbove4G) {\r
       //\r
       // Clear 64bit support\r


@@ -1278,14 +1276,14 @@ RootBridgeIoMap (
         Operation = (EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_OPERATION) (Operation - EfiPciOperationBusMasterRead64);\r
       }\r
     }\r
         Operation = (EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_OPERATION) (Operation - EfiPciOperationBusMasterRead64);\r
       }\r
     }\r

-    Status = mIoMmuProtocol->Map (\r
-                               mIoMmuProtocol,\r
-                               (EDKII_IOMMU_OPERATION) Operation,\r
-                               HostAddress,\r
-                               NumberOfBytes,\r
-                               DeviceAddress,\r
-                               Mapping\r
-                               );\r
+    Status = mIoMmu->Map (\r
+                       mIoMmu,\r
+                       (EDKII_IOMMU_OPERATION) Operation,\r
+                       HostAddress,\r
+                       NumberOfBytes,\r
+                       DeviceAddress,\r
+                       Mapping\r
+                       );\r

     return Status;\r
   }\r
 \r
     return Status;\r
   }\r
 \r


@@ -1413,11 +1411,11 @@ RootBridgeIoUnmap (
   PCI_ROOT_BRIDGE_INSTANCE *RootBridge;\r
   EFI_STATUS                Status;\r
 \r
   PCI_ROOT_BRIDGE_INSTANCE *RootBridge;\r
   EFI_STATUS                Status;\r
 \r

-  if (mIoMmuProtocol != NULL) {\r
-    Status = mIoMmuProtocol->Unmap (\r
-                               mIoMmuProtocol,\r
-                               Mapping\r
-                               );\r
+  if (mIoMmu != NULL) {\r
+    Status = mIoMmu->Unmap (\r
+                       mIoMmu,\r
+                       Mapping\r
+                       );\r

     return Status;\r
   }\r
 \r
     return Status;\r
   }\r
 \r


@@ -1539,21 +1537,21 @@ RootBridgeIoAllocateBuffer (
 \r
   RootBridge = ROOT_BRIDGE_FROM_THIS (This);\r
 \r
 \r
   RootBridge = ROOT_BRIDGE_FROM_THIS (This);\r
 \r

-  if (mIoMmuProtocol != NULL) {\r
+  if (mIoMmu != NULL) {\r

     if (!RootBridge->DmaAbove4G) {\r
       //\r
       // Clear DUAL_ADDRESS_CYCLE\r
       //\r
       Attributes &= ~((UINT64) EFI_PCI_ATTRIBUTE_DUAL_ADDRESS_CYCLE);\r
     }\r
     if (!RootBridge->DmaAbove4G) {\r
       //\r
       // Clear DUAL_ADDRESS_CYCLE\r
       //\r
       Attributes &= ~((UINT64) EFI_PCI_ATTRIBUTE_DUAL_ADDRESS_CYCLE);\r
     }\r

-    Status = mIoMmuProtocol->AllocateBuffer (\r
-                               mIoMmuProtocol,\r
-                               Type,\r
-                               MemoryType,\r
-                               Pages,\r
-                               HostAddress,\r
-                               Attributes\r
-                               );\r
+    Status = mIoMmu->AllocateBuffer (\r
+                       mIoMmu,\r
+                       Type,\r
+                       MemoryType,\r
+                       Pages,\r
+                       HostAddress,\r
+                       Attributes\r
+                       );\r

     return Status;\r
   }\r
 \r
     return Status;\r
   }\r
 \r


@@ -1603,12 +1601,12 @@ RootBridgeIoFreeBuffer (
 {\r
   EFI_STATUS                Status;\r
 \r
 {\r
   EFI_STATUS                Status;\r
 \r

-  if (mIoMmuProtocol != NULL) {\r
-    Status = mIoMmuProtocol->FreeBuffer (\r
-                               mIoMmuProtocol,\r
-                               Pages,\r
-                               HostAddress\r
-                               );\r
+  if (mIoMmu != NULL) {\r
+    Status = mIoMmu->FreeBuffer (\r
+                       mIoMmu,\r
+                       Pages,\r
+                       HostAddress\r
+                       );\r

     return Status;\r
   }\r
 \r
     return Status;\r
   }\r
 \r