From 5648836987cab28ca988dfe5af94413cfa480a92 Mon Sep 17 00:00:00 2001 From: Leif Lindholm Date: Sat, 12 Sep 2020 17:19:57 +0100 Subject: [PATCH] OvmfPkg: drop redundant VendorID check in VirtioMmioDeviceLib MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit There is a DEBUG warning printout in VirtioMmioDeviceLib if the current device's VendorID does not match the traditional 16-bit Red Hat PCIe vendor ID used with virtio-pci. The virtio-mmio vendor ID is 32-bit and has no connection to the PCIe registry. Most specifically, this causes a bunch of noise when booting an AArch64 QEMU platform, since QEMU's virtio-mmio implementation used 'QEMU' as the vendor ID: VirtioMmioInit: Warning: The VendorId (0x554D4551) does not match the VirtIo VendorId (0x1AF4). Drop the warning message. Cc: Jordan Justen Cc: Laszlo Ersek Cc: Ard Biesheuvel Signed-off-by: Leif Lindholm Reviewed-by: Laszlo Ersek Reviewed-by: Philippe Mathieu-Daudé --- .../VirtioMmioDeviceLib/VirtioMmioDevice.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDevice.c b/OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDevice.c index 2f20272c14..6dbbba008c 100644 --- a/OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDevice.c +++ b/OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDevice.c @@ -58,7 +58,6 @@ VirtioMmioInit ( ) { UINT32 MagicValue; - UINT32 VendorId; UINT32 Version; // @@ -84,20 +83,6 @@ VirtioMmioInit ( return EFI_UNSUPPORTED; } - // - // Double-check MMIO-specific values - // - VendorId = VIRTIO_CFG_READ (Device, VIRTIO_MMIO_OFFSET_VENDOR_ID); - if (VendorId != VIRTIO_VENDOR_ID) { - // - // The ARM Base and Foundation Models do not report a valid VirtIo VendorId. - // They return a value of 0x0 for the VendorId. - // - DEBUG((DEBUG_WARN, "VirtioMmioInit: Warning: The VendorId (0x%X) does not " - "match the VirtIo VendorId (0x%X).\n", - VendorId, VIRTIO_VENDOR_ID)); - } - return EFI_SUCCESS; } -- 2.39.2