From nobody Sat May 18 05:53:12 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+81298+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+81298+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=hpe.com ARC-Seal: i=1; a=rsa-sha256; t=1632966209; cv=none; d=zohomail.com; s=zohoarc; b=WcE1rALTGQg/MIWSr6Iw+8c1EQE9acMXgWPny06cunAlFIaboFcXwlzt965mgmUT6tvtLRmj58JEJNQyaSQfpAn289aGe3NYt6TPp+VylBeYPrWfJqj9XnqeZIALusH0mLgKWIUJGGLdG8Bf9qP2oQ3V35k9LzQ1dErjlHLhh64= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632966209; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=Shdmvs6+nICsUNCT+DXFPWNDqo4Osp4Oww9TOqU7hD8=; b=mjyIf6ayVabpZB49V3OzsHHOeHrhKzQfQo8LMrgGIKp4Kk3Xy676F5z0S0zlL/UZMujno1PT1HEyh6Th/PMLZi5KxNuYdkAg25HFcRDEkJq/YAq3wnLJbPkoTubliqshIyxXyPbWqhQKRFCUZKzcGOBBziL0U6SAOqh7ySRVqpg= 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+81298+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 1632966209163223.6485798197043; Wed, 29 Sep 2021 18:43:29 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id CkntYY1788612xFuK4fra5MH; Wed, 29 Sep 2021 18:43:28 -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.6540.1632966199228295942 for ; Wed, 29 Sep 2021 18:43:27 -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 18U1Paus001702; Thu, 30 Sep 2021 01:43:15 GMT X-Received: from g2t2352.austin.hpe.com (g2t2352.austin.hpe.com [15.233.44.25]) by mx0b-002e3701.pphosted.com with ESMTP id 3bd3jkg2s6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 30 Sep 2021 01:43:14 +0000 X-Received: from g2t2360.austin.hpecorp.net (g2t2360.austin.hpecorp.net [16.196.225.135]) by g2t2352.austin.hpe.com (Postfix) with ESMTP id 1132785; Thu, 30 Sep 2021 01:43:14 +0000 (UTC) X-Received: from abner-virtual-machine.asiapacific.hpqcorp.net (abner-virtual-machine.asiapacific.hpqcorp.net [15.119.210.153]) by g2t2360.austin.hpecorp.net (Postfix) with ESMTP id 8131A36; Thu, 30 Sep 2021 01:43:12 +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 V3 01/12] ArmVirtPkg/FdtClintDxe: Move FdtClientDxe to EmbeddedPkg Date: Thu, 30 Sep 2021 08:45:37 +0800 Message-Id: <20210930004548.3033-2-abner.chang@hpe.com> In-Reply-To: <20210930004548.3033-1-abner.chang@hpe.com> References: <20210930004548.3033-1-abner.chang@hpe.com> X-Proofpoint-GUID: wYcrEdNPwmPFOSNzRUJO6k-z9aMdgJAh X-Proofpoint-ORIG-GUID: wYcrEdNPwmPFOSNzRUJO6k-z9aMdgJAh 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: fFm0YFZJmQ3z8Kgt6925Xz16x1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1632966208; bh=efHRvwsp2O4jJ8v25Z7CJTVYv687BuM0/4X7JLfJARo=; h=Cc:Date:From:Reply-To:Subject:To; b=p2dHNKaRbdS4weDDMobxNGeAl7Vtf19QtOGuV8FLbUxdPPCrhJW2vTkuqJTp3CoAgUo aus6XNO0PM8uw+mI6jTQSwnrNbf/kQxhFIV+viIf29+cG31IYt2J/Ddo1zsa5hZisfHGD bC6xfQ2KJyhTaSb4FkUtR/u5MbnwE/4VJd8= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1632966211144100001 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 Acked-by: Gerd Hoffmann Reviewed-By: Daniel Schaefer Reviewed-by: Sunil V L --- 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 (#81298): https://edk2.groups.io/g/devel/message/81298 Mute This Topic: https://groups.io/mt/85964658/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 Sat May 18 05:53:12 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+81305+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+81305+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=hpe.com ARC-Seal: i=1; a=rsa-sha256; t=1632966217; cv=none; d=zohomail.com; s=zohoarc; b=iFuyi0MXiCVlGrOWmclsgSjbnpMsdJyQ6aiknvsyq6UfWvHz8nQhMgtQc9bbnaFFmCX9hIW7RdYezMS2tHaIfOSgXER6OHTDAEeAm6teZN0CNdJUE/9dLluNBaJ7cQUgW40sPgfiv3MTTbt/6w6Betge37l95oa6hcttFdU4t+I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632966217; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=Cr1xUuu69lWLOmf8zh9Kiau+marpQcrlEjtNxgyS/Ac=; b=f0t8lHJI/wrm/3t16WCB/t/HNUJFKN4aoLknciy30T7+YJ52PjivrFZk+Cha/tQZ8O0YrWYqiIHHGP1ZyxEK2c99mdRW0V2E8VYSbcfY4Dzlq2hI24rE/RhgTC4zGlFO5BATz0CMcV0i41usocWBwAddoRNoduKg+Ykb7+sYhao= 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+81305+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 1632966217673892.8658554271427; Wed, 29 Sep 2021 18:43:37 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id z92YYY1788612xuiR4k1UKp4; Wed, 29 Sep 2021 18:43:37 -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.6549.1632966212719846202 for ; Wed, 29 Sep 2021 18:43:36 -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 18TKL2ND026907; Thu, 30 Sep 2021 01:43:18 GMT X-Received: from g2t2353.austin.hpe.com (g2t2353.austin.hpe.com [15.233.44.26]) by mx0b-002e3701.pphosted.com with ESMTP id 3bct2vcrcn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 30 Sep 2021 01:43:18 +0000 X-Received: from g2t2360.austin.hpecorp.net (g2t2360.austin.hpecorp.net [16.196.225.135]) by g2t2353.austin.hpe.com (Postfix) with ESMTP id 73C5784; Thu, 30 Sep 2021 01:43:16 +0000 (UTC) X-Received: from abner-virtual-machine.asiapacific.hpqcorp.net (abner-virtual-machine.asiapacific.hpqcorp.net [15.119.210.153]) by g2t2360.austin.hpecorp.net (Postfix) with ESMTP id 5D16939; Thu, 30 Sep 2021 01:43:14 +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 V3 02/12] MdePkg: Add PcdPciIoTranslation PCD Date: Thu, 30 Sep 2021 08:45:38 +0800 Message-Id: <20210930004548.3033-3-abner.chang@hpe.com> In-Reply-To: <20210930004548.3033-1-abner.chang@hpe.com> References: <20210930004548.3033-1-abner.chang@hpe.com> X-Proofpoint-ORIG-GUID: r_A3RDo0vjUaPBsGN7DjYNx0TfE5KRqF X-Proofpoint-GUID: r_A3RDo0vjUaPBsGN7DjYNx0TfE5KRqF 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: aXNufcHv72Hji2diJgg9uLMcx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1632966217; bh=nT/bJMFXgVsPRw3mopvoliWmx/M3gWokR3StuAFtVlI=; h=Cc:Date:From:Reply-To:Subject:To; b=I6LxnCRuzVb5I/91Hg98TjSFR0+UYjyNcChfHCj1nzRsA4vBTzoR3nU/2tjm/tyn64a Rvz8unocz8gh/GOMuO5cnYp1PZBomK+cJ3fr97EWzV115+JOXIo4pkh3QZp+KdizmX+We 27/rGOCQhV7l7ifv06tdKB13wHoPTurmbNI= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1632966219801100002 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 Acked-by: Gerd Hoffmann Reviewed-By: Daniel Schaefer Reviewed-by: 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 (#81305): https://edk2.groups.io/g/devel/message/81305 Mute This Topic: https://groups.io/mt/85964668/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 Sat May 18 05:53:12 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+81301+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+81301+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=hpe.com ARC-Seal: i=1; a=rsa-sha256; t=1632966212; cv=none; d=zohomail.com; s=zohoarc; b=hOMBiyAjzh26sMKuG2BhkElMgnA5Dn1MqRHS8dGl+7dyD7fweNKaaqfchmmazYEWFMabxV/SXRYi/R5TmkyXAHYN4Zp5Z0YaNqFRnFAIvLU8w8QUg86weejp0jbipLiLhGqTynwlaREotJvuMXBKhtfj2DdPRyy3uBpY/S/aqIM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632966212; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=kEVRY6VhGQE0Bjnu+qOggOgK47QhO3ce1R7MtGgqn+s=; b=cSz/wiQBgiVzUHdU790H8PICTRO/RoadcerzpaeQr7bqcb5HnlPfnUdX2ll/fhn6sB1tVe9jnakimJ0TP9zmuvLtZm9sgSk20hsEhKWuNsh1VHlAfFTL0PMimYlTAUSe4hWSGWbao08uW6sGl2MevdfjaNFr8fFuqipMGpmcDHM= 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+81301+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 1632966212414636.7430189040806; Wed, 29 Sep 2021 18:43:32 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 75sDYY1788612xlCXhwg2hBR; Wed, 29 Sep 2021 18:43:32 -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.6730.1632966203187861200 for ; Wed, 29 Sep 2021 18:43:31 -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 18TMXGSC018514; Thu, 30 Sep 2021 01:43:18 GMT X-Received: from g2t2354.austin.hpe.com (g2t2354.austin.hpe.com [15.233.44.27]) by mx0b-002e3701.pphosted.com with ESMTP id 3bcy5qhq9g-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 30 Sep 2021 01:43:18 +0000 X-Received: from g2t2360.austin.hpecorp.net (g2t2360.austin.hpecorp.net [16.196.225.135]) by g2t2354.austin.hpe.com (Postfix) with ESMTP id 4EFEE81; Thu, 30 Sep 2021 01:43:18 +0000 (UTC) X-Received: from abner-virtual-machine.asiapacific.hpqcorp.net (abner-virtual-machine.asiapacific.hpqcorp.net [15.119.210.153]) by g2t2360.austin.hpecorp.net (Postfix) with ESMTP id BD94D39; Thu, 30 Sep 2021 01:43:16 +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 V3 03/12] ArmPkg: Use PcdPciIoTranslation PCD from MdePkg Date: Thu, 30 Sep 2021 08:45:39 +0800 Message-Id: <20210930004548.3033-4-abner.chang@hpe.com> In-Reply-To: <20210930004548.3033-1-abner.chang@hpe.com> References: <20210930004548.3033-1-abner.chang@hpe.com> X-Proofpoint-GUID: iKrYKoZnbKeX38FtBppVjL0X4-okIIWw X-Proofpoint-ORIG-GUID: iKrYKoZnbKeX38FtBppVjL0X4-okIIWw 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: nl8OXgqOKv5CfEkbYXp2GQ3ax1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1632966212; bh=GBpSVvS8gH5A8GWhtNhUffhXo1rQqEeZOKpebp5p+rI=; h=Cc:Date:From:Reply-To:Subject:To; b=t+AmKdjFbpM9DlD+qOGsVQKa2GcWL6/6hFeUPucmJIyBKTTRvqI/QHd/7cOKujYT5Z0 dn9C5nVELHzfhP43o2kRIUvSVFCETI9RhnpZYZgsj8GdA8F6f6o2w2ycYqlrkcQKYlmiM 8IY3dVaOzCwwl9iHduWJbnbM0MwWuJEJUXc= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1632966213557100003 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 Acked-by: Gerd Hoffmann Reviewed-By: Daniel Schaefer Reviewed-by: Sunil V L --- 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 (#81301): https://edk2.groups.io/g/devel/message/81301 Mute This Topic: https://groups.io/mt/85964662/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 Sat May 18 05:53:12 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+81303+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+81303+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=hpe.com ARC-Seal: i=1; a=rsa-sha256; t=1632966214; cv=none; d=zohomail.com; s=zohoarc; b=Q9eAqhCS6qHb0Yvoz9PTcJTyFL3zC9DftQmE+4voUgAfvNmfA2y8cM0XlaIiP1MbsB47QVyoiJ7Je4iokSYlIqOd+RS4LwNWblsR9WDePwX9rZQgos/TIJsZHH+QKtxAKax3PA2lrDJd9IvCELY83KIXVRQnMlnhuTI4t6SWNeo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632966214; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=cV/iPClJCJzH+TF9ZlV+gAPrMZyE/RprPMdi/FL0hkQ=; b=WZl869pnCpUTEnnT0zYWUL2aJ/AI/xug69MvcnZRM0irneV4d3FpSGzNQf8FMK6KNXnpVDkRymTX7y4CDPIVZ9fn3bPdM065Swn5E9Ioqi6tKUFMmJvFpUIa7wl1b3iUFGFTSs1KOc7Eo7jmx0q4YIrO9+BEXe2D8a09Rd4XmXA= 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+81303+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 163296621465771.78096145432073; Wed, 29 Sep 2021 18:43:34 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id SJeSYY1788612xDGuNEpxYro; Wed, 29 Sep 2021 18:43:34 -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.6729.1632966204585923861 for ; Wed, 29 Sep 2021 18:43:32 -0700 X-Received: from pps.filterd (m0150245.ppops.net [127.0.0.1]) by mx0b-002e3701.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 18TLWNVW020654; Thu, 30 Sep 2021 01:43:21 GMT X-Received: from g2t2352.austin.hpe.com (g2t2352.austin.hpe.com [15.233.44.25]) by mx0b-002e3701.pphosted.com with ESMTP id 3bcs1n5cvv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 30 Sep 2021 01:43:21 +0000 X-Received: from g2t2360.austin.hpecorp.net (g2t2360.austin.hpecorp.net [16.196.225.135]) by g2t2352.austin.hpe.com (Postfix) with ESMTP id 7CB9563; Thu, 30 Sep 2021 01:43:20 +0000 (UTC) X-Received: from abner-virtual-machine.asiapacific.hpqcorp.net (abner-virtual-machine.asiapacific.hpqcorp.net [15.119.210.153]) by g2t2360.austin.hpecorp.net (Postfix) with ESMTP id 9A8D039; Thu, 30 Sep 2021 01:43:18 +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 V3 04/12] ArmVirtPkg/FdtPciPcdProducerLib: Relocate PciPcdProducerLib to OvmfPkg Date: Thu, 30 Sep 2021 08:45:40 +0800 Message-Id: <20210930004548.3033-5-abner.chang@hpe.com> In-Reply-To: <20210930004548.3033-1-abner.chang@hpe.com> References: <20210930004548.3033-1-abner.chang@hpe.com> X-Proofpoint-GUID: PhGezKwDo5Xrd7GeJIkFEHtSdV9ut0KU X-Proofpoint-ORIG-GUID: PhGezKwDo5Xrd7GeJIkFEHtSdV9ut0KU 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: 6PCnwzg4fEMA4VQGqDZKoSTkx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1632966214; bh=5q+H3GsK4OZ/iQD2LYQKarxwzcKHO/08xrtnZHMfYKs=; h=Cc:Date:From:Reply-To:Subject:To; b=Gl7pCKyVKXE8FkiK4YKDGksw05PN2ULQCzlGZfaIGZZsu88SQLWNqAIZ/nnJ4Xrbj4c vYCdkKO6cqIUooQOXr7dxUnIf+Fq2NMGM9zT0Dl0foiZlSW/cCqJXr4gPH3PAA3FCnSp+ Uymrxp8zizkhsJZXFbJlGAPLr8ZXhXI8SJU= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1632966215645100017 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 Acked-by: Gerd Hoffmann Reviewed-By: Daniel Schaefer Reviewed-by: Sunil V L --- 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..ac2526f574 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 +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 (#81303): https://edk2.groups.io/g/devel/message/81303 Mute This Topic: https://groups.io/mt/85964664/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 Sat May 18 05:53:12 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+81304+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+81304+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=hpe.com ARC-Seal: i=1; a=rsa-sha256; t=1632966214; cv=none; d=zohomail.com; s=zohoarc; b=g6Hctsgi2ygCRg66uoBQnOQRBGuWpujkGQrWJDKdP+7N/+Rq3ZfUOhg1Sq71bZTlvUzcuS+bzl1cN0KGngyW37CgOYO2lbkx5kK2HP785ggtTdUTDUcrbFJ7Fomkl9Dg4sQHApYzxrueLU5L2marXwUgiOiW4ZBCO9DtUv2tlg4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632966214; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=nfnzBT95VHWtNd9bcsbSNuEPCTVb1BjFGWWBN0qPDPw=; b=Dnr+uyRoMK3mSguWa7KSKsOj6P1nDKZCWrka/KkxZg6XkNYGqw8UKXkIr2d235nUhPdNIMqZWNIjg0QJRXhR7t4TPIalrINXirSqq1cwnE6AlB+gWMJyTMzLx3DsURM6b/VDiyzMw19cwFZMfp+OrbEHduOnjqQ5RF1Tb1i9PMw= 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+81304+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 16329662146341023.6385042864973; Wed, 29 Sep 2021 18:43:34 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id ZPZHYY1788612xGBDDqNUaV2; Wed, 29 Sep 2021 18:43:34 -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.6730.1632966207028311486 for ; Wed, 29 Sep 2021 18:43:32 -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 18TKKmD3003112; Thu, 30 Sep 2021 01:43:23 GMT X-Received: from g2t2354.austin.hpe.com (g2t2354.austin.hpe.com [15.233.44.27]) by mx0b-002e3701.pphosted.com with ESMTP id 3bcmr8frj6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 30 Sep 2021 01:43:23 +0000 X-Received: from g2t2360.austin.hpecorp.net (g2t2360.austin.hpecorp.net [16.196.225.135]) by g2t2354.austin.hpe.com (Postfix) with ESMTP id A9E3481; Thu, 30 Sep 2021 01:43:22 +0000 (UTC) X-Received: from abner-virtual-machine.asiapacific.hpqcorp.net (abner-virtual-machine.asiapacific.hpqcorp.net [15.119.210.153]) by g2t2360.austin.hpecorp.net (Postfix) with ESMTP id C7D3439; Thu, 30 Sep 2021 01:43:20 +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 V3 05/12] ArmVirtPkg/HighMemDxe: Relocate HighMemDxe to OvmfPkg Date: Thu, 30 Sep 2021 08:45:41 +0800 Message-Id: <20210930004548.3033-6-abner.chang@hpe.com> In-Reply-To: <20210930004548.3033-1-abner.chang@hpe.com> References: <20210930004548.3033-1-abner.chang@hpe.com> X-Proofpoint-ORIG-GUID: JHWdNhfHwq9CDjtfVHuI4t16G_dLZWW9 X-Proofpoint-GUID: JHWdNhfHwq9CDjtfVHuI4t16G_dLZWW9 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: P2VcIJpazD30W5QhFVtgozorx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1632966214; bh=wHFQTUvNsC7zH1ZzNVbx+AMx4x5zkm7v15/bur2u3po=; h=Cc:Date:From:Reply-To:Subject:To; b=Ee2f2JnPMB1uVW+uX/f2GVuGbqI7toO8ccblrISiJKPn+b3jfmOpCLIAQvEWxx5A+SS wCQwZkAAdhXEnVLI/Q3Kr/2+WNGIBzEQ0eP20/HYNn+eqEx6UMi7l1OXNf/fmR0BozOjJ OsY75p30w2qqIADMWTxhgE+SO1J1h7t8fzQ= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1632966215650100018 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 Acked-by: Gerd Hoffmann Reviewed-By: Daniel Schaefer Reviewed-by: 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 (#81304): https://edk2.groups.io/g/devel/message/81304 Mute This Topic: https://groups.io/mt/85964665/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 Sat May 18 05:53:12 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+81299+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+81299+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=hpe.com ARC-Seal: i=1; a=rsa-sha256; t=1632966209; cv=none; d=zohomail.com; s=zohoarc; b=f4azGrSQ4FA48hYrVaXKLaHFcVqEppS+L2UwVp/oLacv4vnt7GHNJlePfmREWk0hrCDuzK72WLQl+c9G20ARNqt4yGl83Tvxb1xQuKy//mWg5JcdTiDVQhyhFd2TlSL1JnqwnoVL1tsrhmGKdNx8Pc4INuxB/Qd5MC0+owDRycY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632966209; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=T+rmU0uU2so+71mvsw7E6oN+sm1LJ+V2hdWGV/9LGfQ=; b=JRzrSrCvFXSRUloxhIhaijFXMs8AVBR3bS5PNxycaXuuxXt7TYpPzEWmOtYq/VUJHz/VpcOP9ltpYAEQV4PjOOdf9w7569bSHLBAE5+FT0Mh7I2SvDNsOXBAh//JnY7NyY3HM05iKQfEpWiw+BCNSiqfIbKVCZG81O2kj6Zx1/8= 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+81299+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 1632966209113763.2734988973284; Wed, 29 Sep 2021 18:43:29 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 8YXoYY1788612xE1uR6Gcrdf; Wed, 29 Sep 2021 18:43:28 -0700 X-Received: from mx0a-002e3701.pphosted.com (mx0a-002e3701.pphosted.com [148.163.147.86]) by mx.groups.io with SMTP id smtpd.web08.6542.1632966207247359891 for ; Wed, 29 Sep 2021 18:43:27 -0700 X-Received: from pps.filterd (m0134422.ppops.net [127.0.0.1]) by mx0b-002e3701.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 18TKKdVM012188; Thu, 30 Sep 2021 01:43:25 GMT X-Received: from g2t2354.austin.hpe.com (g2t2354.austin.hpe.com [15.233.44.27]) by mx0b-002e3701.pphosted.com with ESMTP id 3bcmfgywja-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 30 Sep 2021 01:43:25 +0000 X-Received: from g2t2360.austin.hpecorp.net (g2t2360.austin.hpecorp.net [16.196.225.135]) by g2t2354.austin.hpe.com (Postfix) with ESMTP id 3C49A81; Thu, 30 Sep 2021 01:43:24 +0000 (UTC) X-Received: from abner-virtual-machine.asiapacific.hpqcorp.net (abner-virtual-machine.asiapacific.hpqcorp.net [15.119.210.153]) by g2t2360.austin.hpecorp.net (Postfix) with ESMTP id 00F0E39; Thu, 30 Sep 2021 01:43:22 +0000 (UTC) From: "Abner Chang" To: devel@edk2.groups.io Cc: Leif Lindholm , Gerd Hoffmann , Daniel Schaefer , Sunil V L Subject: [edk2-devel] [PATCH V3 06/12] OvmfPkg/HighMemDxe: Add RISC-V in the supported arch. Date: Thu, 30 Sep 2021 08:45:42 +0800 Message-Id: <20210930004548.3033-7-abner.chang@hpe.com> In-Reply-To: <20210930004548.3033-1-abner.chang@hpe.com> References: <20210930004548.3033-1-abner.chang@hpe.com> X-Proofpoint-ORIG-GUID: eh7H8byL8VpRFpSPAueU5dMsx9yF_ju1 X-Proofpoint-GUID: eh7H8byL8VpRFpSPAueU5dMsx9yF_ju1 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: XdGvvrL93ccjrgT4AWplWu2lx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1632966208; bh=m06HgGh9kwH82D6AgzQXVBxXWjYHd1koJ2CdQb8GyIQ=; h=Cc:Date:From:Reply-To:Subject:To; b=Z9J21YD3vFWBEiFrvqU/Ngw3FjbIVcwZEHx+OXEYOyCzra5gldzzoRsbC/+yQbg5xV1 81Oo1SGD3fEPqYu1HC3kfthwL3AGm89nsyBwm77Da24udN81a0c0FDl5x0iQhx7oDB4ec 4O82skhW5/mZw8QsH41Q6OV6P83Utcy+jEs= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1632966211241100002 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add RISC-V VM in the file header. Add RISC-V to the supported arch. Signed-off-by: Abner Chang Cc: Leif Lindholm Cc: Gerd Hoffmann Cc: Daniel Schaefer Cc: Sunil V L Acked-by: Gerd Hoffmann Reviewed-By: Daniel Schaefer Reviewed-by: Sunil V L --- OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf | 3 ++- OvmfPkg/Fdt/HighMemDxe/HighMemDxe.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf b/OvmfPkg/Fdt/HighMemDxe= /HighMemDxe.inf index 45779a2d59..c7dde9f455 100644 --- a/OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf +++ b/OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf @@ -1,5 +1,6 @@ ## @file -# High memory node enumeration DXE driver for ARM Virtual Machines +# High memory node enumeration DXE driver for ARM and RISC-V +# Virtual Machines # # Copyright (c) 2015-2016, Linaro Ltd. All rights reserved. # diff --git a/OvmfPkg/Fdt/HighMemDxe/HighMemDxe.c b/OvmfPkg/Fdt/HighMemDxe/H= ighMemDxe.c index c383757364..3bcd3eb213 100644 --- a/OvmfPkg/Fdt/HighMemDxe/HighMemDxe.c +++ b/OvmfPkg/Fdt/HighMemDxe/HighMemDxe.c @@ -1,5 +1,6 @@ /** @file -* High memory node enumeration DXE driver for ARM Virtual Machines +* High memory node enumeration DXE driver for ARM and RISC-V +* Virtual Machines * * Copyright (c) 2015-2016, Linaro Ltd. All rights reserved. * --=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 (#81299): https://edk2.groups.io/g/devel/message/81299 Mute This Topic: https://groups.io/mt/85964659/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 Sat May 18 05:53:12 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+81300+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+81300+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=hpe.com ARC-Seal: i=1; a=rsa-sha256; t=1632966212; cv=none; d=zohomail.com; s=zohoarc; b=l4rR6KdeBvqUBRzNBLkGD/ioz7cjN5lK2c9SwMeXWsFYeqMgEMk8XlbZKldWE4xsiV7r2kdtdcKIC3FG4DtxdI7aTQ6G6jQXCiTNZ9ddKZxhkJpRuB0uysgTk2ZxNs1ewvcnNJmCvl8eqnwMHeqD+4pt+Z3eHkISJ5LcNYPFQew= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632966212; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=NFq20h4NrUR95yAD7URTNyZjdy1r2PArCrASJngDTRw=; b=ShbZfh+unPRx4YmSw3mDTE4ElSd8jkjHNR5SaJAxyVtLMYVHau1ogK+m3/q7Fr3iBN1jNlRiD6jWaUE0ZsfaL0yVgn3c5N0h/fLQm4KEBwG7pRRM/yi3e4hzL4h9ZdyR3iMdaNJkiJ6P++qHRoO+/JFPTSq92AmoXEaLHqgqQDw= 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+81300+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 1632966212338206.41261438498657; Wed, 29 Sep 2021 18:43:32 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id K3iBYY1788612xaWkIkEPj6q; Wed, 29 Sep 2021 18:43:32 -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.6733.1632966211269185226 for ; Wed, 29 Sep 2021 18:43:31 -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 18U1QQOn003057; Thu, 30 Sep 2021 01:43:27 GMT X-Received: from g2t2352.austin.hpe.com (g2t2352.austin.hpe.com [15.233.44.25]) by mx0b-002e3701.pphosted.com with ESMTP id 3bd3jkg2t8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 30 Sep 2021 01:43:27 +0000 X-Received: from g2t2360.austin.hpecorp.net (g2t2360.austin.hpecorp.net [16.196.225.135]) by g2t2352.austin.hpe.com (Postfix) with ESMTP id 6F3C663; Thu, 30 Sep 2021 01:43:26 +0000 (UTC) X-Received: from abner-virtual-machine.asiapacific.hpqcorp.net (abner-virtual-machine.asiapacific.hpqcorp.net [15.119.210.153]) by g2t2360.austin.hpecorp.net (Postfix) with ESMTP id 8A31539; Thu, 30 Sep 2021 01:43:24 +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 V3 07/12] ArmVirtPkg/QemuFwCfgLib: Relocate QemuFwCfgLib to OvmfPkg Date: Thu, 30 Sep 2021 08:45:43 +0800 Message-Id: <20210930004548.3033-8-abner.chang@hpe.com> In-Reply-To: <20210930004548.3033-1-abner.chang@hpe.com> References: <20210930004548.3033-1-abner.chang@hpe.com> X-Proofpoint-GUID: O7VGgaGeF2nIAQKCms7idC1VzYnDtfxz X-Proofpoint-ORIG-GUID: O7VGgaGeF2nIAQKCms7idC1VzYnDtfxz 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: 2sBvAHmlafzJt1kspHRJlrxwx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1632966212; bh=TAW2Uj7UHRURBKlQEYUM39K8r5YKSQhQXEnJaTzO+Cg=; h=Cc:Date:From:Reply-To:Subject:To; b=Z2TkjYYtB06Ghl6Yzu9/So6I22SAzOOwnNIUXvX7QQKQfcBy+ktMHLSGvMTtieCRyUa n6zHvF8nW561TyOTVNdtp9g3EFFpyRO0Huzx4WFcezLTxMVmt1TV/7cuG7DLlk3RqQE98 1xRScuhysaQVLJ4ETRshIoZfFQHmVSEyR/0= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1632966213542100001 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 Acked-by: Gerd Hoffmann Reviewed-By: Daniel Schaefer Reviewed-by: Sunil V L --- ArmVirtPkg/ArmVirtQemu.dsc | 2 +- ArmVirtPkg/ArmVirtQemuKernel.dsc | 2 +- .../Library/QemuFwCfgLib/QemuFwCfgLibMmio.inf | 3 +-- .../Library/QemuFwCfgLib/QemuFwCfgLibMmio.c | 0 4 files changed, 3 insertions(+), 4 deletions(-) rename ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf =3D> OvmfPkg/Libra= ry/QemuFwCfgLib/QemuFwCfgLibMmio.inf (91%) rename ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c =3D> OvmfPkg/Library= /QemuFwCfgLib/QemuFwCfgLibMmio.c (100%) diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc index 07f9699c79..d4ada5c541 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..70ce0b0cfa 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 91% rename from ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf rename to OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLibMmio.inf index f3cc827907..67531517b7 100644 --- a/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf +++ b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLibMmio.inf @@ -27,13 +27,12 @@ # =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 100% rename from ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c rename to OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLibMmio.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 (#81300): https://edk2.groups.io/g/devel/message/81300 Mute This Topic: https://groups.io/mt/85964661/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 Sat May 18 05:53:12 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+81302+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+81302+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=hpe.com ARC-Seal: i=1; a=rsa-sha256; t=1632966213; cv=none; d=zohomail.com; s=zohoarc; b=gp7TT+hFe2NhJVF7Y61OL5HMEG7Zjub6Pj8vVEASxlFXTFFz20/I9Lbr8qwOcqnNCa+jNl+cC5gAgdeRvspIbPFuwBQWJeNOUZ7C8LjJd/bvTZn7s9FyF3YWNcg+YtkrfjVZR0/DztGX9e+CgCdlmbt+p5T1+LFaSz2bwpqSHHg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632966213; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=xLCwpIRBikiFMWvK+rg9EiI1CfVuuu8cufh3xZHVn7Q=; b=EqlPNB9gakUg53SEQAbdJi3kOYIUcTg35qnRzbDlNupgoPfIcN7fFZBX12UWbaBY9Z+zsdy3ay3vac3oG9kj7XeTFpqlV3BtSX9mjCdk0TcNr7YyrUSa+aiJhHE3cs8LiebQkUbkCqzYE9aeAqCO47pPVpw4IsxL7RXq1iOPIhU= 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+81302+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 1632966213805597.9847731819444; Wed, 29 Sep 2021 18:43:33 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id fap9YY1788612xlYdn2OWrEN; Wed, 29 Sep 2021 18:43:33 -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.6544.1632966209893729656 for ; Wed, 29 Sep 2021 18:43:32 -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 18TMW2Ze021053; Thu, 30 Sep 2021 01:43:29 GMT X-Received: from g2t2352.austin.hpe.com (g2t2352.austin.hpe.com [15.233.44.25]) by mx0b-002e3701.pphosted.com with ESMTP id 3bcmr8frjj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 30 Sep 2021 01:43:28 +0000 X-Received: from g2t2360.austin.hpecorp.net (g2t2360.austin.hpecorp.net [16.196.225.135]) by g2t2352.austin.hpe.com (Postfix) with ESMTP id 4CA0F63; Thu, 30 Sep 2021 01:43:28 +0000 (UTC) X-Received: from abner-virtual-machine.asiapacific.hpqcorp.net (abner-virtual-machine.asiapacific.hpqcorp.net [15.119.210.153]) by g2t2360.austin.hpecorp.net (Postfix) with ESMTP id BB6E336; Thu, 30 Sep 2021 01:43:26 +0000 (UTC) From: "Abner Chang" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Jiewen Yao , Jordan Justen , Gerd Hoffmann , Daniel Schaefer , Sunil V L Subject: [edk2-devel] [PATCH V3 08/12] OvmfPkg/QemuFwCfgLibMMIO: Add RISC-V arch support Date: Thu, 30 Sep 2021 08:45:44 +0800 Message-Id: <20210930004548.3033-9-abner.chang@hpe.com> In-Reply-To: <20210930004548.3033-1-abner.chang@hpe.com> References: <20210930004548.3033-1-abner.chang@hpe.com> X-Proofpoint-ORIG-GUID: cPQZCxWXGyzNHrNvWGfAHsVGZp5K0OnG X-Proofpoint-GUID: cPQZCxWXGyzNHrNvWGfAHsVGZp5K0OnG 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: ZuUxu9ZKreLshgj125YkvCGOx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1632966213; bh=A8SEHNdOF2Qlhiw7Gba54F02LlsRgC08AmJB0E7cZGw=; h=Cc:Date:From:Reply-To:Subject:To; b=aRFjoXofbHMUmAUq3HEr6OTjLbZ+4b8EEiMSqKmArcePD4Sge0MxbMDQ4vLB+De4pd6 3cFDS1d9vor7SZjAJakJ8PSJDK9FBrCDiVbWZmjaffpnQ5wGf+w/SH979elKeFU+tnw2J ihIcXjc/p/X6cDUfEKZzwnuFvJ5oyYPGWUc= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1632966215555100009 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Abner Chang Cc: Ard Biesheuvel Cc: Jiewen Yao Cc: Jordan Justen Cc: Gerd Hoffmann Cc: Daniel Schaefer Cc: Sunil V L Acked-by: Gerd Hoffmann Reviewed-By: Daniel Schaefer Reviewed-by: Sunil V L --- OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLibMmio.inf | 2 +- OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLibMmio.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLibMmio.inf b/OvmfPkg/Li= brary/QemuFwCfgLib/QemuFwCfgLibMmio.inf index 67531517b7..4b0dfbcb0d 100644 --- a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLibMmio.inf +++ b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLibMmio.inf @@ -23,7 +23,7 @@ # 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] diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLibMmio.c b/OvmfPkg/Libr= ary/QemuFwCfgLib/QemuFwCfgLibMmio.c index e2ac4108d1..b953f2eb6c 100644 --- a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLibMmio.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 (#81302): https://edk2.groups.io/g/devel/message/81302 Mute This Topic: https://groups.io/mt/85964663/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 Sat May 18 05:53:12 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+81309+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+81309+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=hpe.com ARC-Seal: i=1; a=rsa-sha256; t=1632966228; cv=none; d=zohomail.com; s=zohoarc; b=UjWgMoXZcaCYZHLH3YEDTZ4/EQEHn5zKnE1r2uaL5MthcRwCzjnnaXwmlTGIS+CnLrwB5IEks36jPusmk8WXH8MIY6c5MW7zYMS3CgsnHfJnmuLvmoIIuW6KIQgneOaftcy+d3qvzwfr2VN6g7Xk6m+riz4485akDfA4u5k5WAw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632966228; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=ggvEHtDP3qcKs7knvD/3Q7nlzcLhvpqZcorU3I4Dpig=; b=FJtUknyjcj8xj3g51DdL+iB4JaWXj67rrPtEffRS5YnOm4RRYDRMh+bObERcyJKP/9w9uHxChybc/WwmjggCkMqQRMydJLUFnCBfjlVvPX9Kww9+JhAMKYXHDVUqyGPTtdp7TdZ5ywv58ttpLmUjE6Ho8cwR3xm2ZLvDKh5ofZA= 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+81309+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 1632966228470638.0471381010684; Wed, 29 Sep 2021 18:43:48 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id wVJLYY1788612xMN1Wkm3hYi; Wed, 29 Sep 2021 18:43:48 -0700 X-Received: from mx0a-002e3701.pphosted.com (mx0a-002e3701.pphosted.com [148.163.147.86]) by mx.groups.io with SMTP id smtpd.web12.6735.1632966223594267004 for ; Wed, 29 Sep 2021 18:43:47 -0700 X-Received: from pps.filterd (m0148663.ppops.net [127.0.0.1]) by mx0a-002e3701.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 18U1Z6iq008689; Thu, 30 Sep 2021 01:43:31 GMT X-Received: from g2t2353.austin.hpe.com (g2t2353.austin.hpe.com [15.233.44.26]) by mx0a-002e3701.pphosted.com with ESMTP id 3bd3pb01j2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 30 Sep 2021 01:43:31 +0000 X-Received: from g2t2360.austin.hpecorp.net (g2t2360.austin.hpecorp.net [16.196.225.135]) by g2t2353.austin.hpe.com (Postfix) with ESMTP id A96338B; Thu, 30 Sep 2021 01:43:30 +0000 (UTC) X-Received: from abner-virtual-machine.asiapacific.hpqcorp.net (abner-virtual-machine.asiapacific.hpqcorp.net [15.119.210.153]) by g2t2360.austin.hpecorp.net (Postfix) with ESMTP id 99D0C36; Thu, 30 Sep 2021 01:43: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 V3 09/12] MdePkg: Add PcdPciMmio32(64)Translation PCDs Date: Thu, 30 Sep 2021 08:45:45 +0800 Message-Id: <20210930004548.3033-10-abner.chang@hpe.com> In-Reply-To: <20210930004548.3033-1-abner.chang@hpe.com> References: <20210930004548.3033-1-abner.chang@hpe.com> X-Proofpoint-GUID: 7GELVsRjYiqH6LB19CQQBYqzf5wEBZI_ X-Proofpoint-ORIG-GUID: 7GELVsRjYiqH6LB19CQQBYqzf5wEBZI_ 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: tc7ikXCS6A9Lnrnmkdw5OdFvx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1632966228; bh=aOk+flTzMKA4Fr7zl++Z4m+i260EQYsgLZR1Jp38c1k=; h=Cc:Date:From:Reply-To:Subject:To; b=elsQEycWX7yWWfUs7U+mqy9IsY+0se9eXG22K9HO1RooCE3CXf+SG9kJC4ACVMtV+MM ATz6gcyirfCvd5tP2T5fHaHjhecoY6bv93d3v9pPEvGvL6lWZnCXc9pzKuGiAhL2ME8x4 u2gdkpZHdudGel/0fywSKZDuYhkbm7h0j7I= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1632966230338100001 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 Acked-by: Gerd Hoffmann Reviewed-By: Daniel Schaefer Reviewed-by: 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 (#81309): https://edk2.groups.io/g/devel/message/81309 Mute This Topic: https://groups.io/mt/85964677/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 Sat May 18 05:53:12 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+81310+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+81310+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=hpe.com ARC-Seal: i=1; a=rsa-sha256; t=1632966230; cv=none; d=zohomail.com; s=zohoarc; b=C0/u7xIJLea5kS0B963Mw+ROv0xCUA8FF01phbEh/sBIxk5CeZO51m1hwe9Sr7xeztRbfiuq0zGQfQcz1chgbP14a+2MI5uVLIMtf7blzsQxmz9gAVWOoEWAmgPLryldr2MP4xvyGvAsyqhiPPmU0EVsuOFca7gePu0Vnghf+jE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632966230; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=OM4V19adt8o6ED9h5YvYv8F8ASpYxQXXbgNGzBOkD/I=; b=ehkEvqAWres1RArJ6BW+erAwCwvUdjcjRUSEJNPn4QTFP+lKRsAa84KYP52KxtqNhxpGdwVFGRhpLFIr5YtcyijfqEvRdItjx+Ro5cC8vRQKFqx4nx7co84ie/5toLaacEmaiqW1LsQWj7pH60IXZhuSWokLpFE4XYnkjsOz4Mw= 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+81310+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 1632966230575867.3339243079839; Wed, 29 Sep 2021 18:43:50 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id QVhHYY1788612xjcHRgfYQmx; Wed, 29 Sep 2021 18:43:50 -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.6734.1632966217469845452 for ; Wed, 29 Sep 2021 18:43:49 -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 18U1Pfiu001755; Thu, 30 Sep 2021 01:43:33 GMT X-Received: from g2t2353.austin.hpe.com (g2t2353.austin.hpe.com [15.233.44.26]) by mx0b-002e3701.pphosted.com with ESMTP id 3bd3jkg2ts-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 30 Sep 2021 01:43:33 +0000 X-Received: from g2t2360.austin.hpecorp.net (g2t2360.austin.hpecorp.net [16.196.225.135]) by g2t2353.austin.hpe.com (Postfix) with ESMTP id D8E078B; Thu, 30 Sep 2021 01:43:32 +0000 (UTC) X-Received: from abner-virtual-machine.asiapacific.hpqcorp.net (abner-virtual-machine.asiapacific.hpqcorp.net [15.119.210.153]) by g2t2360.austin.hpecorp.net (Postfix) with ESMTP id 00D2E49; Thu, 30 Sep 2021 01:43:30 +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 V3 10/12] ArmVirtPkg/FdtPciHostBridgeLib: Relocate FdtPciHostBridgeLib to OvmfPkg/Fdt Date: Thu, 30 Sep 2021 08:45:46 +0800 Message-Id: <20210930004548.3033-11-abner.chang@hpe.com> In-Reply-To: <20210930004548.3033-1-abner.chang@hpe.com> References: <20210930004548.3033-1-abner.chang@hpe.com> X-Proofpoint-GUID: hKllE8bI8zu6wc1zEQriXbheEGtCY8xb X-Proofpoint-ORIG-GUID: hKllE8bI8zu6wc1zEQriXbheEGtCY8xb 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: YORFGlaBeLd5g4hInDL2cb1Bx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1632966230; bh=/D9lYpH4ioWchwovVAFt8fNtWVLfxi8cHffOKrsOhPE=; h=Cc:Date:From:Reply-To:Subject:To; b=Vh0t2o5G9Uzv6rDYXq+oRm7PPLU+j+FDMVanhn/IYtICWGTE0fnqcIlU6+kF7WpWVq6 jQxIM3eb9Ue9VGhpDDxjdhnZyZzOU4+HdOupGsP+EjqzR14EzK/APXp9DDmWgPepEsn7T xQyVFEhjDih+7AWqVtEkU/+G25BzHzMxVCU= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1632966232480100005 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 Acked-by: Gerd Hoffmann Reviewed-By: Daniel Schaefer Reviewed-by: Sunil V L --- ArmPkg/ArmPkg.dec | 10 ++++------ ArmVirtPkg/ArmVirtCloudHv.dsc | 2 +- ArmVirtPkg/ArmVirtKvmTool.dsc | 2 +- ArmVirtPkg/ArmVirtQemu.dsc | 2 +- ArmVirtPkg/ArmVirtQemuKernel.dsc | 2 +- .../Fdt}/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf | 6 ++---- .../Fdt}/FdtPciHostBridgeLib/FdtPciHostBridgeLib.c | 0 7 files changed, 10 insertions(+), 14 deletions(-) rename {ArmVirtPkg/Library =3D> OvmfPkg/Fdt}/FdtPciHostBridgeLib/FdtPciHos= tBridgeLib.inf (85%) rename {ArmVirtPkg/Library =3D> OvmfPkg/Fdt}/FdtPciHostBridgeLib/FdtPciHos= tBridgeLib.c (100%) diff --git a/ArmPkg/ArmPkg.dec b/ArmPkg/ArmPkg.dec index 12584fb319..5935663fa9 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.PcdPciMmio32Trans= lation; # 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 d4ada5c541..ac86f20e68 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 70ce0b0cfa..ca0d872264 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 85% rename from ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf rename to OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf index f149693fa2..f015480685 100644 --- a/ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf +++ b/OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf @@ -27,8 +27,6 @@ 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 (#81310): https://edk2.groups.io/g/devel/message/81310 Mute This Topic: https://groups.io/mt/85964678/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 Sat May 18 05:53:12 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+81308+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+81308+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=hpe.com ARC-Seal: i=1; a=rsa-sha256; t=1632966221; cv=none; d=zohomail.com; s=zohoarc; b=oDubQoPc4D/NLYkHbulTqH1bx2crbD8QoDT3hXPoTF65tLv4yaX5LZyqRvv4GyKVBup3tNtwyj16k2dTHbxp7N3kRg1TupxGHyqBBizSd1SkGZlB3mmbJRRZYHBNRSXCUpDuJGxDA4uifwIg3Qk3VeWp4bQHuDRudKn6XZ0oLK4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632966221; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=wRXXty7mandNqiHa8LLXtnQs6cRfEVcm85c15P02QjM=; b=ERg0o/NulM+SWIUxrlIGYT1f7csuXybY7GIFJp2stHjPh+XW8Krw7T8NsvLqtS0s0Ni7+ZeIhUJ4DHo/Y7Jo+dFuobdEX+Qr28hYg+fntJzIodAX8o+tFqEr3s7IRBn1YTP75x07DPXtRd8SQVkCclVVhv/oJhwtq3wkbRaOi5E= 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+81308+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 1632966221351251.83746471535267; Wed, 29 Sep 2021 18:43:41 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id vx8bYY1788612xfvtWyqD1PS; Wed, 29 Sep 2021 18:43: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.web10.6733.1632966216018187599 for ; Wed, 29 Sep 2021 18:43:40 -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 18TMZNY5021927; Thu, 30 Sep 2021 01:43:35 GMT X-Received: from g2t2352.austin.hpe.com (g2t2352.austin.hpe.com [15.233.44.25]) by mx0b-002e3701.pphosted.com with ESMTP id 3bcy5qhqax-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 30 Sep 2021 01:43:35 +0000 X-Received: from g2t2360.austin.hpecorp.net (g2t2360.austin.hpecorp.net [16.196.225.135]) by g2t2352.austin.hpe.com (Postfix) with ESMTP id 6B7C6A7; Thu, 30 Sep 2021 01:43:34 +0000 (UTC) X-Received: from abner-virtual-machine.asiapacific.hpqcorp.net (abner-virtual-machine.asiapacific.hpqcorp.net [15.119.210.153]) by g2t2360.austin.hpecorp.net (Postfix) with ESMTP id 2F4E949; Thu, 30 Sep 2021 01:43:33 +0000 (UTC) From: "Abner Chang" To: devel@edk2.groups.io Cc: Leif Lindholm , Gerd Hoffmann , Daniel Schaefer , Sunil V L Subject: [edk2-devel] [PATCH V3 11/12] OvmfPkg/FdtPciHostBridgeLib: Add RISC-V in the supported arch. Date: Thu, 30 Sep 2021 08:45:47 +0800 Message-Id: <20210930004548.3033-12-abner.chang@hpe.com> In-Reply-To: <20210930004548.3033-1-abner.chang@hpe.com> References: <20210930004548.3033-1-abner.chang@hpe.com> X-Proofpoint-GUID: 6fBllz-uDsETZEN6K-7aoeM0FlGUPFvY X-Proofpoint-ORIG-GUID: 6fBllz-uDsETZEN6K-7aoeM0FlGUPFvY 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: 7lhRIetz9v5046tKoRvDx4eux1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1632966220; bh=fvRbO6tCV1dQ/5aFjUPX8VSl/QsUjx5j91ymiBZKYaU=; h=Cc:Date:From:Reply-To:Subject:To; b=JhBHqAwxgfZyEHlaQq5lyVY1zyBRKfukDwbuwV6JFRUTMW5TYSrJvPY9oSIa4uxSlT2 TY88tTlGId+gaH5g9z6iNqrr41YEXUNpthQePTGHjTxLDbvUiOgThsl/oHjKDgRtFjr8N zm/nkzy3O7dVJvlcbsm1QcLENUrierH2uXo= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1632966222291100009 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Abner Chang Cc: Leif Lindholm Cc: Gerd Hoffmann Cc: Daniel Schaefer Cc: Sunil V L Reviewed-by: Daniel Schaefer Acked-by: Gerd Hoffmann Reviewed-By: Daniel Schaefer Reviewed-by: Sunil V L --- OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf b/Ovmf= Pkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf index f015480685..e610e3d03f 100644 --- a/OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf +++ b/OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf @@ -20,7 +20,7 @@ # 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] --=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 (#81308): https://edk2.groups.io/g/devel/message/81308 Mute This Topic: https://groups.io/mt/85964672/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 Sat May 18 05:53:12 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+81307+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+81307+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=hpe.com ARC-Seal: i=1; a=rsa-sha256; t=1632966220; cv=none; d=zohomail.com; s=zohoarc; b=mZOW0S0tQZ5uNVXis8rvpYAz+4J/IIKgTjb+PqvpGgzGldtbnGrwoQ8OH8YVWGmT6pnA3H7IANMIAnpTS85WbW6PCIubJxEqPz4qcYeVPPUkiE8N3eYBLOcO8OkTdYpgKSroipJy/Ed6e1J29QCU/obg8Jjx3thUSFzooR9zEZg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632966220; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=ykiQK6ARtoTsYp8ho35RY0Nj/7m1rLioFOUmgKMZXms=; b=njhi94Ngcm7FUC2fZPsdH7ajamtlKW0A84TUVKyTfyMt38x2DnWsD0VcUbf1bowCUV2pXxsfF/bg5B9jRLhH0UL9bpIFSWeZDZ8lIrnASiYGF58vp+JERemd6FE2fpLyz4GvySsbFJFFRTBJoXSl3SPn+uNHgg3D+dkFOtM5p/Q= 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+81307+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 1632966220606933.1951770646518; Wed, 29 Sep 2021 18:43:40 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id zykSYY1788612xdQ6B7QWvGt; Wed, 29 Sep 2021 18:43: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.web09.6706.1632966219615349549 for ; Wed, 29 Sep 2021 18:43: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 18TNWLlD010451; Thu, 30 Sep 2021 01:43:37 GMT X-Received: from g2t2353.austin.hpe.com (g2t2353.austin.hpe.com [15.233.44.26]) by mx0b-002e3701.pphosted.com with ESMTP id 3bcmr8frkh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 30 Sep 2021 01:43:37 +0000 X-Received: from g2t2360.austin.hpecorp.net (g2t2360.austin.hpecorp.net [16.196.225.135]) by g2t2353.austin.hpe.com (Postfix) with ESMTP id 9EB5E8B; Thu, 30 Sep 2021 01:43:36 +0000 (UTC) X-Received: from abner-virtual-machine.asiapacific.hpqcorp.net (abner-virtual-machine.asiapacific.hpqcorp.net [15.119.210.153]) by g2t2360.austin.hpecorp.net (Postfix) with ESMTP id B7D0039; Thu, 30 Sep 2021 01:43:34 +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 V3 12/12] ArmVirtPkg/VirtioFdtDxe: Relocate VirtioFdtDxe to OvmfPkg/Fdt Date: Thu, 30 Sep 2021 08:45:48 +0800 Message-Id: <20210930004548.3033-13-abner.chang@hpe.com> In-Reply-To: <20210930004548.3033-1-abner.chang@hpe.com> References: <20210930004548.3033-1-abner.chang@hpe.com> X-Proofpoint-ORIG-GUID: I78YHPUUReSggLEscaOROfKt9cGwJbGR X-Proofpoint-GUID: I78YHPUUReSggLEscaOROfKt9cGwJbGR 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: k4sghcxokpCTulzo1gUqfNUAx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1632966220; bh=kbggOEKcwe2PLqiziJt2uWbm9xhJwIw7Ayc0oYT8lcw=; h=Cc:Date:From:Reply-To:Subject:To; b=NOjUBK4n5kDpbMRTCD5OWUElRABQQ2KLs3nAsgPtCDS38g260RaxukiYZBXh4a/ECyj w9mysKyz9TzNnWKmYZeMw3o3QuYTaTnGvPZ/3skjynT/46uO++lsny3RECQWRIkaZb5/G Nte7AUpVlbf3HerW20l1yswUa4cwbgLjz1Q= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1632967123914100001 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 Acked-by: Gerd Hoffmann Reviewed-By: Daniel Schaefer Reviewed-by: 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}/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 ac86f20e68..adb490ed5a 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 ca0d872264..aaceb5daab 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 (#81307): https://edk2.groups.io/g/devel/message/81307 Mute This Topic: https://groups.io/mt/85964671/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-