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

1 files changed, 11 insertions, 13 deletions

diff --git a/OvmfPkg/VirtioScsiDxe/VirtioScsi.h b/OvmfPkg/VirtioScsiDxe/VirtioScsi.h
index f5220b2215..0d3181d140 100644
--- a/OvmfPkg/VirtioScsiDxe/VirtioScsi.h
+++ b/OvmfPkg/VirtioScsiDxe/VirtioScsi.h
@@ -20,7 +20,6 @@
 

 #include <Protocol/ComponentName.h>

 #include <Protocol/DriverBinding.h>

-#include <Protocol/PciIo.h>

 #include <Protocol/ScsiPassThruExt.h>

 

 #include <IndustryStandard/Virtio.h>

@@ -49,18 +48,17 @@ typedef struct {
   // at various call depths. The table to the right should make it easier to

   // track them.

   //

-  //                              field                     init function       init depth

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

-  UINT32                          Signature;             // DriverBindingStart  0

-  EFI_PCI_IO_PROTOCOL             *PciIo;                // DriverBindingStart  0

-  UINT64                          OriginalPciAttributes; // DriverBindingStart  0

-  BOOLEAN                         InOutSupported;        // VirtioScsiInit      1

-  UINT16                          MaxTarget;             // VirtioScsiInit      1

-  UINT32                          MaxLun;                // VirtioScsiInit      1

-  UINT32                          MaxSectors;            // VirtioScsiInit      1

-  VRING                           Ring;                  // VirtioRingInit      2

-  EFI_EXT_SCSI_PASS_THRU_PROTOCOL PassThru;              // VirtioScsiInit      1

-  EFI_EXT_SCSI_PASS_THRU_MODE     PassThruMode;          // VirtioScsiInit      1

+  //                              field              init function       init depth

+  //                              ----------------   ------------------  ----------

+  UINT32                          Signature;      // DriverBindingStart  0

+  VIRTIO_DEVICE_PROTOCOL          *VirtIo;        // DriverBindingStart  0

+  BOOLEAN                         InOutSupported; // VirtioScsiInit      1

+  UINT16                          MaxTarget;      // VirtioScsiInit      1

+  UINT32                          MaxLun;         // VirtioScsiInit      1

+  UINT32                          MaxSectors;     // VirtioScsiInit      1

+  VRING                           Ring;           // VirtioRingInit      2

+  EFI_EXT_SCSI_PASS_THRU_PROTOCOL PassThru;       // VirtioScsiInit      1

+  EFI_EXT_SCSI_PASS_THRU_MODE     PassThruMode;   // VirtioScsiInit      1

 } VSCSI_DEV;

 

 #define VIRTIO_SCSI_FROM_PASS_THRU(PassThruPointer) \