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:
@@ -26,19 +26,18 @@
|
||||
//
|
||||
#pragma pack(1)
|
||||
typedef struct {
|
||||
VIRTIO_HDR Generic;
|
||||
UINT64 VhdrCapacity;
|
||||
UINT32 VhdrSizeMax;
|
||||
UINT32 VhdrSegMax;
|
||||
UINT16 VhdrCylinders;
|
||||
UINT8 VhdrHeads;
|
||||
UINT8 VhdrSectors;
|
||||
UINT32 VhdrBlkSize;
|
||||
} VBLK_HDR;
|
||||
UINT64 Capacity;
|
||||
UINT32 SizeMax;
|
||||
UINT32 SegMax;
|
||||
UINT16 Cylinders;
|
||||
UINT8 Heads;
|
||||
UINT8 Sectors;
|
||||
UINT32 BlkSize;
|
||||
} VIRTIO_BLK_CONFIG;
|
||||
#pragma pack()
|
||||
|
||||
#define OFFSET_OF_VBLK(Field) OFFSET_OF (VBLK_HDR, Field)
|
||||
#define SIZE_OF_VBLK(Field) (sizeof ((VBLK_HDR *) 0)->Field)
|
||||
#define OFFSET_OF_VBLK(Field) OFFSET_OF (VIRTIO_BLK_CONFIG, Field)
|
||||
#define SIZE_OF_VBLK(Field) (sizeof ((VIRTIO_BLK_CONFIG *) 0)->Field)
|
||||
|
||||
#define VIRTIO_BLK_F_BARRIER BIT0
|
||||
#define VIRTIO_BLK_F_SIZE_MAX BIT1
|
||||
|
Reference in New Issue
Block a user