From: "Laszlo Ersek" <lersek@redhat.com>
To: devel@edk2.groups.io, dwmw2@infradead.org
Cc: Ray Ni <ray.ni@intel.com>
Subject: Re: [edk2-devel] [PATCH 6/7] MdeModulePkg/UefiBootManagerLib: describe VirtIO devices correctly
Date: Tue, 25 Jun 2019 01:16:24 +0200 [thread overview]
Message-ID: <3d62cecb-d235-2b7e-3342-b1f6e4a619c6@redhat.com> (raw)
In-Reply-To: <20190621223156.701502-6-dwmw2@infradead.org>
On 06/22/19 00:31, David Woodhouse wrote:
> I know, I said it was Someone Else's Problem. But it annoyed me.
>
> My initial thought was to look for VIRTIO_DEVICE_PROTOCOL on the same
> handle but I don't think I can do that if I can't rely on VirtIO being
> present in the build. This will do.
>
> Signed-off-by: David Woodhouse <dwmw2@infradead.org>
> ---
> .../UefiBootManagerLib/BmBootDescription.c | 30 +++++++++++++++++--
> 1 file changed, 28 insertions(+), 2 deletions(-)
>
> diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmBootDescription.c b/MdeModulePkg/Library/UefiBootManagerLib/BmBootDescription.c
> index dd4d160f31..b7d9e98790 100644
> --- a/MdeModulePkg/Library/UefiBootManagerLib/BmBootDescription.c
> +++ b/MdeModulePkg/Library/UefiBootManagerLib/BmBootDescription.c
> @@ -661,6 +661,8 @@ BmGetMiscDescription (
> CHAR16 *Description;
> EFI_BLOCK_IO_PROTOCOL *BlockIo;
> EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *Fs;
> + EFI_PCI_IO_PROTOCOL *PciIo;
> + PCI_TYPE00 Pci;
>
> switch (BmDevicePathType (DevicePathFromHandle (Handle))) {
> case BmAcpiFloppyBoot:
> @@ -698,9 +700,33 @@ BmGetMiscDescription (
> Status = gBS->HandleProtocol (Handle, &gEfiSimpleFileSystemProtocolGuid, (VOID **) &Fs);
> if (!EFI_ERROR (Status)) {
> Description = L"Non-Block Boot Device";
> - } else {
> - Description = L"Misc Device";
> + break;
> + }
> + Status = gBS->HandleProtocol (Handle, &gEfiPciIoProtocolGuid, (VOID **) &PciIo);
> + if (!EFI_ERROR (Status)) {
> + Status = PciIo->Pci.Read (
> + PciIo, // (protocol, device)
> + // handle
> + EfiPciIoWidthUint32, // access width & copy
> + // mode
> + 0, // Offset
> + sizeof Pci / sizeof (UINT32), // Count
> + &Pci // target buffer
> + );
(1) Can we save some cycles by reading just
PCI_DEVICE_INDEPENDENT_REGION, rather than PCI_TYPE00? It would not
complicate the code either.
> + //
> + // If the same node is a Qumranet/Red Hat PCI device, it's VirtIO.
> + //
> + if (!EFI_ERROR (Status) &&
> + (Pci.Hdr.VendorId == 0x1AF4) &&
> + (Pci.Hdr.DeviceId >= 0x1000) &&
> + (Pci.Hdr.DeviceId <= 0x103F) &&
> + (Pci.Hdr.RevisionID == 0x00)) {
(2) This will match legacy and transitional virtio devices, but not
modern-only virtio devices. (SeaBIOS supports modern-only devices too.)
Please see the check for the latter in Virtio10BindingSupported().
(Admittedly, "Pci.Device.SubsystemID" cannot be determined from
PCI_DEVICE_INDEPENDENT_REGION...)
In general I think this approach is viable; at the worst we might have
to gate the code with a Feature PCD. Let's see what Ray says.
Thanks
Laszlo
> + Description = L"VirtIO Device";
> + break;
> + }
> }
> +
> + Description = L"Misc Device";
> break;
> }
>
>
next prev parent reply other threads:[~2019-06-24 23:16 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-21 22:31 [PATCH 1/7] OvmfPkg/LegacyBios: set NumberBbsEntries to the size of BbsTable David Woodhouse
2019-06-21 22:31 ` [PATCH 2/7] OvmfPkg/LegacyBbs: Add boot entries for VirtIO and NVME devices David Woodhouse
2019-06-24 22:46 ` [edk2-devel] " Laszlo Ersek
2019-06-21 22:31 ` [PATCH 3/7] OvmfPkg: Don't build in QemuVideoDxe when we have CSM David Woodhouse
2019-06-21 22:31 ` [PATCH 4/7] MdeModulePkg/UefiBootManagerLib: export EfiBootManagerGetBootDescription() David Woodhouse
2019-06-24 22:36 ` [edk2-devel] " Laszlo Ersek
2019-06-25 2:00 ` Ni, Ray
2019-06-25 8:00 ` David Woodhouse
2019-06-21 22:31 ` [PATCH 5/7] OvmfPkg/LegacyBiosDxe: Use EfiBootManagerGetBootDescription() David Woodhouse
2019-06-24 23:03 ` [edk2-devel] " Laszlo Ersek
2019-06-21 22:31 ` [PATCH 6/7] MdeModulePkg/UefiBootManagerLib: describe VirtIO devices correctly David Woodhouse
2019-06-24 23:16 ` Laszlo Ersek [this message]
2019-06-25 1:44 ` [edk2-devel] " Ni, Ray
2019-06-25 7:40 ` David Woodhouse
2019-06-25 8:06 ` Ni, Ray
2019-06-25 8:28 ` David Woodhouse
2019-06-25 9:15 ` Ni, Ray
2019-06-25 9:28 ` David Woodhouse
2019-06-25 9:56 ` Ni, Ray
2019-06-25 11:27 ` David Woodhouse
2019-06-21 22:31 ` [PATCH 7/7] OvmfPkg: don't assign PCI BARs above 4GiB when CSM enabled David Woodhouse
2019-06-24 23:50 ` [edk2-devel] " Laszlo Ersek
2019-06-25 12:07 ` David Woodhouse
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3d62cecb-d235-2b7e-3342-b1f6e4a619c6@redhat.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox