From nobody Wed May 8 02:39:24 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+96589+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+96589+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1669225863; cv=none; d=zohomail.com; s=zohoarc; b=N1JxFGuIJzCGKHS7boD482kfKZvSt9XD2SKFkfAct+9gceAuTCMxmTwvcHwA3qMnCFD86INQuUnMUJAVAJhymXWA2pOfEcy4xiuTopEm/FcqLIDzaABMbqDIplbmwfUHcvTxNmO6Z5lShBYEPedXZAXhRSfWJnutU2jHrpCwwLA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669225863; 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=/RAmbmLbLaORnhYNfX1F96OElQcnpW9h0cU7zVCQtGI=; b=eYXlLPfmGiuw3sBlzJH8Nr7J/aZarJ+iavy5/r28rUXWPIUOxtKHF38Yu94z8AH3YxV52BiRF5byPx9LD0c3wrkZxt6Ao8k3a/Z3r8ewqxhkIL09OcD2+JACvYGs1pmISLJo12R8biW+YyBikwVpuxKt3EPy7C8NzffYSE4woQc= 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+96589+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 1669225863725281.3461693519166; Wed, 23 Nov 2022 09:51:03 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id veE4YY1788612xxUZgimgHfx; Wed, 23 Nov 2022 09:51:03 -0800 X-Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mx.groups.io with SMTP id smtpd.web11.17392.1669200631533899222 for ; Wed, 23 Nov 2022 02:50:32 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10539"; a="312739386" X-IronPort-AV: E=Sophos;i="5.96,187,1665471600"; d="scan'208";a="312739386" X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Nov 2022 02:50:29 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10539"; a="619574629" X-IronPort-AV: E=Sophos;i="5.96,187,1665471600"; d="scan'208";a="619574629" X-Received: from unknown (HELO marslinx-DESK1.gar.corp.intel.com) ([10.5.215.146]) by orsmga006.jf.intel.com with ESMTP; 23 Nov 2022 02:50:27 -0800 From: marsx.lin@intel.com To: devel@edk2.groups.io Cc: MarsX Lin , Guo Dong , Ray Ni , Sean Rhodes , James Lu , Gua Guo Subject: [edk2-devel] [PATCH] UefiPayloadPkg: Support multiple-firmware volume Date: Wed, 23 Nov 2022 18:50:25 +0800 Message-Id: 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,marsx.lin@intel.com X-Gm-Message-State: 5BM15xtBMs4rIzZRMiBxdqLix1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1669225863; bh=kV+AjzOHEnyb88lV0Lz0664rQMbHklpSv0Rny60xmmA=; h=Cc:Date:From:Reply-To:Subject:To; b=NsoJJPENtR02o44pWT2xb127UmR3b0SWAXv1fjM4RxjHQcLRnWzaNPLtirrmeD9eNCh HJcnGiYBUjqgBPfepmDFO/IQWO/By8UJeFJv46/gh6/sURAOJfASQ5r9OcMEo0ty8+pTx xMTROmbMh9mPhlonQ4TxOUdsEjRVWCT0eJQ= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1669225864735100002 Content-Type: text/plain; charset="utf-8" From: MarsX Lin REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4164 To support multiple FVs provided by UPL Cc: Guo Dong Cc: Ray Ni Cc: Sean Rhodes Cc: James Lu Cc: Gua Guo Signed-off-by: MarsX Lin Reviewed-by: Gua Guo =20 Reviewed-by: James Lu --- .../UefiPayloadEntry/UniversalPayloadEntry.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.c b/Uefi= PayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.c index 09aee89680..9df7d3ee19 100644 --- a/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.c +++ b/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.c @@ -397,12 +397,21 @@ BuildHobs ( GuidHob =3D GetFirstGuidHob (&gUniversalPayloadExtraDataGuid); ASSERT (GuidHob !=3D NULL); ExtraData =3D (UNIVERSAL_PAYLOAD_EXTRA_DATA *)GET_GUID_HOB_DATA (GuidHob= ); - ASSERT (ExtraData->Count =3D=3D 1); + DEBUG ((DEBUG_INFO, "Multiple Fv Count=3D%d\n", ExtraData->Count)); ASSERT (AsciiStrCmp (ExtraData->Entry[0].Identifier, "uefi_fv") =3D=3D 0= ); =20 *DxeFv =3D (EFI_FIRMWARE_VOLUME_HEADER *)(UINTN)ExtraData->Entry[0].Base; ASSERT ((*DxeFv)->FvLength =3D=3D ExtraData->Entry[0].Size); - + // + // support multiple FVs provided by UPL + // + for (UINT8 idx =3D 1; idx < ExtraData->Count ; idx++) { + BuildFvHob (ExtraData->Entry[idx].Base, ExtraData->Entry[idx].Size); + DEBUG ((DEBUG_INFO, "UPL Multiple fv[%d], Base=3D0x%x, size=3D0x%x\n", + idx, + ExtraData->Entry[idx].Base, + ExtraData->Entry[idx].Size)); + } // // Create guid hob for acpi board information // --=20 2.33.0.windows.2 -=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 (#96589): https://edk2.groups.io/g/devel/message/96589 Mute This Topic: https://groups.io/mt/95222918/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-