From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mx.groups.io with SMTP id smtpd.web11.2473.1685419740357755979 for ; Mon, 29 May 2023 21:09:01 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=ULNfFgOR; spf=pass (domain: intel.com, ip: 192.55.52.43, 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=1685419740; x=1716955740; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=RY+RT0QFcGkHlidxy0WFvaP7RqwLiAITsJmnRwdaqM4=; b=ULNfFgORsCC2/HKO+47zGDuncY0vu3U2xAk1NvFgMBKUFiz9Wci3TN2z m+1FocbB8QuDt6o09ALUTMnhb1hasQhiQE0W5Pwh2rQ09NlP+PuVLbnGy wf9LzqRE72Q6I2sPB5WHUhla1cdOPgjFnpB3AFSpK8Eb80PEt0m0Ecdnw X4IM9GvTiLGU3sRxVtgJLDFGj84LGqJ+TV0FhZz0p6Hca2J4uGtrLB7Qa 5MJdsHpeYz3ODhKyTIM4F8NgW/eAfc/6EkJdRN9V5ctuU7IG0tp4e61dC RyRGr13efNV605wcbVufVZBYuyILtyYl/7tQ1FDg9STkhVvnAwEeLceDM w==; X-IronPort-AV: E=McAfee;i="6600,9927,10725"; a="441168622" X-IronPort-AV: E=Sophos;i="6.00,203,1681196400"; d="scan'208";a="441168622" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 May 2023 21:09:00 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10725"; a="776138976" X-IronPort-AV: E=Sophos;i="6.00,203,1681196400"; d="scan'208";a="776138976" Received: from orsmsx602.amr.corp.intel.com ([10.22.229.15]) by fmsmga004.fm.intel.com with ESMTP; 29 May 2023 21:08:59 -0700 Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) by ORSMSX602.amr.corp.intel.com (10.22.229.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Mon, 29 May 2023 21:08:59 -0700 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx610.amr.corp.intel.com (10.22.229.23) 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, 29 May 2023 21:08:59 -0700 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (104.47.57.168) by edgegateway.intel.com (134.134.137.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.23; Mon, 29 May 2023 21:08:58 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PqmJadFrdhyJVXFzK22DqtWe3BM6mYF/qdtNXpXYDhdZVKWQPdlCDviFeLZcjRItTUkMbB1yJLT2ur+xpM+7TTNAZR/eVULKL+N+v4hMEJzxw1EgUgtDaDyB/d2IudvkqOF/Srw6j2aqUMVMZ4lqF2ut+5lneSBC4hS+lNSJfJkQhspOXYgEWExXuAUnqboJAH77ULWQq+mRoblQDsupyAfz5EiHlKrmRPfzuo9twDLldQ/abpQ8cmIxwH/GM5PqvM0xT2knlQ0eFfgRXhb9mZ462bCfpNWp8yf9MAiHkIqs3jKP6Zv9jXbXZh2EithVCVmS/zfXJz9Or9+4RLUSYQ== 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=28fQa3ebOUlVgMOVKsZRFqAxbZTyucBhDP5RdmRdX/0=; b=nMai2jVIZY5wE2MKuTjPUHdSRDdvpu17aTEDrotDFw5TYOiiYEGkS0Sp3errsJ17PAJaJ7KWFKhsIS5eufllTp/MriMbBA9cME/j8xQQxP1GWzM/ImL2jNdb+Yd7M5kO+H0LP5evvN341ehTwI6CvechhfORtf1JlLIEYuUnbmQlY4e+DTTH+y7c1xiRhcVUJmFi/CMzc/wvAIUPw//P5ZVSgZ3a7ZycxrjQ7/c6CtFgBeS5GBJu1wYQ7tOeLVgfKmD8LjwhQpXqKiKTyrLrIMTAsmzHB9uW60HS162Nf+uSHW+6V9D4IqCiv77PyTjokgfXsPrRye5uqXzzy3Iu7A== 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 DM8PR11MB5576.namprd11.prod.outlook.com (2603:10b6:8:37::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.23; Tue, 30 May 2023 04:08:52 +0000 Received: from BN9PR11MB5483.namprd11.prod.outlook.com ([fe80::37e4:7a65:b8a7:c4ae]) by BN9PR11MB5483.namprd11.prod.outlook.com ([fe80::37e4:7a65:b8a7:c4ae%5]) with mapi id 15.20.6433.022; Tue, 30 May 2023 04:08:52 +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/PPSD87K9yP+nQ Date: Tue, 30 May 2023 04:08:51 +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_|DM8PR11MB5576:EE_ x-ms-office365-filtering-correlation-id: 3dfc0519-a75b-4802-beca-08db60c393aa x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 1OTdKo0YoczCMt0cTdRem7+QqscGgpl5QXf80Ru+ePPcHYJiWw0L2JTGXO92gEUoay0+Z6Fyr0btZqthIZFo00jlgXMhiN56CjpcT9YQObr74MC+qdi3OePEAxUgMFcgJWzMyTWy2subKCLSeBWMwCmYf6kX2wDwdNOnK0B3JaSawaFKeakgUDvYC2k6ciEZANWm1RKyzw5v7y/OhoQNA9QP04NbTJMb9C63tmEFZWJuADnqF+bhfFxozBhNnh7f7qoo9IpLjWXFK1+TD1WUJkGVRuqHE5HoFPcTNo3jH+5aDZJZImZX2DVbf5LPTD4FmZ1cga8uW+a4E+U7JQchlQqF24BXVygwkUQXEuOysp/c68piDh05BpbzMLD5t5g2M2n+5zxhiuNr2u7cZI/1Y99dmkASP5tRHa9AWpSEiUBLG66EzMj3lIeeKIKgq4Rb8i1Fkf81xT2rlMdIm0oURsC13gbVgkQGD0MNi//iFXsPYx9moh0146YTbFv27TjBvffsDUkEvESg6ECzKhTZv84N3omAlb4tD73TZLEWwxL+rM05WbkvlY2DTX7ObV39gZ//YuBtyGOu6+IkXT31CkGHCtdbesZM+I5yfm6Kj31DPczKEduAG0+v7Y/LG0OeFlaQ15oVeuhzDpBoBp2poA== 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)(136003)(366004)(346002)(376002)(396003)(39860400002)(451199021)(966005)(186003)(107886003)(38100700002)(41300700001)(83380400001)(6506007)(9686003)(53546011)(26005)(7696005)(478600001)(110136005)(71200400001)(4326008)(82960400001)(66556008)(66476007)(66946007)(66446008)(64756008)(122000001)(76116006)(55016003)(316002)(5660300002)(52536014)(8676002)(8936002)(2906002)(86362001)(33656002)(38070700005);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?rYe6MSUgnNQhqfhfIihYqm9v5Vqd2L2xZqGkBecYnWzidSXve3XpD7MXl+fX?= =?us-ascii?Q?UDmUrgRDlXA7JRFI/vTGAa1cnNa2ZZKaSEsqFBk6D+tKwy48nz49yN8ns3q3?= =?us-ascii?Q?Aa5HAoZNjtbSUeMXtnm8HSrba5inE2sIlIQXpENr0r1SuaI7X+SHis/VYueg?= =?us-ascii?Q?MBVQAsA0ngLL/LjP4RkQn4KLHnPZ0jnw1LCN32260xgSWqXp90DSfeDb+ks1?= =?us-ascii?Q?NJJuo5aEHAvqdvEZ+t4/XrQJsLHReebmcbgpYaGSXzQsehRp6QCZj5Wkub7R?= =?us-ascii?Q?Ba27yG2RJINUMp3R4r9JAzeNaSTEHE0ACqAmTaQXy1mMV9Hzl16UaAse564g?= =?us-ascii?Q?F2uUm7cwRR/2dqfPmCtj0CphGuWcs8va4RkzjyoBQM41dB5FD2UkkCDb8z0P?= =?us-ascii?Q?F4bYQUIlqVQ65o/Xwnzy/MN8YZCrmykN5fEqarofKu+l5nVvGi70zwWz5vE4?= =?us-ascii?Q?yn4018T9PkWKgdMuCOt9frtoq89SfDKAdaBixitki07q0KdAOA58KhUNl7L5?= =?us-ascii?Q?WdvEMikbDn1Cl1aJCQeWAhwL3dIbO0sCOh4+H+AhPlGuu/7mZ2ITRfuE4eAM?= =?us-ascii?Q?fWId7IAF8x1cyvm2QD0AxMj2yXMfjnRhIifvy8kTLsOZc8RQXOrvgOKdXfHR?= =?us-ascii?Q?hiv8AE10WG5CRQsgh5aqZimmgpt/WqdzrGB1jqECur/Tz48R1BPP8EdDeDmZ?= =?us-ascii?Q?ChJ71czbqd/FcDaxDHD+ag04SXlpvro7XOMbn+h7OE7DVyuXImbN8VeMVA2S?= =?us-ascii?Q?L4RSdkD2tVI7Iy2SdwuUVfs/TblPL0yeSebbUVmXiCh+0ThO2pjJp2ut/t8g?= =?us-ascii?Q?ZJ1TITEpZbdtMQcAzyTboAVOke9Y8GAKeI+uHvuZVuQzjxb2rj1xU7APnRGM?= =?us-ascii?Q?HZa9lVCOC4oVcq+fQdu9V5M5FVwN271NG1NwJPA7dn0EAgxsospy6XReWNuc?= =?us-ascii?Q?S57G6dXy3H7ClQ6lz9VM39w410RCFumkI7miWC/XKNQZS87ub1mFHucMOjOf?= =?us-ascii?Q?vQEozrPfw2UD4V0UAJp0gj5b+37O+A9pRwJ7xROuEci4uYHQwv5UnX+i5+VE?= =?us-ascii?Q?mIX/29kF2vazcBAiPvxZpsbi5ig6afclrI0hPhji7IQjT2qRt26QdqC9KsO9?= =?us-ascii?Q?sy7+JcbWoQhnT6m3bwLHkWyO8VJnradlTOPyYEyMEmF2tstBJ81XiChxoc6b?= =?us-ascii?Q?7GNZf6nbbPkJTNWfRgq3BYlpyeTfBjfW7wvAiUJbRIp+AP697X1gGqltDgqA?= =?us-ascii?Q?XXkEZ2M3y4LR7Qy+ae1lZf4NT/wbD8YQ4IGupraZ8QZqTrCS0cAiuzQgjVth?= =?us-ascii?Q?MfmtgoJePHydk1pObfoCRPnjQnNYr+Jni3ynL9As07SrK+vy8OHu2c3JkImj?= =?us-ascii?Q?mphSLg/JSsZWKiJ/VQDUcprCQGQmWHOgt9HUe/3TRXZ73+Mif2bCqZ0cVfmc?= =?us-ascii?Q?9xDNqI/60GwD8c8LB2A/Yj+gqVBEWgKaeGaVKFfCfq2ora1GCUXXDbX9WBjJ?= =?us-ascii?Q?sZ8TepuKiRo7SM6rgqdVgNo5t9jSLv0szFxiloKlm4uh5GAoAe0qPhrQna6a?= =?us-ascii?Q?ZuNZKXkgm943oSeHz6xtOPsOn63AHzUzGMN3Ze6P?= 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: 3dfc0519-a75b-4802-beca-08db60c393aa X-MS-Exchange-CrossTenant-originalarrivaltime: 30 May 2023 04:08:51.5294 (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: cRKh37RIyJJsoxvDpZlIXh6Dw6Akbr7XFdCZG/frhznDFEGvchewCRLgzHrrp15WZsaXj/y6XKAwGd8tpLP/8Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM8PR11MB5576 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 Patch merged: https://github.com/tianocore/edk2/commit/69e10f02111bf7e71923= 7f05233abff4e50016fa 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