From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mx.groups.io with SMTP id smtpd.web11.6890.1647494488718150083 for ; Wed, 16 Mar 2022 22:21:29 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=mXm809aO; spf=pass (domain: intel.com, ip: 134.134.136.126, 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=1647494488; x=1679030488; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=f3sdd1d9IMUjGztNI2UODa24Z7xV/wwo6muFoOJgOlk=; b=mXm809aOrb3nns6rGCov948rsxFHfrDKc/4B1GM8ZX/uSBMKbZyUohS7 oGfO1eeosNgWDaB89YRbR27E3J59Dl8p1gihmm1BcEQY5rbotsyFMSdyB sZbyj04ihc0yAhCcTsoDqMsDUam2owXw+4x5zqfwoG/+hBZbHoL+XLOFs rK9IhvGxVQJYi8+f2bqnvX3B5m1mTAn4comyi/vn60G0ZzvF8ITmxaB/W c7Vs1ec4H3Sp0jXBEV1PpQj8NbEDk1VcyLEEK3duXjTafep1n7nVutBPG kBU2UyqOtu8Ry4fIbWTaLd/aoYlKF6tyerT+k4cazbNwUmyaYJMrGmnR1 A==; X-IronPort-AV: E=McAfee;i="6200,9189,10288"; a="238947899" X-IronPort-AV: E=Sophos;i="5.90,188,1643702400"; d="scan'208";a="238947899" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Mar 2022 22:21:27 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.90,188,1643702400"; d="scan'208";a="557777860" Received: from fmsmsx606.amr.corp.intel.com ([10.18.126.86]) by orsmga008.jf.intel.com with ESMTP; 16 Mar 2022 22:21:27 -0700 Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) by fmsmsx606.amr.corp.intel.com (10.18.126.86) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.21; Wed, 16 Mar 2022 22:21:27 -0700 Received: from fmsmsx601.amr.corp.intel.com (10.18.126.81) by fmsmsx610.amr.corp.intel.com (10.18.126.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.21; Wed, 16 Mar 2022 22:21:26 -0700 Received: from fmsedg602.ED.cps.intel.com (10.1.192.136) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.21 via Frontend Transport; Wed, 16 Mar 2022 22:21:26 -0700 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (104.47.59.174) 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.2308.21; Wed, 16 Mar 2022 22:21:26 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=njYFUYIt3RDshdq51mcy1FYX49XrwZIL8JH32A0hQp91GbBUglAmv+f7PNkExBzVJubZVc3IMe0HQcwRD42fIt5wFEX7D3OjqwtsKO7xW/kzT59W9rWK08MkpeEErO4qi1CnvsKKwu3Y4AzqrqSbOsI+gMU7ggNML7e2xdl/Pt0zDveXApmZNiotVlLO2W5C/K5n5ny5JIhODMMhGAsM+LCC/0KS1D3hCtti1lJwE0xERgTOSduyiHRgvrG7VZPhEBHxMzGpbvACc8CvKhGa52PYoiBWJ+eiwgnyBGbd5g4qUsIsjc4bMObyQJLm2IVYB12XEW+JuuZRdodpq42NgA== 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=Cwgx74xFBQVARwYeOm9pCX+QXE+jVm47vXEk2ig61gg=; b=c/ZjIG+/W9gYvDegpMBeI7EZvbNzGhxWpUYxFKx3yKMSlzTKr/vw9YW5h9D3hGs2CjBKrYJp0X2i26Hhb0rsIrITGIVmDz+vxbKKkt6QUtc0cg71pOZ8q2e5onpZEPBdomLkOKEUgJCpC0l6e9i5Ryl7XAKuLCdoj20O2yw4EwXopnpZot/9LBBkOjjqK4cpc7QTiYtufK0eutXe2/T7rX2VIrByy9cMHh/znNozSaFFvM571Vkl1TzUOQtUAvk+p/w8dmqaqGUjy3RBtrfbmawrtuD22wXCCJDTYizBfC+GGCW2mOt9Q/1Ri0Ep5hRQ/Qnbfhd7pu0qbPK/2qV4mQ== 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 CY4PR11MB1622.namprd11.prod.outlook.com (2603:10b6:910:e::10) by CY4PR1101MB2184.namprd11.prod.outlook.com (2603:10b6:910:24::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5081.17; Thu, 17 Mar 2022 05:21:25 +0000 Received: from CY4PR11MB1622.namprd11.prod.outlook.com ([fe80::9988:fd3a:9117:99f6]) by CY4PR11MB1622.namprd11.prod.outlook.com ([fe80::9988:fd3a:9117:99f6%4]) with mapi id 15.20.5081.014; Thu, 17 Mar 2022 05:21:24 +0000 From: "Ni, Ray" To: "devel@edk2.groups.io" , "Ni, Ray" , "Kuo, Ted" CC: "De, Debkumar" , "Han, Harry" , "West, Catharine" , "Xu, Min M" 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/QgAlGiKA= Date: Thu, 17 Mar 2022 05:21:24 +0000 Message-ID: References: <3825a811b080d332ee27d42c625d0753daf3a961.1646981876.git.ted.kuo@intel.com> <16DB43B094343574.10972@groups.io> In-Reply-To: <16DB43B094343574.10972@groups.io> 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-office365-filtering-correlation-id: 71352530-e5be-4d44-4246-08da07d5fb24 x-ms-traffictypediagnostic: CY4PR1101MB2184: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: nc5TJhdezbJ88dYo7eApTWO4cV9uH6oVi1PKwolqgDYM8R8aZLy+63ZkpQomzFqDFJAHpTgQd6aAOZ5yb/vInOAUhx65B0Qp2kIVcK6X+ZF1ywSmkoOboPoXTYwU+94sNDv8VlbhRfrFLoRm+30AJVpqH2MKfsJyjuNYn3+FqUFCYVvsm/vwTx7KwGP12bs+jiJzeOfNLzqkl91Ovgai7+wPCubGYsLavbIOic84qMyTGyJdKPrYK+MHhBDD6sxik4tlluCoUWQTEDNFam8kx3H0pmT5svNRoVk6yYOaMrOZPh7r5KjpMLrnZPl80gaDM4rc6hVWUtPbGd8pzhtOPBQCZnl2iaiDdXOPi6pf9kX5z0chB3Az2R5paRdaLUO9uT9wWuxDxE8Mpoe53ebKtX4Oqv1+RmEade3Gbc+MAlp+fmGVtr1lviAhYycNLgLDCkI/37qMniqg6V5Lg9dg6Hwv0BiY4gwO82T6WvjXnCPXqODORnevCZPIwhzfsy6J5/XGH++23tisnHrO4BeoTsw5nLZS8Ws5/0ic9VhEzQLSfEbUtwxGrQ3i5cbyZipo3jkGY0jAaoEKNXyHmFXnjsftNtCeoU6QmXJ969NmW5c/ANGRwrPjvV/e4YdHiRh0Fsef0SnThFcc3Kb2flvD6y52UU94B2t+WB3HT2mHuSQW+Ke+JGdg1yep04qDH9amyQFYGtPD/e9tCHDFbi3UwApyoBAADLE/0mhv2TpvZPtFjRXCW5pF07q1ccS4Cns2IoMQMngVU04PlxNMfa9tlNsv8V/IWWIkHUHr5xtrwl/L3n8ioAb/YmEdoC8mk8FGIB6wEsWm6F1jSamC3irbfg== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CY4PR11MB1622.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(66556008)(66476007)(66446008)(8676002)(64756008)(38070700005)(66946007)(76116006)(4326008)(508600001)(966005)(5660300002)(38100700002)(82960400001)(107886003)(122000001)(8936002)(33656002)(55016003)(71200400001)(54906003)(52536014)(110136005)(6636002)(9686003)(316002)(83380400001)(19627235002)(6506007)(7696005)(53546011)(86362001)(26005)(186003)(2906002);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?IuCpILzBwPyKeq0MvvGyMwfDxXlVuRUpSM+HYQ7IgpKaUlBHwkAFeOEZkE6g?= =?us-ascii?Q?1MeFPCbdVugW3m5p7xkEd3hNtALPLbFpJJVVQK5sC6XxGwWlvEw57093YNiL?= =?us-ascii?Q?sA8Htn73jdvhxgReFJtMSwFowMqmhOsciDb8110qrbqoWMPN7ctS3+thF/LJ?= =?us-ascii?Q?aDnCVorSSGwv1pnixUOYPmwn/GAA4oxxHCe4nt55DtOSH9cOoeXJ15a7kwL5?= =?us-ascii?Q?FGLElHtKRSTGrlTOM1wE3/7qAZpraG2EocYRboTTtzEXtXkrCcahlz0Tz4il?= =?us-ascii?Q?Q3lvpLearRbYJhsVXYTKEhcrDhsbvm44/S2XGEj/EGLgXqpltEIBbJvKgDSZ?= =?us-ascii?Q?1R3QunR6XghG7zB0+/lpqZeyRDg/r7rQSdrLzKZu5oDvJwGXtXO2OY7e4zBJ?= =?us-ascii?Q?GyDZ+8VT83qvCfLeqQiaKXaxBEoYF4qtYy4dQ+pzglXGGVAQ4H7RQp0cDA4C?= =?us-ascii?Q?9oWihXYD7OUeH62LGJ+a3ktFnUS7I3qoTYQkdneW0RHF31xELZ7ggz/BJLpK?= =?us-ascii?Q?IjH/t0fGimxtno2NPk1qu0tLZbCINvnn/SjRheqzpUwB5tNRjJqVDViu3weo?= =?us-ascii?Q?JBLiqzY01EnWDFpe4xrJtBs/5gU0tTh3yacfdV68W56YMs6svD83obM9uH3p?= =?us-ascii?Q?/uEUKcdouRerJsOmjtVbyxSXAJyHEpHP7yB3RsY5wczxXlEn2eWkWyTZk8/F?= =?us-ascii?Q?O4O89BDZOm0lRNapXM0isMjeTclXB/9TsCIj9x6qjOH0NtSDgdij+T5wFGkR?= =?us-ascii?Q?lxmcr812A23CL8lnWBa1+5vMhmmakDn/FPzyBqHp3g5NZVokun5/aJ4mHrVT?= =?us-ascii?Q?aGiKp3P4nUxhfLNolYpsxwtEJrgdTg1pjQMd11YqZk8BGQk3X0cCdc4npHV1?= =?us-ascii?Q?5/SuQSFQe6L2GvoZyM5KEWHiS/NKqEFF9NfGU+ZhtqIfsLN2S0oZHHontgOR?= =?us-ascii?Q?8JUzFWlOqHg3ZzD498AMYFrsVjvAhLiObPvc7K7w7f/WFNE4xlwLbDNAAFJV?= =?us-ascii?Q?kqvhE0ZCCe3JztHX424T5r8T3ua4mjYiy7i0O5Nv1l8uS83/GEUjBFHNkRQd?= =?us-ascii?Q?syCRlqyZLLdnK5UtK2nWkGdcy5AV3nZDw5qKgK03HfxivJP/eGLOzE7gpM7N?= =?us-ascii?Q?XLl8amIDTrosn5FtdiKwkE7BPojCYj+lYTfiw1Z9XGGTI1TTwK4IiSLbwFUx?= =?us-ascii?Q?IXiPsXt32xQnA5WATcymOcj1/UVeyfLLKWU0hVxxhl2Rmk3t2uw/FC3n/fmR?= =?us-ascii?Q?Flc/GbrRNhvXndwEh1FdVHAdKP4WiIlwqEYJ6VTxat6kl/pMPF2xzAHi8ndE?= =?us-ascii?Q?WeeqIU6fNfKmIj2rLtdbFNj0duFN2f/F9BozrIb7X7VMer1JJ9qY2CXBx0eh?= =?us-ascii?Q?cTuesxzPJvp6TwIJuBzoASC7HosjRy/7bLBMPV95kWDsoZU7PUyYejrb/GsM?= =?us-ascii?Q?kek0nQead6Z7GItf9vSdVZj5NfQazdrf?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: CY4PR11MB1622.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 71352530-e5be-4d44-4246-08da07d5fb24 X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Mar 2022 05:21:24.7826 (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: DkoEpbl7TlSl18TSSG0HpK1zdasMB6PekTIKWuOvjKalaThMQ3ZcO6980oH0FmaK7jCR2OhWU39VzHSkxwsMzQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR1101MB2184 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 Ted, Have you considered a case that BFV is a FFS2 FV and the logic may find a F= FS3 FV just below the BFV? Thanks, Ray -----Original Message----- From: devel@edk2.groups.io On Behalf Of Ni, Ray Sent: Friday, March 11, 2022 3:42 PM 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 Search= ForBfvBase.asm Reviewed-by: Ray Ni -----Original Message----- From: Kuo, Ted 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 -> 2867= 6 bytes .../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=3D9m= q3<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^pmqCD= m!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^pmqCD= m!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_oUQ0= R{$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, 0x2d, 0xd3 } } -%define FFS_GUID_DW= ORD0 0x8c8ce578 -%define FFS_GUID_DWORD1 0x4f1c8a3d -%define FFS_GUID_DWORD= 2 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,=20 +0x4dca, { 0xbd, 0x6f, 0x1e, 0x96, 0x89, 0xe7, 0x34, 0x9a } } %define=20 +FFS3_GUID_DWORD0 0x5473c07a %define FFS3_GUID_DWORD1 0x4dca3dcb %define=20 +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 -- 2.16.2.windows.1