From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mx.groups.io with SMTP id smtpd.web10.4375.1681985034045919629 for ; Thu, 20 Apr 2023 03:03:54 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=UmE8a9Pk; spf=pass (domain: intel.com, ip: 192.55.52.151, mailfrom: james.lu@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1681985034; x=1713521034; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=Pa7L0aKM34+5XZ6UR237YcMuqSfYfN2j89deJ0cvLLU=; b=UmE8a9PkbxPY0imZ5yI4SwOnN72TqU5sAENEu2op+dW/yprA6/I8OwMe LMPYqaDS3Mv+ttkHSvZIBQmaYt6M9y0YQo3xy7bGQ2bFfTeBqSHUf0PML hwrB0fjmoiJ4NOiqHKldBL3xDB579TCIu8kfzFV+BmPSHKmkAvD2TVU6j j6sCxxOXZg+h063rC4MdTfQS4EEJ1mfAUTlpOIBrNMG92QLd9O9BMu0Ny dhJQKGv9tVgaDu3GIJRYAIGTHZ8ibSRWMgfp3NkmFNp/ZZ/qmH5cMV6i6 ENmMYGEDe+sjkl9zNg4rw2MR3p4i9kgYR2ZGpfFG6MBCizJgApFwwjfvQ g==; X-IronPort-AV: E=McAfee;i="6600,9927,10685"; a="326020252" X-IronPort-AV: E=Sophos;i="5.99,212,1677571200"; d="scan'208";a="326020252" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Apr 2023 03:03:53 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10685"; a="1021531199" X-IronPort-AV: E=Sophos;i="5.99,212,1677571200"; d="scan'208";a="1021531199" Received: from orsmsx601.amr.corp.intel.com ([10.22.229.14]) by fmsmga005.fm.intel.com with ESMTP; 20 Apr 2023 03:03:53 -0700 Received: from orsmsx601.amr.corp.intel.com (10.22.229.14) by ORSMSX601.amr.corp.intel.com (10.22.229.14) 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 03:03:52 -0700 Received: from ORSEDG602.ED.cps.intel.com (10.7.248.7) by orsmsx601.amr.corp.intel.com (10.22.229.14) 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 03:03:52 -0700 Received: from NAM04-BN8-obe.outbound.protection.outlook.com (104.47.74.43) by edgegateway.intel.com (134.134.137.103) 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 03:03:52 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=glQGLWWI27DHERkC624gxR0vcRWB17vMVaEHwjTGp81a4igim9OTgaCJcp4xXSsHdpTsujtyExjJjQqquKgIxw3gMmsipL6gkVbj03JGchNQOU+Kjz9R995asv76Go/4jyIdPbAE0pyrnPObY6106LldlhAsoBRKlZfYNeiuhM4vkbh0mZZJJrvi1Z0F+GgJFxoH/79HrWM/7fCuXhBvzCl/pb25YtgL7YVSQrps5gtLXOwCmT6JnibTxiZgzLgGwrR2cnFPEvOO/DY13FT3AVBLWkX/k2JpcVIt/BetIfK4cPTpgYCT7Kh7XH0I0lzPfOPVEFrk77tPDYsLAwWgHQ== 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=up4rms/4GInIJltVVsX1+cdIY42LGpteAO161xrjapM=; b=AVd+sUtObpVRkSx8XxTeeps99vQNzvQ6A20PvUkkpBF8UcuoI5lACTbjb2sRvcJC/tUITgWbKeuRq5wIaXKYD2fr8ix24zH9raleSDCGFa3K7wJD8CEKX2C5XCO2cUOsEqVyQY6KnZeo89f9cZ01qthwjkqAVe6cpjh4RlhETYs1embROU8zjzOXcjwUsgePxKFQ76yMMS3b/1B1zkI/BwZk8zvLraefdKtHV0bZtMnB48UEns6WkzEUftjmUdi0yiaMQbYWW2vIqxtiVcFFYfbS3DK4hKfGZfjAd+Wt4jgaBR12st8MCCJu6teGkLQmrYwEejgj5s5+WDJwN77enA== 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 CH3PR11MB7819.namprd11.prod.outlook.com (2603:10b6:610:125::20) by DM4PR11MB6501.namprd11.prod.outlook.com (2603:10b6:8:88::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.22; Thu, 20 Apr 2023 10:03:50 +0000 Received: from CH3PR11MB7819.namprd11.prod.outlook.com ([fe80::6cff:33a5:d30b:9ddb]) by CH3PR11MB7819.namprd11.prod.outlook.com ([fe80::6cff:33a5:d30b:9ddb%5]) with mapi id 15.20.6319.022; Thu, 20 Apr 2023 10:03:49 +0000 From: "Lu, James" To: "Wu, LinusX" , "devel@edk2.groups.io" CC: "Dong, Guo" , "Ni, Ray" , "Rhodes, Sean" , "Guo, Gua" 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: AQHZc1ovodM0lIGLOECzfYkEPOMfe68z9/7A Date: Thu, 20 Apr 2023 10:03:49 +0000 Message-ID: References: <5c06696f3b044899e2e80b45742e76448b604cba.1681973922.git.linusx.wu@intel.com> In-Reply-To: <5c06696f3b044899e2e80b45742e76448b604cba.1681973922.git.linusx.wu@intel.com> Accept-Language: en-001, en-US, zh-TW 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: CH3PR11MB7819:EE_|DM4PR11MB6501:EE_ x-ms-office365-filtering-correlation-id: 3971ac0b-62cb-4821-41af-08db4186897b 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: e+yqkNImUKPNSnt5CYiM6KaRQhY6+q2gsltetoug4mPsF8DN/qn2mshSpc+v391+G2oC59wQPY6uRkeWCcoAJlzwrA7TIdBUaI6s6BjbTk8a1DqKhrjFtOW1pf5YAsgCeQzcm6oxVTh4kkg7+rjQ5vTkNMYTqoBXE27OPHd3hyjdQRNolOGZsBWsmUdAOtJe6qiMaKn7xa5q2bvRDKPLT9U+OMOaODwljar6rVg9e1ZkgsGsGeWayI1nNYjeN6vrZBPXqTxGGChk2sfC3K6L6woPWvaDFJRAvD+Jpymaq0VYBFAz76DS9oxIVa7GtuIHzIbQ3FlX9JdRxfm5M41qJduhAgK7Xft50Aav/oCimw1dUB1mS3v+zJBLlKkNiu2rd1bSekJTTqY1upZL0ZZxL7sbQwvhBY/n7rZ+LY38fEPpMS3ipcN90QKjy21/UkoSuwp6uEb2kdIafJIR5RlDDvoI/ZR7oR3kBpWcU4sBattKwca4B+rOKF7j1dRN98SSziNo61b6noq7v/Lyp1MoEyDPIoudo441fmd6PtgB+9Pf1KjdTDM9bYIoqGwY86ESemUHKKrcSX3K38PP9FiHwf/dYjLJ+zCMysWKB8Pn2nc= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH3PR11MB7819.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(366004)(396003)(376002)(346002)(136003)(39860400002)(451199021)(186003)(86362001)(122000001)(41300700001)(66556008)(55016003)(33656002)(53546011)(9686003)(6506007)(107886003)(316002)(66476007)(64756008)(4326008)(66446008)(82960400001)(26005)(71200400001)(966005)(7696005)(83380400001)(478600001)(110136005)(38070700005)(8676002)(8936002)(5660300002)(76116006)(66946007)(2906002)(52536014)(38100700002)(54906003);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?gobT81KPcBDOYw9SzFVEMHQIEXpbnQF/vsDNaNG2Q95Sw3F9YO0/wnFHAuK/?= =?us-ascii?Q?K46hTf68I1BihwUPVmQyjEuT4gxRM+YH8BEUxwoUHjbqHBuZB5e0ktfHw39A?= =?us-ascii?Q?mMQ7wAJPfOgdZCEZUa9KKJVJwf97IVxGHwYualvXhOygFG/wrdY/QZDZkCfr?= =?us-ascii?Q?jqcv2F9CQBf8LYa0q7x3Qe8FS30uk4ZF9TB9nMiKfixc1UR29nlWoAiTyvHH?= =?us-ascii?Q?7Qnp01McLn2cI4AzAdF/HI1Gz0nRYxH46shwFyUFVfyjMPWZu4FId6/zbeCR?= =?us-ascii?Q?e4T8aUXWK1Uxg8lHp/fDJb+XJcrEQQf/6mnDRa4e/fbFozXQwq9xVicsD6t7?= =?us-ascii?Q?+vHHbzWEKvep5ZZsMHKZnxfucWkWFOzMBQeWmC/PIYlrCHlTzR5e7ZIbZvcY?= =?us-ascii?Q?6hDfU0ne3CENggWwe0GCuGczDoZXvCLU8f0Ze6q87aQhNj18Zsru1UvFPwfc?= =?us-ascii?Q?+MyY065B80AlRdsLe7efAD3KLDRwKGbwUASkB5Dp9kPfcD3N74uCNr/z2y4+?= =?us-ascii?Q?Z3xtPwahM3WFKAwARLzQNhSX9Bw3l3DU1cFducuLGztTh8RIhRJx6vm7jXHO?= =?us-ascii?Q?7i7lSVwVsyNYIhWXXNC+jlvM3p2G5EodZQsDIrZSgGTzqlaJmjgoLqljEUlg?= =?us-ascii?Q?FsbV3VHLaLRjB6V564GU90EO8HjMaOIhIGA6jlMDdj/J25KPviqr2WG9B8EB?= =?us-ascii?Q?OTeU5LX3BcxDKA4Q1J62M1N8QUX94KNNMHptUStKskz47jAWG26LIQGbr6bM?= =?us-ascii?Q?aSPVPyv4RowD1TMtO1azkhxzpWQWIHXcCQkle1NyLnzO/kgVjP3KIw2NZHoM?= =?us-ascii?Q?y18J54NvJgAMDgfxvjU1Qd84noghJr4K6dFo5PaBTIaYFSMpJkGLco83dpGi?= =?us-ascii?Q?Dj8eamI9vJrr56BKWjbeLjyJ/rkM4og4ILgz8fHA73xDlkzFUj4lkD2QUrla?= =?us-ascii?Q?9K7EEbSinhejernHxcanb4u2Oom9oQhMsv5h1e7Bw4Si8rByPs8lXy10Qu44?= =?us-ascii?Q?hzpoqmwemTTrrb72qaXcjhIoYH2V0GCkqy64ruNtjw4Jazem73zr1EfoaMl7?= =?us-ascii?Q?D07/yWntu8DEbmwUUtg0rtE1GZbKr7S0jyH2taOalmFBt0amzgMUAAMFwhvj?= =?us-ascii?Q?Bn2qYDbzuoAlJjrrTZHWXuqGUKeZWhQb5CeaoFtkxyx0mNVy3LPXSXLSvQ+R?= =?us-ascii?Q?HlEQwLWMx3LAsGBNctLoXOvG/n41qAplMP+LwRKjNBNgfvFnC48t8PU05i0L?= =?us-ascii?Q?U+y2+0oBJREDFu7QwbraDbsPgz3ju3zYaEJNHEPj2A6k8U/XY98ZgkxTxe2G?= =?us-ascii?Q?eVpK/H1CnHcufmfaHZNHqKz1uNvYEwUIrad73tw9C4ovzzNfGvFXkZUG88ca?= =?us-ascii?Q?ZhXMC2zmp/19tBpkN11Q7mJ5rakZ1Qh34GdnVGmbgz0BPRR4kkjwwp2FdPqA?= =?us-ascii?Q?JfWbLD6DTdCNU/jTnzT8EejAO1t2V4cNwQpoYCqAB0SiDrOOUlyWmFMYb7Wu?= =?us-ascii?Q?ZzmPZe4D3s8jmzURYEPiJOngU43ECblNmHq68ahePb6guOWGerwC6u5G/plr?= =?us-ascii?Q?FZtc0n6ZnHf2lhKThQY=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: CH3PR11MB7819.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3971ac0b-62cb-4821-41af-08db4186897b X-MS-Exchange-CrossTenant-originalarrivaltime: 20 Apr 2023 10:03:49.1017 (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: 0BUAqmKpSkkkXwVD4UIVXxAW6Z2vdqN596pEwiqcRylGXTxmh8ymwbary8j4KtD3cKZwbxXA3r8m5dSc6dERyQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR11MB6501 Return-Path: james.lu@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: James Lu Thanks, James -----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