From nobody Thu Apr 25 02:15:12 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+105101+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+105101+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1684736015; cv=none; d=zohomail.com; s=zohoarc; b=i+5Mvy3RQeNAoiUeCRMXdj9NX/9kjSDFaVE2prbrhSb5PAoOrbIT/+4JuNV/K7EdT8eZ4YE3hTbLHBQgtn28TqaCCAMS5KmcL+DYJRlOOrb7F/ic37WXSrkMy2wjvnbuuRj/Z/QQTt1g/ydTyzndTdkPfEvAZC156M0/VgA3VfM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684736015; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=r3mmT5ZbgKj2JWkAlEWd2lkvimO1cgqQQdeqY2aTsTA=; b=bVEZLoNFsZffDwG2MdHh/TyoMtutv0A+bJ7mfYsuukaVM5yGrAF0MwkjiediS0wciGqNFF28vgTpLfqUoPN+dQA8yobdlgJPnYgtHhPtJ6CQl9OwsVHDhJcp8ZhAqkIg3wVCKHBf5yk1+SvhjH6aRByzetz7NoRO/UcT3kTgimE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+105101+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1684736015900160.9263833777543; Sun, 21 May 2023 23:13:35 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id IetVYY1788612x20kAJEzlQ9; Sun, 21 May 2023 23:13:35 -0700 X-Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mx.groups.io with SMTP id smtpd.web11.15932.1684736014855581591 for ; Sun, 21 May 2023 23:13:35 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,10717"; a="333201828" X-IronPort-AV: E=Sophos;i="6.00,183,1681196400"; d="scan'208";a="333201828" X-Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 May 2023 23:13:34 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10717"; a="877644710" X-IronPort-AV: E=Sophos;i="6.00,183,1681196400"; d="scan'208";a="877644710" X-Received: from mingtan1-desk1.ccr.corp.intel.com ([10.239.153.149]) by orsmga005.jf.intel.com with ESMTP; 21 May 2023 23:13:33 -0700 From: "Tan, Ming" To: devel@edk2.groups.io Cc: Chasel Chiu , Duggapu Chinni B Subject: [edk2-devel] [PATCH] IntelFsp2WrapperPkg: Fix ASSERT when FSP-S/M use FFS3 Date: Mon, 22 May 2023 14:13:06 +0800 Message-Id: <20230522061306.11787-1-ming.tan@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,ming.tan@intel.com X-Gm-Message-State: oyeOgYmHuwnGgcjf15hn4J50x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1684736015; bh=rUXvjMbPQPNXsPKRwEEWxyU9v1cJDoZkitLjhWYA5ho=; h=Cc:Date:From:Reply-To:Subject:To; b=HyolmmmLz640ZSkchOccHNdOh1569MeGsW4VziL1e9cunNvooDiEdFuQn0j+c/lNWBC BwAGEs3oSJ8F546mcp0elPgPT097SYeGdng73xxyJJ3cpcOBoKWQdJeKvykrztB9pl+Ei WeQHYQIF5KAlhCXicxFZuUjuf6x+onZjHYY= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1684736016187100001 Content-Type: text/plain; charset="utf-8" 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, then 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 Reviewed-by: Chasel Chiu Reviewed-by: S, Ashraf Ali --- IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.c | 2 +- IntelFsp2WrapperPkg/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); =20 PeiServicesInstallFvInfoPpi ( - NULL, + &((EFI_FIRMWARE_VOLUME_HEADER *)(UINTN)PcdGet32 (PcdFspmBaseAddress)= )->FileSystemGuid, (VOID *)(UINTN)PcdGet32 (PcdFspmBaseAddress), (UINT32)((EFI_FIRMWARE_VOLUME_HEADER *)(UINTN)PcdGet32 (PcdFspmBaseA= ddress))->FvLength, NULL, diff --git a/IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.c b/IntelF= sp2WrapperPkg/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_FIRMWARE_VOLUME_HEADER *)(UINTN)PcdGet32 (PcdFspsBaseAddress))-= >FileSystemGuid, (VOID *)(UINTN)PcdGet32 (PcdFspsBaseAddress), (UINT32)((EFI_FIRMWARE_VOLUME_HEADER *)(UINTN)PcdGet32 (PcdFspsBaseAdd= ress))->FvLength, NULL, --=20 2.31.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=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/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-