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:
@@ -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), \
|
||||
|
Reference in New Issue
Block a user