mirror of https://github.com/acidanthera/audk.git
OvmfPkg/VirtioBlkDxe: negotiate VIRTIO_F_IOMMU_PLATFORM
VirtioBlkDxe driver has been updated to use IOMMU-like member functions from VIRTIO_DEVICE_PROTOCOL to translate the system physical address to device address. We do not need to do anything special when VIRTIO_F_IOMMU_PLATFORM bit is present hence treat it in parallel with VIRTIO_F_VERSION_1. Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> Cc: Jordan Justen <jordan.l.justen@intel.com> Cc: Tom Lendacky <thomas.lendacky@amd.com> Cc: Laszlo Ersek <lersek@redhat.com> Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Brijesh Singh <brijesh.singh@amd.com> Reviewed-by: Laszlo Ersek <lersek@redhat.com> Regression-tested-by: Laszlo Ersek <lersek@redhat.com>
This commit is contained in:
parent
3540f2cef5
commit
dd4205f8ba
|
@ -808,7 +808,8 @@ VirtioBlkInit (
|
|||
}
|
||||
|
||||
Features &= VIRTIO_BLK_F_BLK_SIZE | VIRTIO_BLK_F_TOPOLOGY | VIRTIO_BLK_F_RO |
|
||||
VIRTIO_BLK_F_FLUSH | VIRTIO_F_VERSION_1;
|
||||
VIRTIO_BLK_F_FLUSH | VIRTIO_F_VERSION_1 |
|
||||
VIRTIO_F_IOMMU_PLATFORM;
|
||||
|
||||
//
|
||||
// In virtio-1.0, feature negotiation is expected to complete before queue
|
||||
|
@ -886,7 +887,7 @@ VirtioBlkInit (
|
|||
// step 5 -- Report understood features.
|
||||
//
|
||||
if (Dev->VirtIo->Revision < VIRTIO_SPEC_REVISION (1, 0, 0)) {
|
||||
Features &= ~(UINT64)VIRTIO_F_VERSION_1;
|
||||
Features &= ~(UINT64)(VIRTIO_F_VERSION_1 | VIRTIO_F_IOMMU_PLATFORM);
|
||||
Status = Dev->VirtIo->SetGuestFeatures (Dev->VirtIo, Features);
|
||||
if (EFI_ERROR (Status)) {
|
||||
goto UnmapQueue;
|
||||
|
|
Loading…
Reference in New Issue