From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mx.groups.io with SMTP id smtpd.web11.3395.1681980320844664705 for ; Thu, 20 Apr 2023 01:45:21 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=CVmT/2mC; spf=pass (domain: intel.com, ip: 134.134.136.24, mailfrom: gua.guo@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1681980320; x=1713516320; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=nxon4lMZZ5xKfs4KAfXEYQaeM0qt6YGHMF2S6+R6KE0=; b=CVmT/2mCr/MX2Wh7mXn4RKbGeucHpUN+edrqKYtNck1EnOQztMjKzNsC Df9+Tb6HeCs18I2OUhJ3s6JcSAYjJIj5CS2tCfarPjPhAeC0XZwc+zzif iAJjv3kfPAPuOUpqYGCW01Qh+I8KwCeaeBAGxLSzcob0XLmWiQm3m0e5Z Gq4ehbs2ePbFNYDhK/JKjx9p6u8ZC0ldtm0kqGxycA14JfzMStgWy4o4W XA8hhDtsefzJhMLCAxHmFgooKOonmxErSI1fAiutBk/v0kjMFPdHwwGdc exnjJwixTsNPgXvBwWa0cLGtJNr6fx+Fs0nYdm/eq0bLsFdv4vXVrIV6g A==; X-IronPort-AV: E=McAfee;i="6600,9927,10685"; a="347537162" X-IronPort-AV: E=Sophos;i="5.99,212,1677571200"; d="scan'208";a="347537162" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Apr 2023 01:45:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10685"; a="722290320" X-IronPort-AV: E=Sophos;i="5.99,212,1677571200"; d="scan'208";a="722290320" Received: from fmsmsx602.amr.corp.intel.com ([10.18.126.82]) by orsmga008.jf.intel.com with ESMTP; 20 Apr 2023 01:45:20 -0700 Received: from fmsmsx611.amr.corp.intel.com (10.18.126.91) by fmsmsx602.amr.corp.intel.com (10.18.126.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Thu, 20 Apr 2023 01:45:19 -0700 Received: from fmsmsx602.amr.corp.intel.com (10.18.126.82) by fmsmsx611.amr.corp.intel.com (10.18.126.91) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Thu, 20 Apr 2023 01:45:19 -0700 Received: from fmsedg602.ED.cps.intel.com (10.1.192.136) by fmsmsx602.amr.corp.intel.com (10.18.126.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23 via Frontend Transport; Thu, 20 Apr 2023 01:45:19 -0700 Received: from NAM04-DM6-obe.outbound.protection.outlook.com (104.47.73.44) by edgegateway.intel.com (192.55.55.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.23; Thu, 20 Apr 2023 01:45:18 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mghmV+hGpIX5iU9V+FYIMcZh6jPyDF2oA2g6RpHVKCTjhBVF1JiqepodEUmf5H4D4Xb+UZ/EQUy5RDlC8Em0bk2s1zcvz15rNzGYZUK9AqArwBpqgu/4ZFYgNHUkuqPdMH/4zT6PDjvbaDTdZ9YA6Ok0IRo+2SMq5h1voq7eUwMyX49rC5Ez9c5i0PpOz+JP8FpOel/61DtnmWeWOUrNSVg8v3mQhwcpB3SJBA5ukkSQm4yAYslV7igHowJ+XxZigrOKVBIGXR1ZFlpPW5/HSaGwOadmzJjAxcDciMih6FahGJUrc6QFaAIYjbRjhZ7OftSJGE/aqSgBKGLjZnLYjQ== 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=uQnf2KqJO8+92VSeIz5Yx9fakWurv3KpWi8ophvlf+c=; b=ki0viakEJneBP1aJdyxzooq9SMXcnzF7XVjlIP25nOzTnBND8dtPdncz34lG/Ee3Fq0sZS0f4/kKrD7oxuCwWrEVgbFo70MTvF8BHMuZxAIc1lWGXdHwKP+rNIrzKoqHIhkjVT8tZqyfOuDWvg2WJ3H+dlaiDn/vQY4WEl7xAzwjnM59x3cyaT9jGdEK/ZoWAWi5TxLAosKlzazkhrQm6InieSBt/oa6Wvh3y3JXIV+h8BQydvno8k6ZOlmIc9bn4O5W0mgcTwg2OXeHHWcy4ImslW5Bis6Jh2TWgrByeUnD4VtkzRWNwUTFv2u7PlC37+RcaClRv351eerkk8D5dA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Received: from BL1PR11MB5478.namprd11.prod.outlook.com (2603:10b6:208:31d::12) by IA1PR11MB7726.namprd11.prod.outlook.com (2603:10b6:208:3f4::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.45; Thu, 20 Apr 2023 08:45:15 +0000 Received: from BL1PR11MB5478.namprd11.prod.outlook.com ([fe80::c7e7:7b20:9a8b:aa59]) by BL1PR11MB5478.namprd11.prod.outlook.com ([fe80::c7e7:7b20:9a8b:aa59%4]) with mapi id 15.20.6319.022; Thu, 20 Apr 2023 08:45:15 +0000 From: "Guo, Gua" To: "Wu, LinusX" , "devel@edk2.groups.io" CC: "Dong, Guo" , "Ni, Ray" , "Rhodes, Sean" , "Lu, James" Subject: Re: [PATCH] UefiPayloadPkg: Move Network modules from Dxe FV to Network FV in elf Thread-Topic: [PATCH] UefiPayloadPkg: Move Network modules from Dxe FV to Network FV in elf Thread-Index: AQHZc1ovzNI29NW/r0yQX23Wdc+5k68z4gPQ Date: Thu, 20 Apr 2023 08:45:15 +0000 Message-ID: References: <5c06696f3b044899e2e80b45742e76448b604cba.1681973922.git.linusx.wu@intel.com> In-Reply-To: <5c06696f3b044899e2e80b45742e76448b604cba.1681973922.git.linusx.wu@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: BL1PR11MB5478:EE_|IA1PR11MB7726:EE_ x-ms-office365-filtering-correlation-id: c581edcc-a766-4416-b44c-08db417b8ff1 x-ld-processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: h77LN56kSujUDLvnysvc3qD00cSzm/SZ4kAoDbIdRbObD9PAArB9fPPnUG0etf8x7HDR5I3+7kf0gqM65clj4//Hljb1+Bbn/QVPsinw9iVNpFortwqRkT3WtNOSMdJ13/PX2KidIwmjMUY1o7CXHrKctbCEW9muPM+2YJ+VkxuAh9xpOxi+NN0PJ9ZudXWE0pU6GraDf50KPlIfdy1eeEkPbqkY3LTAQ4WKbxbSjmW2WKbY+AgfmGTQg6mh9fwxkqLA/quJL2xFWRAka4Hv5uf1KvJ8sbfG+uXebMcg0GmSqWVmHtfxXY/g0HrC+EWGLPn9j3AKf98a+RsYgtEghFYLkikSQTGa4nVDkROHLNRLwpRuIEEV4gwAlSVF9hlnHjcwKvs7Ud2VhzcxCHmIGkl4Bqh8yRQglfL0FUT+r+5D99bvl0AsisjV5ZPup5GkB4mxa81uNbHA5OmLw0wTec22HcjJFLA9kZiBuLvQJJ2g8qL63wNnFt61t+s7rR4gJozlsb6yfVc+dcFsCeXtEWgmcH+5MjnimyV5uhsmk4jUGRFBssOeMCN0TjIuVjeVS82SihRyQO2MI3GozdmTnpKOz8spRWowqgLuEpBkAqc= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BL1PR11MB5478.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(396003)(346002)(39860400002)(376002)(366004)(136003)(451199021)(122000001)(2906002)(82960400001)(55016003)(33656002)(38070700005)(38100700002)(52536014)(107886003)(478600001)(7696005)(26005)(83380400001)(6506007)(53546011)(71200400001)(9686003)(8676002)(86362001)(41300700001)(316002)(966005)(110136005)(5660300002)(186003)(8936002)(66446008)(54906003)(4326008)(66476007)(66556008)(66946007)(64756008)(76116006);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?/ovdtvwZl2OiLTPRzerTdHcRkNI/ee3vyZiCkP3UM1kawWIo/+GtNChdEE7N?= =?us-ascii?Q?lIl2W3vco4XCh+x54ceWDyhd6ocGqAfja8DcjMYG49SnBrph3B6syjahqYzL?= =?us-ascii?Q?oJPBcxKwB2yETdfYcQppQyaELCxikPvrYkbGd+63Cvyk4GDdX3Yb31MEYMNJ?= =?us-ascii?Q?lyGWSyTfuj4PxbdpvfPi8OweiKnC0pyePblkXH9eEfwaTAKws4jNa+9EJZmv?= =?us-ascii?Q?pL9kwBJ62nAL+Zb9l+TfPO5MKgVZ1JRxjl3l4M+2wmIPG13I8eVxQi5FTsRV?= =?us-ascii?Q?Cq3fv+CfzBzH6dJkuRzI9NMDAMi1tYTo1PcLLMjF433qmiKnzXSb0QHwMSHa?= =?us-ascii?Q?1xFH6im3+4GAtLtwDmDz31/baGA2+Lb0o6Z9B2i234eK7AObjaEfogn7HoRA?= =?us-ascii?Q?vvDB9CTJnE4kodrokFFsYPs36JZ/8VecKVDrMuMI7s7hqTJ2ClksrmBE7n25?= =?us-ascii?Q?G7acG90WjZQo49EWQmeh2QZsoZ+zlSve5mwWRdOwEiy6QbZQEuZiBpq9sJfM?= =?us-ascii?Q?Qwr+/3pDH5BoSbelqKBny823TECp235JdZc01nHmLDPhFAa7g9pmL9pKot5x?= =?us-ascii?Q?FSmIi/3YXjIZozMe2H4PzZ/VjsQgB/FIcYSdaSBL4gUryE8BpSRzdNjBsCWc?= =?us-ascii?Q?PpV+I91h1LvuKrpu5/VR4Pkvi0di3jMqwi7bRxclnXBzZuOh7LSFdWivLIAQ?= =?us-ascii?Q?tTgLPZBO5pTe9MOt3sYcSno2CklFz5QSGHgCprI/xcZjjOBd2BRJ5sAB+l8v?= =?us-ascii?Q?VDkCi6itkoJThFSU+F0dMRRM/MGq3c2MWwHbCEk3NZsJZBqjNCNoQchskmiA?= =?us-ascii?Q?vSpY7T7X+mHkVnqKRq4eimGzpKZyla/U3+E4hi5epz2L6G4wln8BbvB2HUoz?= =?us-ascii?Q?vdrsACpl9r9tYjdX4u46c/cA65JHcf3dXYez+DrVsJIcX6MNoD99J8JGd7Zt?= =?us-ascii?Q?AWgG5g1nqBGNbzrTlFj+WEyuBJrIIk4huahuesC5S4i9ojrqo/ynmSxMFpcL?= =?us-ascii?Q?/rSfsTFuBW5xalS4nD8z4aHsaCgmLbHP8R5NuBqnVbRvR8NtDS/PTi/rQgsH?= =?us-ascii?Q?gYbqD8xPSYohyIZ7VrqVCiED4rMu6XtmCLKRGOoy2PaydzuwGQ6kjFK7HsTK?= =?us-ascii?Q?u140KUPj0QZ0wbo0rAKF/utMbAWXpVzEWJVxqr5Mj9HmPmnQkHV3EvM5/JWc?= =?us-ascii?Q?vhLUwv7x9k6ztBQiXQLXhwnNw6p8OwxtEt6p79WPABRq33XrTtucgxQ2KG68?= =?us-ascii?Q?2ALnS/FcG3o9Gm3P4uFEie0ScIrj6wmn68XcF7L6bK/8VZGM054+3HtgyLjw?= =?us-ascii?Q?PzwQRGO8Uey19WnQQKvu2k9+ZlKZAyGr+3wi0gJ0YSFowdQrt5pSzBO5J4e0?= =?us-ascii?Q?D6yW/6Kar6bPTJXyDw/Z7G7kpVLdP4ylIaxXU3GiorGUgDlmsIXTavYyKG0/?= =?us-ascii?Q?EbW7f+8O7XmB00+MWsdgFwozTiBWECEjUY9Mp85YJMZk31A3WtkupPGsiM3A?= =?us-ascii?Q?F88OkH/u4Qz4qsDYkpg1IxPvBwCb52QWxGdmcWlzP2Cpt575brPVmpUOJBQZ?= =?us-ascii?Q?Y20tbXB4JVy44TymhQg=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BL1PR11MB5478.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c581edcc-a766-4416-b44c-08db417b8ff1 X-MS-Exchange-CrossTenant-originalarrivaltime: 20 Apr 2023 08:45:15.4494 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: t1naHf9YksDXQ0zi/y9NCvVKdnuRh1P975mOdfTZ7aebTKinMcrpRqiSj7I0aFAwjYkcGY45PtyaO2jQaN3OKw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR11MB7726 Return-Path: gua.guo@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: gua.guo@intel.com -----Original Message----- From: Wu, LinusX =20 Sent: Thursday, April 20, 2023 3:31 PM To: devel@edk2.groups.io Cc: Wu, LinusX ; Dong, Guo ; Ni, R= ay ; Rhodes, Sean ; Lu, James ; Guo, Gua Subject: [PATCH] UefiPayloadPkg: Move Network modules from Dxe FV to Networ= k FV in elf From: Linus Wu REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4417 Since UefiPayload had supported multiple FV, move Network.fdf.inc to new fi= rmware volume and add this network FV into elf file. Cc: Guo Dong Cc: Ray Ni Cc: Sean Rhodes Cc: James Lu Cc: Gua Guo Signed-off-by: Linus Wu --- UefiPayloadPkg/UefiPayloadPkg.fdf | 32 +++++++++++++++++++++++-- UefiPayloadPkg/UniversalPayloadBuild.py | 12 ++++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/UefiPayloadPkg/UefiPayloadPkg.fdf b/UefiPayloadPkg/UefiPayload= Pkg.fdf index ee7d718b3f..f8c2aa8c4a 100644 --- a/UefiPayloadPkg/UefiPayloadPkg.fdf +++ b/UefiPayloadPkg/UefiPayloadPkg.fdf @@ -60,6 +60,35 @@ FILE FV_IMAGE =3D 4E35FD93-9C72-4c15-8C4B-E77F1DB2D793 { SECTION FV_IMAGE =3D DXEFV } +!if $(NETWORK_DRIVER_ENABLE) =3D=3D TRUE= +##########################################################################= ######+[FV.NETWORKFV]+FvNameGuid =3D 3CF5CB69-C439-4B84-AF11-8167B2= 2D7221+BlockSize =3D $(FD_BLOCK_SIZE)+FvForceRebase =3D FALSE= +FvAlignment =3D 16+ERASE_POLARITY =3D 1+MEMORY_MAPPED =3D = TRUE+STICKY_WRITE =3D TRUE+LOCK_CAP =3D TRUE+LOCK_STATUS = =3D TRUE+WRITE_DISABLED_CAP =3D TRUE+WRITE_ENABLED_CAP =3D TRUE+WRITE= _STATUS =3D TRUE+WRITE_LOCK_CAP =3D TRUE+WRITE_LOCK_STATUS =3D T= RUE+READ_DISABLED_CAP =3D TRUE+READ_ENABLED_CAP =3D TRUE+READ_STATUS = =3D TRUE+READ_LOCK_CAP =3D TRUE+READ_LOCK_STATUS =3D TRUE++#+# U= EFI network modules+#+!include NetworkPkg/Network.fdf.inc+!endif+ #########= ####################################################################### [FV= .BDSFV] FvNameGuid =3D CA5590AF-9558-4822-B5EA-BE2E876CD3EC@@ -276,= 14 +305,13 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe= /BootGraphicsResour !if $(UNIVERSAL_PAYLOAD) =3D=3D FALSE INF MdeModulePkg/Universal/BdsDxe/B= dsDxe.inf-!endif- # # UEFI network modules # !if $(NETWORK_DRIVER_ENABLE) = =3D=3D TRUE !include NetworkPkg/Network.fdf.inc !endif+!endif # # Shelld= iff --git a/UefiPayloadPkg/UniversalPayloadBuild.py b/UefiPayloadPkg/Univer= salPayloadBuild.py index db7ce0500b..83e0de95d8 100644 --- a/UefiPayloadPkg/UniversalPayloadBuild.py +++ b/UefiPayloadPkg/UniversalPayloadBuild.py @@ -108,6 +108,7 @@ def BuildUniversalPayload(Args, MacroList): DscPath =3D os.path.normpath("UefiPayloadPkg/UefiPayloadPkg.dsc") = DxeFvOutputDir =3D os.path.join(BuildDir, "{}_{}".format (BuildTarget, Tool= Chain), os.path.normpath("FV/DXEFV.Fv")) BdsFvOutputDir =3D os.path.joi= n(BuildDir, "{}_{}".format (BuildTarget, ToolChain), os.path.normpath("FV/B= DSFV.Fv"))+ NetworkFvOutputDir =3D os.path.join(BuildDir, "{}_{}".format= (BuildTarget, ToolChain), os.path.normpath("FV/NETWORKFV.Fv")) Payload= ReportPath =3D os.path.join(BuildDir, "UefiUniversalPayload.txt") Modul= eReportPath =3D os.path.join(BuildDir, "UefiUniversalPayloadEntry.txt") = UpldInfoFile =3D os.path.join(BuildDir, "UniversalPayloadInfo.bin")@@ -185= ,6 +186,17 @@ def BuildUniversalPayload(Args, MacroList): ObjCopyFlag, EntryOu= tputDir )+ #+ # Append network fv = to sections if exists+ #+ if os.path.isfile(NetworkFvOutputDi= r):+ index =3D remove_section.find(EntryOutputDir)+ r= emove_section =3D remove_section[:index] + '--remove-section .upld.network_= fv ' + remove_section[index:]+ index =3D add_section.find(EntryO= utputDir)+ add_section =3D add_section[:index] + '--add-section = .upld.network_fv=3D' + NetworkFvOutputDir + ' ' + add_section[index:]+ = index =3D set_section.find(EntryOutputDir)+ set_section = =3D set_section[:index] + '--set-section-alignment .upld.network_fv=3D16 ' = + set_section[index:]+ RunCommand(remove_section) RunComman= d(add_section) RunCommand(set_section)--=20 2.39.1.windows.1