From patchwork Wed Apr 13 08:02:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 65690 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp2362803qge; Wed, 13 Apr 2016 01:02:51 -0700 (PDT) X-Received: by 10.98.19.82 with SMTP id b79mr11075162pfj.17.1460534571799; Wed, 13 Apr 2016 01:02:51 -0700 (PDT) Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id t20si14863297pfa.119.2016.04.13.01.02.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Apr 2016 01:02:51 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id F3B791A221B; Wed, 13 Apr 2016 01:02:41 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received: from mail-wm0-x231.google.com (mail-wm0-x231.google.com [IPv6:2a00:1450:400c:c09::231]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id BAA121A2245 for ; Wed, 13 Apr 2016 01:02:40 -0700 (PDT) Received: by mail-wm0-x231.google.com with SMTP id n3so62093226wmn.0 for ; Wed, 13 Apr 2016 01:02:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=XhrY753mhc+ecX6UUmuNK3tj42Yoi3iP1iInb46wr2g=; b=ERm5b8rVY9q1QZxF2pxtGscb4y+1p/9MdrqnT13tON24wKZ4MscURjnjHHXe0BTzCt vzvibZId4WBi8sU7FcTYgq9XI68sCurVCXDTZGqUgqUwMByjeIxGyoXAsjgitvdSLMkx eU7Uxc+G6Vrcdwl9hmp5JUVG2WlfChaIRs6/M= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=XhrY753mhc+ecX6UUmuNK3tj42Yoi3iP1iInb46wr2g=; b=PPewTUtnD72AxIOSfSFUa+Qfhry1s8Yaz60fQ7MD12f68YCl1d85gEnecLde2WoSlk ov6L0PywGpaGbpB2NE3rzocH18ro+c7nBD7cS/F3VUTc+r/x1exeGmK6AaqqRicub09x dvhmoemuv8lT2vqlE1dvTeMqyFGewqGO3QY6QroPK61EwznfWESsdms4C/3WMWrDra52 xP+n5DlKDBwIa/LO6nbaWh5ZHTFa8IQA9OmlQm7+kyKmUjp4BfmnW87jIbHWB7O6msRY WSu6FrtD4O5Y8ogILHe76S7LCObn86K3PY6tJPrlo65rKWs+ZeVKfLm3bMVMwsFlsMc2 S7yQ== X-Gm-Message-State: AOPr4FUqmf2hL3yGDD9jWKenzqgePA5BDxvoFdqO6G5flvk+sdDbGmtlJHW1wqiZfCl18my8 X-Received: by 10.194.216.227 with SMTP id ot3mr8779408wjc.69.1460534559410; Wed, 13 Apr 2016 01:02:39 -0700 (PDT) Received: from localhost.localdomain ([195.55.142.58]) by smtp.gmail.com with ESMTPSA id i206sm26686549wmf.1.2016.04.13.01.02.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 13 Apr 2016 01:02:38 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.01.org, lersek@redhat.com Date: Wed, 13 Apr 2016 10:02:19 +0200 Message-Id: <1460534539-2169-10-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1460534539-2169-1-git-send-email-ard.biesheuvel@linaro.org> References: <1460534539-2169-1-git-send-email-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH v3 9/9] ArmVirtPkg/VirtFdtDxe: remove Xenio handling and rename to VirtioFdtDxe X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Now that we have moved the handling of the xen,xen DT node to XenioFdtDxe, remove its handling from VirtFdtDxe. Since the only functionality that remains is handling the virtio,mmio DT node, rename VirtFdtDxe to VirtioFdtDxe to reflect that. Also update the platforms that use this driver. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- ArmVirtPkg/{VirtFdtDxe/VirtFdtDxe.inf => VirtioFdtDxe/VirtioFdtDxe.inf} | 32 ++- ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.c | 218 -------------------- ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.c | 125 +++++++++++ ArmVirtPkg/ArmVirtQemu.dsc | 2 +- ArmVirtPkg/ArmVirtQemu.fdf | 2 +- ArmVirtPkg/ArmVirtQemuKernel.dsc | 2 +- ArmVirtPkg/ArmVirtQemuKernel.fdf | 2 +- 7 files changed, 143 insertions(+), 240 deletions(-) -- 2.5.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Laszlo Ersek diff --git a/ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf b/ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf similarity index 61% rename from ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf rename to ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf index 4dd46cf87011..e4ac1a285bc8 100644 --- a/ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf +++ b/ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf @@ -1,7 +1,7 @@ ## @file -# Device tree enumeration DXE driver for ARM Virtual Machines +# Virtio FDT client protocol driver for virtio,mmio DT node # -# Copyright (c) 2014, Linaro Ltd. All rights reserved.
+# Copyright (c) 2014 - 2016, Linaro Ltd. All rights reserved.
# # This program and the accompanying materials are # licensed and made available under the terms and conditions of the BSD License @@ -15,41 +15,37 @@ [Defines] INF_VERSION = 0x00010005 - BASE_NAME = VirtFdtDxe + BASE_NAME = VirtioFdtDxe FILE_GUID = 9AD7DCB4-E6EC-472E-96BF-81C219A3F77E MODULE_TYPE = DXE_DRIVER VERSION_STRING = 1.0 - ENTRY_POINT = InitializeVirtFdtDxe + ENTRY_POINT = InitializeVirtioFdtDxe [Sources] - VirtFdtDxe.c + VirtioFdtDxe.c [Packages] - MdePkg/MdePkg.dec - MdeModulePkg/MdeModulePkg.dec - ArmPkg/ArmPkg.dec - ArmPlatformPkg/ArmPlatformPkg.dec ArmVirtPkg/ArmVirtPkg.dec - EmbeddedPkg/EmbeddedPkg.dec + MdePkg/MdePkg.dec OvmfPkg/OvmfPkg.dec [LibraryClasses] BaseLib - PcdLib + BaseMemoryLib + DebugLib + DevicePathLib + MemoryAllocationLib + UefiBootServicesTableLib UefiDriverEntryPoint - DxeServicesLib - FdtLib VirtioMmioDeviceLib - HobLib - XenIoMmioLib [Guids] gVirtioMmioTransportGuid - gFdtHobGuid [Protocols] - gEfiDevicePathProtocolGuid + gEfiDevicePathProtocolGuid ## PRODUCES + gFdtClientProtocolGuid ## CONSUMES [Depex] - TRUE + gFdtClientProtocolGuid diff --git a/ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.c b/ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.c deleted file mode 100644 index cebd4aa91fd9..000000000000 --- a/ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.c +++ /dev/null @@ -1,218 +0,0 @@ -/** @file -* Device tree enumeration DXE driver for ARM Virtual Machines -* -* Copyright (c) 2014, Linaro Ltd. All rights reserved.
-* -* This program and the accompanying materials are -* licensed and made available under the terms and conditions of the BSD License -* which accompanies this distribution. The full text of the license may be found at -* http://opensource.org/licenses/bsd-license.php -* -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -* -**/ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#pragma pack (1) -typedef struct { - VENDOR_DEVICE_PATH Vendor; - UINT64 PhysBase; - EFI_DEVICE_PATH_PROTOCOL End; -} VIRTIO_TRANSPORT_DEVICE_PATH; -#pragma pack () - -typedef enum { - PropertyTypeUnknown, - PropertyTypeVirtio, - PropertyTypeXen, -} PROPERTY_TYPE; - -typedef struct { - PROPERTY_TYPE Type; - CHAR8 Compatible[32]; -} PROPERTY; - -STATIC CONST PROPERTY CompatibleProperties[] = { - { PropertyTypeVirtio, "virtio,mmio" }, - { PropertyTypeXen, "xen,xen" }, - { PropertyTypeUnknown, "" } -}; - -STATIC -PROPERTY_TYPE -GetTypeFromNode ( - IN CONST CHAR8 *NodeType, - IN UINTN Size - ) -{ - CONST CHAR8 *Compatible; - CONST PROPERTY *CompatibleProperty; - - // - // A 'compatible' node may contain a sequence of NULL terminated - // compatible strings so check each one - // - for (Compatible = NodeType; Compatible < NodeType + Size && *Compatible; - Compatible += 1 + AsciiStrLen (Compatible)) { - for (CompatibleProperty = CompatibleProperties; CompatibleProperty->Compatible[0]; CompatibleProperty++) { - if (AsciiStrCmp (CompatibleProperty->Compatible, Compatible) == 0) { - return CompatibleProperty->Type; - } - } - } - return PropertyTypeUnknown; -} - -EFI_STATUS -EFIAPI -InitializeVirtFdtDxe ( - IN EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE *SystemTable - ) -{ - VOID *Hob; - VOID *DeviceTreeBase; - INT32 Node, Prev; - EFI_STATUS Status; - CONST CHAR8 *Type; - INT32 Len; - PROPERTY_TYPE PropType; - CONST VOID *RegProp; - VIRTIO_TRANSPORT_DEVICE_PATH *DevicePath; - EFI_HANDLE Handle; - UINT64 RegBase; - - Hob = GetFirstGuidHob(&gFdtHobGuid); - if (Hob == NULL || GET_GUID_HOB_DATA_SIZE (Hob) != sizeof (UINT64)) { - return EFI_NOT_FOUND; - } - DeviceTreeBase = (VOID *)(UINTN)*(UINT64 *)GET_GUID_HOB_DATA (Hob); - - if (fdt_check_header (DeviceTreeBase) != 0) { - DEBUG ((EFI_D_ERROR, "%a: No DTB found @ 0x%p\n", __FUNCTION__, DeviceTreeBase)); - return EFI_NOT_FOUND; - } - - DEBUG ((EFI_D_INFO, "%a: DTB @ 0x%p\n", __FUNCTION__, DeviceTreeBase)); - - // - // Now enumerate the nodes and install peripherals that we are interested in, - // i.e., GIC, RTC and virtio MMIO nodes - // - for (Prev = 0;; Prev = Node) { - Node = fdt_next_node (DeviceTreeBase, Prev, NULL); - if (Node < 0) { - break; - } - - Type = fdt_getprop (DeviceTreeBase, Node, "compatible", &Len); - if (Type == NULL) { - continue; - } - - PropType = GetTypeFromNode (Type, Len); - if (PropType == PropertyTypeUnknown) { - continue; - } - - // - // Get the 'reg' property of this node. For now, we will assume - // 8 byte quantities for base and size, respectively. - // TODO use #cells root properties instead - // - RegProp = fdt_getprop (DeviceTreeBase, Node, "reg", &Len); - ASSERT (RegProp != NULL); - - switch (PropType) { - case PropertyTypeVirtio: - ASSERT (Len == 16); - // - // Create a unique device path for this transport on the fly - // - RegBase = fdt64_to_cpu (((UINT64 *)RegProp)[0]); - DevicePath = (VIRTIO_TRANSPORT_DEVICE_PATH *)CreateDeviceNode ( - HARDWARE_DEVICE_PATH, - HW_VENDOR_DP, - sizeof (VIRTIO_TRANSPORT_DEVICE_PATH)); - if (DevicePath == NULL) { - DEBUG ((EFI_D_ERROR, "%a: Out of memory\n", __FUNCTION__)); - break; - } - - CopyMem (&DevicePath->Vendor.Guid, &gVirtioMmioTransportGuid, - sizeof (EFI_GUID)); - DevicePath->PhysBase = RegBase; - SetDevicePathNodeLength (&DevicePath->Vendor, - sizeof (*DevicePath) - sizeof (DevicePath->End)); - SetDevicePathEndNode (&DevicePath->End); - - Handle = NULL; - Status = gBS->InstallProtocolInterface (&Handle, - &gEfiDevicePathProtocolGuid, EFI_NATIVE_INTERFACE, - DevicePath); - if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, "%a: Failed to install the EFI_DEVICE_PATH " - "protocol on a new handle (Status == %r)\n", - __FUNCTION__, Status)); - FreePool (DevicePath); - break; - } - - Status = VirtioMmioInstallDevice (RegBase, Handle); - if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, "%a: Failed to install VirtIO transport @ 0x%Lx " - "on handle %p (Status == %r)\n", __FUNCTION__, RegBase, - Handle, Status)); - - Status = gBS->UninstallProtocolInterface (Handle, - &gEfiDevicePathProtocolGuid, DevicePath); - ASSERT_EFI_ERROR (Status); - FreePool (DevicePath); - } - break; - - case PropertyTypeXen: - ASSERT (Len == 16); - - // - // Retrieve the reg base from this node and wire it up to the - // MMIO flavor of the XenBus root device I/O protocol - // - RegBase = fdt64_to_cpu (((UINT64 *)RegProp)[0]); - Handle = NULL; - Status = XenIoMmioInstall (&Handle, RegBase); - if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, "%a: XenIoMmioInstall () failed on a new handle " - "(Status == %r)\n", __FUNCTION__, Status)); - break; - } - - DEBUG ((EFI_D_INFO, "Found Xen node with Grant table @ 0x%Lx\n", RegBase)); - - break; - - default: - break; - } - } - - return EFI_SUCCESS; -} diff --git a/ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.c b/ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.c new file mode 100644 index 000000000000..09c311410fda --- /dev/null +++ b/ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.c @@ -0,0 +1,125 @@ +/** @file +* Virtio FDT client protocol driver for virtio,mmio DT node +* +* Copyright (c) 2014 - 2016, Linaro Ltd. All rights reserved.
+* +* This program and the accompanying materials are +* licensed and made available under the terms and conditions of the BSD License +* which accompanies this distribution. The full text of the license may be found at +* http://opensource.org/licenses/bsd-license.php +* +* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +* +**/ + +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include + +#pragma pack (1) +typedef struct { + VENDOR_DEVICE_PATH Vendor; + UINT64 PhysBase; + EFI_DEVICE_PATH_PROTOCOL End; +} VIRTIO_TRANSPORT_DEVICE_PATH; +#pragma pack () + +EFI_STATUS +EFIAPI +InitializeVirtioFdtDxe ( + IN EFI_HANDLE ImageHandle, + IN EFI_SYSTEM_TABLE *SystemTable + ) +{ + EFI_STATUS Status, FindNodeStatus; + FDT_CLIENT_PROTOCOL *FdtClient; + INT32 Node; + CONST UINT64 *Reg; + UINT32 RegSize; + VIRTIO_TRANSPORT_DEVICE_PATH *DevicePath; + EFI_HANDLE Handle; + UINT64 RegBase; + + Status = gBS->LocateProtocol (&gFdtClientProtocolGuid, NULL, + (VOID **)&FdtClient); + ASSERT_EFI_ERROR (Status); + + for (FindNodeStatus = FdtClient->FindCompatibleNode (FdtClient, + "virtio,mmio", &Node); + FindNodeStatus == EFI_SUCCESS; + FindNodeStatus = FdtClient->FindNextCompatibleNode (FdtClient, + "virtio,mmio", Node, &Node)) { + + Status = FdtClient->GetNodeProperty (FdtClient, Node, "reg", + (CONST VOID **)&Reg, &RegSize); + if (EFI_ERROR (Status)) { + DEBUG ((EFI_D_ERROR, "%a: GetNodeProperty () failed (Status == %r)\n", + __FUNCTION__, Status)); + continue; + } + + ASSERT (RegSize == 16); + + // + // Create a unique device path for this transport on the fly + // + RegBase = SwapBytes64 (*Reg); + DevicePath = (VIRTIO_TRANSPORT_DEVICE_PATH *)CreateDeviceNode ( + HARDWARE_DEVICE_PATH, + HW_VENDOR_DP, + sizeof (VIRTIO_TRANSPORT_DEVICE_PATH)); + if (DevicePath == NULL) { + DEBUG ((EFI_D_ERROR, "%a: Out of memory\n", __FUNCTION__)); + break; + } + + CopyGuid (&DevicePath->Vendor.Guid, &gVirtioMmioTransportGuid); + DevicePath->PhysBase = RegBase; + SetDevicePathNodeLength (&DevicePath->Vendor, + sizeof (*DevicePath) - sizeof (DevicePath->End)); + SetDevicePathEndNode (&DevicePath->End); + + Handle = NULL; + Status = gBS->InstallProtocolInterface (&Handle, + &gEfiDevicePathProtocolGuid, EFI_NATIVE_INTERFACE, + DevicePath); + if (EFI_ERROR (Status)) { + DEBUG ((EFI_D_ERROR, "%a: Failed to install the EFI_DEVICE_PATH " + "protocol on a new handle (Status == %r)\n", + __FUNCTION__, Status)); + FreePool (DevicePath); + break; + } + + Status = VirtioMmioInstallDevice (RegBase, Handle); + if (EFI_ERROR (Status)) { + DEBUG ((EFI_D_ERROR, "%a: Failed to install VirtIO transport @ 0x%Lx " + "on handle %p (Status == %r)\n", __FUNCTION__, RegBase, + Handle, Status)); + + Status = gBS->UninstallProtocolInterface (Handle, + &gEfiDevicePathProtocolGuid, DevicePath); + ASSERT_EFI_ERROR (Status); + FreePool (DevicePath); + break; + } + } + + if (EFI_ERROR (FindNodeStatus) && FindNodeStatus != EFI_NOT_FOUND) { + DEBUG ((EFI_D_ERROR, "%a: Error occurred while iterating DT nodes " + "(FindNodeStatus == %r)\n", __FUNCTION__, FindNodeStatus)); + return Status; + } + + return EFI_SUCCESS; +} diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc index 70419ff3f856..34323bf83d64 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -322,7 +322,7 @@ [Components.common] # # Platform Driver # - ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf + ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf ArmVirtPkg/HighMemDxe/HighMemDxe.inf OvmfPkg/VirtioBlkDxe/VirtioBlk.inf diff --git a/ArmVirtPkg/ArmVirtQemu.fdf b/ArmVirtPkg/ArmVirtQemu.fdf index a7204898f473..071eaef5dd80 100644 --- a/ArmVirtPkg/ArmVirtQemu.fdf +++ b/ArmVirtPkg/ArmVirtQemu.fdf @@ -103,7 +103,7 @@ [FV.FvMain] INF MdeModulePkg/Core/Dxe/DxeMain.inf INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf - INF ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf + INF ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf INF ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf INF ArmVirtPkg/HighMemDxe/HighMemDxe.inf diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc index 65991baaf680..e1b45ffaf8fd 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc @@ -300,7 +300,7 @@ [Components.common] # # Platform Driver # - ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf + ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf OvmfPkg/VirtioBlkDxe/VirtioBlk.inf OvmfPkg/VirtioScsiDxe/VirtioScsi.inf diff --git a/ArmVirtPkg/ArmVirtQemuKernel.fdf b/ArmVirtPkg/ArmVirtQemuKernel.fdf index b8f66d2f472c..7c478340f9e7 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.fdf +++ b/ArmVirtPkg/ArmVirtQemuKernel.fdf @@ -125,7 +125,7 @@ [FV.FvMain] INF MdeModulePkg/Core/Dxe/DxeMain.inf INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf - INF ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf + INF ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf INF ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf #