diff options
| author | Brijesh Singh <brijesh.singh@amd.com> | 2017-08-31 10:25:27 -0400 |
|---|---|---|
| committer | Laszlo Ersek <lersek@redhat.com> | 2017-08-31 21:29:53 +0200 |
| commit | 17cbf7359f04a4eb762b2b4bc26c2df635ef2812 (patch) | |
| tree | 5c2e3a317a95636deafd747d2ea8f8bf23a0ca41 | |
| parent | 9d0d5050c73b142ea03c82cd078be8c703a556f4 (diff) | |
| download | edk2-17cbf7359f04a4eb762b2b4bc26c2df635ef2812.tar.gz edk2-17cbf7359f04a4eb762b2b4bc26c2df635ef2812.tar.bz2 edk2-17cbf7359f04a4eb762b2b4bc26c2df635ef2812.zip | |
OvmfPkg/VirtioScsiDxe: negotiate VIRTIO_F_IOMMU_PLATFORM
VirtioScsiDxe 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>
Tested-by: Laszlo Ersek <lersek@redhat.com>
| -rw-r--r-- | OvmfPkg/VirtioScsiDxe/VirtioScsi.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OvmfPkg/VirtioScsiDxe/VirtioScsi.c b/OvmfPkg/VirtioScsiDxe/VirtioScsi.c index aa22f85be8..7b8c3d22c8 100644 --- a/OvmfPkg/VirtioScsiDxe/VirtioScsi.c +++ b/OvmfPkg/VirtioScsiDxe/VirtioScsi.c @@ -1016,7 +1016,8 @@ VirtioScsiInit ( goto Failed;
}
- Features &= VIRTIO_SCSI_F_INOUT | VIRTIO_F_VERSION_1;
+ Features &= VIRTIO_SCSI_F_INOUT | VIRTIO_F_VERSION_1 |
+ VIRTIO_F_IOMMU_PLATFORM;
//
// In virtio-1.0, feature negotiation is expected to complete before queue
@@ -1096,7 +1097,7 @@ VirtioScsiInit ( // step 5 -- Report understood features and guest-tuneables.
//
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;
|