From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mx.groups.io with SMTP id smtpd.web08.7059.1647497107260417726 for ; Wed, 16 Mar 2022 23:05:07 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=er0nG40k; spf=pass (domain: intel.com, ip: 192.55.52.120, mailfrom: ted.kuo@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1647497107; x=1679033107; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=58kZuhKVQYOWUAWUtTt+x3YbjYKbo+clMMuV3jWqTkQ=; b=er0nG40keMTjzXkOYGLIefGY3c7JLFd4RA4XqqmicRrK0PnULaY+H5ST 0bqrDBune+O54BZZVeZt5TSB2d0YwDTpVLWuMDlAqizd+7xKyhwmuMqJo MnzZqGPuNuFTHi5TyyZPFDcG4L2xbUtdHhdgPqY7Pmwcs8P/zKIkvckFT rbG94JrKCKBbEkDgr6zToOhVyF93sYsLZTuVW5OdADD2MDKqK4ufKgE7Y IUWAc880NCLtmv8s/MF3+hO8FKpXa6YjEVrWtneJ6Sq1iGGBOPJ6NLr84 gThIIRV8GapR4xV5AAkwHGJwRh76dGYi6Xaw1C7C33ogh1DpsKqaUXItD w==; X-IronPort-AV: E=McAfee;i="6200,9189,10288"; a="255621300" X-IronPort-AV: E=Sophos;i="5.90,188,1643702400"; d="scan'208";a="255621300" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Mar 2022 23:05:06 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.90,188,1643702400"; d="scan'208";a="541239324" Received: from orsmsx605.amr.corp.intel.com ([10.22.229.18]) by orsmga007.jf.intel.com with ESMTP; 16 Mar 2022 23:05:05 -0700 Received: from orsmsx606.amr.corp.intel.com (10.22.229.19) by ORSMSX605.amr.corp.intel.com (10.22.229.18) 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 23:05:05 -0700 Received: from ORSEDG602.ED.cps.intel.com (10.7.248.7) by orsmsx606.amr.corp.intel.com (10.22.229.19) 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 23:05:05 -0700 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (104.47.58.174) 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; Wed, 16 Mar 2022 23:05:05 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kSDO7kr5/g35HZg6KP8YPjwDi+9gMtmS3fcx6NLlLeM2iIKHGa1Npvuaf3un3Cs9MNfNGVP/kNvKvPcyosk5dj204Li1LxQzXDqHVyqn9r6J7sV8y3ks5hbn5VvshyaDvvFfPwscK3DYgB2X8JKtXIclgf/V2dCvFGpzCII2cAWTLNiSSMcA2aBjltt5oMd8dczo0zGB5xDqyQ4RYnvIrq46B4GpxDbQE6AGtN0RGVSS9k6nmHsCnRwZFObSRK8YoZxYFP5fWcc4jMyiyFctvnK76ur8yoEzavCxEa8gXHPrmG6gPTHhwRV+wwYfH6Um6sI6Dq1SPC3kmsMKOnCk9w== 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=H0CbRuOJ5TstbGKbHMGo3t/zzYzmAZwoq+JCOR9YelQ=; b=CPGZeMMgBt95jwu6DcuoK7ST1QmGRkdtcn3cm4C1yxM4mRtD6hm73/3Tmo8sDovaUgkmsfymuBVdjrQNGJNI0gZMe1IGwIwVxH6KnHv6K0e+eixip/OaAd/aYR9aPLlakg4t2zgP4ZqTONqtBXOH9T+PQjiWAI/XAogrLu0/TnhQ33/V3sd+64DR6jjCdkH6x7oHpAcWdTnupGC3drzIuw8E8DzzxXxLuOCr/8LQj5irVcAOJb/Lpp1XMKjucBkw0gE6AnHfodKwYAbldoJlJu51w0U5WCve6nNCaC5oyDk/lVhEiln+wDorAzABdYHNAVcrry2n9yfYQYAfPiktEQ== 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 MW5PR11MB5932.namprd11.prod.outlook.com (2603:10b6:303:1a2::5) by DM4PR11MB5520.namprd11.prod.outlook.com (2603:10b6:5:39f::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5081.15; Thu, 17 Mar 2022 06:05:03 +0000 Received: from MW5PR11MB5932.namprd11.prod.outlook.com ([fe80::99c1:4af2:442d:4ffa]) by MW5PR11MB5932.namprd11.prod.outlook.com ([fe80::99c1:4af2:442d:4ffa%5]) with mapi id 15.20.5061.028; Thu, 17 Mar 2022 06:05:03 +0000 From: "Kuo, Ted" To: "Ni, Ray" , "devel@edk2.groups.io" 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/QgAlGiKCAAAw2IA== Date: Thu, 17 Mar 2022 06:05:03 +0000 Message-ID: References: <3825a811b080d332ee27d42c625d0753daf3a961.1646981876.git.ted.kuo@intel.com> <16DB43B094343574.10972@groups.io> In-Reply-To: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-reaction: no-action dlp-version: 11.6.401.20 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: fee4bfb1-23fe-4e62-9e2f-08da07dc13ef x-ms-traffictypediagnostic: DM4PR11MB5520: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: JNNFcfEntg4KX9UJuyKirVKpNHtvcflVsxy9fvjd7YFJszOa/Qs35Q3j+U0vlA3V5Tr0OyrzlS85GSk9gAAVPEe9fUzMiKpW60kv+UWmLdPr7WPo/f88xkfNymrnfjK6uNEO1NbX81+xaYAvNJrAwxvWsfi7heo9D/8jsXStRIkBHFqYOOjdRS2btILeSibNY6brrOIFNQeHnul2oYxVnymvO7e33x+ruBoGjQ/3qPIkNfj+nnt8B253AWkH1mJEp9KmkS6S4xi/MIpeSxkZdyZ4fI0UeYR4m1AAQ/37a5O9GE+ZIdGiRfUw2TKp2aHsUrLDSukSy2APrB6d8NPnPVOhtsEP43vGg19GT2cblIhIoWTnPR3Kc6OP5LuZfnnRPEqGVyYLBKxKqsdOUg5/PfomD6LByjzWqNAutQiyPDbrksbuyqG0oFireZ1rZQ2y5EIR7IWZZyQW2AkAk7uDAzkM+oSLJ6cymEuR35ZAn0PxhZjqXzUdgtOXgb6eUHaFRyKUGQFLrYRaXqNiSfIVE7oXr9SM1vnWsAxanmztFywwNEMznHpGQmnLOy/9mowYHX3ER4yLKm1CxFuZBU7xEid3YeoHHpf0UEvObHqRCrjm0TS1M3/nniI2h0sOTZ1oiEwERCfyBMF1ebwzoa++4kecce6EsmjbiUwySLBhyjPF09ot9iWSOtq7lO8iLDmSC6dAnJPhqzz4XSpKkazuLxbN7i4EKoUcS68itqtahU0xYVAR47bUWUX9WFqWqJO3DzAFqchvVbWVeRWIfhi0qFX0ZnjrjCmwh6KoCUpO/noOhPqFzJH0caUoIogybVYfxNmC5WPLkQMZPpmWSnt7sw== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MW5PR11MB5932.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(107886003)(38070700005)(186003)(83380400001)(26005)(38100700002)(82960400001)(122000001)(54906003)(8936002)(5660300002)(52536014)(30864003)(66446008)(66476007)(66556008)(66946007)(4326008)(55016003)(2906002)(76116006)(508600001)(64756008)(53546011)(7696005)(316002)(19627235002)(9686003)(71200400001)(966005)(110136005)(6506007)(86362001)(33656002)(8676002);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?rO6WMIzepPUT3irD6oP4S03ShD8onqHYxDb83Aku/ObArqfmVDs3aVW7gYMG?= =?us-ascii?Q?9wYAKdOh/G5KHZKdXwW4gpw1MnhjOD4U40HTZCm2sbH6pyLEzpZBy17Pl5W2?= =?us-ascii?Q?0LCikare5jATLZLm3y7JJ9H3Swea0ZE7vp0yEixkx3fWZ5Ggzzvw8LHaOkJE?= =?us-ascii?Q?0CJD3PINZUfjgzffa0ZQtCI2FUwNowSR6mCDmf8dNXnlFh7AlvNbKRplNZWA?= =?us-ascii?Q?Gp0jotYbz2uPrWHjezSOxv+5NPZtx478tamfaOh9sQd4U40uUQ8s9u5OBTtH?= =?us-ascii?Q?YZFfH4tXBtDW2f3GR/4Jn5Xe2P4PJHpchBOSJJmnG2ukYS9iCE6+f4+EIo80?= =?us-ascii?Q?j5bzWJWyGG5FA5G5+NF1MJ9JGEjM3aECddExTjyTVzjDSyBlTIOP/dbLJMlG?= =?us-ascii?Q?wl7MnTtW3aEiTNO9hETCXHVdFDzccwkgmThCD7lc995t/CjHTChmODfVEkrX?= =?us-ascii?Q?OHudcbCwBZAQB5DwY11TKcn0erdGOR/WwLWHjfA71ZDrJDWGCUhjsG6JR5p5?= =?us-ascii?Q?Dfut5jxuE20CYAVia7/pIG8+Uxh4x6lnez6OouS+KjzR4LMOFGzHd6CLmqeW?= =?us-ascii?Q?271ms6C/gjm4pbbYMBPcDAsnH0KpAXc+FXn7Zsdrx1wB7a97BtGAZb0O877L?= =?us-ascii?Q?pZ8bNnFXzRGaJil+7K8rTINGojhArUyP62yU7m/Qx9wX/NiXWxS4l2D41yEr?= =?us-ascii?Q?8ZgxRwJeJ1wRzpqtezhShjHIJfFLAGHCIYQtwLdtUy6pojGSuVd0hKExMXn+?= =?us-ascii?Q?XMDKSkhxXXduDowy9xQ9hWLe+DVvXLsp+gY+mU20GmLv8+0bvG/7NZTWJI1J?= =?us-ascii?Q?jrNnScKBRHjSudlH1GpkPxUO3klC/6t7ORXubuffHrSJ1QRyH2wBeD15ylOH?= =?us-ascii?Q?wQwllAeGCbq2Dn6S8cvboZkzsHUGY8UWu2HRt0v4hTVOqEPOBK0Jl/tU0jAv?= =?us-ascii?Q?LGTNKwIq7gietQe7BxfzNDo0wiVCpUgC+HOtSF8ad4H4X3janOmQBUgpM7jN?= =?us-ascii?Q?cDR5KiIiHXsSDXUcgJKZk6pk6niy15F5U1gyE2bKASsO4CHRkVaclAb9O7Xg?= =?us-ascii?Q?lW7O3fD3Rm9kBISB7Jy9cA8DuS6N4gq34XBzQVuA9/wj6FZ00u5QnClHOal6?= =?us-ascii?Q?X9YZrzFnKVlbXd8DS+Hp/1vjXBevrpJk5SNnrB1oMEBIw0uJmTCHD9fbw5Qe?= =?us-ascii?Q?eCAyjO7kLaQuFcRvjUveMSE1yWCfOH8XaQgCTr/u/AgjCpKOSQiouJX00GIr?= =?us-ascii?Q?tYJF7s0qliYtSNSfXg99AdGMKAIR+3rUlxOBmrD2FgrfO+t5sVLdEx91jCJD?= =?us-ascii?Q?hNaSMJnYomQxPR8ACpKMbNuKrwNCazbxEt6JOFe55xGJN64LAbtemgLz+tQ5?= =?us-ascii?Q?ED8SOIFf6Z3OfOnovo9rPmP9rzhuu3D3EXh4OrG7jfEy6inoqsQxuBVatK/d?= =?us-ascii?Q?KxQGq/s4ftzByih4jwyl+Ygr6PlXtav2?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MW5PR11MB5932.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: fee4bfb1-23fe-4e62-9e2f-08da07dc13ef X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Mar 2022 06:05:03.4079 (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: bPqOtWVMosGVlpEvIc80X8wAohSFcEQUdqoUH2VCSK51UM00uQ/AGXe/9dAZ6yZWH1yjJx7NUt8+KZ4jFcNdUA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR11MB5520 Return-Path: ted.kuo@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Hi Ray, No, I'll send patch to update the searching algorithm. Thanks, Ted -----Original Message----- From: Ni, Ray =20 Sent: Thursday, March 17, 2022 1:21 PM 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 Search= ForBfvBase.asm 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 +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 -- 2.16.2.windows.1