From nobody Sun May 19 00:42:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+81208+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+81208+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=hpe.com ARC-Seal: i=1; a=rsa-sha256; t=1632821320; cv=none; d=zohomail.com; s=zohoarc; b=jQRmrL8jp58ENCOVkmYaj9hDcZnyhE60eVU1/iOCcJw2out6DBQJfhGScLRoZITYf45qZ/bzkZ1znX+3EldOHj5tYBTAe6Ryz3DCzAflqKdFKU2lKGuTVyp4giEe2GFTJpNkl65ZWk3GuGfdd1K15nezviMsSHqm9Qp0+37ASGQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632821320; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=Vwp0p5/Ri2X4mu4uyWbkiIQK/P+JH0+WM7yXipZfOm4=; b=oBvpxoIllmNcuDpg7O2PXTAah0qs3zE/kuUJsZ7fzpLnh8CaZCRjoI7Sm8veo89NwjdS3r5wI9cRBoYdTDy741CXTGU8uc/k/2DyymfhSuM+uI7WrR0M6xkSUpd7D0q6gwPoKT1dT9eKXT4Z8hFX656wPETPRa5lx8wWx6JTU0I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+81208+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1632821320851148.80358291539108; Tue, 28 Sep 2021 02:28:40 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 2px9YY1788612xmV435Oh4l6; Tue, 28 Sep 2021 02:28:40 -0700 X-Received: from mx0b-002e3701.pphosted.com (mx0b-002e3701.pphosted.com [148.163.143.35]) by mx.groups.io with SMTP id smtpd.web11.11548.1632821315123682983 for ; Tue, 28 Sep 2021 02:28:39 -0700 X-Received: from pps.filterd (m0134424.ppops.net [127.0.0.1]) by mx0b-002e3701.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 18S6lGNZ005108; Tue, 28 Sep 2021 09:28:29 GMT X-Received: from g9t5009.houston.hpe.com (g9t5009.houston.hpe.com [15.241.48.73]) by mx0b-002e3701.pphosted.com with ESMTP id 3bbed2gp1g-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 28 Sep 2021 09:28:29 +0000 X-Received: from g4t3433.houston.hpecorp.net (g4t3433.houston.hpecorp.net [16.208.49.245]) by g9t5009.houston.hpe.com (Postfix) with ESMTP id 94A6751; Tue, 28 Sep 2021 09:28:28 +0000 (UTC) X-Received: from abner-virtual-machine.asiapacific.hpqcorp.net (abner-virtual-machine.asiapacific.hpqcorp.net [15.119.210.153]) by g4t3433.houston.hpecorp.net (Postfix) with ESMTP id 0F2225F; Tue, 28 Sep 2021 09:28:26 +0000 (UTC) From: "Abner Chang" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Leif Lindholm , Sami Mujawar , Gerd Hoffmann , Daniel Schaefer , Sunil V L Subject: [edk2-devel] [PATCH V2 1/9] ArmVirtPkg/FdtClintDxe: Move FdtClientDxe to EmbeddedPkg Date: Tue, 28 Sep 2021 16:30:59 +0800 Message-Id: <20210928083107.7418-2-abner.chang@hpe.com> In-Reply-To: <20210928083107.7418-1-abner.chang@hpe.com> References: <20210928083107.7418-1-abner.chang@hpe.com> X-Proofpoint-GUID: OK83GlbccmkCo4RCP4UB5cT72_RZBf0Q X-Proofpoint-ORIG-GUID: OK83GlbccmkCo4RCP4UB5cT72_RZBf0Q X-HPE-SCL: -1 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,abner.chang@hpe.com X-Gm-Message-State: 41ZimK90RTGzqhXCuJbsF7QXx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1632821320; bh=/Fn5MYl6w5OGp1DtM/vpdTUDC2QQFkMzuQtaTogv/78=; h=Cc:Date:From:Reply-To:Subject:To; b=vUwlEFGVKZQf/so4A09XxhgmbsSNvODCxINul/FxHVoB3ftuIcwh6t4GNoPG+UXbT8e HiKvJ4oJ0PYM5P5BysiiEOqZOIGS9M16BWqP7aleyZcRRHvX6s83OXiPOlD3TQVOJC1Og fjKc09c86E5PMUYGXoCQyzAKfAPS8WDkDjQ= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1632821322668100001 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This is one of the series patches to restructure the location of modules un= der ArmVirtPkg for RiscVVirtPkg. RiscVVirtPkg leverage FDT Client protocol to parse FDT nodes. Signed-off-by: Abner Chang Cc: Ard Biesheuvel Cc: Leif Lindholm Cc: Sami Mujawar Cc: Gerd Hoffmann Cc: Daniel Schaefer Cc: Sunil V L Reviewed-By: Daniel Schaefer --- ArmVirtPkg/ArmVirtPkg.dec | 3 --- EmbeddedPkg/EmbeddedPkg.dec | 1 + ArmVirtPkg/ArmVirtCloudHv.dsc | 2 +- ArmVirtPkg/ArmVirtKvmTool.dsc | 2 +- ArmVirtPkg/ArmVirtQemu.dsc | 2 +- ArmVirtPkg/ArmVirtQemuKernel.dsc | 2 +- ArmVirtPkg/ArmVirtXen.dsc | 2 +- EmbeddedPkg/EmbeddedPkg.dsc | 1 + ArmVirtPkg/ArmVirtCloudHv.fdf | 2 +- ArmVirtPkg/ArmVirtKvmTool.fdf | 2 +- ArmVirtPkg/ArmVirtXen.fdf | 2 +- ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc | 2 +- ArmVirtPkg/HighMemDxe/HighMemDxe.inf | 1 + ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.inf | 1 + .../ArmVirtPL031FdtClientLib/ArmVirtPL031FdtClientLib.inf | 1 + .../ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.inf | 1 + .../ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.inf | 1 + ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf | 1 + .../Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf | 1 + .../Library/KvmtoolRtcFdtClientLib/KvmtoolRtcFdtClientLib.inf | 1 + ArmVirtPkg/Library/NorFlashKvmtoolLib/NorFlashKvmtoolLib.inf | 1 + ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf | 1 + ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf | 1 + ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf | 1 + ArmVirtPkg/XenAcpiPlatformDxe/XenAcpiPlatformDxe.inf | 1 + ArmVirtPkg/XenioFdtDxe/XenioFdtDxe.inf | 1 + .../Drivers}/FdtClientDxe/FdtClientDxe.inf | 1 - {ArmVirtPkg =3D> EmbeddedPkg}/Include/Protocol/FdtClient.h | 0 .../Drivers}/FdtClientDxe/FdtClientDxe.c | 0 29 files changed, 25 insertions(+), 13 deletions(-) rename {ArmVirtPkg =3D> EmbeddedPkg/Drivers}/FdtClientDxe/FdtClientDxe.inf= (92%) rename {ArmVirtPkg =3D> EmbeddedPkg}/Include/Protocol/FdtClient.h (100%) rename {ArmVirtPkg =3D> EmbeddedPkg/Drivers}/FdtClientDxe/FdtClientDxe.c (= 100%) diff --git a/ArmVirtPkg/ArmVirtPkg.dec b/ArmVirtPkg/ArmVirtPkg.dec index 4e4d758015..4e165f6cd8 100644 --- a/ArmVirtPkg/ArmVirtPkg.dec +++ b/ArmVirtPkg/ArmVirtPkg.dec @@ -35,9 +35,6 @@ =20 gArmVirtVariableGuid =3D { 0x50bea1e5, 0xa2c5, 0x46e9, { 0x9b, 0x3a, 0= x59, 0x59, 0x65, 0x16, 0xb0, 0x0a } } =20 -[Protocols] - gFdtClientProtocolGuid =3D { 0xE11FACA0, 0x4710, 0x4C8E, { 0xA7, 0xA2, 0= x01, 0xBA, 0xA2, 0x59, 0x1B, 0x4C } } - [PcdsFeatureFlag] # # Feature Flag PCD that defines whether TPM2 support is enabled diff --git a/EmbeddedPkg/EmbeddedPkg.dec b/EmbeddedPkg/EmbeddedPkg.dec index 7638aaaade..637888e0fd 100644 --- a/EmbeddedPkg/EmbeddedPkg.dec +++ b/EmbeddedPkg/EmbeddedPkg.dec @@ -79,6 +79,7 @@ gPlatformGpioProtocolGuid =3D { 0x52ce9845, 0x5af4, 0x43e2, {0xba, 0xfd,= 0x23, 0x08, 0x12, 0x54, 0x7a, 0xc2 }} gPlatformVirtualKeyboardProtocolGuid =3D { 0x0e3606d2, 0x1dc3, 0x4e6f, {= 0xbe, 0x65, 0x39, 0x49, 0x82, 0xa2, 0x65, 0x47 }} gAndroidBootImgProtocolGuid =3D { 0x9859bb19, 0x407c, 0x4f8b, {0xbc, 0xe= 1, 0xf8, 0xda, 0x65, 0x65, 0xf4, 0xa5 }} + gFdtClientProtocolGuid =3D { 0xE11FACA0, 0x4710, 0x4C8E, { 0xA7, 0xA2, 0= x01, 0xBA, 0xA2, 0x59, 0x1B, 0x4C } } =20 [Ppis] gEdkiiEmbeddedGpioPpiGuid =3D { 0x21c3b115, 0x4e0b, 0x470c, { 0x85, 0xc7= , 0xe1, 0x05, 0xa5, 0x75, 0xc9, 0x7b }} diff --git a/ArmVirtPkg/ArmVirtCloudHv.dsc b/ArmVirtPkg/ArmVirtCloudHv.dsc index f292ba6079..07313e1e67 100644 --- a/ArmVirtPkg/ArmVirtCloudHv.dsc +++ b/ArmVirtPkg/ArmVirtCloudHv.dsc @@ -293,7 +293,7 @@ # Platform Driver # ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf - ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf + EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf ArmVirtPkg/HighMemDxe/HighMemDxe.inf OvmfPkg/VirtioBlkDxe/VirtioBlk.inf OvmfPkg/VirtioScsiDxe/VirtioScsi.inf diff --git a/ArmVirtPkg/ArmVirtKvmTool.dsc b/ArmVirtPkg/ArmVirtKvmTool.dsc index 3bd1cc72a1..745eae347b 100644 --- a/ArmVirtPkg/ArmVirtKvmTool.dsc +++ b/ArmVirtPkg/ArmVirtKvmTool.dsc @@ -292,7 +292,7 @@ # ArmVirtPkg/KvmtoolPlatformDxe/KvmtoolPlatformDxe.inf ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf - ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf + EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf ArmVirtPkg/HighMemDxe/HighMemDxe.inf OvmfPkg/VirtioBlkDxe/VirtioBlk.inf OvmfPkg/VirtioScsiDxe/VirtioScsi.inf diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc index 97539edef7..5030174fe3 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -404,7 +404,7 @@ # Platform Driver # ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf - ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf + EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf ArmVirtPkg/HighMemDxe/HighMemDxe.inf OvmfPkg/VirtioBlkDxe/VirtioBlk.inf OvmfPkg/VirtioScsiDxe/VirtioScsi.inf diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKerne= l.dsc index 28064199c8..5e0a2ee0c6 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc @@ -340,7 +340,7 @@ # Platform Driver # ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf - ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf + EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf ArmVirtPkg/HighMemDxe/HighMemDxe.inf OvmfPkg/VirtioBlkDxe/VirtioBlk.inf OvmfPkg/VirtioScsiDxe/VirtioScsi.inf diff --git a/ArmVirtPkg/ArmVirtXen.dsc b/ArmVirtPkg/ArmVirtXen.dsc index 2b07a5ba19..73b4a90f3e 100644 --- a/ArmVirtPkg/ArmVirtXen.dsc +++ b/ArmVirtPkg/ArmVirtXen.dsc @@ -196,7 +196,7 @@ # Platform Driver # ArmVirtPkg/XenioFdtDxe/XenioFdtDxe.inf - ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf + EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf =20 # # FAT filesystem + GPT/MBR partitioning + UDF filesystem diff --git a/EmbeddedPkg/EmbeddedPkg.dsc b/EmbeddedPkg/EmbeddedPkg.dsc index c41864e8a5..f7ed61545c 100644 --- a/EmbeddedPkg/EmbeddedPkg.dsc +++ b/EmbeddedPkg/EmbeddedPkg.dsc @@ -238,6 +238,7 @@ =20 EmbeddedPkg/Drivers/ConsolePrefDxe/ConsolePrefDxe.inf EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformDxe.inf + EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf =20 EmbeddedPkg/Drivers/NonCoherentIoMmuDxe/NonCoherentIoMmuDxe.inf { diff --git a/ArmVirtPkg/ArmVirtCloudHv.fdf b/ArmVirtPkg/ArmVirtCloudHv.fdf index 13fe8061c3..1bb452ebb8 100644 --- a/ArmVirtPkg/ArmVirtCloudHv.fdf +++ b/ArmVirtPkg/ArmVirtCloudHv.fdf @@ -106,7 +106,7 @@ READ_LOCK_STATUS =3D TRUE INF MdeModulePkg/Core/Dxe/DxeMain.inf INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf INF ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf - INF ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf + INF EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf INF ArmVirtPkg/HighMemDxe/HighMemDxe.inf =20 # diff --git a/ArmVirtPkg/ArmVirtKvmTool.fdf b/ArmVirtPkg/ArmVirtKvmTool.fdf index 152453dc4b..1dac8b7880 100644 --- a/ArmVirtPkg/ArmVirtKvmTool.fdf +++ b/ArmVirtPkg/ArmVirtKvmTool.fdf @@ -120,7 +120,7 @@ READ_LOCK_STATUS =3D TRUE INF MdeModulePkg/Core/Dxe/DxeMain.inf INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf INF ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf - INF ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf + INF EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf INF ArmVirtPkg/KvmtoolPlatformDxe/KvmtoolPlatformDxe.inf INF ArmVirtPkg/HighMemDxe/HighMemDxe.inf =20 diff --git a/ArmVirtPkg/ArmVirtXen.fdf b/ArmVirtPkg/ArmVirtXen.fdf index 9597465cf5..132480f030 100644 --- a/ArmVirtPkg/ArmVirtXen.fdf +++ b/ArmVirtPkg/ArmVirtXen.fdf @@ -139,7 +139,7 @@ READ_LOCK_STATUS =3D TRUE INF MdeModulePkg/Core/Dxe/DxeMain.inf INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf INF ArmVirtPkg/XenioFdtDxe/XenioFdtDxe.inf - INF ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf + INF EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf =20 # # PI DXE Drivers producing Architectural Protocols (EFI Services) diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuF= vMain.fdf.inc index 26f13f6a21..e9518dd273 100644 --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc @@ -41,7 +41,7 @@ READ_LOCK_STATUS =3D TRUE INF MdeModulePkg/Core/Dxe/DxeMain.inf INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf INF ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf - INF ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf + INF EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf INF ArmVirtPkg/HighMemDxe/HighMemDxe.inf =20 # diff --git a/ArmVirtPkg/HighMemDxe/HighMemDxe.inf b/ArmVirtPkg/HighMemDxe/H= ighMemDxe.inf index e510880b0d..168fc90d2a 100644 --- a/ArmVirtPkg/HighMemDxe/HighMemDxe.inf +++ b/ArmVirtPkg/HighMemDxe/HighMemDxe.inf @@ -20,6 +20,7 @@ HighMemDxe.c =20 [Packages] + EmbeddedPkg/EmbeddedPkg.dec MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec ArmPkg/ArmPkg.dec diff --git a/ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.inf b/A= rmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.inf index 43fcb0b73b..23cc64ab93 100644 --- a/ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.inf +++ b/ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.inf @@ -30,6 +30,7 @@ [Packages] ArmPkg/ArmPkg.dec ArmVirtPkg/ArmVirtPkg.dec + EmbeddedPkg/EmbeddedPkg.dec MdePkg/MdePkg.dec =20 [Protocols] diff --git a/ArmVirtPkg/Library/ArmVirtPL031FdtClientLib/ArmVirtPL031FdtCli= entLib.inf b/ArmVirtPkg/Library/ArmVirtPL031FdtClientLib/ArmVirtPL031FdtCli= entLib.inf index 52027d5101..2cfb2b6af5 100644 --- a/ArmVirtPkg/Library/ArmVirtPL031FdtClientLib/ArmVirtPL031FdtClientLib.= inf +++ b/ArmVirtPkg/Library/ArmVirtPL031FdtClientLib/ArmVirtPL031FdtClientLib.= inf @@ -22,6 +22,7 @@ [Packages] ArmPlatformPkg/ArmPlatformPkg.dec ArmVirtPkg/ArmVirtPkg.dec + EmbeddedPkg/EmbeddedPkg.dec MdePkg/MdePkg.dec =20 [LibraryClasses] diff --git a/ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetS= ystemLib.inf b/ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciRese= tSystemLib.inf index 954a6ac8a6..4fde5e443f 100644 --- a/ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLi= b.inf +++ b/ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLi= b.inf @@ -24,6 +24,7 @@ [Packages] ArmPkg/ArmPkg.dec ArmVirtPkg/ArmVirtPkg.dec + EmbeddedPkg/EmbeddedPkg.dec MdeModulePkg/MdeModulePkg.dec MdePkg/MdePkg.dec =20 diff --git a/ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtCli= entLib.inf b/ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtCli= entLib.inf index 382e3004e1..9e6f6f63a5 100644 --- a/ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.= inf +++ b/ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.= inf @@ -23,6 +23,7 @@ [Packages] ArmPkg/ArmPkg.dec ArmVirtPkg/ArmVirtPkg.dec + EmbeddedPkg/EmbeddedPkg.dec MdePkg/MdePkg.dec =20 [LibraryClasses] diff --git a/ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf= b/ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf index b813a0851d..1549f9d884 100644 --- a/ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf +++ b/ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf @@ -29,6 +29,7 @@ [Packages] ArmPkg/ArmPkg.dec ArmVirtPkg/ArmVirtPkg.dec + EmbeddedPkg/EmbeddedPkg.dec MdeModulePkg/MdeModulePkg.dec MdePkg/MdePkg.dec OvmfPkg/OvmfPkg.dec diff --git a/ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.i= nf b/ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf index 337a5488fc..bb055a5beb 100644 --- a/ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf +++ b/ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf @@ -22,6 +22,7 @@ [Packages] ArmPkg/ArmPkg.dec ArmVirtPkg/ArmVirtPkg.dec + EmbeddedPkg/EmbeddedPkg.dec MdeModulePkg/MdeModulePkg.dec MdePkg/MdePkg.dec =20 diff --git a/ArmVirtPkg/Library/KvmtoolRtcFdtClientLib/KvmtoolRtcFdtClientL= ib.inf b/ArmVirtPkg/Library/KvmtoolRtcFdtClientLib/KvmtoolRtcFdtClientLib.i= nf index deb3bf635c..f0a7c19ca5 100644 --- a/ArmVirtPkg/Library/KvmtoolRtcFdtClientLib/KvmtoolRtcFdtClientLib.inf +++ b/ArmVirtPkg/Library/KvmtoolRtcFdtClientLib/KvmtoolRtcFdtClientLib.inf @@ -21,6 +21,7 @@ =20 [Packages] ArmVirtPkg/ArmVirtPkg.dec + EmbeddedPkg/EmbeddedPkg.dec MdePkg/MdePkg.dec PcAtChipsetPkg/PcAtChipsetPkg.dec =20 diff --git a/ArmVirtPkg/Library/NorFlashKvmtoolLib/NorFlashKvmtoolLib.inf b= /ArmVirtPkg/Library/NorFlashKvmtoolLib/NorFlashKvmtoolLib.inf index 95e4ba89a4..04d6723295 100644 --- a/ArmVirtPkg/Library/NorFlashKvmtoolLib/NorFlashKvmtoolLib.inf +++ b/ArmVirtPkg/Library/NorFlashKvmtoolLib/NorFlashKvmtoolLib.inf @@ -22,6 +22,7 @@ ArmPkg/ArmPkg.dec ArmPlatformPkg/ArmPlatformPkg.dec ArmVirtPkg/ArmVirtPkg.dec + EmbeddedPkg/EmbeddedPkg.dec MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec =20 diff --git a/ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf b/ArmVi= rtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf index 9aad84ca6d..4c3683bf5d 100644 --- a/ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf +++ b/ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf @@ -24,6 +24,7 @@ ArmPlatformPkg/ArmPlatformPkg.dec ArmPkg/ArmPkg.dec ArmVirtPkg/ArmVirtPkg.dec + EmbeddedPkg/EmbeddedPkg.dec =20 [LibraryClasses] BaseLib diff --git a/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf b/ArmVirtPkg/= Library/QemuFwCfgLib/QemuFwCfgLib.inf index feceed5f93..f3cc827907 100644 --- a/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf +++ b/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf @@ -32,6 +32,7 @@ [Packages] MdePkg/MdePkg.dec OvmfPkg/OvmfPkg.dec + EmbeddedPkg/EmbeddedPkg.dec ArmVirtPkg/ArmVirtPkg.dec =20 [LibraryClasses] diff --git a/ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf b/ArmVirtPkg/VirtioFd= tDxe/VirtioFdtDxe.inf index 8fd92f17df..9d5ae7b12f 100644 --- a/ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf +++ b/ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf @@ -21,6 +21,7 @@ =20 [Packages] ArmVirtPkg/ArmVirtPkg.dec + EmbeddedPkg/EmbeddedPkg.dec MdePkg/MdePkg.dec OvmfPkg/OvmfPkg.dec =20 diff --git a/ArmVirtPkg/XenAcpiPlatformDxe/XenAcpiPlatformDxe.inf b/ArmVirt= Pkg/XenAcpiPlatformDxe/XenAcpiPlatformDxe.inf index 5881d6b515..9bd31790ca 100644 --- a/ArmVirtPkg/XenAcpiPlatformDxe/XenAcpiPlatformDxe.inf +++ b/ArmVirtPkg/XenAcpiPlatformDxe/XenAcpiPlatformDxe.inf @@ -26,6 +26,7 @@ =20 [Packages] ArmVirtPkg/ArmVirtPkg.dec + EmbeddedPkg/EmbeddedPkg.dec MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec =20 diff --git a/ArmVirtPkg/XenioFdtDxe/XenioFdtDxe.inf b/ArmVirtPkg/XenioFdtDx= e/XenioFdtDxe.inf index 59e53cad80..10038d5625 100644 --- a/ArmVirtPkg/XenioFdtDxe/XenioFdtDxe.inf +++ b/ArmVirtPkg/XenioFdtDxe/XenioFdtDxe.inf @@ -21,6 +21,7 @@ =20 [Packages] ArmVirtPkg/ArmVirtPkg.dec + EmbeddedPkg/EmbeddedPkg.dec MdePkg/MdePkg.dec OvmfPkg/OvmfPkg.dec =20 diff --git a/ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf b/EmbeddedPkg/Drivers= /FdtClientDxe/FdtClientDxe.inf similarity index 92% rename from ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf rename to EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf index d7ba17a0c9..ff80ed8b6a 100644 --- a/ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf +++ b/EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf @@ -19,7 +19,6 @@ FdtClientDxe.c =20 [Packages] - ArmVirtPkg/ArmVirtPkg.dec EmbeddedPkg/EmbeddedPkg.dec MdeModulePkg/MdeModulePkg.dec MdePkg/MdePkg.dec diff --git a/ArmVirtPkg/Include/Protocol/FdtClient.h b/EmbeddedPkg/Include/= Protocol/FdtClient.h similarity index 100% rename from ArmVirtPkg/Include/Protocol/FdtClient.h rename to EmbeddedPkg/Include/Protocol/FdtClient.h diff --git a/ArmVirtPkg/FdtClientDxe/FdtClientDxe.c b/EmbeddedPkg/Drivers/F= dtClientDxe/FdtClientDxe.c similarity index 100% rename from ArmVirtPkg/FdtClientDxe/FdtClientDxe.c rename to EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.c --=20 2.17.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#81208): https://edk2.groups.io/g/devel/message/81208 Mute This Topic: https://groups.io/mt/85920583/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sun May 19 00:42:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+81214+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+81214+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=hpe.com ARC-Seal: i=1; a=rsa-sha256; t=1632821331; cv=none; d=zohomail.com; s=zohoarc; b=Fk+pAnBhzAzTIly6Cl4jKrEPyl/qAgNMEy7RioWF45jNtB2gDaWLhIfeDThOFHsgXgYqH64cKLLpBn/uznRTnQ2XcxpsawDL17K8dS9yfmzLU48/5D1K1cMVN3JYi2PIwwr7GHPYRPJJ1Z19GPJIueMvYrx7PmeeW7YQvdnDWkA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632821331; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=GW8kSdhJ4hrCBN4YHX3J1R9W2Unf9TO3f2Zlz8HOSYI=; b=Sac+9fp6AwKzRw9vQQZbaBBhqBCAEKZvoLQrNtPn2Ryvql56tvTUJFfPDTfeFfDCIDBmY5VAqJt5BEYtlXRegg7cpzn+GiBoFImbPodIfGIIH8TEgWku9cwu9WSo79tVgG6yTPudVeWqmKEEqdvUGRJ7ZWD7PFcZ+pV4kzVk7gY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+81214+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 16328213317695.099885612322396; Tue, 28 Sep 2021 02:28:51 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id QWb1YY1788612xPED9cAYNZd; Tue, 28 Sep 2021 02:28:51 -0700 X-Received: from mx0a-002e3701.pphosted.com (mx0a-002e3701.pphosted.com [148.163.147.86]) by mx.groups.io with SMTP id smtpd.web10.11651.1632821326370737181 for ; Tue, 28 Sep 2021 02:28:51 -0700 X-Received: from pps.filterd (m0150242.ppops.net [127.0.0.1]) by mx0a-002e3701.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 18S8nLF5006153; Tue, 28 Sep 2021 09:28:32 GMT X-Received: from g4t3425.houston.hpe.com (g4t3425.houston.hpe.com [15.241.140.78]) by mx0a-002e3701.pphosted.com with ESMTP id 3bbyvg097a-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 28 Sep 2021 09:28:32 +0000 X-Received: from g4t3433.houston.hpecorp.net (g4t3433.houston.hpecorp.net [16.208.49.245]) by g4t3425.houston.hpe.com (Postfix) with ESMTP id 16B4CA9; Tue, 28 Sep 2021 09:28:31 +0000 (UTC) X-Received: from abner-virtual-machine.asiapacific.hpqcorp.net (abner-virtual-machine.asiapacific.hpqcorp.net [15.119.210.153]) by g4t3433.houston.hpecorp.net (Postfix) with ESMTP id E2ACA4C; Tue, 28 Sep 2021 09:28:28 +0000 (UTC) From: "Abner Chang" To: devel@edk2.groups.io Cc: Michael D Kinney , Liming Gao , Zhiguang Liu , Ard Biesheuvel , Leif Lindholm , Sami Mujawar , Gerd Hoffmann , Daniel Schaefer , Sunil V L Subject: [edk2-devel] [PATCH V2 2/9] MdePkg: Add PcdPciIoTranslation PCD Date: Tue, 28 Sep 2021 16:31:00 +0800 Message-Id: <20210928083107.7418-3-abner.chang@hpe.com> In-Reply-To: <20210928083107.7418-1-abner.chang@hpe.com> References: <20210928083107.7418-1-abner.chang@hpe.com> X-Proofpoint-ORIG-GUID: l6JHRmAdhPaGtuWT1ncxEdvY_YgoPfKh X-Proofpoint-GUID: l6JHRmAdhPaGtuWT1ncxEdvY_YgoPfKh X-HPE-SCL: -1 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,abner.chang@hpe.com X-Gm-Message-State: hwtaqno9MvaaLFGrS1KPWVnKx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1632821331; bh=r5mJiL5pXy+06vQuRjnFM5xYdV2U9yX1SO/n6Z4X6Qk=; h=Cc:Date:From:Reply-To:Subject:To; b=LxH0g9ozHKE6IYb49srG3z5mICDoKWKXbWCyRpBb4GbczB4OMti5+FKlLnS7ZBi9jVe HzeaWTBHloi6duwbfiUKkNhzOJ/WlmliX83XQ9rN1Yqw4FNxCp7TM0wj8hJ+7TuIggUtl Lv7mm+ufEAymZ5hRNUhkgrYrCBRHMyssJas= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1632821332772100001 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This PCD is moved from ArmPkg that is used to set the base address of PCI MMIO window that provides I/O access. We relocate this PCD because this PCD is common to ARM and RSIC-V arch. Signed-off-by: Abner Chang Cc: Michael D Kinney Cc: Liming Gao Cc: Zhiguang Liu Cc: Ard Biesheuvel Cc: Leif Lindholm Cc: Sami Mujawar Cc: Gerd Hoffmann Cc: Daniel Schaefer Cc: Sunil V L --- MdePkg/MdePkg.dec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec index a28a2daaff..08d259764a 100644 --- a/MdePkg/MdePkg.dec +++ b/MdePkg/MdePkg.dec @@ -2302,6 +2302,10 @@ # @Prompt PCI Express Base Address. gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xE0000000|UINT64|0x00= 00000a =20 + ## This value is used to set the base address of PCI MMIO window that pr= ovides I/O access. + # @Prompt PCI I/O Memory Map Window Base Address. + gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation|0x0|UINT64|0x00000040 + ## This value is used to set the size of PCI express hierarchy. The defa= ult is 256 MB. # @Prompt PCI Express Base Size. gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseSize|0x10000000|UINT64|0x00000= 00f --=20 2.17.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#81214): https://edk2.groups.io/g/devel/message/81214 Mute This Topic: https://groups.io/mt/85920589/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sun May 19 00:42:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+81213+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+81213+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=hpe.com ARC-Seal: i=1; a=rsa-sha256; t=1632821329; cv=none; d=zohomail.com; s=zohoarc; b=ZGZVEzq/3PlaQZO1jJy5LgxFSwI/XbAiB7U56sQy2s79Pz5UK/j2WVNkjXptWWK90KsZEW24zRYoSQb9fWJJl61bnAbN2uWrQZnMPJPgeSIGkxqaZMsYBRuldT1Lh/82VwdkYaUH2CWk/lIJ9mw9MgVqtA52XrbPFp9X+q3m7BI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632821329; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=ANkrCRpEG7lNKV06QaopRKibR4gApLFmSqaTOOC6Qvs=; b=bkbUjaGCo3ITH68+8lyfHfiZKWXwyy0oPbFGZQmHjX0vlWjl+4wSn9rgB2Elc8kfxLzLQ0ygkd+jaSZg3v9LEItdz9qABmp8aU9/Xuycf8SZVaQJGtijwItAENVGFHonWVJVYHyVH3gVQOnxQ9PYkqGntdsWrELB47GVZjX0GMI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+81213+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1632821329191386.3703972120991; Tue, 28 Sep 2021 02:28:49 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id YzTfYY1788612xCmo1oslgMA; Tue, 28 Sep 2021 02:28:48 -0700 X-Received: from mx0b-002e3701.pphosted.com (mx0b-002e3701.pphosted.com [148.163.143.35]) by mx.groups.io with SMTP id smtpd.web10.11650.1632821316284665542 for ; Tue, 28 Sep 2021 02:28:47 -0700 X-Received: from pps.filterd (m0148664.ppops.net [127.0.0.1]) by mx0b-002e3701.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 18S9JXTV022724; Tue, 28 Sep 2021 09:28:33 GMT X-Received: from g9t5009.houston.hpe.com (g9t5009.houston.hpe.com [15.241.48.73]) by mx0b-002e3701.pphosted.com with ESMTP id 3bbsf0b6n5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 28 Sep 2021 09:28:33 +0000 X-Received: from g4t3433.houston.hpecorp.net (g4t3433.houston.hpecorp.net [16.208.49.245]) by g9t5009.houston.hpe.com (Postfix) with ESMTP id E450C51; Tue, 28 Sep 2021 09:28:32 +0000 (UTC) X-Received: from abner-virtual-machine.asiapacific.hpqcorp.net (abner-virtual-machine.asiapacific.hpqcorp.net [15.119.210.153]) by g4t3433.houston.hpecorp.net (Postfix) with ESMTP id 593004C; Tue, 28 Sep 2021 09:28:31 +0000 (UTC) From: "Abner Chang" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Leif Lindholm , Sami Mujawar , Gerd Hoffmann , Daniel Schaefer , Sunil V L Subject: [edk2-devel] [PATCH V2 3/9] ArmPkg: Use PcdPciIoTranslation PCD from MdePkg Date: Tue, 28 Sep 2021 16:31:01 +0800 Message-Id: <20210928083107.7418-4-abner.chang@hpe.com> In-Reply-To: <20210928083107.7418-1-abner.chang@hpe.com> References: <20210928083107.7418-1-abner.chang@hpe.com> X-Proofpoint-GUID: -WGY5HRMF7j_Zx4ZynKR18HRAaYWGWvl X-Proofpoint-ORIG-GUID: -WGY5HRMF7j_Zx4ZynKR18HRAaYWGWvl X-HPE-SCL: -1 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,abner.chang@hpe.com X-Gm-Message-State: o0x14Egu41Qmp9VmlrJoa2vqx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1632821328; bh=tJsR60rZTB5WrS3Uwnpaw24bhi0rMr2O6smCwMKTlTM=; h=Cc:Date:From:Reply-To:Subject:To; b=Bd+qigrMGKRpFPwDHxB5Z+O1CW9KRU/K63JDJ3npOegkRAaGjFgLDfnksEXVEBB3XGY RPD/YOpwGQIcdpyC38O5PkPxebSGOp0EZEi2eaQB/8fqHIRs1WX9IcvQSh+7skmYLF0qZ UEbkPFBm6Ap7Jlos8pomd7gFWl35zcllMQg= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1632821330614100008 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" PcdPciIoTranslation PCD is relocated to MdePkg and leveraged by both ARM and RISC-V arch. This patch removes the one from ArmPkg and address the corresponding changes required for other modules under ArmVirtPkg. Signed-off-by: Abner Chang Cc: Ard Biesheuvel Cc: Leif Lindholm Cc: Sami Mujawar Cc: Gerd Hoffmann Cc: Daniel Schaefer Cc: Sunil V L Reviewed-By: Daniel Schaefer --- ArmPkg/ArmPkg.dec | 5 ++--- ArmVirtPkg/ArmVirtCloudHv.dsc | 2 +- ArmVirtPkg/ArmVirtKvmTool.dsc | 2 +- ArmVirtPkg/ArmVirtQemu.dsc | 2 +- ArmVirtPkg/ArmVirtQemuKernel.dsc | 2 +- ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf | 2 +- .../Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf | 2 +- .../Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf | 2 +- 8 files changed, 9 insertions(+), 10 deletions(-) diff --git a/ArmPkg/ArmPkg.dec b/ArmPkg/ArmPkg.dec index 6ed51edd03..12584fb319 100644 --- a/ArmPkg/ArmPkg.dec +++ b/ArmPkg/ArmPkg.dec @@ -337,7 +337,7 @@ # UINT64 Mmio32CpuBase; // mapping target in 64-bit cpu-physical space # UINT64 Mmio64CpuBase; // mapping target in 64-bit cpu-physical space # - # PcdPciIoTranslation =3D IoCpuBase - PcdPciIoBase; + # gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation =3D IoCpuBase - PcdPciI= oBase; # PcdPciMmio32Translation =3D Mmio32CpuBase - (UINT64)PcdPciMmio32Base; # PcdPciMmio64Translation =3D Mmio64CpuBase - PcdPciMmio64Base; # @@ -356,7 +356,7 @@ # UINT64 TranslatedMmio64Address; // output parameter # # TranslatedIoAddress =3D UntranslatedIoAddress + - # PcdPciIoTranslation; + # gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslati= on; # TranslatedMmio32Address =3D (UINT64)UntranslatedMmio32Address + # PcdPciMmio32Translation; # TranslatedMmio64Address =3D UntranslatedMmio64Address + @@ -369,7 +369,6 @@ # gArmTokenSpaceGuid.PcdPciIoBase|0x0|UINT64|0x00000050 gArmTokenSpaceGuid.PcdPciIoSize|0x0|UINT64|0x00000051 - gArmTokenSpaceGuid.PcdPciIoTranslation|0x0|UINT64|0x00000052 gArmTokenSpaceGuid.PcdPciMmio32Base|0x0|UINT32|0x00000053 gArmTokenSpaceGuid.PcdPciMmio32Size|0x0|UINT32|0x00000054 gArmTokenSpaceGuid.PcdPciMmio32Translation|0x0|UINT64|0x00000055 diff --git a/ArmVirtPkg/ArmVirtCloudHv.dsc b/ArmVirtPkg/ArmVirtCloudHv.dsc index 07313e1e67..f159754bf4 100644 --- a/ArmVirtPkg/ArmVirtCloudHv.dsc +++ b/ArmVirtPkg/ArmVirtCloudHv.dsc @@ -192,7 +192,7 @@ # PCD and PcdPciDisableBusEnumeration above have not been assigned yet gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xFFFFFFFFFFFFFFFF =20 - gArmTokenSpaceGuid.PcdPciIoTranslation|0 + gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation|0 =20 gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress|0x0 =20 diff --git a/ArmVirtPkg/ArmVirtKvmTool.dsc b/ArmVirtPkg/ArmVirtKvmTool.dsc index 745eae347b..ff70509542 100644 --- a/ArmVirtPkg/ArmVirtKvmTool.dsc +++ b/ArmVirtPkg/ArmVirtKvmTool.dsc @@ -184,7 +184,7 @@ # PCD and PcdPciDisableBusEnumeration above have not been assigned yet gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xFFFFFFFFFFFFFFFF =20 - gArmTokenSpaceGuid.PcdPciIoTranslation|0x0 + gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation|0x0 =20 # # Set video resolution for boot options and for text setup. diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc index 5030174fe3..f4bb14903f 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -247,7 +247,7 @@ # PCD and PcdPciDisableBusEnumeration above have not been assigned yet gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xFFFFFFFFFFFFFFFF =20 - gArmTokenSpaceGuid.PcdPciIoTranslation|0x0 + gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation|0x0 =20 # # Set video resolution for boot options and for text setup. diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKerne= l.dsc index 5e0a2ee0c6..eecef1a063 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc @@ -227,7 +227,7 @@ # PCD and PcdPciDisableBusEnumeration above have not been assigned yet gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xFFFFFFFFFFFFFFFF =20 - gArmTokenSpaceGuid.PcdPciIoTranslation|0x0 + gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation|0x0 =20 # # Set video resolution for boot options and for text setup. diff --git a/ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf b/ArmPkg/Dr= ivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf index 2bc4571d06..9339c2b532 100644 --- a/ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf +++ b/ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf @@ -38,7 +38,7 @@ UefiBootServicesTableLib =20 [Pcd] - gArmTokenSpaceGuid.PcdPciIoTranslation + gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation =20 [Protocols] gEfiCpuIo2ProtocolGuid ## PRODUCES diff --git a/ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf= b/ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf index 1549f9d884..f149693fa2 100644 --- a/ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf +++ b/ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf @@ -48,7 +48,7 @@ gArmTokenSpaceGuid.PcdPciMmio64Translation =20 [Pcd] - gArmTokenSpaceGuid.PcdPciIoTranslation + gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress =20 [Depex] diff --git a/ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.i= nf b/ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf index bb055a5beb..1dfe779f6c 100644 --- a/ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf +++ b/ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf @@ -36,7 +36,7 @@ gFdtClientProtocolGuid ## CONSUMES =20 [Pcd] - gArmTokenSpaceGuid.PcdPciIoTranslation ## PRODUCES + gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation ## PRODUCES gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress ## PRODUCES gEfiMdeModulePkgTokenSpaceGuid.PcdPciDisableBusEnumeration ## PRODUCES =20 --=20 2.17.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#81213): https://edk2.groups.io/g/devel/message/81213 Mute This Topic: https://groups.io/mt/85920588/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sun May 19 00:42:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+81210+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+81210+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=hpe.com ARC-Seal: i=1; a=rsa-sha256; t=1632821328; cv=none; d=zohomail.com; s=zohoarc; b=mKkCUNRKzcuFIxesUlE6e6GcovYG+bQnvO+PFfeEdDYbhQ7lD8Hmgbox2RglkuYwUxq39dShlIMBzIhbPAZQS7tDB9uvgFZVhF+Hq7bGapIP/A9VYpuRE776H5+K2P0aCXXnMn1ggH9dlvSdw50ZYhqPismonC8SM/ThpjXskRo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632821328; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=sgvYEX4qlwISPbG02ei0V42wV5BUzxYlkWv+gtaJNjY=; b=Wt0IIax9uIdMzMlRsJzZotK25gHjk1g6U3Z81rO9g0RF3MnDCps8XQ5fj4UxeZklGbElVJ/WhZ9jFL7pOkFPNHyxgQts6nuRnWquJeO++ku0++jHOfWLP47fPlfa0AjhvGF8qGDcmy3o0nMGjy4nLXDSogOXbBqDNCYA90pW8XY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+81210+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 163282132833316.005749184572437; Tue, 28 Sep 2021 02:28:48 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id e4B0YY1788612x7tRM26vHjR; Tue, 28 Sep 2021 02:28:47 -0700 X-Received: from mx0b-002e3701.pphosted.com (mx0b-002e3701.pphosted.com [148.163.143.35]) by mx.groups.io with SMTP id smtpd.web09.11530.1632821318810025266 for ; Tue, 28 Sep 2021 02:28:47 -0700 X-Received: from pps.filterd (m0134423.ppops.net [127.0.0.1]) by mx0b-002e3701.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 18S82Fe4008208; Tue, 28 Sep 2021 09:28:35 GMT X-Received: from g9t5008.houston.hpe.com (g9t5008.houston.hpe.com [15.241.48.72]) by mx0b-002e3701.pphosted.com with ESMTP id 3bbxdbs3br-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 28 Sep 2021 09:28:35 +0000 X-Received: from g4t3433.houston.hpecorp.net (g4t3433.houston.hpecorp.net [16.208.49.245]) by g9t5008.houston.hpe.com (Postfix) with ESMTP id 2262959; Tue, 28 Sep 2021 09:28:35 +0000 (UTC) X-Received: from abner-virtual-machine.asiapacific.hpqcorp.net (abner-virtual-machine.asiapacific.hpqcorp.net [15.119.210.153]) by g4t3433.houston.hpecorp.net (Postfix) with ESMTP id 3DCA84C; Tue, 28 Sep 2021 09:28:33 +0000 (UTC) From: "Abner Chang" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Leif Lindholm , Sami Mujawar , Jiewen Yao , Jordan Justen , Gerd Hoffmann , Daniel Schaefer , Sunil V L Subject: [edk2-devel] [PATCH V2 4/9] ArmVirtPkg/FdtPciPcdProducerLib: Relocate PciPcdProducerLib to OvmfPkg Date: Tue, 28 Sep 2021 16:31:02 +0800 Message-Id: <20210928083107.7418-5-abner.chang@hpe.com> In-Reply-To: <20210928083107.7418-1-abner.chang@hpe.com> References: <20210928083107.7418-1-abner.chang@hpe.com> X-Proofpoint-ORIG-GUID: _-4uL6kVw7AlHV6BdKiZe8_zLxjBoY2_ X-Proofpoint-GUID: _-4uL6kVw7AlHV6BdKiZe8_zLxjBoY2_ X-HPE-SCL: -1 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,abner.chang@hpe.com X-Gm-Message-State: 6UFrWb8iKBRh3tgGkvV1Er1ox1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1632821327; bh=DA+VtuetGm9AwgeA90+xdVPVXCcDLGgU1aW4dT9EUcU=; h=Cc:Date:From:Reply-To:Subject:To; b=HpxAZ9tvVqqeB3adQ3VHSmddHig+UwHEa4fkIXpJs6SmzvoUMVbbf738PDOMWGHq4FE uAdRM8sY4q9vefsRv51dMQT2q+o7e8tYjqthJpbv78HxxjrF7aHpsXBI9DSPicb1VCmHD FkcQz9cwlubgWtilCPckMWavekQpq2nQycs= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1632821330514100003 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Relocate PciPcdProducerLib to OvmfPkg/Fdt, this library is leverage by both ARM and RISC-V archs. Add OvmfPkg/Fdt maintainers in Maintainers.txt Signed-off-by: Abner Chang Cc: Ard Biesheuvel Cc: Leif Lindholm Cc: Sami Mujawar Cc: Jiewen Yao Cc: Jordan Justen Cc: Gerd Hoffmann Cc: Daniel Schaefer Cc: Sunil V L Reviewed-By: Daniel Schaefer --- ArmVirtPkg/ArmVirtCloudHv.dsc | 8 ++++---- ArmVirtPkg/ArmVirtKvmTool.dsc | 8 ++++---- ArmVirtPkg/ArmVirtQemu.dsc | 8 ++++---- ArmVirtPkg/ArmVirtQemuKernel.dsc | 8 ++++---- .../Fdt}/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf | 2 -- .../Fdt}/FdtPciPcdProducerLib/FdtPciPcdProducerLib.c | 0 Maintainers.txt | 6 ++++++ 7 files changed, 22 insertions(+), 18 deletions(-) rename {ArmVirtPkg/Library =3D> OvmfPkg/Fdt}/FdtPciPcdProducerLib/FdtPciPc= dProducerLib.inf (92%) rename {ArmVirtPkg/Library =3D> OvmfPkg/Fdt}/FdtPciPcdProducerLib/FdtPciPc= dProducerLib.c (100%) diff --git a/ArmVirtPkg/ArmVirtCloudHv.dsc b/ArmVirtPkg/ArmVirtCloudHv.dsc index f159754bf4..2928b9adb5 100644 --- a/ArmVirtPkg/ArmVirtCloudHv.dsc +++ b/ArmVirtPkg/ArmVirtCloudHv.dsc @@ -49,7 +49,7 @@ FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltL= ib.inf QemuBootOrderLib|OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.inf FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf - PciPcdProducerLib|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProdu= cerLib.inf + PciPcdProducerLib|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.= inf PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.i= nf PciHostBridgeLib|ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridge= Lib.inf PciHostBridgeUtilityLib|ArmVirtPkg/Library/ArmVirtPciHostBridgeUtilityLi= b/ArmVirtPciHostBridgeUtilityLib.inf @@ -341,12 +341,12 @@ # ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf { - NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf + NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf } MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf { - NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf + NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf } OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf OvmfPkg/VirtioPciDeviceDxe/VirtioPciDeviceDxe.inf @@ -360,5 +360,5 @@ MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsRes= ourceTableDxe.inf ArmVirtPkg/CloudHvAcpiPlatformDxe/CloudHvAcpiPlatformDxe.inf { - NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf + NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf } diff --git a/ArmVirtPkg/ArmVirtKvmTool.dsc b/ArmVirtPkg/ArmVirtKvmTool.dsc index ff70509542..3cc182545c 100644 --- a/ArmVirtPkg/ArmVirtKvmTool.dsc +++ b/ArmVirtPkg/ArmVirtKvmTool.dsc @@ -57,7 +57,7 @@ =20 FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf =20 - PciPcdProducerLib|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProdu= cerLib.inf + PciPcdProducerLib|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.= inf PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.i= nf PciHostBridgeLib|ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridge= Lib.inf PciHostBridgeUtilityLib|ArmVirtPkg/Library/ArmVirtPciHostBridgeUtilityLi= b/ArmVirtPciHostBridgeUtilityLib.inf @@ -338,17 +338,17 @@ # ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf { - NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf + NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf NULL|ArmVirtPkg/Library/BaseCachingPciExpressLib/BaseCachingPciExpre= ssLib.inf } MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf { - NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf + NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf NULL|ArmVirtPkg/Library/BaseCachingPciExpressLib/BaseCachingPciExpre= ssLib.inf } MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf { - NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf + NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf NULL|ArmVirtPkg/Library/BaseCachingPciExpressLib/BaseCachingPciExpre= ssLib.inf } OvmfPkg/VirtioPciDeviceDxe/VirtioPciDeviceDxe.inf diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc index f4bb14903f..85fcf5f310 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -77,7 +77,7 @@ FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltL= ib.inf QemuBootOrderLib|OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.inf FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf - PciPcdProducerLib|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProdu= cerLib.inf + PciPcdProducerLib|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.= inf PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.i= nf PciHostBridgeLib|ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridge= Lib.inf PciHostBridgeUtilityLib|OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostB= ridgeUtilityLib.inf @@ -487,12 +487,12 @@ # ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf { - NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf + NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf } MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf { - NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf + NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf } OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf OvmfPkg/VirtioPciDeviceDxe/VirtioPciDeviceDxe.inf @@ -543,5 +543,5 @@ MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsRes= ourceTableDxe.inf OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf { - NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf + NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf } diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKerne= l.dsc index eecef1a063..909968d13a 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc @@ -75,7 +75,7 @@ FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltL= ib.inf QemuBootOrderLib|OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.inf FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf - PciPcdProducerLib|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProdu= cerLib.inf + PciPcdProducerLib|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.= inf PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.i= nf PciHostBridgeLib|ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridge= Lib.inf PciHostBridgeUtilityLib|OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostB= ridgeUtilityLib.inf @@ -423,12 +423,12 @@ # ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf { - NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf + NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf } MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf { - NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf + NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf } OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf OvmfPkg/VirtioPciDeviceDxe/VirtioPciDeviceDxe.inf @@ -459,5 +459,5 @@ MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsRes= ourceTableDxe.inf OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf { - NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf + NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf } diff --git a/ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.i= nf b/OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf similarity index 92% rename from ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf rename to OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf index 1dfe779f6c..0f5156615b 100644 --- a/ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf +++ b/OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf @@ -20,8 +20,6 @@ FdtPciPcdProducerLib.c =20 [Packages] - ArmPkg/ArmPkg.dec - ArmVirtPkg/ArmVirtPkg.dec EmbeddedPkg/EmbeddedPkg.dec MdeModulePkg/MdeModulePkg.dec MdePkg/MdePkg.dec diff --git a/ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.c= b/OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.c similarity index 100% rename from ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.c rename to OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.c diff --git a/Maintainers.txt b/Maintainers.txt index 41f491bcae..c77b455381 100644 --- a/Maintainers.txt +++ b/Maintainers.txt @@ -463,6 +463,12 @@ R: Jiewen Yao [jyao1] R: Min Xu [mxu9] R: Tom Lendacky [tlendacky] =20 +OvmfPkg: FDT related modules +F: OvmfPkg/Fdt/Cc: Leif Lindholm +R: Leif Lindholm +R: Gerd Hoffmann +R: Abner Chang + OvmfPkg: LsiScsi driver F: OvmfPkg/LsiScsiDxe/ R: Gary Lin --=20 2.17.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#81210): https://edk2.groups.io/g/devel/message/81210 Mute This Topic: https://groups.io/mt/85920585/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sun May 19 00:42:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+81211+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+81211+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=hpe.com ARC-Seal: i=1; a=rsa-sha256; t=1632821332; cv=none; d=zohomail.com; s=zohoarc; b=RoBOgAdV9XuFwrrsPAI+XwAlSHC04RapjlNUltd7gTBKWo7mrsM8y1n6Uyvvz7YnjjKnKiIyJvouSgYlDB+YZrCMs8mZu16nIZGAfUhLeDaI5Skolho+PTA5EcQBZrw1uJBPBIGvEMYdS7uKYkeF7zlKl85AoI6/ORaGoHLmOnk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632821332; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=CgtDub2nRgSbSKY41ZcRyT7pAbdsCBtP3LT1vP+T2Bs=; b=OOEYa2kwpjS1USg9TFpIgREVmWxXaQIEMkQfg1uIF/4eeBdogjPt4ij0+z7sEaOuxSPDrqE2XWM6j+TtmIYK+8D8vfk6wKcu232XgeVGvMa2urndN1lXQGiw+IHXI1d+GhuB1MOIQXt0sndpQxR4EDXx0PPMXqgdkpV90T+JpGs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+81211+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1632821332778816.234328025028; Tue, 28 Sep 2021 02:28:52 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id pzGIYY1788612xs3rsKalzrU; Tue, 28 Sep 2021 02:28:52 -0700 X-Received: from mx0b-002e3701.pphosted.com (mx0b-002e3701.pphosted.com [148.163.143.35]) by mx.groups.io with SMTP id smtpd.web08.11424.1632821321744364600 for ; Tue, 28 Sep 2021 02:28:47 -0700 X-Received: from pps.filterd (m0134423.ppops.net [127.0.0.1]) by mx0b-002e3701.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 18S78c4N031170; Tue, 28 Sep 2021 09:28:38 GMT X-Received: from g9t5009.houston.hpe.com (g9t5009.houston.hpe.com [15.241.48.73]) by mx0b-002e3701.pphosted.com with ESMTP id 3bbxdbs3bx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 28 Sep 2021 09:28:38 +0000 X-Received: from g4t3433.houston.hpecorp.net (g4t3433.houston.hpecorp.net [16.208.49.245]) by g9t5009.houston.hpe.com (Postfix) with ESMTP id 503667E; Tue, 28 Sep 2021 09:28:37 +0000 (UTC) X-Received: from abner-virtual-machine.asiapacific.hpqcorp.net (abner-virtual-machine.asiapacific.hpqcorp.net [15.119.210.153]) by g4t3433.houston.hpecorp.net (Postfix) with ESMTP id 6EE7464; Tue, 28 Sep 2021 09:28:35 +0000 (UTC) From: "Abner Chang" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Leif Lindholm , Sami Mujawar , Jiewen Yao , Jordan Justen , Gerd Hoffmann , Daniel Schaefer , Sunil V L Subject: [edk2-devel] [PATCH V2 5/9] ArmVirtPkg/HighMemDxe: Relocate HighMemDxe to OvmfPkg Date: Tue, 28 Sep 2021 16:31:03 +0800 Message-Id: <20210928083107.7418-6-abner.chang@hpe.com> In-Reply-To: <20210928083107.7418-1-abner.chang@hpe.com> References: <20210928083107.7418-1-abner.chang@hpe.com> X-Proofpoint-ORIG-GUID: u9NjBX494P1alMZ1cB25J69dHpzkWwfK X-Proofpoint-GUID: u9NjBX494P1alMZ1cB25J69dHpzkWwfK X-HPE-SCL: -1 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,abner.chang@hpe.com X-Gm-Message-State: DQ0yKzwC28ZKqwbzBBBVgtz1x1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1632821332; bh=9f5KThss6vO5XntR55jMwBepyjj81l1bt+R05Vaew2U=; h=Cc:Date:From:Reply-To:Subject:To; b=mNMZfVjSDd9QYl7RJm17WFxRwPZQC4pJfHQSVe+mO2a2qUCZCq8h9nEYPoz6ux0sZLg wSidFPp+xNFCtP7/u3IpXOUIFphQcTsQfD3wNYZPfwVFO9TH7MzpaoHmyiG6802mu84by BYEs0ejUk0FjI+r7Vx/XFUGYDdJGnTpEIHk= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1632821334874100009 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Relocate HighMemDxe to OvmfPkg/Fdt, this library is leverage by both ARM and RISC-V archs. Signed-off-by: Abner Chang Cc: Ard Biesheuvel Cc: Leif Lindholm Cc: Sami Mujawar Cc: Jiewen Yao Cc: Jordan Justen Cc: Gerd Hoffmann Cc: Daniel Schaefer Cc: Sunil V L --- ArmVirtPkg/ArmVirtCloudHv.dsc | 2 +- ArmVirtPkg/ArmVirtKvmTool.dsc | 2 +- ArmVirtPkg/ArmVirtQemu.dsc | 2 +- ArmVirtPkg/ArmVirtQemuKernel.dsc | 2 +- ArmVirtPkg/ArmVirtCloudHv.fdf | 2 +- ArmVirtPkg/ArmVirtKvmTool.fdf | 2 +- ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc | 2 +- {ArmVirtPkg =3D> OvmfPkg/Fdt}/HighMemDxe/HighMemDxe.inf | 3 +-- {ArmVirtPkg =3D> OvmfPkg/Fdt}/HighMemDxe/HighMemDxe.c | 0 9 files changed, 8 insertions(+), 9 deletions(-) rename {ArmVirtPkg =3D> OvmfPkg/Fdt}/HighMemDxe/HighMemDxe.inf (91%) rename {ArmVirtPkg =3D> OvmfPkg/Fdt}/HighMemDxe/HighMemDxe.c (100%) diff --git a/ArmVirtPkg/ArmVirtCloudHv.dsc b/ArmVirtPkg/ArmVirtCloudHv.dsc index 2928b9adb5..4470fa3b14 100644 --- a/ArmVirtPkg/ArmVirtCloudHv.dsc +++ b/ArmVirtPkg/ArmVirtCloudHv.dsc @@ -294,7 +294,7 @@ # ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf - ArmVirtPkg/HighMemDxe/HighMemDxe.inf + OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf OvmfPkg/VirtioBlkDxe/VirtioBlk.inf OvmfPkg/VirtioScsiDxe/VirtioScsi.inf OvmfPkg/VirtioNetDxe/VirtioNet.inf diff --git a/ArmVirtPkg/ArmVirtKvmTool.dsc b/ArmVirtPkg/ArmVirtKvmTool.dsc index 3cc182545c..97fc98d778 100644 --- a/ArmVirtPkg/ArmVirtKvmTool.dsc +++ b/ArmVirtPkg/ArmVirtKvmTool.dsc @@ -293,7 +293,7 @@ ArmVirtPkg/KvmtoolPlatformDxe/KvmtoolPlatformDxe.inf ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf - ArmVirtPkg/HighMemDxe/HighMemDxe.inf + OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf OvmfPkg/VirtioBlkDxe/VirtioBlk.inf OvmfPkg/VirtioScsiDxe/VirtioScsi.inf OvmfPkg/VirtioNetDxe/VirtioNet.inf diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc index 85fcf5f310..07f9699c79 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -405,7 +405,7 @@ # ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf - ArmVirtPkg/HighMemDxe/HighMemDxe.inf + OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf OvmfPkg/VirtioBlkDxe/VirtioBlk.inf OvmfPkg/VirtioScsiDxe/VirtioScsi.inf OvmfPkg/VirtioNetDxe/VirtioNet.inf diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKerne= l.dsc index 909968d13a..cf7a2b4463 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc @@ -341,7 +341,7 @@ # ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf - ArmVirtPkg/HighMemDxe/HighMemDxe.inf + OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf OvmfPkg/VirtioBlkDxe/VirtioBlk.inf OvmfPkg/VirtioScsiDxe/VirtioScsi.inf OvmfPkg/VirtioNetDxe/VirtioNet.inf diff --git a/ArmVirtPkg/ArmVirtCloudHv.fdf b/ArmVirtPkg/ArmVirtCloudHv.fdf index 1bb452ebb8..7ecf5ca88d 100644 --- a/ArmVirtPkg/ArmVirtCloudHv.fdf +++ b/ArmVirtPkg/ArmVirtCloudHv.fdf @@ -107,7 +107,7 @@ READ_LOCK_STATUS =3D TRUE INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf INF ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf INF EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf - INF ArmVirtPkg/HighMemDxe/HighMemDxe.inf + INF OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf =20 # # PI DXE Drivers producing Architectural Protocols (EFI Services) diff --git a/ArmVirtPkg/ArmVirtKvmTool.fdf b/ArmVirtPkg/ArmVirtKvmTool.fdf index 1dac8b7880..0535d36b7d 100644 --- a/ArmVirtPkg/ArmVirtKvmTool.fdf +++ b/ArmVirtPkg/ArmVirtKvmTool.fdf @@ -122,7 +122,7 @@ READ_LOCK_STATUS =3D TRUE INF ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf INF EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf INF ArmVirtPkg/KvmtoolPlatformDxe/KvmtoolPlatformDxe.inf - INF ArmVirtPkg/HighMemDxe/HighMemDxe.inf + INF OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf =20 # # PI DXE Drivers producing Architectural Protocols (EFI Services) diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuF= vMain.fdf.inc index e9518dd273..279b905edd 100644 --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc @@ -42,7 +42,7 @@ READ_LOCK_STATUS =3D TRUE INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf INF ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf INF EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf - INF ArmVirtPkg/HighMemDxe/HighMemDxe.inf + INF OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf =20 # # PI DXE Drivers producing Architectural Protocols (EFI Services) diff --git a/ArmVirtPkg/HighMemDxe/HighMemDxe.inf b/OvmfPkg/Fdt/HighMemDxe/= HighMemDxe.inf similarity index 91% rename from ArmVirtPkg/HighMemDxe/HighMemDxe.inf rename to OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf index 168fc90d2a..45779a2d59 100644 --- a/ArmVirtPkg/HighMemDxe/HighMemDxe.inf +++ b/OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf @@ -23,8 +23,7 @@ EmbeddedPkg/EmbeddedPkg.dec MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec - ArmPkg/ArmPkg.dec - ArmVirtPkg/ArmVirtPkg.dec + OvmfPkg/OvmfPkg.dec =20 [LibraryClasses] BaseLib diff --git a/ArmVirtPkg/HighMemDxe/HighMemDxe.c b/OvmfPkg/Fdt/HighMemDxe/Hi= ghMemDxe.c similarity index 100% rename from ArmVirtPkg/HighMemDxe/HighMemDxe.c rename to OvmfPkg/Fdt/HighMemDxe/HighMemDxe.c --=20 2.17.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#81211): https://edk2.groups.io/g/devel/message/81211 Mute This Topic: https://groups.io/mt/85920586/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sun May 19 00:42:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+81209+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+81209+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=hpe.com ARC-Seal: i=1; a=rsa-sha256; t=1632821325; cv=none; d=zohomail.com; s=zohoarc; b=l56YL3lOSgh+PjA/JvbCRhHioasSFPIC+voqYhkAa6BC9uHo8SoOBWa5cohmLVEqoavx/gwpXOfHp6HqOi5VfHVzCSzQ7WmF8oNhTo+7VpuaUpsXBWcLQAuEKLaciqYhme15j1FmyLEkZoHXzUNAuMYa8dVqAjSoLSWPqx4x/bY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632821325; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=oUJaH55JMKbRxPmvugVplCMYQ8hZlqQyaEumKnA1UUg=; b=H5Ga6F++NN0Yt2OLY7DiEjBgXm5s6b7u0pqls37Gtk3HVXzQB2fRrpP6wXZQrX9BFMAm+gYEuCqaPF8bCI10Y283c/24IZTHdGocyySYN9MQwzfBaQp77kJ3T7RibkvGzmf5AbWPcdOMpR4VISniOdOIifQEo3+/gy8mMkzN7PE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+81209+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1632821325423129.94918716356472; Tue, 28 Sep 2021 02:28:45 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id XU75YY1788612xjuqRHW440F; Tue, 28 Sep 2021 02:28:45 -0700 X-Received: from mx0b-002e3701.pphosted.com (mx0b-002e3701.pphosted.com [148.163.143.35]) by mx.groups.io with SMTP id smtpd.web12.11593.1632821324450311338 for ; Tue, 28 Sep 2021 02:28:44 -0700 X-Received: from pps.filterd (m0134425.ppops.net [127.0.0.1]) by mx0b-002e3701.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 18S8224Z001521; Tue, 28 Sep 2021 09:28:40 GMT X-Received: from g9t5008.houston.hpe.com (g9t5008.houston.hpe.com [15.241.48.72]) by mx0b-002e3701.pphosted.com with ESMTP id 3bbt89tvda-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 28 Sep 2021 09:28:40 +0000 X-Received: from g4t3433.houston.hpecorp.net (g4t3433.houston.hpecorp.net [16.208.49.245]) by g9t5008.houston.hpe.com (Postfix) with ESMTP id 81E6059; Tue, 28 Sep 2021 09:28:39 +0000 (UTC) X-Received: from abner-virtual-machine.asiapacific.hpqcorp.net (abner-virtual-machine.asiapacific.hpqcorp.net [15.119.210.153]) by g4t3433.houston.hpecorp.net (Postfix) with ESMTP id 9F48955; Tue, 28 Sep 2021 09:28:37 +0000 (UTC) From: "Abner Chang" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Leif Lindholm , Sami Mujawar , Jiewen Yao , Jordan Justen , Gerd Hoffmann , Daniel Schaefer , Sunil V L Subject: [edk2-devel] [PATCH V2 6/9] ArmVirtPkg/QemuFwCfgLib: Relocate QemuFwCfgLib to OvmfPkg Date: Tue, 28 Sep 2021 16:31:04 +0800 Message-Id: <20210928083107.7418-7-abner.chang@hpe.com> In-Reply-To: <20210928083107.7418-1-abner.chang@hpe.com> References: <20210928083107.7418-1-abner.chang@hpe.com> X-Proofpoint-GUID: QXke78eg34J3-uWof0kRFrC7sWmW67ma X-Proofpoint-ORIG-GUID: QXke78eg34J3-uWof0kRFrC7sWmW67ma X-HPE-SCL: -1 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,abner.chang@hpe.com X-Gm-Message-State: D0cn1GMJEWsNgk4yU2JImpn9x1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1632821325; bh=OistQACbI+QU//6bc8U4zEoeSOQsaEG1A7TW4/DwTMM=; h=Cc:Date:From:Reply-To:Subject:To; b=NCkNyrcLGDDvwY03w4ZkfmJZBHMcLbzu3IZG9BoViyc4KKWu7dPjHINxjKi5/rF4Fsb Efa5ZET7/oDHn8yd/MD/hhl3qg21gMwQI5XIyMuBhWqVJfqHP5pWOGnxdDsDFhhrC9JZW 0IDsZYdefOsPvR9HQVgvQMRKwgQRKHDNc7Q= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1632821327020100001 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Relocate QemuFwCfgLib to OvmfPkg/Library/QemuFwCfgLib and rename it to QemuFwCfgLibMMIO, this library is leverage by both ARM and RISC-V archs. Signed-off-by: Abner Chang Cc: Ard Biesheuvel Cc: Leif Lindholm Cc: Sami Mujawar Cc: Jiewen Yao Cc: Jordan Justen Cc: Gerd Hoffmann Cc: Daniel Schaefer Cc: Sunil V L --- ArmVirtPkg/ArmVirtQemu.dsc | 2 +- ArmVirtPkg/ArmVirtQemuKernel.dsc | 2 +- .../Library/QemuFwCfgLib/QemuFwCfgLibMMIO.inf | 5 ++--- .../Library/QemuFwCfgLib/QemuFwCfgLibMMIO.c | 7 ++++--- 4 files changed, 8 insertions(+), 8 deletions(-) rename ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf =3D> OvmfPkg/Libra= ry/QemuFwCfgLib/QemuFwCfgLibMMIO.inf (87%) rename ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c =3D> OvmfPkg/Library= /QemuFwCfgLib/QemuFwCfgLibMMIO.c (93%) diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc index 07f9699c79..6c949fd559 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -59,7 +59,7 @@ # Virtio Support VirtioLib|OvmfPkg/Library/VirtioLib/VirtioLib.inf VirtioMmioDeviceLib|OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDevice= Lib.inf - QemuFwCfgLib|ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf + QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLibMMIO.inf QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/BaseQemuFwCfgS3LibNull.inf QemuFwCfgSimpleParserLib|OvmfPkg/Library/QemuFwCfgSimpleParserLib/QemuFw= CfgSimpleParserLib.inf QemuLoadImageLib|OvmfPkg/Library/GenericQemuLoadImageLib/GenericQemuLoad= ImageLib.inf diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKerne= l.dsc index cf7a2b4463..64035a948d 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc @@ -57,7 +57,7 @@ # Virtio Support VirtioLib|OvmfPkg/Library/VirtioLib/VirtioLib.inf VirtioMmioDeviceLib|OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDevice= Lib.inf - QemuFwCfgLib|ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf + QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLibMMIO.inf QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/BaseQemuFwCfgS3LibNull.inf QemuFwCfgSimpleParserLib|OvmfPkg/Library/QemuFwCfgSimpleParserLib/QemuFw= CfgSimpleParserLib.inf QemuLoadImageLib|OvmfPkg/Library/GenericQemuLoadImageLib/GenericQemuLoad= ImageLib.inf diff --git a/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf b/OvmfPkg/Lib= rary/QemuFwCfgLib/QemuFwCfgLibMMIO.inf similarity index 87% rename from ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf rename to OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLibMMIO.inf index f3cc827907..8101fac03f 100644 --- a/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf +++ b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLibMMIO.inf @@ -23,17 +23,16 @@ # The following information is for reference only and not required by the = build # tools. # -# VALID_ARCHITECTURES =3D ARM AARCH64 +# VALID_ARCHITECTURES =3D ARM AARCH64 RISCV64 # =20 [Sources] - QemuFwCfgLib.c + QemuFwCfgLibMMIO.c =20 [Packages] MdePkg/MdePkg.dec OvmfPkg/OvmfPkg.dec EmbeddedPkg/EmbeddedPkg.dec - ArmVirtPkg/ArmVirtPkg.dec =20 [LibraryClasses] BaseLib diff --git a/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c b/OvmfPkg/Libra= ry/QemuFwCfgLib/QemuFwCfgLibMMIO.c similarity index 93% rename from ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c rename to OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLibMMIO.c index e2ac4108d1..b953f2eb6c 100644 --- a/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c +++ b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLibMMIO.c @@ -4,6 +4,7 @@ =20 Copyright (C) 2013 - 2014, Red Hat, Inc. Copyright (c) 2011 - 2013, Intel Corporation. All rights reserved.
+ (C) Copyright 2021 Hewlett Packard Enterprise Development LP
=20 SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -239,7 +240,7 @@ MmioReadBytes ( UINT8 *Ptr; UINT8 *End; =20 -#ifdef MDE_CPU_AARCH64 +#if defined(MDE_CPU_AARCH64) || defined(MDE_CPU_RISCV64) Left =3D Size & 7; #else Left =3D Size & 3; @@ -249,7 +250,7 @@ MmioReadBytes ( Ptr =3D Buffer; End =3D Ptr + Size; =20 -#ifdef MDE_CPU_AARCH64 +#if defined(MDE_CPU_AARCH64) || defined(MDE_CPU_RISCV64) while (Ptr < End) { *(UINT64 *)Ptr =3D MmioRead64 (mFwCfgDataAddress); Ptr +=3D 8; @@ -322,7 +323,7 @@ DmaTransferBytes ( // // This will fire off the transfer. // -#ifdef MDE_CPU_AARCH64 +#if defined(MDE_CPU_AARCH64) || defined(MDE_CPU_RISCV64) MmioWrite64 (mFwCfgDmaAddress, SwapBytes64 ((UINT64)&Access)); #else MmioWrite32 ((UINT32)(mFwCfgDmaAddress + 4), SwapBytes32 ((UINT32)&Acces= s)); --=20 2.17.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#81209): https://edk2.groups.io/g/devel/message/81209 Mute This Topic: https://groups.io/mt/85920584/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sun May 19 00:42:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+81217+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+81217+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=hpe.com ARC-Seal: i=1; a=rsa-sha256; t=1632821342; cv=none; d=zohomail.com; s=zohoarc; b=mY7dsguw6Q76eNKXiI1yXX6jqN4wsEkHMYD7kssNiNVd7ZO0pm3iiHZrwFdu2qgj4bpsEPWfiiPYzRbLgGrWURBBg5qEW7G7gi+QDlbR0TXIXU+7UWigMOSb8MoSQP+Xa0VmahfZ2X8Jok8pjM97poZCF/cqTkMINH0EOHnuTbU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632821342; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=pXcXVYEnTMqOz6f1L2w/9w/PTgvnUP51+cEg5T2i7KU=; b=SJ5qRWI/gHW2MFi0wmLzuWXu4J/FYUDd1gW8QY6s1eCxO+S1US5Z6Mk81uj7s7PBZvZU3b9PfzmP22GDzzxwfMgO2FF/eZnb6v6uc0SUFz0PSvYGgq2knFIsWAsb6mdKtkh8+CKt80lChKBTtRT+xI2difnHPg/TYdKQ3nlY/PU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+81217+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 16328213429921017.2385876902154; Tue, 28 Sep 2021 02:29:02 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 0qkDYY1788612xxLgyM7Cw3X; Tue, 28 Sep 2021 02:29:02 -0700 X-Received: from mx0b-002e3701.pphosted.com (mx0b-002e3701.pphosted.com [148.163.143.35]) by mx.groups.io with SMTP id smtpd.web08.11427.1632821337942966885 for ; Tue, 28 Sep 2021 02:29:02 -0700 X-Received: from pps.filterd (m0134424.ppops.net [127.0.0.1]) by mx0b-002e3701.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 18S8aXim011883; Tue, 28 Sep 2021 09:28:42 GMT X-Received: from g4t3425.houston.hpe.com (g4t3425.houston.hpe.com [15.241.140.78]) by mx0b-002e3701.pphosted.com with ESMTP id 3bbed2gp2y-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 28 Sep 2021 09:28:42 +0000 X-Received: from g4t3433.houston.hpecorp.net (g4t3433.houston.hpecorp.net [16.208.49.245]) by g4t3425.houston.hpe.com (Postfix) with ESMTP id DD43192; Tue, 28 Sep 2021 09:28:41 +0000 (UTC) X-Received: from abner-virtual-machine.asiapacific.hpqcorp.net (abner-virtual-machine.asiapacific.hpqcorp.net [15.119.210.153]) by g4t3433.houston.hpecorp.net (Postfix) with ESMTP id D09D84C; Tue, 28 Sep 2021 09:28:39 +0000 (UTC) From: "Abner Chang" To: devel@edk2.groups.io Cc: Michael D Kinney , Liming Gao , Zhiguang Liu , Ard Biesheuvel , Leif Lindholm , Sami Mujawar , Gerd Hoffmann , Daniel Schaefer , Sunil V L Subject: [edk2-devel] [PATCH V2 7/9] MdePkg: Add PcdPciMmio32(64)Translation PCDs Date: Tue, 28 Sep 2021 16:31:05 +0800 Message-Id: <20210928083107.7418-8-abner.chang@hpe.com> In-Reply-To: <20210928083107.7418-1-abner.chang@hpe.com> References: <20210928083107.7418-1-abner.chang@hpe.com> X-Proofpoint-GUID: iHBM9dfcsiYj6QddQfW_5ItJRNiLyQ6n X-Proofpoint-ORIG-GUID: iHBM9dfcsiYj6QddQfW_5ItJRNiLyQ6n X-HPE-SCL: -1 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,abner.chang@hpe.com X-Gm-Message-State: WWvDHOMlDpBM3ecWW5nmFzbPx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1632821342; bh=D3iz8C2oaKyk/KgZSjk9Nw4o3P1KXh5oTObXJ9eEkLs=; h=Cc:Date:From:Reply-To:Subject:To; b=RcBs/0CGY8Cf4cy+l484GCBIBlt8OVIWX++H1f6Xtr6+PJJHRqQTgksetUz0t0PKSpw 5gVcTmVdOKbjN2U1UrktXBZ++YUvkjgR3uZRmgNLCpZ5qnKWU/BdVN03DBOddT0q78zCT 1Zgu+f1CVm+ggNr3xtRz5mK7EjiNxl24b6k= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1632821343733100002 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" PcdPciMmio32Translation and PcdPciMmio64Translation PCDs are added to MdePkg as the common PCDs for ARM and RSIC-V archs. The one under ArmPkg is removed in the next patch. Signed-off-by: Abner Chang Cc: Michael D Kinney Cc: Liming Gao Cc: Zhiguang Liu Cc: Ard Biesheuvel Cc: Leif Lindholm Cc: Sami Mujawar Cc: Gerd Hoffmann Cc: Daniel Schaefer Cc: Sunil V L --- MdePkg/MdePkg.dec | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec index 08d259764a..9df95abc50 100644 --- a/MdePkg/MdePkg.dec +++ b/MdePkg/MdePkg.dec @@ -2306,6 +2306,14 @@ # @Prompt PCI I/O Memory Map Window Base Address. gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation|0x0|UINT64|0x00000040 =20 + ## This value is used for the 32-bit PCI memory map I/O base address tra= nslation. + # @Prompt 32-bit PCI Memory Map I/O Base Address translation. + gEfiMdePkgTokenSpaceGuid.PcdPciMmio32Translation|0x0|UINT64|0x00000041 + + ## This value is used for the 64-bit PCI memory map I/O base address tra= nslation. + # @Prompt 64-bit PCI Memory Map I/O Base Address translation. + gEfiMdePkgTokenSpaceGuid.PcdPciMmio64Translation|0x0|UINT64|0x00000042 + ## This value is used to set the size of PCI express hierarchy. The defa= ult is 256 MB. # @Prompt PCI Express Base Size. gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseSize|0x10000000|UINT64|0x00000= 00f --=20 2.17.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#81217): https://edk2.groups.io/g/devel/message/81217 Mute This Topic: https://groups.io/mt/85920592/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sun May 19 00:42:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+81215+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+81215+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=hpe.com ARC-Seal: i=1; a=rsa-sha256; t=1632821332; cv=none; d=zohomail.com; s=zohoarc; b=Ua8cXsmYbjuhOSH+E1dKi8+m4OhbrpgvX36wJdvwtScBe2Jfh60Qi0iRqILk/GUR2akxl2fK4ToeKZ82FrpDanhHqHOcHqgIBk2PREJrxcgBKVY+QL5J1MruwY/35dR9uHyY3xJhoh4QTZvoPNt6FF6cVJRvdkWTmh378l9AXZk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632821332; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=XYPwP4QR2x+PlL9Csx7otOppJ/8IWDnugtRkBP+N/fA=; b=hLKmR7V7s29lLonVFF7KtLrARzNAkvMrZKCDj/zCcq7DfciH0TSlFmPMgFwiLQ4xcrGWwf6HDg7hX9HrCFpKaxDUENTEvSWH9Q4G3e2f1bylFp7znQMu7qoaBIvnlaHkzHzC/UECD0yCJwlRrSqJNpgaFOJM4dFgIMO6aL4aAfc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+81215+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1632821332174886.1700196187845; Tue, 28 Sep 2021 02:28:52 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id U31pYY1788612xrPAcAf8oC9; Tue, 28 Sep 2021 02:28:51 -0700 X-Received: from mx0b-002e3701.pphosted.com (mx0b-002e3701.pphosted.com [148.163.143.35]) by mx.groups.io with SMTP id smtpd.web09.11531.1632821327768287593 for ; Tue, 28 Sep 2021 02:28:51 -0700 X-Received: from pps.filterd (m0134424.ppops.net [127.0.0.1]) by mx0b-002e3701.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 18S91tbO011535; Tue, 28 Sep 2021 09:28:45 GMT X-Received: from g4t3426.houston.hpe.com (g4t3426.houston.hpe.com [15.241.140.75]) by mx0b-002e3701.pphosted.com with ESMTP id 3bbed2gp38-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 28 Sep 2021 09:28:44 +0000 X-Received: from g4t3433.houston.hpecorp.net (g4t3433.houston.hpecorp.net [16.208.49.245]) by g4t3426.houston.hpe.com (Postfix) with ESMTP id 1DDD14E; Tue, 28 Sep 2021 09:28:44 +0000 (UTC) X-Received: from abner-virtual-machine.asiapacific.hpqcorp.net (abner-virtual-machine.asiapacific.hpqcorp.net [15.119.210.153]) by g4t3433.houston.hpecorp.net (Postfix) with ESMTP id 37EED45; Tue, 28 Sep 2021 09:28:42 +0000 (UTC) From: "Abner Chang" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Leif Lindholm , Sami Mujawar , Jiewen Yao , Jordan Justen , Gerd Hoffmann , Daniel Schaefer , Sunil V L Subject: [edk2-devel] [PATCH V2 8/9] ArmVirtPkg/FdtPciHostBridgeLib: Relocate FdtPciHostBridgeLib to OvmfPkg/Fdt Date: Tue, 28 Sep 2021 16:31:06 +0800 Message-Id: <20210928083107.7418-9-abner.chang@hpe.com> In-Reply-To: <20210928083107.7418-1-abner.chang@hpe.com> References: <20210928083107.7418-1-abner.chang@hpe.com> X-Proofpoint-GUID: TuY0J7_U2BvkPRXv-yaSqk-u2EiXeRn1 X-Proofpoint-ORIG-GUID: TuY0J7_U2BvkPRXv-yaSqk-u2EiXeRn1 X-HPE-SCL: -1 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,abner.chang@hpe.com X-Gm-Message-State: 6RXDseHrGTHJ6c9F6X3jPb2hx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1632821331; bh=1c1Pzjd7r8szq7Ar08cue/xZSzI+bD+BEoadmp43shk=; h=Cc:Date:From:Reply-To:Subject:To; b=bX76ZrHvTJ0VGR3jS7tNpW97OqrshdGd3SPEPEiI4NkKcwgRogzV4BOxR93DlyPuLj9 f/dRkiRxFBy9EDeXFKhofY23TpG4MXWuNyK+E/29g0tzogSRkIbfsC+GkitJxboTmUMMd ctH4a9ZyWOZoH8MQKrGEGWRblDMJUG089d0= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1632821332801100003 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Relocate FdtPciHostBridgeLib to OvmfPkg/Fdt, this library is leverage by both ARM and RISC-V archs. Also use PcdPciMmio32Translation and PcdPciMmio64Translation PCDs provided by MdePkg instead of ArmPkg. Signed-off-by: Abner Chang Cc: Ard Biesheuvel Cc: Leif Lindholm Cc: Sami Mujawar Cc: Jiewen Yao Cc: Jordan Justen Cc: Gerd Hoffmann Cc: Daniel Schaefer Cc: Sunil V L Reviewed-By: Daniel Schaefer --- ArmPkg/ArmPkg.dec | 10 ++++------ ArmVirtPkg/ArmVirtCloudHv.dsc | 2 +- ArmVirtPkg/ArmVirtKvmTool.dsc | 2 +- ArmVirtPkg/ArmVirtQemu.dsc | 2 +- ArmVirtPkg/ArmVirtQemuKernel.dsc | 2 +- .../Fdt}/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf | 8 +++----- .../Fdt}/FdtPciHostBridgeLib/FdtPciHostBridgeLib.c | 0 7 files changed, 11 insertions(+), 15 deletions(-) rename {ArmVirtPkg/Library =3D> OvmfPkg/Fdt}/FdtPciHostBridgeLib/FdtPciHos= tBridgeLib.inf (81%) rename {ArmVirtPkg/Library =3D> OvmfPkg/Fdt}/FdtPciHostBridgeLib/FdtPciHos= tBridgeLib.c (100%) diff --git a/ArmPkg/ArmPkg.dec b/ArmPkg/ArmPkg.dec index 12584fb319..8a512b7035 100644 --- a/ArmPkg/ArmPkg.dec +++ b/ArmPkg/ArmPkg.dec @@ -338,8 +338,8 @@ # UINT64 Mmio64CpuBase; // mapping target in 64-bit cpu-physical space # # gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation =3D IoCpuBase - PcdPciI= oBase; - # PcdPciMmio32Translation =3D Mmio32CpuBase - (UINT64)PcdPciMmio32Base; - # PcdPciMmio64Translation =3D Mmio64CpuBase - PcdPciMmio64Base; + # gEfiMdePkgTokenSpaceGuid.PcdPciMmio32Translation =3D Mmio32CpuBase -= (UINT64)PcdPciMmio32Base; + # gEfiMdePkgTokenSpaceGuid.PcdPciMmio64Translation =3D Mmio64CpuBase -= PcdPciMmio64Base; # # because (a) the target address space (ie. the cpu-physical space) is # 64-bit, and (b) the translation values are meant as offsets for *modul= ar* @@ -358,9 +358,9 @@ # TranslatedIoAddress =3D UntranslatedIoAddress + # gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslati= on; # TranslatedMmio32Address =3D (UINT64)UntranslatedMmio32Address + - # PcdPciMmio32Translation; + # gEfiMdePkgTokenSpaceGuid..PcdPciMmio32Tran= slation; # TranslatedMmio64Address =3D UntranslatedMmio64Address + - # PcdPciMmio64Translation; + # gEfiMdePkgTokenSpaceGuid.PcdPciMmio64Trans= lation; # # The modular arithmetic performed in UINT64 ensures that the translati= on # works correctly regardless of the relation between IoCpuBase and @@ -371,10 +371,8 @@ gArmTokenSpaceGuid.PcdPciIoSize|0x0|UINT64|0x00000051 gArmTokenSpaceGuid.PcdPciMmio32Base|0x0|UINT32|0x00000053 gArmTokenSpaceGuid.PcdPciMmio32Size|0x0|UINT32|0x00000054 - gArmTokenSpaceGuid.PcdPciMmio32Translation|0x0|UINT64|0x00000055 gArmTokenSpaceGuid.PcdPciMmio64Base|0x0|UINT64|0x00000056 gArmTokenSpaceGuid.PcdPciMmio64Size|0x0|UINT64|0x00000057 - gArmTokenSpaceGuid.PcdPciMmio64Translation|0x0|UINT64|0x00000058 =20 # # Inclusive range of allowed PCI buses. diff --git a/ArmVirtPkg/ArmVirtCloudHv.dsc b/ArmVirtPkg/ArmVirtCloudHv.dsc index 4470fa3b14..0f26c10aab 100644 --- a/ArmVirtPkg/ArmVirtCloudHv.dsc +++ b/ArmVirtPkg/ArmVirtCloudHv.dsc @@ -51,7 +51,7 @@ FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf PciPcdProducerLib|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.= inf PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.i= nf - PciHostBridgeLib|ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridge= Lib.inf + PciHostBridgeLib|OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf PciHostBridgeUtilityLib|ArmVirtPkg/Library/ArmVirtPciHostBridgeUtilityLi= b/ArmVirtPciHostBridgeUtilityLib.inf =20 TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurem= entLibNull.inf diff --git a/ArmVirtPkg/ArmVirtKvmTool.dsc b/ArmVirtPkg/ArmVirtKvmTool.dsc index 97fc98d778..0c5da4427e 100644 --- a/ArmVirtPkg/ArmVirtKvmTool.dsc +++ b/ArmVirtPkg/ArmVirtKvmTool.dsc @@ -59,7 +59,7 @@ =20 PciPcdProducerLib|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.= inf PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.i= nf - PciHostBridgeLib|ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridge= Lib.inf + PciHostBridgeLib|OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf PciHostBridgeUtilityLib|ArmVirtPkg/Library/ArmVirtPciHostBridgeUtilityLi= b/ArmVirtPciHostBridgeUtilityLib.inf =20 TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurem= entLibNull.inf diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc index 6c949fd559..4624b6ec36 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -79,7 +79,7 @@ FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf PciPcdProducerLib|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.= inf PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.i= nf - PciHostBridgeLib|ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridge= Lib.inf + PciHostBridgeLib|OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf PciHostBridgeUtilityLib|OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostB= ridgeUtilityLib.inf =20 !if $(TPM2_ENABLE) =3D=3D TRUE diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKerne= l.dsc index 64035a948d..426e0ff1fd 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc @@ -77,7 +77,7 @@ FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf PciPcdProducerLib|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.= inf PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.i= nf - PciHostBridgeLib|ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridge= Lib.inf + PciHostBridgeLib|OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf PciHostBridgeUtilityLib|OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostB= ridgeUtilityLib.inf TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurem= entLibNull.inf =20 diff --git a/ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf= b/OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf similarity index 81% rename from ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf rename to OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf index f149693fa2..e610e3d03f 100644 --- a/ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf +++ b/OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf @@ -20,15 +20,13 @@ # The following information is for reference only and not required by the = build # tools. # -# VALID_ARCHITECTURES =3D AARCH64 ARM +# VALID_ARCHITECTURES =3D AARCH64 ARM RISCV64 # =20 [Sources] FdtPciHostBridgeLib.c =20 [Packages] - ArmPkg/ArmPkg.dec - ArmVirtPkg/ArmVirtPkg.dec EmbeddedPkg/EmbeddedPkg.dec MdeModulePkg/MdeModulePkg.dec MdePkg/MdePkg.dec @@ -44,8 +42,8 @@ PciPcdProducerLib =20 [FixedPcd] - gArmTokenSpaceGuid.PcdPciMmio32Translation - gArmTokenSpaceGuid.PcdPciMmio64Translation + gEfiMdePkgTokenSpaceGuid.PcdPciMmio32Translation + gEfiMdePkgTokenSpaceGuid.PcdPciMmio64Translation =20 [Pcd] gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation diff --git a/ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.c b= /OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.c similarity index 100% rename from ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.c rename to OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.c --=20 2.17.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#81215): https://edk2.groups.io/g/devel/message/81215 Mute This Topic: https://groups.io/mt/85920590/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sun May 19 00:42:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+81216+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+81216+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=hpe.com ARC-Seal: i=1; a=rsa-sha256; t=1632821339; cv=none; d=zohomail.com; s=zohoarc; b=kBPwruqQfIlFufoXYoK4zRj88i2U4uqkBfnJi6Goy1woqAiKduIKoBcSpU6Ey/+vo6nvGkqMUfa8AHlz+qCpWFJy+utv/DZHGj3SHlZ5U7UoKjpuN04lKuqZSFfIHpN10bPlt1cUuVchL8zFTBxJe2VeVUmb9IMMoQMAkFZMflQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632821339; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=gTEwCyhit9KH8WKMMjV4bIBgmbxdXTknbRinoD+ZcPM=; b=fZB+pCAdbg6BYbOj8DhaDrzda79Z8dMeEORZIK1nbQxi7zacBYWydE27RAaU4g3uTmbKJ69MlZnsblBGIQ9nDSkMxyF0MyYJuJscqKAyYLZyh4Gr5GCcnQgxSYCU2GdWfZ6o0P0MHxMdLVTB2jw7urj+wbmRUr5UFjANJCVTnds= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+81216+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1632821339116937.4271571680202; Tue, 28 Sep 2021 02:28:59 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id XqZTYY1788612xqVul2P9jKL; Tue, 28 Sep 2021 02:28:58 -0700 X-Received: from mx0b-002e3701.pphosted.com (mx0b-002e3701.pphosted.com [148.163.143.35]) by mx.groups.io with SMTP id smtpd.web12.11594.1632821330143754956 for ; Tue, 28 Sep 2021 02:28:58 -0700 X-Received: from pps.filterd (m0150244.ppops.net [127.0.0.1]) by mx0b-002e3701.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 18S94f83009732; Tue, 28 Sep 2021 09:28:47 GMT X-Received: from g9t5008.houston.hpe.com (g9t5008.houston.hpe.com [15.241.48.72]) by mx0b-002e3701.pphosted.com with ESMTP id 3bc03pr5t2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 28 Sep 2021 09:28:46 +0000 X-Received: from g4t3433.houston.hpecorp.net (g4t3433.houston.hpecorp.net [16.208.49.245]) by g9t5008.houston.hpe.com (Postfix) with ESMTP id 5161657; Tue, 28 Sep 2021 09:28:46 +0000 (UTC) X-Received: from abner-virtual-machine.asiapacific.hpqcorp.net (abner-virtual-machine.asiapacific.hpqcorp.net [15.119.210.153]) by g4t3433.houston.hpecorp.net (Postfix) with ESMTP id 6B4414C; Tue, 28 Sep 2021 09:28:44 +0000 (UTC) From: "Abner Chang" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Leif Lindholm , Sami Mujawar , Jiewen Yao , Jordan Justen , Gerd Hoffmann , Daniel Schaefer , Sunil V L Subject: [edk2-devel] [PATCH V2 9/9] ArmVirtPkg/VirtioFdtDxe: Relocate VirtioFdtDxe to OvmfPkg/Fdt Date: Tue, 28 Sep 2021 16:31:07 +0800 Message-Id: <20210928083107.7418-10-abner.chang@hpe.com> In-Reply-To: <20210928083107.7418-1-abner.chang@hpe.com> References: <20210928083107.7418-1-abner.chang@hpe.com> X-Proofpoint-GUID: IOJS6kP1PU2_0gd-wC79tbX2hWCIKCJl X-Proofpoint-ORIG-GUID: IOJS6kP1PU2_0gd-wC79tbX2hWCIKCJl X-HPE-SCL: -1 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,abner.chang@hpe.com X-Gm-Message-State: GYAgCUbWnYUDrIYvxjDHONv7x1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1632821338; bh=agkGXHf4ZK5Q9huVCWJIEoGtX+3igArt26Q6R3ELkS8=; h=Cc:Date:From:Reply-To:Subject:To; b=KLdz0fQWos+Mvv0fj9fwh9L//BhP+FPJMbbgM6qKQNtnG+oJ5FNKiMzY0iYojeycRiS KZz+nsUF1n+LEVZtbWH0j0H5SCjOSFVGKpPFAgVhK1SVtpbe2wsITwd6F2T1uuNdRDeSY UPcp4VQbyzSql9a6PM0Gckdncod5rQSKyVQ= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1632821339336100001 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Relocate VirtioFdtDxe to OvmfPkg/Fdt, this driver is leverage by both ARM and RISC-V archs. Signed-off-by: Abner Chang Cc: Ard Biesheuvel Cc: Leif Lindholm Cc: Sami Mujawar Cc: Jiewen Yao Cc: Jordan Justen Cc: Gerd Hoffmann Cc: Daniel Schaefer Cc: Sunil V L Reviewed-By: Daniel Schaefer --- ArmVirtPkg/ArmVirtCloudHv.dsc | 2 +- ArmVirtPkg/ArmVirtKvmTool.dsc | 2 +- ArmVirtPkg/ArmVirtQemu.dsc | 2 +- ArmVirtPkg/ArmVirtQemuKernel.dsc | 2 +- ArmVirtPkg/ArmVirtCloudHv.fdf | 2 +- ArmVirtPkg/ArmVirtKvmTool.fdf | 2 +- ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc | 2 +- {ArmVirtPkg =3D> OvmfPkg/Fdt}/VirtioFdtDxe/VirtioFdtDxe.inf | 1 - {ArmVirtPkg =3D> OvmfPkg/Fdt}/VirtioFdtDxe/VirtioFdtDxe.c | 0 9 files changed, 7 insertions(+), 8 deletions(-) rename {ArmVirtPkg =3D> OvmfPkg/Fdt}/VirtioFdtDxe/VirtioFdtDxe.inf (93%) rename {ArmVirtPkg =3D> OvmfPkg/Fdt}/VirtioFdtDxe/VirtioFdtDxe.c (100%) diff --git a/ArmVirtPkg/ArmVirtCloudHv.dsc b/ArmVirtPkg/ArmVirtCloudHv.dsc index 0f26c10aab..9ad124522f 100644 --- a/ArmVirtPkg/ArmVirtCloudHv.dsc +++ b/ArmVirtPkg/ArmVirtCloudHv.dsc @@ -292,7 +292,7 @@ # # Platform Driver # - ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf + OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.inf EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf OvmfPkg/VirtioBlkDxe/VirtioBlk.inf diff --git a/ArmVirtPkg/ArmVirtKvmTool.dsc b/ArmVirtPkg/ArmVirtKvmTool.dsc index 0c5da4427e..9d23072d8f 100644 --- a/ArmVirtPkg/ArmVirtKvmTool.dsc +++ b/ArmVirtPkg/ArmVirtKvmTool.dsc @@ -291,7 +291,7 @@ # Platform Driver # ArmVirtPkg/KvmtoolPlatformDxe/KvmtoolPlatformDxe.inf - ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf + OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.inf EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf OvmfPkg/VirtioBlkDxe/VirtioBlk.inf diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc index 4624b6ec36..6d41c8ac55 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -403,7 +403,7 @@ # # Platform Driver # - ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf + OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.inf EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf OvmfPkg/VirtioBlkDxe/VirtioBlk.inf diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKerne= l.dsc index 426e0ff1fd..19544ea898 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc @@ -339,7 +339,7 @@ # # Platform Driver # - ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf + OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.inf EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf OvmfPkg/VirtioBlkDxe/VirtioBlk.inf diff --git a/ArmVirtPkg/ArmVirtCloudHv.fdf b/ArmVirtPkg/ArmVirtCloudHv.fdf index 7ecf5ca88d..81c539590a 100644 --- a/ArmVirtPkg/ArmVirtCloudHv.fdf +++ b/ArmVirtPkg/ArmVirtCloudHv.fdf @@ -105,7 +105,7 @@ READ_LOCK_STATUS =3D TRUE =20 INF MdeModulePkg/Core/Dxe/DxeMain.inf INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf - INF ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf + INF OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.inf INF EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf INF OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf =20 diff --git a/ArmVirtPkg/ArmVirtKvmTool.fdf b/ArmVirtPkg/ArmVirtKvmTool.fdf index 0535d36b7d..14a5fce43a 100644 --- a/ArmVirtPkg/ArmVirtKvmTool.fdf +++ b/ArmVirtPkg/ArmVirtKvmTool.fdf @@ -119,7 +119,7 @@ READ_LOCK_STATUS =3D TRUE =20 INF MdeModulePkg/Core/Dxe/DxeMain.inf INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf - INF ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf + INF OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.inf INF EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf INF ArmVirtPkg/KvmtoolPlatformDxe/KvmtoolPlatformDxe.inf INF OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuF= vMain.fdf.inc index 279b905edd..f6a538df72 100644 --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc @@ -40,7 +40,7 @@ READ_LOCK_STATUS =3D TRUE =20 INF MdeModulePkg/Core/Dxe/DxeMain.inf INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf - INF ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf + INF OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.inf INF EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf INF OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf =20 diff --git a/ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf b/OvmfPkg/Fdt/VirtioF= dtDxe/VirtioFdtDxe.inf similarity index 93% rename from ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf rename to OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.inf index 9d5ae7b12f..dece5c806b 100644 --- a/ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf +++ b/OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.inf @@ -20,7 +20,6 @@ VirtioFdtDxe.c =20 [Packages] - ArmVirtPkg/ArmVirtPkg.dec EmbeddedPkg/EmbeddedPkg.dec MdePkg/MdePkg.dec OvmfPkg/OvmfPkg.dec diff --git a/ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.c b/OvmfPkg/Fdt/VirtioFdt= Dxe/VirtioFdtDxe.c similarity index 100% rename from ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.c rename to OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.c --=20 2.17.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#81216): https://edk2.groups.io/g/devel/message/81216 Mute This Topic: https://groups.io/mt/85920591/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-