OvmfPkg: Make the VirtIo devices use the new VIRTIO_DEVICE_PROTOCOL

This change replaces the accesses to the PCI bus from the Block, Scsi and Net drivers by
the use of the new VIRTIO_DEVICE_PROTOCOL protocol that abstracts the transport layer.
It means these drivers can be used on PCI and MMIO transport layer.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <olivier.martin@arm.com>

v5:
- VirtioFlush(): update comment block in VirtioLib.[hc]; error code is
  propagated from VirtIo->SetQueueNotify().
- VirtioBlkInit(): jump to Failed label if SetPageSize() fails
- VirtioBlkInit(): fixup comment, and add error handling, near
  SetQueueNum() call
- VirtioBlkDriverBindingStart(): remove redundant (always false) check for
  a subsystem device ID different from VIRTIO_SUBSYSTEM_BLOCK_DEVICE;
  VirtioBlkDriverBindingSupported() handles it already
- VirtioNetGetFeatures(): update stale comment block
- VirtioNetGetFeatures(): retrieve MAC address byte for byte (open-coded
  loop)
- VirtioNetDriverBindingStart(): remove redundant (always false) check for
  a subsystem device ID different from VIRTIO_SUBSYSTEM_NETWORK_CARD;
  VirtioNetDriverBindingSupported() handles it already
- VirtioNetInitRing(): call SetQueueNum() and SetQueueAlign() for proper
  MMIO operation
- VirtioNetInitialize(): fix destination error label for when
  SetPageSize() fails
- VirtioScsi.c: fix comment block of VIRTIO_CFG_WRITE()/VIRTIO_CFG_READ()
- VirtioScsiInit(): fix destination error label for when SetPageSize()
  fails
- VirtioScsiInit(): call SetQueueNum() and SetQueueAlign() for proper MMIO
  operation

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14966 6f19259b-4bc3-4df7-8a09-765794883524

10 files changed, 125 insertions, 121 deletions

diff --git a/OvmfPkg/VirtioNetDxe/ComponentName.c b/OvmfPkg/VirtioNetDxe/ComponentName.c
index a291405ee6..2c96adbcbd 100644
--- a/OvmfPkg/VirtioNetDxe/ComponentName.c
+++ b/OvmfPkg/VirtioNetDxe/ComponentName.c
@@ -139,20 +139,20 @@ VirtioNetGetControllerName (
   }

 

   //

-  // confirm that the device is managed by this driver, using the PCI IO

+  // confirm that the device is managed by this driver, using the VirtIo

   // Protocol

   //

   Status = EfiTestManagedDevice (

              ControllerHandle,

              gVirtioNetDriverBinding.DriverBindingHandle,

-             &gEfiPciIoProtocolGuid

+             &gVirtioDeviceProtocolGuid

              );

   if (EFI_ERROR (Status)) {

     return Status;

   }

 

   //

-  // we don't give different names to the bus (= parent, = PCI) handle and the

+  // we don't give different names to the bus (= parent) handle and the

   // child (= MAC) handle

   //

   return LookupUnicodeString2 (

diff --git a/OvmfPkg/VirtioNetDxe/DriverBinding.c b/OvmfPkg/VirtioNetDxe/DriverBinding.c
index c9259ab339..93995c6359 100644
--- a/OvmfPkg/VirtioNetDxe/DriverBinding.c
+++ b/OvmfPkg/VirtioNetDxe/DriverBinding.c
@@ -15,7 +15,6 @@
 

 **/

 

-#include <IndustryStandard/Pci.h>

 #include <Library/BaseMemoryLib.h>

 #include <Library/DevicePathLib.h>

 #include <Library/MemoryAllocationLib.h>

@@ -50,8 +49,7 @@
                                     unused.

 

   @retval EFI_UNSUPPORTED           The host doesn't supply a MAC address.

-  @return                           Status codes from Dev->PciIo->Io.Read(),

-                                    VIRTIO_CFG_READ() and VIRTIO_CFG_WRITE().

+  @return                           Status codes from VirtIo protocol members.

   @retval EFI_SUCCESS               Configuration values retrieved.

 */

 STATIC

@@ -67,6 +65,7 @@ VirtioNetGetFeatures (
   EFI_STATUS Status;

   UINT8      NextDevStat;

   UINT32     Features;

+  UINTN      MacIdx;

   UINT16     LinkStatus;

 

   //

@@ -74,19 +73,19 @@ VirtioNetGetFeatures (
   // Initialization Sequence), but don't complete setting it up.

   //

   NextDevStat = 0;             // step 1 -- reset device

-  Status = VIRTIO_CFG_WRITE (Dev, Generic.VhdrDeviceStatus, NextDevStat);

+  Status = Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, NextDevStat);

   if (EFI_ERROR (Status)) {

     return Status;

   }

 

   NextDevStat |= VSTAT_ACK;    // step 2 -- acknowledge device presence

-  Status = VIRTIO_CFG_WRITE (Dev, Generic.VhdrDeviceStatus, NextDevStat);

+  Status = Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, NextDevStat);

   if (EFI_ERROR (Status)) {

     goto YieldDevice;

   }

 

   NextDevStat |= VSTAT_DRIVER; // step 3 -- we know how to drive it

-  Status = VIRTIO_CFG_WRITE (Dev, Generic.VhdrDeviceStatus, NextDevStat);

+  Status = Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, NextDevStat);

   if (EFI_ERROR (Status)) {

     goto YieldDevice;

   }

