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.web08.3332.1646984513926159582 for ; Thu, 10 Mar 2022 23:41:54 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=ZN+auaOI; spf=pass (domain: intel.com, ip: 134.134.136.24, mailfrom: ray.ni@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1646984513; x=1678520513; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=s7ZWejnZ+wpGsUukHFkBNNsNhWT0m4VrFcdHBhWFcMI=; b=ZN+auaOI1KzpxO2odT+DJuWAFa6KtDsh3k1OOuvNvy2yOm+7VHeXBsYm u4AwTNsAC/PAYD+yuZPWemjHob8URtV1EdOcMR8kr3EDHvOPsfluXE+BC 29g4mOX91NlBM/gwXEV9mMrPP312s6MBBgW5BiZUsCDz3q8BhXeWwnFTW a4f7vVdrE9blNM0nA5xc4nAMWrtDfGeVwUTdjC5DT4LsqPLNd2SnH7Au3 gF99ZhuO2zE15cqDiRXsZb9N7tqFjeVid/h0ibndAFt1eNRnpTH/fMrb3 1jIj/fbWIjKbHx2IF3IGgZDpl/negFPyqIdyDlGr7lHPVZXWcVZ/knx+N w==; X-IronPort-AV: E=McAfee;i="6200,9189,10282"; a="255255664" X-IronPort-AV: E=Sophos;i="5.90,173,1643702400"; d="scan'208";a="255255664" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Mar 2022 23:41:52 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.90,173,1643702400"; d="scan'208";a="642903795" Received: from orsmsx601.amr.corp.intel.com ([10.22.229.14]) by fmsmga002.fm.intel.com with ESMTP; 10 Mar 2022 23:41:52 -0800 Received: from orsmsx604.amr.corp.intel.com (10.22.229.17) 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.2308.21; Thu, 10 Mar 2022 23:41:51 -0800 Received: from ORSEDG602.ED.cps.intel.com (10.7.248.7) by orsmsx604.amr.corp.intel.com (10.22.229.17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.21 via Frontend Transport; Thu, 10 Mar 2022 23:41:51 -0800 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (104.47.56.168) 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.2308.21; Thu, 10 Mar 2022 23:41:51 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gPW2ISSFInVTb/5PI0XcTsVJpsu5o/6Ue2AucOS8fMbNWjwVi1AlUFZk2+DNu5JAXmU5xWD4Y7EGJ3CzAs3TXixm9lplHgvBdhc0eaqpjdcoMy4RCeChTE1gPiC15JtUS12Fs6c1xirSZKBtGI5J5TxRD9BpvHamiyvmxCqXObqdfoBawCyQjg2cATGQSMrrt+WWUE64M5MaCh5If8KG3rzRtPby7KE19el7XaxBtXT2vMfNmzim5dUDCb+V+U3PsK/wqybxub/lz/KqM1YFVQCUvVxHkT3jzd2xKf6xNCokSdONw5xu9Paek84qN4hcosIcF3V7EcDRANPe024Kjw== 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=lbn6f5J0W7ZNGoASXXbHMHpfwOZFsjBwx8HJiGq1G0Y=; b=GY4Gbcaebxj35a8zIHAP4/nfaUIcMh5rvHRcM3EXwPWQ2qrUGAYzr83CElVeFT1iN6WWEqkiV7XiRzAEfY8tBauk1fYPc0cImhB4qLiHtKADzln4lQEi5RqO+h7iLs/hZ19IAMSobvoNQ2G+hTsB/13fipThO9Ur0zE/BGOfJ91/FeXNliTcNr5A7h3iSl7hjgXiVn9KZDq4QTYclhmIwi8rP+P0AXr5mQdcFYX3Tvo7wHOhp7VtIUo0xKwAQOrPhGxonDuy4L7Ko52ac62Tj7OeldPESEeiKyrM3uXsxCV5/UVE8PYXGA6kKhU69sFCTJozpde5wLKMe5kkPZftqA== 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 MWHPR11MB1631.namprd11.prod.outlook.com (2603:10b6:301:10::10) by BN9PR11MB5276.namprd11.prod.outlook.com (2603:10b6:408:135::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.14; Fri, 11 Mar 2022 07:41:48 +0000 Received: from MWHPR11MB1631.namprd11.prod.outlook.com ([fe80::99b6:d326:2925:4d2f]) by MWHPR11MB1631.namprd11.prod.outlook.com ([fe80::99b6:d326:2925:4d2f%3]) with mapi id 15.20.5061.024; Fri, 11 Mar 2022 07:41:48 +0000 From: "Ni, Ray" To: "Kuo, Ted" , "devel@edk2.groups.io" CC: "De, Debkumar" , "Han, Harry" , "West, Catharine" Subject: Re: [edk2-devel][PATCH v2] UefiCpuPkg: Support FFS3 GUID in SearchForBfvBase.asm Thread-Topic: [edk2-devel][PATCH v2] UefiCpuPkg: Support FFS3 GUID in SearchForBfvBase.asm Thread-Index: AQHYNRnBUK+YvQZNCEK8x1sNlxrWZqy5zJ/Q Date: Fri, 11 Mar 2022 07:41:48 +0000 Message-ID: References: <3825a811b080d332ee27d42c625d0753daf3a961.1646981876.git.ted.kuo@intel.com> In-Reply-To: <3825a811b080d332ee27d42c625d0753daf3a961.1646981876.git.ted.kuo@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-version: 11.6.401.20 dlp-reaction: no-action dlp-product: dlpe-windows authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 8632cbc3-4a7e-4359-0a7c-08da03329994 x-ms-traffictypediagnostic: BN9PR11MB5276:EE_ x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: kiLiDG4aSdzO4fZVQCHjc2XB04b9I9zStQmqZ1maw98CrnA9IDvCXKQ2QMUuNvOs0LQSDZi66zNlcGEZ5DE3AMMZs+ybKJIwLaRbnWByi6vy/xLo8/A6J17M3By9HWNBmCjagdJ8cioHXJo7okSIheWKKToDnCrOnMc80Taj12pnjDb0/9qY1JF1PVPOnih6PzUybxhItO0rtvYXPT1Ugfu5WFNGLT3CECeBd/rAslxjMAqoH+h4t6rxL1OSpOsJcVsj0lYdGt+qvtjDXcb7Y6FFTg99tb6sOPEVplYPsrx8TEEcSY2Tf3kVBqtLvLu83Iprklx3/ayJI15T+aXkgCd5oYGYsklDAQL//Jh3aTKPLOQKurhC7uYKRtxjYP7lsrAHcDnQDTh8eqp94T6XiHaLwzSuAzJGpXDiZsV2ZXLzKJkHbX1Oh7Ncfl4U6SaPtusGdQ3EU3hlpx2nvRniy/BSXorNMBKWTQ5GwolZKo9k4PRDTG3QY/BjWiuPYsk5KTSOdkC8JNXGTZcWoMOouMtQxj60NBb8ercYtLCUcWosqz3QhGVPOxbjEH9xot2mPDmy16ESuIzqXDofGgQ0NmpuEuAlPoyRk0lm6Dz3H/IfGucKVlEB3DThq6nMOYUAp5t7wmF3CZVOaSJ0Jvai8E03tqI6WIK4jlgngxgVJDZcM8POkdazdwx5ncLG+lpKuPKSZpT/Zj2wDjrE5IKPnl7/2OnqBxxSeYlJDKwDLfl0NRkfrS/v0ZcUBsDwwPeBoSJPuuizA8Xn7HU3gUofGBnzjuXe8r42uEdkLD7s4FE= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR11MB1631.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(76116006)(8936002)(66946007)(508600001)(110136005)(122000001)(33656002)(4326008)(71200400001)(54906003)(26005)(83380400001)(38100700002)(52536014)(186003)(5660300002)(86362001)(55016003)(316002)(8676002)(6506007)(7696005)(53546011)(107886003)(9686003)(19627235002)(66556008)(66446008)(66476007)(38070700005)(82960400001)(2906002)(64756008);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?gKQW5eV0pTBHZF3GDIDm85Fu2zaldvkAg0a+PnxxLNlfuUZ1OZjUCsK0Ce7e?= =?us-ascii?Q?Y0EHpkOJcMxKnAicqRJmEWk8izti5dl+YfmzE5sXvEpN1O75y/f8kcUZEMIL?= =?us-ascii?Q?mEETtUOuLEA7o8ARA8o/l8GUHv9VxGx6vrXhNdBln4u5G3ZHffcll29XNLaB?= =?us-ascii?Q?oO4SW1LZvnTpTrrZTDhv95ivN4ZM/EFr3GEqGU7/ctOYcepwS5ltnk8ooqE/?= =?us-ascii?Q?pwZ2zdTv2S8a25DnDAp5TU7mnG4YRxWlcsTIH6RfeWR220dW4YoWI+tI7NC6?= =?us-ascii?Q?nn97JRWD1Z+4BgWjeQjwfRA/Na15dh2Jy/aMKv8sv/HqTHc7HPKKrlLJN3ed?= =?us-ascii?Q?3sagfO64E2VkE2MHBNA8348TDqJkL/tgnhnMKy73endD0P40yBBTDD3C1oIU?= =?us-ascii?Q?EOndse2m304NY1cw9AC1o1eU0J2BIk0Hs54UdjOmJJ8NQsb2nUbJFLUikjLL?= =?us-ascii?Q?Fn2Um2Y5t7K3PXoRzm1/LqpyQCzeJNhDki2aX9M4vQ0nJbuDSHnZ5sjEP0be?= =?us-ascii?Q?RPKW6IDia0PEG/FuBQuZnRKqBOSgKhT5pwMUSLnyhQU9TuZY26RFlFbowmCO?= =?us-ascii?Q?aX7Wm16e/XNBY+j7PTCGn4ifpOKi93O9eXCZWaltLg3XVtZXpGR2cP5BaHSl?= =?us-ascii?Q?LFbfu3xo2mj+ZNo9Hr4MT7xTHS0xC78B1lor7P7QIwHdOCL6VBK7OPWFURPg?= =?us-ascii?Q?E6fxgD1+iBT8ocG6e9sPFjooK4Eq3cO/nTvhbeANDlLi70mk0iUaTmL74m67?= =?us-ascii?Q?gw00q8Lbe8lTh7w07UI9GAs+mYa49Vz8DIR+JCdsER6kD7JnZgCPEb6UJWBQ?= =?us-ascii?Q?DStBR4qmIdnLB3zc3pg8crC/TvtJTgy7hSdJNGjuKleFV9j7UZ4mwpnudrtk?= =?us-ascii?Q?Mm8XdeZP6Semaj2IrrOLDZdelDcwV35j+yTviwL0OypiB/BZo+s2SD9kdyWB?= =?us-ascii?Q?9EBYqCYUxROPweGMhZFKLey9xWmDmA6paKPcPrmZhxOZAikUkRT3+nZZIT7C?= =?us-ascii?Q?ZQiBgo1geNhgw+RoawMHoRr0zG2tozgvjwH6O0VA8f8cK1cuLok0tiLfoNiV?= =?us-ascii?Q?GEBEPtfQSX3Qn7mEsdvBq6v7yUbqODvK8Ug71wQhpBxE7qlaOX+vYu7+Z+GK?= =?us-ascii?Q?zp6LJWcDSMZu05cziL6VTZqGV1oGigfwOra3Ip2ILOwMCz7QtooZtozREU6S?= =?us-ascii?Q?sYe0ucz4uZqDvYE1QKQ3t4uK16qg3dpR/t1gTyFXWj0/GsFUaiFwHZTeQJlR?= =?us-ascii?Q?U/iMqIbRRfgjN/W+2sxBSV3jdm+odTTWI2Tk4C3SGiw3NBFEZ+AcL+aapqaB?= =?us-ascii?Q?aUgkHD5aC98qjTY8amRPTtPhID6s7dGtZpkf1BKP2wMGoYGAlE2kPpHS+L6A?= =?us-ascii?Q?jJ9kTkzZVJ6oTC4T3BKmbDmBPpnCfnvEKPhp7oMsw3B10I4pmIfJrYUTV07r?= =?us-ascii?Q?Zi9+W4xfHnPRiscgX4fAcnc5+5CcjuKbM/5Vfah8rAmXtX6PbBiVMOG/14I+?= =?us-ascii?Q?Qi/86DWis/JtuugErjcl03It9g27Nrb3Cq5TC9Cf5dR+wIyP1/t8UfKihFwh?= =?us-ascii?Q?7ItN7xBV2nf9f2oPIGGJuGTUXfGxslvuJBydoEJlJZf+sX4uycCOOBextWWI?= =?us-ascii?Q?fA=3D=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MWHPR11MB1631.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8632cbc3-4a7e-4359-0a7c-08da03329994 X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Mar 2022 07:41:48.4179 (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: VKLNsk2o4NjOmKJoQYiGtvtSDrojBQnp2PZOCVAxIXw/GkSG32CZXhMU+gB3XU2Ap9TqCSxcSADAQEtXepqhQQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN9PR11MB5276 Return-Path: ray.ni@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Ray Ni -----Original Message----- From: Kuo, Ted =20 Sent: Friday, March 11, 2022 3:29 PM To: devel@edk2.groups.io Cc: Ni, Ray ; De, Debkumar ; Han, = Harry ; West, Catharine Subject: [edk2-devel][PATCH v2] UefiCpuPkg: Support FFS3 GUID in SearchForB= fvBase.asm REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3D3862 The new algorithm searches BFV address with FFS3 GUID first. If not found, it will search BFV address with FFS2 GUID. Cc: Ray Ni Cc: Debkumar De Cc: Harry Han Cc: Catharine West Signed-off-by: Ted Kuo --- .../Vtf0/Bin/IA32/ResetVector.ia32.port80.raw | Bin 484 -> 548 bytes .../ResetVector/Vtf0/Bin/IA32/ResetVector.ia32.raw | Bin 468 -> 516 bytes .../Vtf0/Bin/IA32/ResetVector.ia32.serial.raw | Bin 868 -> 932 bytes .../Bin/X64/PageTable1G/ResetVector.x64.port80.raw | Bin 12292 -> 12292 by= tes .../Vtf0/Bin/X64/PageTable1G/ResetVector.x64.raw | Bin 12292 -> 12292 by= tes .../Bin/X64/PageTable1G/ResetVector.x64.serial.raw | Bin 12292 -> 12292 by= tes .../Bin/X64/PageTable2M/ResetVector.x64.port80.raw | Bin 28676 -> 28676 by= tes .../Vtf0/Bin/X64/PageTable2M/ResetVector.x64.raw | Bin 28676 -> 28676 by= tes .../Bin/X64/PageTable2M/ResetVector.x64.serial.raw | Bin 28676 -> 28676 by= tes .../ResetVector/Vtf0/Ia32/SearchForBfvBase.asm | 51 +++++++++++++++++= ---- 10 files changed, 41 insertions(+), 10 deletions(-) diff --git a/UefiCpuPkg/ResetVector/Vtf0/Bin/IA32/ResetVector.ia32.port80.r= aw b/UefiCpuPkg/ResetVector/Vtf0/Bin/IA32/ResetVector.ia32.port80.raw index 79b23c047bdc6e552d77d5c9e9aeae21ff04d91d..23254e83bf1a17dee9f38c235fc= c9948624a7536 100644 GIT binary patch delta 227 zcmaFDyo9BG0uUG;*vZVmz@W<@z`$S&Wc)9RYyQbxs@7N`P<5a2DnL~gPkVYw4**r!cFFjcZU?HGY1)}sx(=3DwS^|0>c z(xuH6Dh#FbI}bBQD3s24Eoykcv-u}uY2Sto!p|CZ><5C*qp$yU9^J6;8$wu(9TV=3D}(c8 zUjg)y@_Q48|1M?^0T*VtBLDzE4S>dJ0U!uIkRJe$|NsA!umLp*>x1c7{{R2! Mtds8n6_W!3A^UepbpQYW diff --git a/UefiCpuPkg/ResetVector/Vtf0/Bin/IA32/ResetVector.ia32.raw b/Ue= fiCpuPkg/ResetVector/Vtf0/Bin/IA32/ResetVector.ia32.raw index ce7faa502b858e99908bcdb397b776258205e1d5..18562d8f1f58601f66fcb0cbf2f= 994046ce48fde 100644 GIT binary patch delta 225 zcmcb@+`>{n0SF8a>||zOV9;d{U|_HXGX59EHUDHTRcoves5(#_Qu?g1LgcjVDc{n& zjTI7m^W~3nW7tMv416`-n$r#(HT2Y{+C)y36^7FJorjqt6iR2j7BoEI+5D5Sv~S0L?*04scOHHHuk+|j`-wr}jBh5cDmQQY zub0NpD4w=3DMnSsH9U+F;FtK9$p{|hkeaA0F#;8%K(wu6JA??&H&z6X6T`Yyb-n;_3H Z0jOYd0;3s6_e+a^|Np<-GkG4P833r5W}5&2 delta 153 zcmZo+xxySY0SF8a=3DrRZ}FxWCMF#InvZmbZfc-qrb`ns_~#I{Suzw}XKg~UwL&cxE2 zjTJJjhjlNPUTCgRVJJP-d6+puq4e-;&K>)Kp!4YKf1O8Px=3D-v1XZ$kpQMqv4f4ww* zM)9;A$_xw+{7MJXUZqaXVU!VYn;_3H;s5{tAge)O@&raRj^>vc|Nj4fxn=3DS>Ml%58 CZbm=3D=3D diff --git a/UefiCpuPkg/ResetVector/Vtf0/Bin/IA32/ResetVector.ia32.serial.r= aw b/UefiCpuPkg/ResetVector/Vtf0/Bin/IA32/ResetVector.ia32.serial.raw index 6503a988abdac06f9aa88f0a65f2525e12233b0a..e4aa4fc30a32bc3d4d8d0e1726c= 43fdafef4a374 100644 GIT binary patch delta 214 zcmaFDwuF6xY`rV9;enmZ3=3D9mq3<3-cwm`=3DJqPXUt%%y6L6#`WUibG1DHCBk6wms!r zdbhDcVsF0Ow9+e$6*8UAO=3DgvzeysvjRq?c^r}O|&m2H=3Ddf9ZChs+p#piKXj+s#*{0 zUM^kQT%p2HI=3D}NUbA&?ajMssN2Rxg9GM4tG?fT0+F{OjiW8&Lej75`AFs>J_`LCD8 z&nTX@Lz#iWfnVuB+AHPBT}&|oJ`>~_Cj9^Ze*zRte#c}Yu;9;Yrq|zIvi^U${?Gsa LFE>v%Vm1N**#ci0 delta 146 zcmV;D0B!%I2jm8j9YX~JF~BVV5C8x@00030ax;N=3D5P0Q`jCJdQcoaQ~98Y!Pfp{31 zHHl$$*@1W*g~Kh=3Dbrcl3=3DnSp^pmqCDm!4}B)UliB;letu_u|lBgKygUvv&IUM)3&F4OYb&T zNbJp*n^t{?AX75Kkxp|qp$yU9^J6Bj4$8^oS9{Mya%q3`zYTOak(_!-61 zb|^D2IPfbSNPD$!a;u^OyQ4b81EBWFTNEw%UN^ja@b~}!mpT7{gvsPTiV} delta 259 zcmZokXi3<>rVygbAi%(2%fP_!zsR_;LZISlPfzLV#tISJE*byQM~xK{Gfg`aOK&z- z$h02Tysxk81Z^i=3D0z<_Lw-!>@TaY`>8ANp?ZUi48fjh|6GZHF=3Dg zg9E?PfwWg`llLkr@O!Brcl3=3DnSp^pmqCDm!4}B)UliB;letu_u|lBgKygUvv&IUM)3&F4OYb&T zNbJp*n^tq;e#OWC z|0Nh+&I3AT2g8N`|M`_}ygvDBH^Ya%+q?ID)Jx-M6i?fs%)sEluXG^o)w0RCiZc9u z>I@fv+9p83MyJRzkL7q|Noc8|A2(?|NsAY0P%kh#bX|dM?DmecyvDa|7^m9 eje;9^6<$hx0&4}@$q*Le#xP;ROJ;}$oEHj+dD delta 239 zcmZokXi3<>rr@K?Ai%(2%fP_!zsR_;LZISlPfzLV#tISJE*byQM~xK{Gfg`aOK&z- z$h02Tysxk81Z^i=3D0z<_Lw-!>>7a><5C*qp$yU9(`Fqxl19OQD^cag(*P}AOHWC zV0bwdXz&h(3;+M~E8Tc~^4D&L4}G_Hw|&%0<7X64+o8{ z27aXnX*)O=3D`fl_c=3DzGxjqVK|MS9OL7K>5iR6m9ulx4bm?_y7OP8W3SKSw=3D~Mal%Hy e54;L5Z+)Bq0zms1!b02_CQNvF7$O1|o&W$orgJI) diff --git a/UefiCpuPkg/ResetVector/Vtf0/Bin/X64/PageTable1G/ResetVector.x6= 4.serial.raw b/UefiCpuPkg/ResetVector/Vtf0/Bin/X64/PageTable1G/ResetVector.= x64.serial.raw index d9b051ff06d1d30b0dfd585e05e75c98ebd88b03..de97b858ddd03171114aa0efb19= 29796b1aa5435 100644 GIT binary patch delta 259 zcmZokXi3;0t5Cm}+3>(lW(EcZT?PRL23sKGe^FfXPv%m!#tMO|1H~bw&l)R4PTQXH zExp@VA+a}KZd&P;#tNCv=3DO(jCPrp_Hs;YR}(^Gl?sLHlW#=3DmqsP}NM+&cxDnKvk`W zbuX7LZLUyZD4pMVm^nhBbjIsI!vmhpKN(B=3D(suo2o}8l4!FXWuTZLPUuO^>RoWeM5 za;%aYqwwSrau&;S2V&QrD#)%f$8 z>GijlZ2w=3DH|M~y_rS)GRQMY-&@>gz!m#;og00E$%7{Wr_7$!`3c^M)C7M=3DhAKvr~s delta 209 zcmZokXi3;0tKi(rY; zmfmcvkZC=3Dvd%5&NbA<{+>8Z}c%n=3DHuhhKY6o}tjgcw(}u;w{Ecla!_~#!a58nO}3=3DaHC2hv`#Otw~z;SW}4DER#U{{$$QJWtt1G~&-|rq|zI x{`>bb{m=3DjZFOB~KiL%Y_mA`UNR4`C@x$84nG0>R|VIgh|6DGV|3=3Dx5t0RVO0UcCSS diff --git a/UefiCpuPkg/ResetVector/Vtf0/Bin/X64/PageTable2M/ResetVector.x6= 4.port80.raw b/UefiCpuPkg/ResetVector/Vtf0/Bin/X64/PageTable2M/ResetVector.= x64.port80.raw index 0e53a574fab74db6973d7ea41a6a495266a4d0ae..23c58501b5a48448ffcd2757310= 442ef33f45fa0 100644 GIT binary patch delta 291 zcmZp9z}WJDaRXaI{Z3{E1_oUQ0R{$JAme{gT=3DP%nQnkhkfvN+=3DA*Ih6D@0D)p7Jfd z+gKs7H(zdA>6OL`na<}Xvr13DRspK2c-qrbdH|@(woAspbURShOw-Q9(se*pt%r3l zmo9CtP+=3D&Y-+7ohLZNiVYf-}kp3OfQOZzr#c-F9E|Ni~F`#X=3Dm{?~bQ!^UR~FZ(A) zCB!qDOx~3+#k}L=3D|NjyU8&ZJ6Gl34I@Hn+9z*GwB&o;@bbam|Nmd+`~wmulm8@2FizMg exPVvTrPikjAOJL+AuPm=3DVZwx$!VnR#@B{$qM2t58 delta 261 zcmZp9z}WJDaRXaIh%SQw1A{FC1H=3DC!4oMB6^7DNorjqt6iN@j=3DH0O2S;LO~K+t*g^}o)e8#X>`csXP8q=3Da}z z+sU62rkDqO{QqBqVM7W~coEQ&9Sjrx|L0e_@%rcnv1bjxb~AkFyS;nSN4+$DM)9;A z$_xw+{7MJXUbRi$o2bC=3DrOvPcsC@zyOn#DRss6J3|4aUV|Np;C1`*o-|Nq|s#Q!}M uk9jB_^-w(G(fQ#2vk4P63SQt6OL`na<}Xvr13DRspK2c-qrbdH|@(woAspbURShOw-Q9(se*pt%r3l zmo9CtP+=3D&Y-+7ohLZNiVYeB;Up3OfQOZ#^02ZGL{uUY?f9(~y{IVd5V(RA{vgem$J zAOHWCV0bwX=3D$IW06aN3_SGw`~2jh|6GZHF=3Dgg9E?PfwWi4Cg&!~ z@cXGVTmWjD00omLB-*OKtp5M<{onupUl#uZ62|}k|K9<`|2-6sc_<$BP(0$%`QZPv g2@^I7Zs1jTDfJ1g6=3D)|zScn_Lgb6R1AtDeH0oMqWMgRZ+ delta 241 zcmZp9z}WJDaRXa|k1m4%1A{FC1H=3DC!4oMB6^7DNorjqt6iN@j=3DG?I#2s)3x{?~c*W&Px?gm6Zk$&V7I1UY>C z|6hXP<fsFq}am_!OOVt`H1gZ`chm<~RtPnYE zd&;-;ZexYS-h8=3DfrB@m&WICUl%ql(oS_P=3D8;%QG$=3D>ecB+b$XZ((OQ1Gfg`aOVu0bK?G1_oOO28RDd#*GyM6;FG5N?$ith}d??_?JFvtdN*# z+L>5-v#~;^^|0>c(hJQMDh#EkIuA2PD3l(4?KycyLJ#AK$*PIB7(Y!)n!*@2d1{gy zqx9rENj}0cpY_uC8O76fC^IlP@GBiid&M%@Iyr_vSe>EZ^Z)-7pkVU6WE;_lKd+fy ze|!1w-^=3Dtr|Np-<{tG0^Hos5)$~{rRK;h-C&tSzsXEKC^xG_wa@NzLk1Y!mNLy2Mk diff --git a/UefiCpuPkg/ResetVector/Vtf0/Ia32/SearchForBfvBase.asm b/UefiCp= uPkg/ResetVector/Vtf0/Ia32/SearchForBfvBase.asm index 10f8e3e8bb..786239325d 100644 --- a/UefiCpuPkg/ResetVector/Vtf0/Ia32/SearchForBfvBase.asm +++ b/UefiCpuPkg/ResetVector/Vtf0/Ia32/SearchForBfvBase.asm @@ -9,10 +9,17 @@ =20 ;#define EFI_FIRMWARE_FILE_SYSTEM2_GUID \ ; { 0x8c8ce578, 0x8a3d, 0x4f1c, { 0x99, 0x35, 0x89, 0x61, 0x85, 0xc3, 0x2= d, 0xd3 } } -%define FFS_GUID_DWORD0 0x8c8ce578 -%define FFS_GUID_DWORD1 0x4f1c8a3d -%define FFS_GUID_DWORD2 0x61893599 -%define FFS_GUID_DWORD3 0xd32dc385 +%define FFS2_GUID_DWORD0 0x8c8ce578 +%define FFS2_GUID_DWORD1 0x4f1c8a3d +%define FFS2_GUID_DWORD2 0x61893599 +%define FFS2_GUID_DWORD3 0xd32dc385 + +;#define EFI_FIRMWARE_FILE_SYSTEM3_GUID \ +; { 0x8c8ce578, 0x3dcb, 0x4dca, { 0xbd, 0x6f, 0x1e, 0x96, 0x89, 0xe7, 0x3= 4, 0x9a } } +%define FFS3_GUID_DWORD0 0x5473c07a +%define FFS3_GUID_DWORD1 0x4dca3dcb +%define FFS3_GUID_DWORD2 0x961e6fbd +%define FFS3_GUID_DWORD3 0x9a34e789 =20 BITS 32 =20 @@ -25,6 +32,7 @@ BITS 32 Flat32SearchForBfvBase: =20 xor eax, eax + mov ecx, 3 ; 3: FFS3 GUID, 2: FFS2 GUID, 1: Not Found searchingForBfvHeaderLoop: ; ; We check for a firmware volume at every 4KB address in the top 16MB @@ -32,20 +40,37 @@ searchingForBfvHeaderLoop: ; sub eax, 0x1000 cmp eax, 0xff000000 - jb searchedForBfvHeaderButNotFound + jb searchingForBfvWithOtherFfsGuid + cmp ecx, 3 + jne searchingForFfs2Guid =20 ; - ; Check FFS GUID + ; Check FFS3 GUID ; - cmp dword [eax + 0x10], FFS_GUID_DWORD0 + cmp dword [eax + 0x10], FFS3_GUID_DWORD0 jne searchingForBfvHeaderLoop - cmp dword [eax + 0x14], FFS_GUID_DWORD1 + cmp dword [eax + 0x14], FFS3_GUID_DWORD1 jne searchingForBfvHeaderLoop - cmp dword [eax + 0x18], FFS_GUID_DWORD2 + cmp dword [eax + 0x18], FFS3_GUID_DWORD2 jne searchingForBfvHeaderLoop - cmp dword [eax + 0x1c], FFS_GUID_DWORD3 + cmp dword [eax + 0x1c], FFS3_GUID_DWORD3 jne searchingForBfvHeaderLoop + jmp checkingFvLength =20 +searchingForFfs2Guid: + ; + ; Check FFS2 GUID + ; + cmp dword [eax + 0x10], FFS2_GUID_DWORD0 + jne searchingForBfvHeaderLoop + cmp dword [eax + 0x14], FFS2_GUID_DWORD1 + jne searchingForBfvHeaderLoop + cmp dword [eax + 0x18], FFS2_GUID_DWORD2 + jne searchingForBfvHeaderLoop + cmp dword [eax + 0x1c], FFS2_GUID_DWORD3 + jne searchingForBfvHeaderLoop + +checkingFvLength: ; ; Check FV Length ; @@ -57,6 +82,12 @@ searchingForBfvHeaderLoop: =20 jmp searchedForBfvHeaderAndItWasFound =20 +searchingForBfvWithOtherFfsGuid: + xor eax, eax + dec ecx + cmp ecx, 1 + jne searchingForBfvHeaderLoop + searchedForBfvHeaderButNotFound: ; ; Hang if the SEC entry point was not found --=20 2.16.2.windows.1