From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mx.groups.io with SMTP id smtpd.web11.51.1684770436195776949 for ; Mon, 22 May 2023 08:47:16 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=bZqZln0+; spf=pass (domain: intel.com, ip: 192.55.52.115, mailfrom: chasel.chiu@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1684770436; x=1716306436; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=434u6bszq/z6KeJ/AtWD/HBjgfcWyx+svKrC1TqoTuE=; b=bZqZln0+/pQRvid9ln7cfWQ9nqd++vGKjPCexZdhH8NaTsGrb76+Yxow 1JS2qc5drsnAdha+22f9Tlqvj6XzlxEE0AV0OYssnkqzXZ7IspCsOcFL5 AGvrV2UJrUwYe62FFu6ioj5nsYGjmw+MOCkdlNBA5Xfk/iV+BnS4+klpy 2BmV0WnKoesn2dYJUiQma2357zVJaFg+rxL/cAsPPwmAUpGUUXvELx4XQ bgo/U73u5pQ3KXV5Y3HXZVjfELpTqYWievQcrSKMPYEDTvsVHKdfReCgD i0ETjNaRWgcuEVtbhCwN1WpBy9Dm7g/+omSHgkYlVzd5cPLjwuV9pugT5 w==; X-IronPort-AV: E=McAfee;i="6600,9927,10718"; a="352979315" X-IronPort-AV: E=Sophos;i="6.00,184,1681196400"; d="scan'208";a="352979315" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 May 2023 08:47:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10718"; a="768578187" X-IronPort-AV: E=Sophos;i="6.00,184,1681196400"; d="scan'208";a="768578187" Received: from fmsmsx603.amr.corp.intel.com ([10.18.126.83]) by fmsmga008.fm.intel.com with ESMTP; 22 May 2023 08:47:14 -0700 Received: from fmsmsx612.amr.corp.intel.com (10.18.126.92) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Mon, 22 May 2023 08:47:14 -0700 Received: from fmsedg601.ED.cps.intel.com (10.1.192.135) by fmsmsx612.amr.corp.intel.com (10.18.126.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23 via Frontend Transport; Mon, 22 May 2023 08:47:14 -0700 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (104.47.55.169) by edgegateway.intel.com (192.55.55.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.23; Mon, 22 May 2023 08:47:14 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XI88bppdI9wP4qCIawDwf/oXytEslLf1hpC/Z5ydsSl+vyR9Zk7BQZPOhF69oZDt0AZTJNNjMi650ugGwx66g+yZnGNOwjmEa7ufuqBzucoQSAiFzb2fLbXyv7wi1cKYOmFHdx7v7NSx/nWT6S5HS1yDIPuTt06aACMZEeT8EVF7BmCQf0C2P1Oc5m2ZyUlzm0xWNsw5qOtytmQeyObaS9nWctluHGETcRXpwQCJKmpVtLVMEWF+2LyPBBMtPECSgW+DQ6kZVINtsYzz9dkNwPa9MrL1iejhcPF6jGQP+aavPetPZfux6qY8iIIzxUpX/N4wYSUd/+ysR1gLMoMYqg== 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=t+8LkuhJBl72rj60/D+tZzVFFKtMBg9e9AnAVYMFLhY=; b=X2+6qqXlJCcNEs9r3yKiR7atUalJ1uUUMNjyJ5c7AxnSVgss9s+uwaaFAnerKmtdwJSmxrMt1BQYCGH9aQLix4T3IDXS+VKHmjLGbGvLoaXDuM4Tkrr6IobXpuvSo1brIncVacljEGKswTF8Q10P+Flj5sm+X8NJBEdlqwdKS62t6zjfclZzsj+kTUsRTtUnTn66LJ3NxWPh3RVydSaSPM3u79wNOxidI8yNzd4E5lTEpU0XbYXy3V7KmXe7oVFcOvwBs4bAnEaLB6hiUbXixs3XLe0aWT+MlAxRsEI7B69zp+RrcxDBfUimZ6dlQHuEuIshJP9gblZ7CO0bZWNeNQ== 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 BN9PR11MB5483.namprd11.prod.outlook.com (2603:10b6:408:104::10) by SA0PR11MB7159.namprd11.prod.outlook.com (2603:10b6:806:24b::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.28; Mon, 22 May 2023 15:47:12 +0000 Received: from BN9PR11MB5483.namprd11.prod.outlook.com ([fe80::1eb1:2222:1823:8e7a]) by BN9PR11MB5483.namprd11.prod.outlook.com ([fe80::1eb1:2222:1823:8e7a%5]) with mapi id 15.20.6411.028; Mon, 22 May 2023 15:47:12 +0000 From: "Chiu, Chasel" To: "Tan, Ming" , "devel@edk2.groups.io" CC: "Duggapu, Chinni B" Subject: Re: [PATCH] IntelFsp2WrapperPkg: Fix ASSERT when FSP-S/M use FFS3 Thread-Topic: [PATCH] IntelFsp2WrapperPkg: Fix ASSERT when FSP-S/M use FFS3 Thread-Index: AQHZjHSRZ3lbR9IHjk+GKQ/PPSD87K9mcEvg Date: Mon, 22 May 2023 15:47:12 +0000 Message-ID: References: <20230522061306.11787-1-ming.tan@intel.com> In-Reply-To: <20230522061306.11787-1-ming.tan@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: BN9PR11MB5483:EE_|SA0PR11MB7159:EE_ x-ms-office365-filtering-correlation-id: 34a2ccb2-4d7c-4104-2483-08db5adbcf05 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: AOMw/EtqC6UwTaMQKYc+KuQ8bW9KXEOh4VCc8NGELcieifTem+pEJPgceI/EdlQHrewD6Yn9wy2YOhMIKlv074CBdt2qetBin+92QHk+UtBAd4CrTz7wNE35c1q+j2GHFR8RzabFRasJpeAOyfKW78LTg7gISYOVBiJgSldbITW/15mkUEBkdtgNn3FIN5u54q4/rFaa6kMLMl/jaAcEaQaTrsM9DNEks3U6aq0QuL2xU+NQ7OLRHoRvjCkyM2bWa0+4EwbwzDmB9R8kSj5L3sANYJx5l10RdUkitXA+IvpTLqLjsgzFUPRiWR65lNlyJuYrn3ewltB0DRjerXPZm0dHjq3WAkUOqsBbsuW5HZwAHThR56sHQFOzP6TVRcCMqfi3FMmDJ7c/cbSlTyrNbN/vzA3OWQHx9pMHfS3OFEZ86si+3q6bIGs0Ov8KbUHl+c/XfYBHoA8pmwLdnVemG9Ds+y1jcqhXPtUDnqaDzMvQ7iFrhHvHaURYyK1qLycXxuNkeLZ6WYmjZlYW5LXhOeg551EC0yrhCock7rQ5M8lGR75V0se7NeRTeYl17gRq+EZcTqza0x/GbFeooxono9yC2UsPeUVAYv9pRZMICTQ= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BN9PR11MB5483.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(346002)(366004)(396003)(376002)(136003)(39860400002)(451199021)(8936002)(8676002)(52536014)(5660300002)(83380400001)(186003)(53546011)(6506007)(9686003)(86362001)(107886003)(26005)(122000001)(38100700002)(82960400001)(38070700005)(71200400001)(41300700001)(7696005)(64756008)(33656002)(55016003)(966005)(66446008)(66476007)(66556008)(66946007)(76116006)(316002)(4326008)(478600001)(110136005)(2906002);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?RJTz5QB+E3IYd3+fBdGG6Jee53jDWZp4XqvzvRTF8CCpLLpXo7zufwG//uVL?= =?us-ascii?Q?5hDfyBDRE+nt7SOF0jPhblvCPUhTxTQoAjtQ/tToQr6aoOy4lAB9NYBqULfb?= =?us-ascii?Q?andR8pFmKB8ByfDxTAyR2MLGUCmMTEBV7/oPSbg28ENJgDaWVbtO6sN+3BMz?= =?us-ascii?Q?EdlnMvRhQvarcKzs5jGwSRNMN7hSymKKdkksYI6HYubyM++twAs6RoE77itx?= =?us-ascii?Q?DHa3mxIJ0P4HhN+nDm0bFSUaHDAE2WtPyrvFaeIJM/bZNrihpYXuhAhcG71o?= =?us-ascii?Q?ISs8c7Og+KCUfl/71IthTebZ48P2tuIV1NdtKL/w9AqgbcaYtUUJ5eZxECpj?= =?us-ascii?Q?aLU+Kql7V4rshllhK4HslfuTxsgdEPMDnp57QXzYiiwPP55Vyhk1dUAStCxp?= =?us-ascii?Q?p9t0z4M1AvhXb/Z0YofEmRMJYNB0UBZvfQ0j4oqnYmesnkY46zHuS6w1O/La?= =?us-ascii?Q?3ghdCZP4R8YIIW83GmjOYaDpgFgnKzn7inOBsF8hgxpTMoA4ewvUjsbK1Em+?= =?us-ascii?Q?mCeNuubnXZaVDs8jQhyPPInGxZeWOXRi+Uc8u3EvFK88nVaJXT3xDtjrqHwl?= =?us-ascii?Q?wZxkv77hC5wgrU4JfKooIWoF7wtqICIfWQYrK+e6U7FFohbVP6onmFtngHEV?= =?us-ascii?Q?iquvihhJIsyaQY+JAsCYu6nSMWXCbcSs4taFZcCH1qJWyJSnNfB4VQMyykF7?= =?us-ascii?Q?u+u0Pc2rPLVq+lcs4z3cn+Y4CToWUdFOkVnhpV88ep6XzfPo0E3HcGAsINrM?= =?us-ascii?Q?CCoLxUaEBWVg81eK7i2Gd0h/+pyZvI7kJMvLuGe1c8cheC7gf6QWscu+EKMR?= =?us-ascii?Q?igOkLacmkfR/8RIbcHOPwCi16Rg3Akt6KzrJh+oKSv241YYYsa25/JsDdKKB?= =?us-ascii?Q?nvu0mg+NiriaxjWjx/P0N2tVLzi3aU/2xbtKDitULzjqOsFi0kq0Q3uRFvQv?= =?us-ascii?Q?i1LyILVZ3fLb64mZ3jmwblynTdb0mvx/agCOguj+5p/kXsdUKTYm1byR0mH5?= =?us-ascii?Q?/ghFFsLfhDOre3XukYaqUQdXW8PLa4jjF6Dg8QMO2D66Gpq0dFpq3KbRZLxC?= =?us-ascii?Q?/mNWafYRPVRpeVF177QE1jXOupV/vI9QIOJb+QfQW7fn+gQnys9OU3YccrR4?= =?us-ascii?Q?jFyclYDmPfHJILwVaueqRcwIynFEZv1btU/AVZ2QJBluUEf0sunxxgciAt2d?= =?us-ascii?Q?FYUan4EwTXD2+nuqbQkTthXXYd3KGXHjHhj4WKj59iBAcGsOMv/T+2aAwKHo?= =?us-ascii?Q?ufU3QFY2NU1uj7baIC/YycDw7XSAkNlYpyRi7SlmZ0VqHvWFpi5/kz1iiFjT?= =?us-ascii?Q?IuNvtYcdIqpKFh9NJiO6BcGGB14Y2/EobggDtpRfXJm7ds80G4PXs5iriMID?= =?us-ascii?Q?tPJ/B2Lvy1mKoWJWxGkH/CKh7/u3LcIWlcFpjfOM8U8gymGeqfBKRyxhzdcd?= =?us-ascii?Q?rySgT5fgIM4aGr7QHAN+xtuA/+LGvZ5k0IWf2nMpXJdCRWQlEL3O+QPKAy3h?= =?us-ascii?Q?5pJhFc8xS/gTJ7JYqsJrOH+Nt7jzBxHA2+rR++sEBrAXrMEBHF12hq7IuqPC?= =?us-ascii?Q?69A+KEocaTMV8hkscEm446uNukJmOOUiZqDbnznO?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BN9PR11MB5483.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 34a2ccb2-4d7c-4104-2483-08db5adbcf05 X-MS-Exchange-CrossTenant-originalarrivaltime: 22 May 2023 15:47:12.0557 (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: Dcpap9MLnpD5BxZug65pq61h01RZR4a1C3usIyzSYOGs/DYB7wHhpDthanFIoR5UCg7B9thPEzZDFHTyUB3yAw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR11MB7159 Return-Path: chasel.chiu@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Chasel Chiu Thanks, Chasel > -----Original Message----- > From: Tan, Ming > Sent: Sunday, May 21, 2023 11:13 PM > To: devel@edk2.groups.io > Cc: Chiu, Chasel ; Duggapu, Chinni B > > Subject: [PATCH] IntelFsp2WrapperPkg: Fix ASSERT when FSP-S/M use FFS3 >=20 > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4458 >=20 > Original code call PeiServicesInstallFvInfoPpi() with NULL for the FvForm= at > parameter, then PeiServicesInstallFvInfoPpi() will assume it use FFS2, th= en > ASSERT if FSP-S/M use FFS3. > Now set the FvFormat to the info got from FvHeader. >=20 > Cc: Chasel Chiu > Cc: Duggapu Chinni B > Signed-off-by: Ming Tan > --- > IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.c | 2 +- > IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) >=20 > diff --git a/IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.c > b/IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.c > index ea206a7960..ba0c742fea 100644 > --- a/IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.c > +++ b/IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.c > @@ -217,7 +217,7 @@ FspmWrapperInit ( > ASSERT_EFI_ERROR (Status); PeiServicesInstallFvInfoPpi (- = NULL,+ > &((EFI_FIRMWARE_VOLUME_HEADER *)(UINTN)PcdGet32 > (PcdFspmBaseAddress))->FileSystemGuid, (VOID *)(UINTN)PcdGet32 > (PcdFspmBaseAddress), (UINT32)((EFI_FIRMWARE_VOLUME_HEADER > *)(UINTN)PcdGet32 (PcdFspmBaseAddress))->FvLength, NULL,diff --git > a/IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.c > b/IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.c > index 091ddb697a..08fe0fdb7e 100644 > --- a/IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.c > +++ b/IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.c > @@ -438,7 +438,7 @@ FspsWrapperInitDispatchMode ( > // FSP-S Wrapper running in Dispatch mode and reports FSP-S FV to PEI > dispatcher. // PeiServicesInstallFvInfoPpi (- NULL,+ > &((EFI_FIRMWARE_VOLUME_HEADER *)(UINTN)PcdGet32 > (PcdFspsBaseAddress))->FileSystemGuid, (VOID *)(UINTN)PcdGet32 > (PcdFspsBaseAddress), (UINT32)((EFI_FIRMWARE_VOLUME_HEADER > *)(UINTN)PcdGet32 (PcdFspsBaseAddress))->FvLength, NULL,-- > 2.31.1.windows.1