@@ -94,7 +93,7 @@ VirtioNetGetFeatures (
   //

   // step 4a -- retrieve and validate features

   //

-  Status = VIRTIO_CFG_READ (Dev, Generic.VhdrDeviceFeatureBits, &Features);

+  Status = Dev->VirtIo->GetDeviceFeatures (Dev->VirtIo, &Features);

   if (EFI_ERROR (Status)) {

     goto YieldDevice;

   }

@@ -106,16 +105,16 @@ VirtioNetGetFeatures (
     Status = EFI_UNSUPPORTED;

     goto YieldDevice;

   }

-  Status = Dev->PciIo->Io.Read (Dev->PciIo,           // PciIo

-                            EfiPciIoWidthUint8,       // Width

-                            PCI_BAR_IDX0,             // BarIndex

-                            OFFSET_OF_VNET (VhdrMac), // Offset

-                            SIZE_OF_VNET (VhdrMac),   // Count

-                            MacAddress                // Buffer

+  for (MacIdx = 0; MacIdx < SIZE_OF_VNET (Mac); ++MacIdx) {

+    Status = Dev->VirtIo->ReadDevice (Dev->VirtIo,

+                            OFFSET_OF_VNET (Mac) + MacIdx, // Offset

+                            1,                             // FieldSize

+                            1,                             // BufferSize

+                            &MacAddress->Addr[MacIdx]      // Buffer

                             );

-

-  if (EFI_ERROR (Status)) {

-    goto YieldDevice;

+    if (EFI_ERROR (Status)) {

+      goto YieldDevice;

+    }

   }

 

   //

@@ -126,7 +125,7 @@ VirtioNetGetFeatures (
   }

   else {

     *MediaPresentSupported = TRUE;

-    Status = VIRTIO_CFG_READ (Dev, VhdrLinkStatus, &LinkStatus);

+    Status = VIRTIO_CFG_READ (Dev, LinkStatus, &LinkStatus);

     if (EFI_ERROR (Status)) {

       goto YieldDevice;

     }

@@ -134,7 +133,7 @@ VirtioNetGetFeatures (
   }

 

 YieldDevice:

-  VIRTIO_CFG_WRITE (Dev, Generic.VhdrDeviceStatus,

+  Dev->VirtIo->SetDeviceStatus (Dev->VirtIo,

     EFI_ERROR (Status) ? VSTAT_FAILED : 0);

 

   return Status;

@@ -207,9 +206,9 @@ VirtioNetSnpPopulate (
   Dev->Snp.Mode           = &Dev->Snm;

 

   Dev->Snm.State                 = EfiSimpleNetworkStopped;

-  Dev->Snm.HwAddressSize         = SIZE_OF_VNET (VhdrMac);

-  Dev->Snm.MediaHeaderSize       = SIZE_OF_VNET (VhdrMac) + // dst MAC

-                                   SIZE_OF_VNET (VhdrMac) + // src MAC

+  Dev->Snm.HwAddressSize         = SIZE_OF_VNET (Mac);

+  Dev->Snm.MediaHeaderSize       = SIZE_OF_VNET (Mac) + // dst MAC

+                                   SIZE_OF_VNET (Mac) + // src MAC

                                    2;                       // Ethertype

   Dev->Snm.MaxPacketSize         = 1500;

   Dev->Snm.NvRamSize             = 0;

@@ -222,7 +221,7 @@ VirtioNetSnpPopulate (
   Dev->Snm.MacAddressChangeable  = FALSE;

   Dev->Snm.MultipleTxSupported   = TRUE;

 

-  ASSERT (SIZE_OF_VNET (VhdrMac) <= sizeof (EFI_MAC_ADDRESS));

+  ASSERT (SIZE_OF_VNET (Mac) <= sizeof (EFI_MAC_ADDRESS));

 

   Status = VirtioNetGetFeatures (Dev, &Dev->Snm.CurrentAddress,

              &Dev->Snm.MediaPresentSupported, &Dev->Snm.MediaPresent);

@@ -230,8 +229,8 @@ VirtioNetSnpPopulate (
     goto CloseWaitForPacket;

   }

   CopyMem (&Dev->Snm.PermanentAddress, &Dev->Snm.CurrentAddress,

-    SIZE_OF_VNET (VhdrMac));

-  SetMem (&Dev->Snm.BroadcastAddress, SIZE_OF_VNET (VhdrMac), 0xFF);

+    SIZE_OF_VNET (Mac));

+  SetMem (&Dev->Snm.BroadcastAddress, SIZE_OF_VNET (Mac), 0xFF);

 

   //

   // VirtioNetExitBoot() is queued by ExitBootServices(); its purpose is to

@@ -348,31 +347,36 @@ VirtioNetDriverBindingSupported (
   )

 {

   EFI_STATUS          Status;

-  EFI_PCI_IO_PROTOCOL *PciIo;

-  PCI_TYPE00          Pci;

-

-  Status = gBS->OpenProtocol (DeviceHandle, &gEfiPciIoProtocolGuid,

-                  (VOID **)&PciIo, This->DriverBindingHandle, DeviceHandle,

-                  EFI_OPEN_PROTOCOL_BY_DRIVER);

+  VIRTIO_DEVICE_PROTOCOL *VirtIo;

+

+  //

+  // Attempt to open the device with the VirtIo set of interfaces. On success,

+  // the protocol is "instantiated" for the VirtIo device. Covers duplicate open

+  // attempts (EFI_ALREADY_STARTED).

+  //

+  Status = gBS->OpenProtocol (

+                  DeviceHandle,               // candidate device

+                  &gVirtioDeviceProtocolGuid, // for generic VirtIo access

+                  (VOID **)&VirtIo,           // handle to instantiate

+                  This->DriverBindingHandle,  // requestor driver identity

+                  DeviceHandle,               // ControllerHandle, according to

+                                              // the UEFI Driver Model

+                  EFI_OPEN_PROTOCOL_BY_DRIVER // get exclusive VirtIo access to

+                                              // the device; to be released

+                  );

   if (EFI_ERROR (Status)) {

     return Status;

   }

 

-  Status = PciIo->Pci.Read (PciIo, EfiPciIoWidthUint32, 0,

-                        sizeof Pci / sizeof (UINT32), &Pci);

+  if (VirtIo->SubSystemDeviceId != VIRTIO_SUBSYSTEM_NETWORK_CARD) {

+    Status = EFI_UNSUPPORTED;

+  }

 

   //

-  // virtio-0.9.5, 2.1 PCI Discovery:

-  // the network device has Subsystem Device ID 1

+  // We needed VirtIo access only transitorily, to see whether we support the

+  // device or not.

   //

-  if (Status == EFI_SUCCESS) {

-    Status = (Pci.Hdr.VendorId == 0x1AF4 &&

-              Pci.Hdr.DeviceId >= 0x1000 && Pci.Hdr.DeviceId <= 0x103F &&

-              Pci.Hdr.RevisionID == 0x00 &&

-              Pci.Device.SubsystemID == VIRTIO_SUBSYSTEM_NETWORK_CARD) ? EFI_SUCCESS : EFI_UNSUPPORTED;

-  }

-

-  gBS->CloseProtocol (DeviceHandle, &gEfiPciIoProtocolGuid,

+  gBS->CloseProtocol (DeviceHandle, &gVirtioDeviceProtocolGuid,

          This->DriverBindingHandle, DeviceHandle);

   return Status;

 }

@@ -438,7 +442,7 @@ VirtioNetDriverBindingStart (
   VNET_DEV                 *Dev;

   EFI_DEVICE_PATH_PROTOCOL *DevicePath;

   MAC_ADDR_DEVICE_PATH     MacNode;

-  VOID                     *ChildPciIo;

+  VOID                     *ChildVirtIo;

 

   //

   // allocate space for the driver instance

@@ -449,43 +453,24 @@ VirtioNetDriverBindingStart (
   }

   Dev->Signature = VNET_SIG;

 

-  //

-  // get PCI access to the device and keep it open

-  //

-  Status = gBS->OpenProtocol (DeviceHandle, &gEfiPciIoProtocolGuid,

-                  (VOID **)&Dev->PciIo, This->DriverBindingHandle,

+  Status = gBS->OpenProtocol (DeviceHandle, &gVirtioDeviceProtocolGuid,

+                  (VOID **)&Dev->VirtIo, This->DriverBindingHandle,

                   DeviceHandle, EFI_OPEN_PROTOCOL_BY_DRIVER);

   if (EFI_ERROR (Status)) {

     goto FreeVirtioNet;

   }

 

   //

-  // save original PCI attributes and enable IO space access

-  //

-  Status = Dev->PciIo->Attributes (Dev->PciIo, EfiPciIoAttributeOperationGet,

-                         0, &Dev->OrigPciAttributes);

-  if (EFI_ERROR (Status)) {

-    goto ClosePciIo;

-  }

-

-  Status = Dev->PciIo->Attributes (Dev->PciIo,

-                         EfiPciIoAttributeOperationEnable,

-                         EFI_PCI_IO_ATTRIBUTE_IO, NULL);

-  if (EFI_ERROR (Status)) {

-    goto ClosePciIo;

-  }

-

-  //

   // now we can run a basic one-shot virtio-net initialization required to

   // retrieve the MAC address

   //

   Status = VirtioNetSnpPopulate (Dev);

   if (EFI_ERROR (Status)) {

-    goto RestorePciAttributes;

+    goto CloseVirtIo;

   }

 

   //

-  // get the device path of the virtio-net PCI device -- one-shot open

+  // get the device path of the virtio-net device -- one-shot open

   //

   Status = gBS->OpenProtocol (DeviceHandle, &gEfiDevicePathProtocolGuid,

                   (VOID **)&DevicePath, This->DriverBindingHandle,

@@ -523,11 +508,11 @@ VirtioNetDriverBindingStart (
   }

 

   //

-  // make a note that we keep this device open with PciIo for the sake of this

+  // make a note that we keep this device open with VirtIo for the sake of this

   // child

   //

-  Status = gBS->OpenProtocol (DeviceHandle, &gEfiPciIoProtocolGuid,

-                  &ChildPciIo, This->DriverBindingHandle,

+  Status = gBS->OpenProtocol (DeviceHandle, &gVirtioDeviceProtocolGuid,

+                  &ChildVirtIo, This->DriverBindingHandle,

                   Dev->MacHandle, EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER);

   if (EFI_ERROR (Status)) {

     goto UninstallMultiple;

@@ -547,12 +532,8 @@ FreeMacDevicePath:
 Evacuate:

   VirtioNetSnpEvacuate (Dev);

 

-RestorePciAttributes:

-  Dev->PciIo->Attributes (Dev->PciIo, EfiPciIoAttributeOperationSet,

-                Dev->OrigPciAttributes, NULL);

-

-ClosePciIo:

-  gBS->CloseProtocol (DeviceHandle, &gEfiPciIoProtocolGuid,

+CloseVirtIo:

+  gBS->CloseProtocol (DeviceHandle, &gVirtioDeviceProtocolGuid,

          This->DriverBindingHandle, DeviceHandle);

 

 FreeVirtioNet:

@@ -637,7 +618,7 @@ VirtioNetDriverBindingStop (
       Status = EFI_DEVICE_ERROR;

     }

     else {

-      gBS->CloseProtocol (DeviceHandle, &gEfiPciIoProtocolGuid,

+      gBS->CloseProtocol (DeviceHandle, &gVirtioDeviceProtocolGuid,

              This->DriverBindingHandle, Dev->MacHandle);

       gBS->UninstallMultipleProtocolInterfaces (Dev->MacHandle,

              &gEfiDevicePathProtocolGuid,    Dev->MacDevicePath,

@@ -645,8 +626,6 @@ VirtioNetDriverBindingStop (
              NULL);

       FreePool (Dev->MacDevicePath);

       VirtioNetSnpEvacuate (Dev);

-      Dev->PciIo->Attributes (Dev->PciIo, EfiPciIoAttributeOperationSet,

-                    Dev->OrigPciAttributes, NULL);

       FreePool (Dev);

     }

 

@@ -657,7 +636,7 @@ VirtioNetDriverBindingStop (
   //

   // release remaining resources, tied directly to the parent handle

   //

-  gBS->CloseProtocol (DeviceHandle, &gEfiPciIoProtocolGuid,

+  gBS->CloseProtocol (DeviceHandle, &gVirtioDeviceProtocolGuid,

          This->DriverBindingHandle, DeviceHandle);

 

   return EFI_SUCCESS;

diff --git a/OvmfPkg/VirtioNetDxe/Events.c b/OvmfPkg/VirtioNetDxe/Events.c
index b9d7bbf6c6..5be1af6ffb 100644
--- a/OvmfPkg/VirtioNetDxe/Events.c
+++ b/OvmfPkg/VirtioNetDxe/Events.c
@@ -86,6 +86,6 @@ VirtioNetExitBoot (
 

   Dev = Context;

   if (Dev->Snm.State == EfiSimpleNetworkInitialized) {

-    VIRTIO_CFG_WRITE (Dev, Generic.VhdrDeviceStatus, 0);

+    Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, 0);

   }

 }

diff --git a/OvmfPkg/VirtioNetDxe/SnpGetStatus.c b/OvmfPkg/VirtioNetDxe/SnpGetStatus.c
index adb57cf8fe..4393d243a2 100644
--- a/OvmfPkg/VirtioNetDxe/SnpGetStatus.c
+++ b/OvmfPkg/VirtioNetDxe/SnpGetStatus.c
@@ -90,7 +90,7 @@ VirtioNetGetStatus (
   if (Dev->Snm.MediaPresentSupported) {

     UINT16 LinkStatus;

 

-    Status = VIRTIO_CFG_READ (Dev, VhdrLinkStatus, &LinkStatus);

+    Status = VIRTIO_CFG_READ (Dev, LinkStatus, &LinkStatus);

     if (EFI_ERROR (Status)) {

       goto Exit;

     }

diff --git a/OvmfPkg/VirtioNetDxe/SnpInitialize.c b/OvmfPkg/VirtioNetDxe/SnpInitialize.c
index 6cee014072..4203fbd6c1 100644
--- a/OvmfPkg/VirtioNetDxe/SnpInitialize.c
+++ b/OvmfPkg/VirtioNetDxe/SnpInitialize.c
@@ -57,14 +57,15 @@ VirtioNetInitRing (
   //

   // step 4b -- allocate selected queue

   //

-  Status = VIRTIO_CFG_WRITE (Dev, Generic.VhdrQueueSelect, Selector);

+  Status = Dev->VirtIo->SetQueueSel (Dev->VirtIo, Selector);

   if (EFI_ERROR (Status)) {

     return Status;

   }

-  Status = VIRTIO_CFG_READ (Dev, Generic.VhdrQueueSize, &QueueSize);

+  Status = Dev->VirtIo->GetQueueNumMax (Dev->VirtIo, &QueueSize);

   if (EFI_ERROR (Status)) {

     return Status;

   }

+

   //

   // For each packet (RX and TX alike), we need two descriptors:

   // one for the virtio-net request header, and another one for the data

@@ -78,13 +79,33 @@ VirtioNetInitRing (
   }

 

   //

+  // Additional steps for MMIO: align the queue appropriately, and set the

+  // size. If anything fails from here on, we must release the ring resources.

+  //

+  Status = Dev->VirtIo->SetQueueNum (Dev->VirtIo, QueueSize);

+  if (EFI_ERROR (Status)) {

+    goto ReleaseQueue;

+  }

+

+  Status = Dev->VirtIo->SetQueueAlign (Dev->VirtIo, EFI_PAGE_SIZE);

+  if (EFI_ERROR (Status)) {

+    goto ReleaseQueue;

+  }

+

+  //

   // step 4c -- report GPFN (guest-physical frame number) of queue

   //

-  Status = VIRTIO_CFG_WRITE (Dev, Generic.VhdrQueueAddress,

-             (UINTN) Ring->Base >> EFI_PAGE_SHIFT);

+  Status = Dev->VirtIo->SetQueueAddress (Dev->VirtIo,

+      (UINT32)(UINTN) Ring->Base >> EFI_PAGE_SHIFT);

   if (EFI_ERROR (Status)) {

-    VirtioRingUninit (Ring);

+    goto ReleaseQueue;

   }

+

+  return EFI_SUCCESS;

+

+ReleaseQueue:

+  VirtioRingUninit (Ring);

+

   return Status;

 }

 

@@ -287,10 +308,9 @@ VirtioNetInitRx (
   // virtio-0.9.5, 2.4.1.4 Notifying the Device

   //

   MemoryFence ();

-  Status = VIRTIO_CFG_WRITE (Dev, Generic.VhdrQueueNotify, VIRTIO_NET_Q_RX);

-

+  Status = Dev->VirtIo->SetQueueNotify (Dev->VirtIo, VIRTIO_NET_Q_RX);

   if (EFI_ERROR (Status)) {

-    VIRTIO_CFG_WRITE (Dev, Generic.VhdrDeviceStatus, 0);

+    Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, 0);

     FreePool (Dev->RxBuf);

   }

 

@@ -366,13 +386,21 @@ VirtioNetInitialize (
   // virtio-0.9.5 spec, 2.2.1 Device Initialization Sequence.

   //

   NextDevStat = VSTAT_ACK;    // step 2 -- acknowledge device presence

-  Status = VIRTIO_CFG_WRITE (Dev, Generic.VhdrDeviceStatus, NextDevStat);

+  Status = Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, NextDevStat);

   if (EFI_ERROR (Status)) {

     goto InitFailed;

   }

 

   NextDevStat |= VSTAT_DRIVER; // step 3 -- we know how to drive it

-  Status = VIRTIO_CFG_WRITE (Dev, Generic.VhdrDeviceStatus, NextDevStat);

+  Status = Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, NextDevStat);

+  if (EFI_ERROR (Status)) {

+    goto DeviceFailed;

+  }

+

+  //

+  // Set Page Size - MMIO VirtIo Specific

+  //

+  Status = Dev->VirtIo->SetPageSize (Dev->VirtIo, EFI_PAGE_SIZE);

   if (EFI_ERROR (Status)) {

     goto DeviceFailed;

   }

@@ -381,10 +409,11 @@ VirtioNetInitialize (
   // step 4a -- retrieve features. Note that we're past validating required

   // features in VirtioNetGetFeatures().

   //

-  Status = VIRTIO_CFG_READ (Dev, Generic.VhdrDeviceFeatureBits, &Features);

+  Status = Dev->VirtIo->GetDeviceFeatures (Dev->VirtIo, &Features);

   if (EFI_ERROR (Status)) {

     goto DeviceFailed;

   }

+

   ASSERT (Features & VIRTIO_NET_F_MAC);

   ASSERT (Dev->Snm.MediaPresentSupported ==

     !!(Features & VIRTIO_NET_F_STATUS));

@@ -406,7 +435,7 @@ VirtioNetInitialize (
   // step 5 -- keep only the features we want

   //

   Features &= VIRTIO_NET_F_MAC | VIRTIO_NET_F_STATUS;

-  Status = VIRTIO_CFG_WRITE (Dev, Generic.VhdrGuestFeatureBits, Features);

+  Status = Dev->VirtIo->SetGuestFeatures (Dev->VirtIo, Features);

   if (EFI_ERROR (Status)) {

     goto ReleaseTxRing;

   }

@@ -415,7 +444,7 @@ VirtioNetInitialize (
   // step 6 -- virtio-net initialization complete

   //

   NextDevStat |= VSTAT_DRIVER_OK;

-  Status = VIRTIO_CFG_WRITE (Dev, Generic.VhdrDeviceStatus, NextDevStat);

+  Status = Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, NextDevStat);

   if (EFI_ERROR (Status)) {

     goto ReleaseTxRing;

   }

@@ -441,7 +470,7 @@ ReleaseTxAux:
   VirtioNetShutdownTx (Dev);

 

 AbortDevice:

-  VIRTIO_CFG_WRITE (Dev, Generic.VhdrDeviceStatus, 0);

+  Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, 0);

 

 ReleaseTxRing:

   VirtioRingUninit (&Dev->TxRing);

@@ -453,7 +482,7 @@ DeviceFailed:
   //

   // restore device status invariant for the EfiSimpleNetworkStarted state

   //

-  VIRTIO_CFG_WRITE (Dev, Generic.VhdrDeviceStatus, 0);

+  Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, 0);

 

 InitFailed:

   gBS->RestoreTPL (OldTpl);

diff --git a/OvmfPkg/VirtioNetDxe/SnpReceive.c b/OvmfPkg/VirtioNetDxe/SnpReceive.c
index 87c6ca9b4b..99abd7ebe4 100644
--- a/OvmfPkg/VirtioNetDxe/SnpReceive.c
+++ b/OvmfPkg/VirtioNetDxe/SnpReceive.c
@@ -147,14 +147,14 @@ VirtioNetReceive (
   CopyMem (Buffer, RxPtr, RxLen);

 

   if (DestAddr != NULL) {

-    CopyMem (DestAddr, RxPtr, SIZE_OF_VNET (VhdrMac));

+    CopyMem (DestAddr, RxPtr, SIZE_OF_VNET (Mac));

   }

-  RxPtr += SIZE_OF_VNET (VhdrMac);

+  RxPtr += SIZE_OF_VNET (Mac);

 

   if (SrcAddr != NULL) {

-    CopyMem (SrcAddr, RxPtr, SIZE_OF_VNET (VhdrMac));

+    CopyMem (SrcAddr, RxPtr, SIZE_OF_VNET (Mac));

   }

-  RxPtr += SIZE_OF_VNET (VhdrMac);

+  RxPtr += SIZE_OF_VNET (Mac);

 

   if (Protocol != NULL) {

     *Protocol = (UINT16) ((RxPtr[0] << 8) | RxPtr[1]);

@@ -177,9 +177,7 @@ RecycleDesc:
   *Dev->RxRing.Avail.Idx = AvailIdx;

 

   MemoryFence ();

-  NotifyStatus = VIRTIO_CFG_WRITE (Dev, Generic.VhdrQueueNotify,

-                   VIRTIO_NET_Q_RX);

-

+  NotifyStatus = Dev->VirtIo->SetQueueNotify (Dev->VirtIo, VIRTIO_NET_Q_RX);

   if (!EFI_ERROR (Status)) { // earlier error takes precedence

     Status = NotifyStatus;

   }

diff --git a/OvmfPkg/VirtioNetDxe/SnpShutdown.c b/OvmfPkg/VirtioNetDxe/SnpShutdown.c
index 42aeca1676..01409c0ce7 100644
--- a/OvmfPkg/VirtioNetDxe/SnpShutdown.c
+++ b/OvmfPkg/VirtioNetDxe/SnpShutdown.c
@@ -63,7 +63,7 @@ VirtioNetShutdown (
     break;

   }

 

-  VIRTIO_CFG_WRITE (Dev, Generic.VhdrDeviceStatus, 0);

+  Dev->VirtIo->SetDeviceStatus (Dev->VirtIo, 0);

   VirtioNetShutdownRx (Dev);

   VirtioNetShutdownTx (Dev);

   VirtioRingUninit (&Dev->TxRing);

diff --git a/OvmfPkg/VirtioNetDxe/SnpTransmit.c b/OvmfPkg/VirtioNetDxe/SnpTransmit.c
index ff922ca021..7ca40d5d06 100644
--- a/OvmfPkg/VirtioNetDxe/SnpTransmit.c
+++ b/OvmfPkg/VirtioNetDxe/SnpTransmit.c
@@ -127,15 +127,15 @@ VirtioNetTransmit (
       goto Exit;

     }

     Ptr = Buffer;

-    ASSERT (SIZE_OF_VNET (VhdrMac) <= sizeof (EFI_MAC_ADDRESS));

+    ASSERT (SIZE_OF_VNET (Mac) <= sizeof (EFI_MAC_ADDRESS));

 

-    CopyMem (Ptr, DestAddr, SIZE_OF_VNET (VhdrMac));

-    Ptr += SIZE_OF_VNET (VhdrMac);

+    CopyMem (Ptr, DestAddr, SIZE_OF_VNET (Mac));

+    Ptr += SIZE_OF_VNET (Mac);

 

     CopyMem (Ptr,

       (SrcAddr == NULL) ? &Dev->Snm.CurrentAddress : SrcAddr,

-      SIZE_OF_VNET (VhdrMac));

-    Ptr += SIZE_OF_VNET (VhdrMac);

+      SIZE_OF_VNET (Mac));

+    Ptr += SIZE_OF_VNET (Mac);

 

     *Ptr++ = (UINT8) (*Protocol >> 8);

     *Ptr++ = (UINT8) *Protocol;

@@ -161,7 +161,7 @@ VirtioNetTransmit (
   *Dev->TxRing.Avail.Idx = AvailIdx;

 

   MemoryFence ();

-  Status = VIRTIO_CFG_WRITE (Dev, Generic.VhdrQueueNotify, VIRTIO_NET_Q_TX);

+  Status = Dev->VirtIo->SetQueueNotify (Dev->VirtIo, VIRTIO_NET_Q_TX);

 

 Exit:

   gBS->RestoreTPL (OldTpl);

diff --git a/OvmfPkg/VirtioNetDxe/VirtioNet.h b/OvmfPkg/VirtioNetDxe/VirtioNet.h
index 8c21bcdfa2..31fca79b84 100644
--- a/OvmfPkg/VirtioNetDxe/VirtioNet.h
+++ b/OvmfPkg/VirtioNetDxe/VirtioNet.h
@@ -24,7 +24,6 @@
 #include <Protocol/ComponentName2.h>

 #include <Protocol/DevicePath.h>

 #include <Protocol/DriverBinding.h>

-#include <Protocol/PciIo.h>

 #include <Protocol/SimpleNetwork.h>

 

 #define VNET_SIG SIGNATURE_32 ('V', 'N', 'E', 'T')

@@ -75,8 +74,7 @@ typedef struct {
   //                          field              init function

   //                          ------------------ ------------------------------

   UINT32                      Signature;         // VirtioNetDriverBindingStart

-  EFI_PCI_IO_PROTOCOL         *PciIo;            // VirtioNetDriverBindingStart

-  UINT64                      OrigPciAttributes; // VirtioNetDriverBindingStart

+  VIRTIO_DEVICE_PROTOCOL      *VirtIo;           // VirtioNetDriverBindingStart

   EFI_SIMPLE_NETWORK_PROTOCOL Snp;               // VirtioNetSnpPopulate

   EFI_SIMPLE_NETWORK_MODE     Snm;               // VirtioNetSnpPopulate

   EFI_EVENT                   ExitBoot;          // VirtioNetSnpPopulate

@@ -109,15 +107,15 @@ typedef struct {
 #define VIRTIO_NET_FROM_SNP(SnpPointer) \

         CR (SnpPointer, VNET_DEV, Snp, VNET_SIG)

 

-#define VIRTIO_CFG_WRITE(Dev, Field, Value)  (VirtioWrite (             \

-                                                (Dev)->PciIo,           \

+#define VIRTIO_CFG_WRITE(Dev, Field, Value)  (VirtioWriteDevice (       \

+                                                (Dev)->VirtIo,          \

                                                 OFFSET_OF_VNET (Field), \

                                                 SIZE_OF_VNET (Field),   \

                                                 (Value)                 \

                                                 ))

 

-#define VIRTIO_CFG_READ(Dev, Field, Pointer) (VirtioRead (              \

-                                                (Dev)->PciIo,           \

+#define VIRTIO_CFG_READ(Dev, Field, Pointer) (VirtioReadDevice (        \

+                                                (Dev)->VirtIo,          \

                                                 OFFSET_OF_VNET (Field), \

                                                 SIZE_OF_VNET (Field),   \

                                                 sizeof *(Pointer),      \

diff --git a/OvmfPkg/VirtioNetDxe/VirtioNet.inf b/OvmfPkg/VirtioNetDxe/VirtioNet.inf
index 408a54112a..a855ad4ac1 100644
--- a/OvmfPkg/VirtioNetDxe/VirtioNet.inf
+++ b/OvmfPkg/VirtioNetDxe/VirtioNet.inf
@@ -57,4 +57,4 @@
 [Protocols]

   gEfiSimpleNetworkProtocolGuid  ## BY_START

   gEfiDevicePathProtocolGuid     ## BY_START

-  gEfiPciIoProtocolGuid          ## TO_START

+  gVirtioDeviceProtocolGuid      ## TO_START