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.web11.19351.1684754930012546846 for ; Mon, 22 May 2023 04:28:50 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=XIzttCz1; spf=pass (domain: intel.com, ip: 134.134.136.24, mailfrom: ashraf.ali.s@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1684754930; x=1716290930; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=YCN7P7IB+VS/m/QUBpsAa4JAzDn1YHPWg1QdRC791J8=; b=XIzttCz1fzUSW9oifWRQAhS5meupee+c0SEjhasy0NFBGEAiDGA7E3Ld pw8mlN95inmYINYBc1Oh5KI6NbiPyw/IhupXSTuKlAn6am8grxQKNL6vX JEMstreeIkGTDgzZKnMKQ4DyK93Jucv3njl50sL9mDxBy3aKGheOCkcLb kUvBCZBF944O/7OrNnDlHMZjlFcHpuCYmKU9WkcPQtnE5kdPxZlL5RuSG ecPgoZg5VbAKm94iKjrr5lO4qQoxPweKhwritx+JPXvYHxlJgmPN6VjMp xjXQiljg49M/hm6ERdD3p2g3X4Pjd5mGSW1Mq4Z7BSDOdAECl74oz934t A==; X-IronPort-AV: E=McAfee;i="6600,9927,10717"; a="355240612" X-IronPort-AV: E=Sophos;i="6.00,184,1681196400"; d="scan'208";a="355240612" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 May 2023 04:28:49 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10717"; a="815656018" X-IronPort-AV: E=Sophos;i="6.00,184,1681196400"; d="scan'208";a="815656018" Received: from fmsmsx602.amr.corp.intel.com ([10.18.126.82]) by fmsmga002.fm.intel.com with ESMTP; 22 May 2023 04:28:49 -0700 Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) by fmsmsx602.amr.corp.intel.com (10.18.126.82) 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 04:28:48 -0700 Received: from fmsedg602.ED.cps.intel.com (10.1.192.136) 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.2507.23 via Frontend Transport; Mon, 22 May 2023 04:28:48 -0700 Received: from NAM02-BN1-obe.outbound.protection.outlook.com (104.47.51.46) 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.2507.23; Mon, 22 May 2023 04:28:48 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YuRG0OG7bFtqxQgdcUZG2lABUz+A47tmp+djGsLcZZEzxdzRHS2qDOzy2EBpqX9KZCSdG90toAZdnr79m8ynR/AswDIkHsx0tJGSVWErOtvxO2IGnd3sBm6qefAu4jCZzl+dT2wguEqXqB5WXpPrvolWspzBRvb6GWTtSXxiFEBY88tEFfWFL+Jwsi4Wem62QKa65Gn0FGu/IZcoe4QyUO9D8UF/Dv/ROrVI5LBZgtN1SpOBW3BtbafAmwa7cGCMnUYzzVWguq5K/aZUL/LrmC+usWI11eyBIzE/SiQtDvpsvFk9tH4fg/zdIGLhDDDBj9GkCRVfl8nrPG/iBrpxjQ== 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=YY2ACsuXWqKwVCSlebGxBxnOXJ17dijjIhc1lcZA6q0=; b=kC0d8bYWGKtJ/WhpXBQdpt/i7kH1lNJkMBK+stzbNf1K2vJq7TfivJF4MrosfVB36H1GhhfHpHm32nR79lchGl9oj507RvS5Yf6/nkZZESfG478QuICBtQooxy3lbJ6QIDLqh2gKaGyf2OJ1Rckvn/4xl1rYQ818OPA0r6lJDfjVG4jB2/lDdZCdLmi5NSO2SgqwIwhO4PFnHFL4w2Q+MplI+plPA5WDQPuu/5VdG5DP6EEa+6jS0bbSadn76Xadv28jyY5CtAE3YbyMqmDG4fZ1aXcrr2qJwjk78j+j5H9UU+GpcNmeIFgREJmF/iMHWj3sR5JDt+eAXlZ62OvH1g== 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 DM4PR11MB5280.namprd11.prod.outlook.com (2603:10b6:5:38b::18) by PH8PR11MB7991.namprd11.prod.outlook.com (2603:10b6:510:25a::10) 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 11:28:46 +0000 Received: from DM4PR11MB5280.namprd11.prod.outlook.com ([fe80::76a5:755d:8729:fd01]) by DM4PR11MB5280.namprd11.prod.outlook.com ([fe80::76a5:755d:8729:fd01%6]) with mapi id 15.20.6411.028; Mon, 22 May 2023 11:28:46 +0000 From: "Ashraf Ali S" To: "devel@edk2.groups.io" , "Tan, Ming" CC: "Chiu, Chasel" , "Duggapu, Chinni B" Subject: Re: [edk2-devel] [PATCH] IntelFsp2WrapperPkg: Fix ASSERT when FSP-S/M use FFS3 Thread-Topic: [edk2-devel] [PATCH] IntelFsp2WrapperPkg: Fix ASSERT when FSP-S/M use FFS3 Thread-Index: AQHZjHSatOCVzGNsr0+WBp76RYKkCK9mJ8Ow Date: Mon, 22 May 2023 11:28:46 +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: DM4PR11MB5280:EE_|PH8PR11MB7991:EE_ x-ms-office365-filtering-correlation-id: 1e0ee817-ed13-4667-bc9a-08db5ab7b4ea x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: hISMHp7yfRwUZ/DgL0STxyX1CJYWXEeqdQfLrdl1wIsJMdPlS5Z7URQkamzAVcHWgv3q/wDiMnWlRS6LVFbGxn2O/YSkZ3Z3A2QjAqmbFwQnCRIkM+yorWMgGWisgjJFg3/Edf7nfCdhNI1RtKb5ux1SQVGH9mWxhlScyjD8tgA0EeQ7hCcehVba/xj52NPkcWfWdfuAIV+SLKqNGz/lryKYNQMnfxvyKkCdO2SbEQQr7EVwXB+HVsOEOY6MlP+TZUL6Bmyk6MmuzPz7Vv8QnqIoUyMuAqzZModmuiRAwXXXmbNiwsPmu+I8dL70cbRY4baTL6ZUk67KcYSZZbKAHkdJjOXfVc8LPqwDyy8eA5SeByFejj26Qjsrgkhb4jnSHLk0GMiMxNxdV22EqdXKOFzlm016SOWob630TN5dpK54myxCIE/NVZznV/cGit8KOMUO7P5oabMZoGdj9DIzGQH2+LdNNXJfj1lG2aQPpiUOVz5kV66ptFjvneYoHgnyh3vELWgRFPAaDdqLJeDVlna9doDdoGMhCRmXWMaREruUKU6PYlcRrpHXVzMcbU5qBEVpQqlKdxJGmP8aPJwAXQnwDHQoDXvyNClrt/Q9scWi27TIO8LNGzky5JKgYc2bI4iLBKF0Wj4CIVckASil6g== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM4PR11MB5280.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(366004)(39860400002)(346002)(396003)(136003)(376002)(451199021)(2906002)(66899021)(5660300002)(52536014)(83380400001)(8676002)(8936002)(41300700001)(66946007)(76116006)(66476007)(6636002)(4326008)(66556008)(64756008)(66446008)(54906003)(316002)(110136005)(7696005)(33656002)(55016003)(71200400001)(478600001)(966005)(9686003)(6506007)(26005)(122000001)(86362001)(82960400001)(186003)(107886003)(53546011)(38070700005)(38100700002);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?MlJfHqXiytckJfQ6meCHtBnjUBIAIE0MOcnmAs8obOEKcWpcFpuAGKWxZcsj?= =?us-ascii?Q?x/Jn6dFTUzDBu72Z+qaN9ySm06NzmGjV3CqCf4FpVaB1ep/UDBAJkZc35I1L?= =?us-ascii?Q?BOXJzGiqnx5j/ShPbDpolRoVgpnnj0Q1SxUXApajtHU/0I9LRE499eu7vSfX?= =?us-ascii?Q?b4XMpiTR04XAAwx0j9LvC3P/K6yfqms7IpUyrEE5bdmEjh7of992QxRIvKaJ?= =?us-ascii?Q?JRK/J1v/kWzR9sU73LPIJo0Pnwobog4PiBl8WW1B0qArVHHezi3V8setagrg?= =?us-ascii?Q?bKKlGyLB81ZvyMKTqKvaQXqpU5VxGq4IbPa38QoM/DfHFHeyxgauAD04udi9?= =?us-ascii?Q?/nRMmFjyrO5IWyhgp+Y/t3f1c/IbNxOnAPRfYf5QKsQbGzV6iZH5ffXDDOqr?= =?us-ascii?Q?D+AYPlv7MXMuZtdCoAJVppF2VgsVQ2FpWYKpIz7The9qJVpt1fD+1b81IUBW?= =?us-ascii?Q?+Iv99RxytnEG1QqKDlu5Ircx3oVZczhcrrQe54obn3OApn7sC+e0OWnWMvlB?= =?us-ascii?Q?3ynSSffyTef1CJp8fP7Q3cbU25oMnCqnHCPSI9wSFq6MSI2gcq1s8KG7Tpbl?= =?us-ascii?Q?aH88HhJB5WwvXVb92l9q/L63S3XpRcmL/d5s8CSzyGCL7CO/3gxHR9JVK3Na?= =?us-ascii?Q?JAZC2WEv4Ri9oOxKcWm1W0Nt5j2CdAbhi19/b06cqBG48fSCSnV3TwJ4no90?= =?us-ascii?Q?IS1EDEcoS6Dk/zorX9oyXOk+n+P5LaTMUsJ/gJCK4Vzzb9S5RQJbA2dzQ7vg?= =?us-ascii?Q?2Vi3AHY1wrUMCYY00fjpHoa/lvxs1n9fI+oT7qMjHR0d/QmUKYoIS2RguNQL?= =?us-ascii?Q?84vIYjjk4z/yow+raIiGorGdWjWVS57sGLSydzXoyU0jH3Egnp3DGfVYxrAb?= =?us-ascii?Q?U1naqsudGrHYrFszGG4vb/l4o3E6HjFwzsNvRvRCVIeUXjP+VNrLK3Lq0FHH?= =?us-ascii?Q?vp2IpM8AcHk+lYiDMly0jMq5wY7N5rNbl02IwzzE4SNEK2JGXXWU5JYrbPOg?= =?us-ascii?Q?1ue0aMgja8VtuoqMI14+xVwEdAW4N8y37WcB9FHjxJreNCS5W9diz0hP0aYl?= =?us-ascii?Q?G/8/Pk3RN1UO9oj/LDbkpd6TlvWzi21+aMk/6AzPKemjbH3ZK82ny7yONNH9?= =?us-ascii?Q?/hSYvcK6afDFycPsZiuwzlNERuZ5CoiJ3yhlai9sB1rqHK/50BxBF7+4fS3f?= =?us-ascii?Q?avn1+xW8ZkZSPqmwS++mDExME+vQzXRsRC4yMtTF0VeNVZF9kNu5pYjb6Znj?= =?us-ascii?Q?Ga8oYtUMXBytakvNrU1wj317xGMUnD7HVyuIhP5fgzNcZciafuoGk2H3yEsi?= =?us-ascii?Q?YsukE+s6vj/zv7mxg9/+wwVk1z/2dfZtEV1nBpmiwgrA6nOKY5k2tFHsMZJn?= =?us-ascii?Q?Y4L4BOD14QK6TlFsmFIIsim39C0uA2MChCeXDuxJSUrNPyE05Yc2Alexqxvk?= =?us-ascii?Q?DSCfbz2Wa2H2kCusIQ/HnyVXzNTK+PHFgMsBySPG6R+4c4gwX9z56boUA25J?= =?us-ascii?Q?YtV32NRZtSCtAH+QCdKiud/P7XtdX9GWb6JyKkzzRGNh+2XiIstz5E27TSXh?= =?us-ascii?Q?4q7AcisZUjzAdCXiQ50Xoqml5j3r1z/rFGyPfLfE?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5280.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1e0ee817-ed13-4667-bc9a-08db5ab7b4ea X-MS-Exchange-CrossTenant-originalarrivaltime: 22 May 2023 11:28:46.3830 (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: VOqhmghVOiIWWi45siJ4xxglGUZGz6hMI31y0pvpf/KJlMJc3edHqGaUjDu30QmJAHCccyifPiwrlAUPDbyAJg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR11MB7991 Return-Path: ashraf.ali.s@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: S, Ashraf Ali -----Original Message----- From: devel@edk2.groups.io On Behalf Of Tan, Ming Sent: Monday, May 22, 2023 11:43 AM To: devel@edk2.groups.io Cc: Chiu, Chasel ; Duggapu, Chinni B Subject: [edk2-devel] [PATCH] IntelFsp2WrapperPkg: Fix ASSERT when FSP-S/M = use FFS3 REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4458 Original code call PeiServicesInstallFvInfoPpi() with NULL for the FvFormat= parameter, then PeiServicesInstallFvInfoPpi() will assume it use FFS2, the= n ASSERT if FSP-S/M use FFS3. Now set the FvFormat to the info got from FvHeader. Cc: Chasel Chiu Cc: Duggapu Chinni B Signed-off-by: Ming Tan --- IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.c | 2 +- IntelFsp2Wra= pperPkg/FspsWrapperPeim/FspsWrapperPeim.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.c b/IntelF= sp2WrapperPkg/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 (- NU= LL,+ &((EFI_FIRMWARE_VOLUME_HEADER *)(UINTN)PcdGet32 (PcdFspmBaseAddre= ss))->FileSystemGuid, (VOID *)(UINTN)PcdGet32 (PcdFspmBaseAddress), = (UINT32)((EFI_FIRMWARE_VOLUME_HEADER *)(UINTN)PcdGet32 (PcdFspmBaseAdd= ress))->FvLength, NULL,diff --git a/IntelFsp2WrapperPkg/FspsWrapperPe= im/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 di= spatcher. // PeiServicesInstallFvInfoPpi (- NULL,+ &((EFI_FIRMWAR= E_VOLUME_HEADER *)(UINTN)PcdGet32 (PcdFspsBaseAddress))->FileSystemGuid, = (VOID *)(UINTN)PcdGet32 (PcdFspsBaseAddress), (UINT32)((EFI_FIRMWARE_= VOLUME_HEADER *)(UINTN)PcdGet32 (PcdFspsBaseAddress))->FvLength, NULL,-= -=20 2.31.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D Groups.io Links: You receive all messages sent to this group. View/Reply Online (#105101): https://edk2.groups.io/g/devel/message/105101 Mute This Topic: https://groups.io/mt/99059532/6226280 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [ashraf.ali.s@intel.com] = -=3D-=3D-=3D-=3D-=3D-=3D