From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 0903DAC10F0 for ; Mon, 13 Nov 2023 11:47:01 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=cb1LC7km6GGWM02/8A+2a6BDlvGE7jdr+WzrkNgsjDs=; c=relaxed/simple; d=groups.io; h=ARC-Seal:ARC-Message-Signature:ARC-Authentication-Results:Received-SPF:ARC-Seal:ARC-Message-Signature:ARC-Authentication-Results:Authentication-Results-Original:Message-ID:Date:User-Agent:Subject:To:Cc:References:From:In-Reply-To:MIME-Version:NoDisclaimer:Original-Authentication-Results:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Language:Content-Type:Content-Transfer-Encoding; s=20140610; t=1699876020; v=1; b=lj8QGpCsPLIzQtJ5a+vIckevEMx+eht/EQdnNwrUoxCzmLiaxNhwvK5WOijGsJEVCweJjRRw AsYVFbOF+tUxVQ5VdWcSBekVycqqH6RaZ3GY5ASVZKrJD1BCfCTootMnnDmLXz4EUFgdIGcfogr SB4lRAhrOnkeRuAzf00Ll+cE= X-Received: by 127.0.0.2 with SMTP id PXphYY7687511xBBM1ZaWKm5; Mon, 13 Nov 2023 03:47:00 -0800 X-Received: from EUR02-VI1-obe.outbound.protection.outlook.com (EUR02-VI1-obe.outbound.protection.outlook.com [40.107.241.43]) by mx.groups.io with SMTP id smtpd.web11.35041.1699876019021285653 for ; Mon, 13 Nov 2023 03:47:00 -0800 ARC-Seal: i=2; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=pass; b=TjDrpyH973Z3I7+U+uBoN2ag5QsYYAn8to5mmUamuxMSgXm3lkSO7fstyGMg0IJYMcnnwFlxQo8ABSG9ttn+r/WDkuRvkr5cUFBN+YFFSInZ2010GEcS3eB7QMzNckmejbnXE6bOcOy5zExpn/Qs5r5WdFnp3hBRzI9VKIepnx0fiThJ3LNZchTLcodIK+1IK0+7lQ1r1F028HcUi01/mCs534SdEY57HObMpX/Lb3uNYNN8LXHlMtikztg/GbqYD0AVwYGqZyU4gU1SHefE6QJiT1qO5vHaYR4cCkhtLbJMR/2cmOmIGnFwBojwnWBb/u4vL1Qoo7cx/LUurbfBYg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=MfQwzs3unAfTy5zAs3Jm1ajzF2lBUp+2Xh3dVZ7usUU=; b=gAk3RBMdYX60RBfyQsgyu2JNBvXVE2dw80EJmQy7fGkDv26eiEFv2Kyxn8V9EQXVJr3h9z/tTrSKuP/yjuIe9XieFMoHIR7F2cmWYjM10SM616iYi9HXGqQGyMVMl8pZpADlLNZsqIHS8isojf/d8sVjsfqM5KlfUYGHWRzekvtNxVjBF8TDxk+F2+hJiZLvo59eJXCBzlDNNbNsbQ0WV/uRuIvvi4NQ0iTLIuGSP5oXRAVroQFNQYuenm5olRguZowGlDPoljR+/QUFZdQNWsMIdpl+yiqRrJst+rlxXKXGJzH3D4h2neGRLotaUE0D/XDLOsfPGeu1gVbDOzehDQ== ARC-Authentication-Results: i=2; mx.microsoft.com 1; spf=pass (sender ip is 63.35.35.123) smtp.rcpttodomain=edk2.groups.io smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com; arc=pass (0 oda=1 ltdi=1 spf=[1,1,smtp.mailfrom=arm.com] dkim=[1,1,header.d=arm.com] dmarc=[1,1,header.from=arm.com]) X-Received: from AS8PR07CA0053.eurprd07.prod.outlook.com (2603:10a6:20b:459::20) by DU0PR08MB7488.eurprd08.prod.outlook.com (2603:10a6:10:358::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.29; Mon, 13 Nov 2023 11:46:51 +0000 X-Received: from AM1PEPF000252E1.eurprd07.prod.outlook.com (2603:10a6:20b:459:cafe::df) by AS8PR07CA0053.outlook.office365.com (2603:10a6:20b:459::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7002.14 via Frontend Transport; Mon, 13 Nov 2023 11:46:51 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; pr=C X-Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by AM1PEPF000252E1.mail.protection.outlook.com (10.167.16.59) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7002.13 via Frontend Transport; Mon, 13 Nov 2023 11:46:50 +0000 X-Received: ("Tessian outbound e243565b0037:v228"); Mon, 13 Nov 2023 11:46:50 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 9c8355255e3a9879 X-CR-MTA-TID: 64aa7808 X-Received: from 46c5d5250e65.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 02A1DFCA-54C1-475D-A375-3B4EB675A893.1; Mon, 13 Nov 2023 11:46:43 +0000 X-Received: from EUR02-VI1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 46c5d5250e65.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Mon, 13 Nov 2023 11:46:43 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QP66dQuaYv7HtncuPqgCD4+6xlD+2NHisKbBu/k32KWzcmlag4vUiMPLfrjwqr4s1Rils9bcSlSJ68XXlFYzTB4hMejlKDj/UYqicPc1vsglNQpFRGdKMeRcYj6Uxwa8d+1XY1n4QrZrnsqcSx7rqwO2rso3xRbnXSlY4cCJydJQBtADr/J3XR4crLIz/LNEBQxRxhoceJAAYzq3HZATfITFQxaa8EWtALAvwpkofa38MmJ24mAyncNPCteweDC+0FU2FUmwx/x9Ta6bFCN7RlqkC4y3MSFFjbbV3NNAvQ5WijNU+tKg99tTc5seF172ZWmyxF6BmX83Sybgzg2zfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=MfQwzs3unAfTy5zAs3Jm1ajzF2lBUp+2Xh3dVZ7usUU=; b=RYp/DKqy/mz7dNCgGzqeYEk46GAli8ASTq+mxVSFzFPDwdOkJS8YYiHW3bfGV39Bnd0E3Rp1fgynRyW82GJ7OqTyJEVvl2N/mQY1Ldwr2DetYtgAbVmt3tee6mB/9HHxmAnmdJFZIvLwspD/ujxVgf2/FYCEm8/51QngpY6kKbrzrMHkA4I2ywsHS6SoQurXJvSVN4ehQB/KE+Yug5leK5o6Sil0lZNoNx/vRYpF6mIkQuZVATSgO4fxONacRPb8e1bCCaKk3ux/aqI4RsAyJm5kOQ4m+zJ6HcaKFByjHCYUDbcBxxvM2qQPm84EIVjg3dtc9CbDZm1JhB+z0AzdUA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none Authentication-Results-Original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; X-Received: from AS8PR08MB6806.eurprd08.prod.outlook.com (2603:10a6:20b:39b::12) by AS8PR08MB10026.eurprd08.prod.outlook.com (2603:10a6:20b:632::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.29; Mon, 13 Nov 2023 11:46:39 +0000 X-Received: from AS8PR08MB6806.eurprd08.prod.outlook.com ([fe80::f36e:3882:2fce:d775]) by AS8PR08MB6806.eurprd08.prod.outlook.com ([fe80::f36e:3882:2fce:d775%4]) with mapi id 15.20.6977.029; Mon, 13 Nov 2023 11:46:39 +0000 Message-ID: Date: Mon, 13 Nov 2023 11:46:37 +0000 User-Agent: Mozilla Thunderbird Subject: Re: [edk2-devel] [PATCH v2 16/30] ArmVirtPkg: Move PCD of FDT base address and FDT padding to OvmfPkg To: Chao Li , devel@edk2.groups.io Cc: Ard Biesheuvel , Leif Lindholm , Gerd Hoffmann , Jiewen Yao , Jordan Justen , "nd@arm.com" References: <20231106032521.2251143-1-lichao@loongson.cn> <20231106032912.2285510-1-lichao@loongson.cn> From: "Sami Mujawar" In-Reply-To: <20231106032912.2285510-1-lichao@loongson.cn> X-ClientProxiedBy: LO4P265CA0190.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:311::18) To AS8PR08MB6806.eurprd08.prod.outlook.com (2603:10a6:20b:39b::12) MIME-Version: 1.0 X-MS-TrafficTypeDiagnostic: AS8PR08MB6806:EE_|AS8PR08MB10026:EE_|AM1PEPF000252E1:EE_|DU0PR08MB7488:EE_ X-MS-Office365-Filtering-Correlation-Id: d87f235a-e703-4626-da04-08dbe43e39af x-checkrecipientrouted: true NoDisclaimer: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: 1yuhjGEOcTL5ZVS/6zLZzDFwJ5wVirzrdo1fDmj0Lcr4v9iYmEcq3xdJtOFU4C9ejTwGH2Q9KM1JYSrHnkX5jIY0paJty1jSLzyJw1BaFHRFntDIogcTbaS1V0AVJQAlFaKGkcLY2sq2BbCyU9nh/fKJRoWHSfBptUv5c/MtFk+Gp61q1tbNKf2zNXvcIhWPuRVeNPmzuqY5aGM0HDO12e3HjI61aJ8pmb8C6KV/6CohhAnvmIalsbHG+0fzIYISBX3a9cWto9OeSxFwkRCixW8jUbSehuBTa6m0rauFzP0O2vwvyo7IkzdkJEC0iLM+S2in0VRh1GX+6BcR5HpMez6PUohzGubqVxV+YaZal+kbo+GE/49wkaUFMygJwcDJZFM4ZnQIRv17kLZJW4ifh5qKcb4cMhDF/Fx16oLPJc+4o8dSTYBKpycn4QVgPOrQqpkPrqJe9DHw/htyVUlCW5+tKxrulNN2aDK+vYiDtK0vQAk0Lk3QDVH5kT5LT9+jv7esurs28NG6UWTYBdroQOz69zRI0ZGplvcovIfvxVlI68SWr0rfsPjNwPO8ow+eC7qOYOhVoXd6wCY7SuyH/a0USshKECdeCkKpHAte1ZsmbH6DIjIiDnA1zSSPhiRVs3cne16NPPRhNd3cHqlSmE4jX+NGzJNmO/Mk6rNTYZQ= X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS8PR08MB6806.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(376002)(346002)(396003)(366004)(39860400002)(136003)(230922051799003)(64100799003)(451199024)(1800799009)(186009)(316002)(6512007)(54906003)(66476007)(66946007)(66556008)(38100700002)(83380400001)(8676002)(8936002)(4326008)(6486002)(478600001)(36756003)(966005)(31686004)(6506007)(19627235002)(53546011)(44832011)(5660300002)(86362001)(2616005)(30864003)(2906002)(26005)(31696002)(41300700001)(156123004)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB10026 Original-Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM1PEPF000252E1.eurprd07.prod.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 20364bf6-ce68-4f48-c245-08dbe43e32db X-Microsoft-Antispam-Message-Info: 0nbvc76hSjglg2MAjNnLLD+6csImgGRSgogdGpoTBPg5alsDryrP2Afbh6zrzR+r3V0p8Xws9TwjohUBm0hiZIUrDTnUcihJuG7Ps4NTxbqYoi0woalUOVNLJGfZsjPm9+QwCBH+9vhFj0vrVxn81ewH81t6qSRAijxDjw0AETB4kyfghH9a5aXBTyTy4ZK4G7J8yZIEvgbEeUaNnYd+b2sR+HT6AtIvhowk3Jyowim4p8MwiBxjuEdSftasixtVJQ0UCddH9yHTsxLltxAYcgAZLGu1oQBgv8P5XTlUxje6wZD3LdcUDclloqj/1qzqYyg8wDhJHjyo/M+QtE+TVSTl+U9AIHmc7qXoRvN7xyUWMn4eXHDHTDUHRhjLvdbra+AKmpanjqj1GL2eEiEmi6OFyoZE7Djn1EhUPy0RykOnVIo+wbsWe5KfwjSBWzI9Xgd4ge9DMcWWY99jCo/ykefgMZYifL8+WdR/Q2SWeB90/OtbkdqCUML6Y0R4b6dJqq1SDUfXazF+XYsNgvUf110RcLy68T/rGYJ0JsV9Gt2LiDc+U+L5qjTKxpJoQBSYOC5KHAvj/9bkdEwMzfR1SVDFFve0dafjEz6NnItzWpfeRzIZxHl3+HkaqzmOem5MFQMb8Qm+W5GeHAfxwIiwECpB35k7Xyb+i4ytxSbgOD4F0ygVEtLFXVlwT/mX/S5tPRL+SYRBq8sbJP5tsj/B1AkER1BVGGWxBOAPH3v1HUWDc3CDvjrJzPJH+YuL4WRZ/IANY1RV6rDh2M3tIl666Ac39XsT4yKwKTiKmwHiviA= X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2023 11:46:50.9207 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d87f235a-e703-4626-da04-08dbe43e39af X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d;Ip=[63.35.35.123];Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: AM1PEPF000252E1.eurprd07.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR08MB7488 Precedence: Bulk 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,sami.mujawar@arm.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: abpnHguUO2YRlPrFHuf9HV9Ex7686176AA= Content-Language: en-GB Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=lj8QGpCs; arc=reject ("signature check failed: fail, {[1] = sig:microsoft.com:reject}"); dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=arm.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io Hi Chao, Thank you for this patch. I have a few suggestions marked inline as [SAMI]. Otherwise this patch looks good to me. With those fixed, Reviewed-by: Sami Mujawar Regards, Sami Mujawar On 06/11/2023 03:29 am, Chao Li wrote: > Moved PcdDeviceTreeInitialBaseAddress and PcdDeviceTreeAllocationPadding > to OvmfPkg for easier use by other architectures. > > Build-tested only (with "ArmVirtQemu.dsc"). > > BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4584 > > Cc: Ard Biesheuvel > Cc: Leif Lindholm > Cc: Sami Mujawar > Cc: Gerd Hoffmann > Cc: Jiewen Yao > Cc: Jordan Justen > Signed-off-by: Chao Li > --- > ArmVirtPkg/ArmVirtCloudHv.dsc | 2 +- > ArmVirtPkg/ArmVirtKvmTool.dsc | 2 +- > ArmVirtPkg/ArmVirtPkg.dec | 14 -------------- > ArmVirtPkg/ArmVirtQemu.dsc | 2 +- > ArmVirtPkg/ArmVirtQemuKernel.dsc | 2 +- > ArmVirtPkg/ArmVirtXen.dsc | 2 +- > .../ArmVirtPsciResetSystemPeiLib.inf | 3 ++- > .../CloudHvVirtMemInfoPeiLib.inf | 3 ++- > .../DebugLibFdtPL011UartFlash.inf | 3 ++- > .../EarlyFdt16550SerialPortHookLib.inf | 3 ++- > .../EarlyFdtPL011SerialPortLib.inf | 3 ++- > .../KvmtoolPlatformPeiLib.inf | 5 +++-- > .../Library/PlatformPeiLib/PlatformPeiLib.inf | 10 +++++----- > .../QemuVirtMemInfoLib/QemuVirtMemInfoPeiLib.inf | 3 ++- > .../PrePi/ArmVirtPrePiUniCoreRelocatable.inf | 3 ++- > OvmfPkg/OvmfPkg.dec | 15 +++++++++++++++ > 16 files changed, 42 insertions(+), 33 deletions(-) > > diff --git a/ArmVirtPkg/ArmVirtCloudHv.dsc b/ArmVirtPkg/ArmVirtCloudHv.ds= c > index 2cb89ce10c..76c0d28544 100644 > --- a/ArmVirtPkg/ArmVirtCloudHv.dsc > +++ b/ArmVirtPkg/ArmVirtCloudHv.dsc > @@ -129,7 +129,7 @@ > gArmTokenSpaceGuid.PcdSystemMemoryBase|0x40000000 > =20 > # initial location of the device tree blob passed by Cloud Hypervisor= -- base of DRAM > - gArmVirtTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress|0x40000000 > + gUefiOvmfPkgTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress|0x40000000 > =20 > gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|= FALSE > gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0= x2c, 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23= , 0x31 } > diff --git a/ArmVirtPkg/ArmVirtKvmTool.dsc b/ArmVirtPkg/ArmVirtKvmTool.ds= c > index f50d53bf15..cac4fe06d3 100644 > --- a/ArmVirtPkg/ArmVirtKvmTool.dsc > +++ b/ArmVirtPkg/ArmVirtKvmTool.dsc > @@ -179,7 +179,7 @@ > # We are booting from RAM using the Linux kernel boot protocol, > # x0 will point to the DTB image in memory. > # > - gArmVirtTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress|0x0 > + gUefiOvmfPkgTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress|0x0 > =20 > gArmTokenSpaceGuid.PcdFdBaseAddress|0x0 > gArmTokenSpaceGuid.PcdFvBaseAddress|0x0 > diff --git a/ArmVirtPkg/ArmVirtPkg.dec b/ArmVirtPkg/ArmVirtPkg.dec > index 0f2d787327..2451644844 100644 > --- a/ArmVirtPkg/ArmVirtPkg.dec > +++ b/ArmVirtPkg/ArmVirtPkg.dec > @@ -42,20 +42,6 @@ > gArmVirtTokenSpaceGuid.PcdTpm2SupportEnabled|FALSE|BOOLEAN|0x00000004 > =20 > [PcdsFixedAtBuild, PcdsPatchableInModule] > - # > - # This is the physical address where the device tree is expected to be= stored > - # upon first entry into UEFI. This needs to be a FixedAtBuild PCD, so = that we > - # can do a first pass over the device tree in the SEC phase to discove= r the > - # UART base address. > - # > - gArmVirtTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress|0x0|UINT64|0x00= 000001 > - > - # > - # Padding in bytes to add to the device tree allocation, so that the D= TB can > - # be modified in place (default: 256 bytes) > - # > - gArmVirtTokenSpaceGuid.PcdDeviceTreeAllocationPadding|256|UINT32|0x000= 00002 > - > # > # Binary representation of the GUID that determines the terminal type= . The > # size must be exactly 16 bytes. The default value corresponds to > diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc > index 30e3cfc8b9..cf306cac08 100644 > --- a/ArmVirtPkg/ArmVirtQemu.dsc > +++ b/ArmVirtPkg/ArmVirtQemu.dsc > @@ -201,7 +201,7 @@ > gArmTokenSpaceGuid.PcdSystemMemoryBase|0x40000000 > =20 > # initial location of the device tree blob passed by QEMU -- base of = DRAM > - gArmVirtTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress|0x40000000 > + gUefiOvmfPkgTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress|0x40000000 > =20 > gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|= FALSE > gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0= x2c, 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23= , 0x31 } > diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKer= nel.dsc > index b50f8e84a3..c0d079e28d 100644 > --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc > +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc > @@ -198,7 +198,7 @@ > # Define a default initial address for the device tree. > # Ignored if x0 !=3D 0 at entry. > # > - gArmVirtTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress|0x40000000 > + gUefiOvmfPkgTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress|0x40000000 > =20 > gArmTokenSpaceGuid.PcdFdBaseAddress|0x0 > gArmTokenSpaceGuid.PcdFvBaseAddress|0x0 > diff --git a/ArmVirtPkg/ArmVirtXen.dsc b/ArmVirtPkg/ArmVirtXen.dsc > index f0d15b823b..5809832e66 100644 > --- a/ArmVirtPkg/ArmVirtXen.dsc > +++ b/ArmVirtPkg/ArmVirtXen.dsc > @@ -115,7 +115,7 @@ > # > gArmTokenSpaceGuid.PcdSystemMemoryBase|0x0 > gArmTokenSpaceGuid.PcdSystemMemorySize|0x0 > - gArmVirtTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress|0x0 > + gUefiOvmfPkgTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress|0x0 > =20 > gArmTokenSpaceGuid.PcdFdBaseAddress|0x0 > gArmTokenSpaceGuid.PcdFvBaseAddress|0x0 > diff --git a/ArmVirtPkg/Library/ArmVirtPsciResetSystemPeiLib/ArmVirtPsciR= esetSystemPeiLib.inf b/ArmVirtPkg/Library/ArmVirtPsciResetSystemPeiLib/ArmV= irtPsciResetSystemPeiLib.inf > index 3a65706e8d..79217d296d 100644 > --- a/ArmVirtPkg/Library/ArmVirtPsciResetSystemPeiLib/ArmVirtPsciResetSys= temPeiLib.inf > +++ b/ArmVirtPkg/Library/ArmVirtPsciResetSystemPeiLib/ArmVirtPsciResetSys= temPeiLib.inf > @@ -26,6 +26,7 @@ > EmbeddedPkg/EmbeddedPkg.dec > MdeModulePkg/MdeModulePkg.dec > MdePkg/MdePkg.dec > + OvmfPkg/OvmfPkg.dec > =20 > [LibraryClasses] > ArmSmcLib > @@ -36,4 +37,4 @@ > HobLib > =20 > [Pcd] > - gArmVirtTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress > + gUefiOvmfPkgTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress > diff --git a/ArmVirtPkg/Library/CloudHvVirtMemInfoLib/CloudHvVirtMemInfoP= eiLib.inf b/ArmVirtPkg/Library/CloudHvVirtMemInfoLib/CloudHvVirtMemInfoPeiL= ib.inf > index 666b5d9711..6df26ccd64 100644 > --- a/ArmVirtPkg/Library/CloudHvVirtMemInfoLib/CloudHvVirtMemInfoPeiLib.i= nf > +++ b/ArmVirtPkg/Library/CloudHvVirtMemInfoLib/CloudHvVirtMemInfoPeiLib.i= nf > @@ -26,6 +26,7 @@ > EmbeddedPkg/EmbeddedPkg.dec > MdeModulePkg/MdeModulePkg.dec > MdePkg/MdePkg.dec > + OvmfPkg/OvmfPkg.dec > =20 > [LibraryClasses] > ArmLib > @@ -44,4 +45,4 @@ > [FixedPcd] > gArmTokenSpaceGuid.PcdFdSize > gArmTokenSpaceGuid.PcdFvSize > - gArmVirtTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress > + gUefiOvmfPkgTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress > diff --git a/ArmVirtPkg/Library/DebugLibFdtPL011Uart/DebugLibFdtPL011Uart= Flash.inf b/ArmVirtPkg/Library/DebugLibFdtPL011Uart/DebugLibFdtPL011UartFla= sh.inf > index 7870ca2ae4..f35a0913f0 100644 > --- a/ArmVirtPkg/Library/DebugLibFdtPL011Uart/DebugLibFdtPL011UartFlash.i= nf > +++ b/ArmVirtPkg/Library/DebugLibFdtPL011Uart/DebugLibFdtPL011UartFlash.i= nf > @@ -30,6 +30,7 @@ > ArmPlatformPkg/ArmPlatformPkg.dec > ArmVirtPkg/ArmVirtPkg.dec > MdePkg/MdePkg.dec > + OvmfPkg/OvmfPkg.dec > =20 > [LibraryClasses] > BaseLib > @@ -41,7 +42,7 @@ > PrintLib > =20 > [Pcd] > - gArmVirtTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress # Flash.c > + gUefiOvmfPkgTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress # Flash.c [SAMI] Please reorder this section in alphabetical order. > gEfiMdePkgTokenSpaceGuid.PcdDebugClearMemoryValue > gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask > gEfiMdePkgTokenSpaceGuid.PcdFixedDebugPrintErrorLevel > diff --git a/ArmVirtPkg/Library/Fdt16550SerialPortHookLib/EarlyFdt16550Se= rialPortHookLib.inf b/ArmVirtPkg/Library/Fdt16550SerialPortHookLib/EarlyFdt= 16550SerialPortHookLib.inf > index 22aba53d9b..3e2303b7f4 100644 > --- a/ArmVirtPkg/Library/Fdt16550SerialPortHookLib/EarlyFdt16550SerialPor= tHookLib.inf > +++ b/ArmVirtPkg/Library/Fdt16550SerialPortHookLib/EarlyFdt16550SerialPor= tHookLib.inf > @@ -29,7 +29,8 @@ > ArmVirtPkg/ArmVirtPkg.dec > MdeModulePkg/MdeModulePkg.dec > MdePkg/MdePkg.dec > + OvmfPkg/OvmfPkg.dec > =20 > [Pcd] > - gArmVirtTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress > + gUefiOvmfPkgTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress > gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase > diff --git a/ArmVirtPkg/Library/FdtPL011SerialPortLib/EarlyFdtPL011Serial= PortLib.inf b/ArmVirtPkg/Library/FdtPL011SerialPortLib/EarlyFdtPL011SerialP= ortLib.inf > index f47692f06a..e677f1d9e7 100644 > --- a/ArmVirtPkg/Library/FdtPL011SerialPortLib/EarlyFdtPL011SerialPortLib= .inf > +++ b/ArmVirtPkg/Library/FdtPL011SerialPortLib/EarlyFdtPL011SerialPortLib= .inf > @@ -28,9 +28,10 @@ > MdePkg/MdePkg.dec > ArmPlatformPkg/ArmPlatformPkg.dec > ArmVirtPkg/ArmVirtPkg.dec > + OvmfPkg/OvmfPkg.dec > =20 > [Pcd] > - gArmVirtTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress > + gUefiOvmfPkgTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress > =20 > [FixedPcd] > gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate > diff --git a/ArmVirtPkg/Library/KvmtoolPlatformPeiLib/KvmtoolPlatformPeiL= ib.inf b/ArmVirtPkg/Library/KvmtoolPlatformPeiLib/KvmtoolPlatformPeiLib.inf > index f201aee50c..78c9d9d764 100644 > --- a/ArmVirtPkg/Library/KvmtoolPlatformPeiLib/KvmtoolPlatformPeiLib.inf > +++ b/ArmVirtPkg/Library/KvmtoolPlatformPeiLib/KvmtoolPlatformPeiLib.inf > @@ -24,6 +24,7 @@ > EmbeddedPkg/EmbeddedPkg.dec > MdeModulePkg/MdeModulePkg.dec > MdePkg/MdePkg.dec > + OvmfPkg/OvmfPkg.dec > =20 > [LibraryClasses] > DebugLib > @@ -34,11 +35,11 @@ > =20 > [FixedPcd] > gArmTokenSpaceGuid.PcdFvSize > - gArmVirtTokenSpaceGuid.PcdDeviceTreeAllocationPadding > + gUefiOvmfPkgTokenSpaceGuid.PcdDeviceTreeAllocationPadding > =20 > [Pcd] > gArmTokenSpaceGuid.PcdFvBaseAddress > - gArmVirtTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress > + gUefiOvmfPkgTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress [SAMI] Please reorder in alphabetical order. > gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase > =20 > [Guids] > diff --git a/ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.inf b/ArmVi= rtPkg/Library/PlatformPeiLib/PlatformPeiLib.inf > index b867d8bb89..0584a53ee3 100644 > --- a/ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.inf > +++ b/ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.inf > @@ -41,16 +41,16 @@ > =20 > [FixedPcd] > gArmTokenSpaceGuid.PcdFvSize > - gArmVirtTokenSpaceGuid.PcdDeviceTreeAllocationPadding > + gUefiOvmfPkgTokenSpaceGuid.PcdDeviceTreeAllocationPadding > =20 > [Pcd] > gArmTokenSpaceGuid.PcdFvBaseAddress > - gArmVirtTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress > - gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress ## SOMETIMES_P= RODUCES > + gUefiOvmfPkgTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress > + gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress ## SOMETIM= ES_PRODUCES [SAMI] Please reorder in alphabetical order. > =20 > [Ppis] > - gOvmfTpmDiscoveredPpiGuid ## SOMETIMES_P= RODUCES > - gPeiTpmInitializationDonePpiGuid ## SOMETIMES_P= RODUCES > + gOvmfTpmDiscoveredPpiGuid ## SOMETIM= ES_PRODUCES > + gPeiTpmInitializationDonePpiGuid ## SOMETIM= ES_PRODUCES > =20 > [Guids] > gEarlyPL011BaseAddressGuid > diff --git a/ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoPeiLib.= inf b/ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoPeiLib.inf > index f045e39a41..76c3c5d3c8 100644 > --- a/ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoPeiLib.inf > +++ b/ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoPeiLib.inf > @@ -26,6 +26,7 @@ > EmbeddedPkg/EmbeddedPkg.dec > MdeModulePkg/MdeModulePkg.dec > MdePkg/MdePkg.dec > + OvmfPkg/OvmfPkg.dec > =20 > [LibraryClasses] > ArmLib > @@ -44,4 +45,4 @@ > gArmTokenSpaceGuid.PcdSystemMemorySize > gArmTokenSpaceGuid.PcdFdSize > gArmTokenSpaceGuid.PcdFvSize > - gArmVirtTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress > + gUefiOvmfPkgTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress > diff --git a/ArmVirtPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.inf b/ArmVir= tPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.inf > index 7edf501808..691fc26350 100755 > --- a/ArmVirtPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.inf > +++ b/ArmVirtPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.inf > @@ -32,6 +32,7 @@ > MdePkg/MdePkg.dec > MdeModulePkg/MdeModulePkg.dec > EmbeddedPkg/EmbeddedPkg.dec > + OvmfPkg/OvmfPkg.dec > ArmPkg/ArmPkg.dec > ArmPlatformPkg/ArmPlatformPkg.dec > ArmVirtPkg/ArmVirtPkg.dec [SAMI] I understad this section is not ordered correctly. But can you=20 can place the OvmfPkg/OvmfPkg.dec towards the end of this section, please? > @@ -93,6 +94,6 @@ > [Pcd] > gArmTokenSpaceGuid.PcdSystemMemoryBase > gArmTokenSpaceGuid.PcdSystemMemorySize > - gArmVirtTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress > + gUefiOvmfPkgTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress > gArmTokenSpaceGuid.PcdFdBaseAddress > gArmTokenSpaceGuid.PcdFvBaseAddress [SAMI] Please reorder in alphabetical order. > diff --git a/OvmfPkg/OvmfPkg.dec b/OvmfPkg/OvmfPkg.dec > index e3861e5c1b..89091e8bf1 100644 > --- a/OvmfPkg/OvmfPkg.dec > +++ b/OvmfPkg/OvmfPkg.dec > @@ -481,6 +481,21 @@ > # > gUefiOvmfPkgTokenSpaceGuid.PcdForceNoAcpi|0x0|BOOLEAN|0x69 > =20 > +[PcdsFixedAtBuild, PcdsPatchableInModule] > + # > + # This is the physical address where the device tree is expected to be= stored > + # upon first entry into UEFI. This needs to be a FixedAtBuild PCD, so = that we > + # can do a first pass over the device tree in the SEC phase to discove= r the > + # UART base address. > + # > + gUefiOvmfPkgTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress|0x0|UINT64|= 0x6e > + > + # > + # Padding in bytes to add to the device tree allocation, so that the D= TB can > + # be modified in place (default: 256 bytes) > + # > + gUefiOvmfPkgTokenSpaceGuid.PcdDeviceTreeAllocationPadding|256|UINT32|0= x6f > + > [PcdsFeatureFlag] > gUefiOvmfPkgTokenSpaceGuid.PcdQemuBootOrderPciTranslation|TRUE|BOOLEA= N|0x1c > gUefiOvmfPkgTokenSpaceGuid.PcdQemuBootOrderMmioTranslation|FALSE|BOOL= EAN|0x1d -=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 (#111146): https://edk2.groups.io/g/devel/message/111146 Mute This Topic: https://groups.io/mt/102413878/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-