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
This commit is contained in:
@@ -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);
|
||||
|
Reference in New Issue
Block a user