Ovmf/Xen: move XenBusDxe to abstract XENIO_PROTOCOL

[mirror_edk2.git] / OvmfPkg / XenBusDxe / XenBusDxe.c

diff --git a/OvmfPkg/XenBusDxe/XenBusDxe.c b/OvmfPkg/XenBusDxe/XenBusDxe.c
index cc334c086c1f16983ddabe3e28b31c29ed2abfb9..2c4a08673ce64ff8a81c721ae4ee34cfa7d23a33 100644 (file)
--- a/OvmfPkg/XenBusDxe/XenBusDxe.c
+++ b/OvmfPkg/XenBusDxe/XenBusDxe.c
@@ -23,8 +23,6 @@
 \r
 **/\r
 \r
-#include <IndustryStandard/Pci.h>\r
-#include <IndustryStandard/Acpi.h>\r
 #include <Library/DebugLib.h>\r
 #include <Library/XenHypercallLib.h>\r
 \r
@@ -233,34 +231,22 @@ XenBusDxeDriverBindingSupported (
   )\r
 {\r
   EFI_STATUS          Status;\r
-  EFI_PCI_IO_PROTOCOL *PciIo;\r
-  PCI_TYPE00          Pci;\r
+  XENIO_PROTOCOL      *XenIo;\r
 \r
   Status = gBS->OpenProtocol (\r
                      ControllerHandle,\r
-                     &gEfiPciIoProtocolGuid,\r
-                     (VOID **)&PciIo,\r
+                     &gXenIoProtocolGuid,\r
+                     (VOID **)&XenIo,\r
                      This->DriverBindingHandle,\r
                      ControllerHandle,\r
                      EFI_OPEN_PROTOCOL_BY_DRIVER\r
                      );\r
+\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
-  Status = PciIo->Pci.Read (PciIo, EfiPciIoWidthUint32, 0,\r
-                            sizeof Pci / sizeof (UINT32), &Pci);\r
-\r
-  if (Status == EFI_SUCCESS) {\r
-    if (Pci.Hdr.VendorId == PCI_VENDOR_ID_XEN &&\r
-        Pci.Hdr.DeviceId == PCI_DEVICE_ID_XEN_PLATFORM) {\r
-      Status = EFI_SUCCESS;\r
-    } else {\r
-      Status = EFI_UNSUPPORTED;\r
-    }\r
-  }\r
-\r
-  gBS->CloseProtocol (ControllerHandle, &gEfiPciIoProtocolGuid,\r
+  gBS->CloseProtocol (ControllerHandle, &gXenIoProtocolGuid,\r
          This->DriverBindingHandle, ControllerHandle);\r
 \r
   return Status;\r
@@ -326,19 +312,18 @@ XenBusDxeDriverBindingStart (
 {\r
   EFI_STATUS Status;\r
   XENBUS_DEVICE *Dev;\r
-  EFI_PCI_IO_PROTOCOL *PciIo;\r
-  EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR *BarDesc;\r
-  UINT64 MmioAddr;\r
+  XENIO_PROTOCOL *XenIo;\r
   EFI_DEVICE_PATH_PROTOCOL *DevicePath;\r
 \r
   Status = gBS->OpenProtocol (\r
                      ControllerHandle,\r
-                     &gEfiPciIoProtocolGuid,\r
-                     (VOID **) &PciIo,\r
+                     &gXenIoProtocolGuid,\r
+                     (VOID**)&XenIo,\r
                      This->DriverBindingHandle,\r
                      ControllerHandle,\r
                      EFI_OPEN_PROTOCOL_BY_DRIVER\r
                      );\r
+\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -360,7 +345,7 @@ XenBusDxeDriverBindingStart (
   Dev->Signature = XENBUS_DEVICE_SIGNATURE;\r
   Dev->This = This;\r
   Dev->ControllerHandle = ControllerHandle;\r
-  Dev->PciIo = PciIo;\r
+  Dev->XenIo = XenIo;\r
   Dev->DevicePath = DevicePath;\r
   InitializeListHead (&Dev->ChildList);\r
 \r
@@ -376,20 +361,6 @@ XenBusDxeDriverBindingStart (
   mMyDevice = Dev;\r
   EfiReleaseLock (&mMyDeviceLock);\r
 \r
-  //\r
-  // The BAR1 of this PCI device is used for shared memory and is supposed to\r
-  // look like MMIO. The address space of the BAR1 will be used to map the\r
-  // Grant Table.\r
-  //\r
-  Status = PciIo->GetBarAttributes (PciIo, PCI_BAR_IDX1, NULL, (VOID**) &BarDesc);\r
-  ASSERT_EFI_ERROR (Status);\r
-  ASSERT (BarDesc->ResType == ACPI_ADDRESS_SPACE_TYPE_MEM);\r
-\r
-  /* Get a Memory address for mapping the Grant Table. */\r
-  DEBUG ((EFI_D_INFO, "XenBus: BAR at %LX\n", BarDesc->AddrRangeMin));\r
-  MmioAddr = BarDesc->AddrRangeMin;\r
-  FreePool (BarDesc);\r
-\r
   Status = XenGetSharedInfoPage (Dev);\r
   if (EFI_ERROR (Status)) {\r
     DEBUG ((EFI_D_ERROR, "XenBus: Unable to get the shared info page.\n"));\r
@@ -397,7 +368,7 @@ XenBusDxeDriverBindingStart (
     goto ErrorAllocated;\r
   }\r
 \r
-  XenGrantTableInit (Dev, MmioAddr);\r
+  XenGrantTableInit (Dev);\r
 \r
   Status = XenStoreInit (Dev);\r
   ASSERT_EFI_ERROR (Status);\r
@@ -417,7 +388,7 @@ ErrorAllocated:
   gBS->CloseProtocol (ControllerHandle, &gEfiDevicePathProtocolGuid,\r
                       This->DriverBindingHandle, ControllerHandle);\r
 ErrorOpenningProtocol:\r
-  gBS->CloseProtocol (ControllerHandle, &gEfiPciIoProtocolGuid,\r
+  gBS->CloseProtocol (ControllerHandle, &gXenIoProtocolGuid,\r
                       This->DriverBindingHandle, ControllerHandle);\r
   return Status;\r
 }\r
@@ -507,7 +478,7 @@ XenBusDxeDriverBindingStop (
 \r
   gBS->CloseProtocol (ControllerHandle, &gEfiDevicePathProtocolGuid,\r
          This->DriverBindingHandle, ControllerHandle);\r
-  gBS->CloseProtocol (ControllerHandle, &gEfiPciIoProtocolGuid,\r
+  gBS->CloseProtocol (ControllerHandle, &gXenIoProtocolGuid,\r
          This->DriverBindingHandle, ControllerHandle);\r
 \r
   mMyDevice = NULL;\r