From nobody Tue Feb 10 03:45:34 2026 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+79981+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+79981+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1630388335; cv=none; d=zohomail.com; s=zohoarc; b=CuyT9gsdjd/GmTGsFlXqbwNmzV23VxK9WP5nwJqVFsTF0Ew4a+uASSCY3Wr1m5PphPYokUvuzQJeQvOL5fQzNl7jbUKllrTNE5JtaZJF/ecOFaX3yjVQKNSrfyRoWIUhMqmXikLAfdjP33tJr1NScfmf2TDSkfNwHx45tF+60uE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1630388335; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=JbUXtmGH6NAezHFrhG6sCNGFlc1VY5xSUOh5B2PgUM8=; b=NX9odCnwx/J7km78xSH6pARoajy2H7JYkCvbl/IAghZkrh4BP6KeacMNwqaewllg587AYttPAlmM5ZaaTOKdhfosdoKVf8FjvUgbxs+6TP0ZeDpWI/B9RBuv3rMApWzIO6TPvJEs5890VUIkHOJA8H1oGO7tKpg8gWQ+aNpB6JU= 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+79981+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 1630388335656769.1795673146158; Mon, 30 Aug 2021 22:38:55 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id IKMZYY1788612xBOI4COG57N; Mon, 30 Aug 2021 22:38:55 -0700 X-Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web11.1672.1630388334079803018 for ; Mon, 30 Aug 2021 22:38:54 -0700 X-IronPort-AV: E=McAfee;i="6200,9189,10092"; a="240654317" X-IronPort-AV: E=Sophos;i="5.84,365,1620716400"; d="scan'208";a="240654317" X-Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Aug 2021 22:38:46 -0700 X-IronPort-AV: E=Sophos;i="5.84,365,1620716400"; d="scan'208";a="540874281" X-Received: from duntan-mobl.ccr.corp.intel.com ([10.238.1.156]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Aug 2021 22:38:44 -0700 From: "duntan" To: devel@edk2.groups.io Cc: Guo Dong , Ray Ni , Maurice Ma , Benjamin You , Zhiguang Liu , DunTan Subject: [edk2-devel] [Patch V2 1/2] UefiPayloadPkg: Fix the bug in dump guid HOB info functions Date: Tue, 31 Aug 2021 13:38:15 +0800 Message-Id: <20210831053816.2366-2-dun.tan@intel.com> In-Reply-To: <20210831053816.2366-1-dun.tan@intel.com> References: <20210831053816.2366-1-dun.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,dun.tan@intel.com X-Gm-Message-State: u0DatWyKNjesrkagbIxD9IH6x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1630388335; bh=Gxkc7QtVYSwGOaM0zKADDHdLOgqrPE6wWaPYef0Giyk=; h=Cc:Date:From:Reply-To:Subject:To; b=MA2XGK2T4oxQwxR+Mi40HkP48UgQSVNbAbkDwxVM/KSU4+ubA/ObcpGVPCV3eskQjzn uZ8hxgSNEgJ996aWE246WRT7hSxUZN2h0xi9atgC8ZT1Njr5KQ5dghsSm9Ua3v0y1WVVr mMLFDIg1j13l4mOwi4lKhm2xzjf9XcCXSWo= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1630388336802100008 Content-Type: text/plain; charset="utf-8" The input HobLength of PrintHandler should be data size instead of whole le= ngth of HOB Cc: Guo Dong Cc: Ray Ni Cc: Maurice Ma Cc: Benjamin You Cc: Zhiguang Liu Signed-off-by: DunTan Reviewed-by: Ray Ni Reviewed-by: Zhiguang Liu --- UefiPayloadPkg/UefiPayloadEntry/PrintHob.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/UefiPayloadPkg/UefiPayloadEntry/PrintHob.c b/UefiPayloadPkg/Ue= fiPayloadEntry/PrintHob.c index 5fb638d4a4..f93aeec472 100644 --- a/UefiPayloadPkg/UefiPayloadEntry/PrintHob.c +++ b/UefiPayloadPkg/UefiPayloadEntry/PrintHob.c @@ -317,9 +317,11 @@ PrintPciRootBridgeInfoGuidHob ( { UNIVERSAL_PAYLOAD_PCI_ROOT_BRIDGES *PciRootBridges; UINTN Index; + UINTN Length; Index =3D 0; PciRootBridges =3D (UNIVERSAL_PAYLOAD_PCI_ROOT_BRIDGES *) GET_GUID_HOB_D= ATA (HobRaw); - ASSERT (HobLength >=3D sizeof (UNIVERSAL_PAYLOAD_PCI_ROOT_BRIDGES)); + Length =3D sizeof (UNIVERSAL_PAYLOAD_PCI_ROOT_BRIDGES) + PciRootBridges-= >Count * sizeof (UNIVERSAL_PAYLOAD_PCI_ROOT_BRIDGE); + ASSERT (HobLength >=3D Length); DEBUG ((DEBUG_INFO, " Revision =3D 0x%x\n", PciRootBridges->He= ader.Revision)); DEBUG ((DEBUG_INFO, " Length =3D 0x%x\n", PciRootBridges->He= ader.Length)); DEBUG ((DEBUG_INFO, " Count =3D 0x%x\n", PciRootBridges->Co= unt)); @@ -369,10 +371,12 @@ PrintExtraDataGuidHob ( { UNIVERSAL_PAYLOAD_EXTRA_DATA *ExtraData; UINTN Index; + UINTN Length; =20 Index =3D 0; ExtraData =3D (UNIVERSAL_PAYLOAD_EXTRA_DATA *) GET_GUID_HOB_DATA (HobRaw= ); - ASSERT (HobLength >=3D ExtraData->Header.Length); + Length =3D sizeof (UNIVERSAL_PAYLOAD_EXTRA_DATA) + ExtraData->Count * si= zeof (UNIVERSAL_PAYLOAD_EXTRA_DATA_ENTRY); + ASSERT (HobLength >=3D Length); DEBUG ((DEBUG_INFO, " Revision =3D 0x%x\n", ExtraData->Header.Revisio= n)); DEBUG ((DEBUG_INFO, " Length =3D 0x%x\n", ExtraData->Header.Length)= ); DEBUG ((DEBUG_INFO, " Count =3D 0x%x\n", ExtraData->Count)); @@ -443,7 +447,7 @@ PrintGuidHob ( for (Index =3D 0; Index < ARRAY_SIZE (GuidHobPrintHandleTable); Index++)= { if (CompareGuid (&Hob.Guid->Name, GuidHobPrintHandleTable[Index].Guid)= ) { DEBUG ((DEBUG_INFO, " Guid =3D %a\n", GuidHobPrintHandleTable[In= dex].GuidName)); - Status =3D GuidHobPrintHandleTable[Index].PrintHandler (Hob.Raw, Hob= .Header->HobLength); + Status =3D GuidHobPrintHandleTable[Index].PrintHandler (Hob.Raw, GET= _GUID_HOB_DATA_SIZE (Hob.Raw)); return Status; } } --=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 (#79981): https://edk2.groups.io/g/devel/message/79981 Mute This Topic: https://groups.io/mt/85270356/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- From nobody Tue Feb 10 03:45:34 2026 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+79979+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+79979+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1630388334; cv=none; d=zohomail.com; s=zohoarc; b=TQ7KW+rXxIF94g8SWMPffQ7WivODR+Ag/RKmWO8qJB0DwtgQppam4L5t2jyXnBngAPw/7beEIO/EbNvZe5WAVd71WgrbOz7qzpwvA+iJ6FYupoFnZrZn6m3bdtNjfo0rUj9WKl/mO+FYO0uZjf4cX3n6UvewlHxlUMhGmU0EUNc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1630388334; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=64uIDTykWBTBM1oD+nqSc8v18NOxCiwuFArMKoVUUQk=; b=R2otNwEIgrHA9JqulR9GsBkZ37HpnJZAVNXqB/frYsp40LuTh3sSqZEuv4EtC8Tyup6fclvs/JCb0Dk0Q3rxvFp6T8PtAHFznNpR9yPoVhOY0PkbnkZuphSxJpG3tFYQiVwEtU6QbrTTmbvRjAz4ZzJ8eawzYGWNHYxQBihawWQ= 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+79979+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 1630388334051558.9202564945538; Mon, 30 Aug 2021 22:38:54 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id u6tyYY1788612x9XTVbOS2U9; Mon, 30 Aug 2021 22:38:53 -0700 X-Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mx.groups.io with SMTP id smtpd.web12.1764.1630388332801624207 for ; Mon, 30 Aug 2021 22:38:52 -0700 X-IronPort-AV: E=McAfee;i="6200,9189,10092"; a="197965091" X-IronPort-AV: E=Sophos;i="5.84,365,1620716400"; d="scan'208";a="197965091" X-Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Aug 2021 22:38:51 -0700 X-IronPort-AV: E=Sophos;i="5.84,365,1620716400"; d="scan'208";a="540874287" X-Received: from duntan-mobl.ccr.corp.intel.com ([10.238.1.156]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Aug 2021 22:38:49 -0700 From: "duntan" To: devel@edk2.groups.io Cc: Guo Dong , Ray Ni , Maurice Ma , Benjamin You , Zhiguang Liu , DunTan Subject: [edk2-devel] [Patch V2 2/2] UefiPayloadPkg: Dump hob info from gEdkiiBootManagerMenuFileGuid Date: Tue, 31 Aug 2021 13:38:16 +0800 Message-Id: <20210831053816.2366-3-dun.tan@intel.com> In-Reply-To: <20210831053816.2366-1-dun.tan@intel.com> References: <20210831053816.2366-1-dun.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,dun.tan@intel.com X-Gm-Message-State: jBvZB8YijR6JQyNAoCpJaq2ax1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1630388333; bh=QlwYLkVjwTHDMzwIntMk1l+Ym5x/RhTlz90OdEkEVMg=; h=Cc:Date:From:Reply-To:Subject:To; b=oA9wZrM3/aqTsKmeTNWcB9AUHU/PwrBevZqQa5wZEA7HlJpXAJTsZo/Otz4cXMZ9FEr JSZ/hqEsPeV2/pFk7/7Vbu0I/xEGSJxBgYscEv7tNaZUH8SeH95TVsTr3OQjwMhtxR/u3 /bm3Xyc0WSebEWp96nDQNx+nb/ynR53U+dY= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1630388334657100002 Content-Type: text/plain; charset="utf-8" V1: Dump this hob infomation from gEdkiiBootManagerMenuFileGuid V2: Delete the duplicated assertions Cc: Guo Dong Cc: Ray Ni Cc: Maurice Ma Cc: Benjamin You Cc: Zhiguang Liu Signed-off-by: DunTan Reviewed-by: Ray Ni Reviewed-by: Zhiguang Liu --- UefiPayloadPkg/UefiPayloadEntry/PrintHob.c | 25 +++++++++++= +++++++++++++- UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf | 1 + 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/UefiPayloadPkg/UefiPayloadEntry/PrintHob.c b/UefiPayloadPkg/Ue= fiPayloadEntry/PrintHob.c index f93aeec472..b5ea9a17a2 100644 --- a/UefiPayloadPkg/UefiPayloadEntry/PrintHob.c +++ b/UefiPayloadPkg/UefiPayloadEntry/PrintHob.c @@ -10,6 +10,7 @@ #include #include #include +#include =20 #define ROW_LIMITER 16 =20 @@ -410,6 +411,27 @@ PrintMemoryTypeInfoGuidHob ( return EFI_SUCCESS; } =20 +/** + Print the information in EdkiiBootManagerMenuFileGuid. + @param[in] HobRaw A pointer to the start of gEdkiiBootManagerMe= nuFileGuid HOB. + @retval EFI_SUCCESS If it completed successfully. +**/ +EFI_STATUS +PrintBootManagerMenuGuidHob ( + IN UINT8 *HobRaw, + IN UINT16 HobLength + ) +{ + UNIVERSAL_PAYLOAD_BOOT_MANAGER_MENU *BootManagerMenuFile; + + BootManagerMenuFile =3D (UNIVERSAL_PAYLOAD_BOOT_MANAGER_MENU *) GET_GUID= _HOB_DATA (HobRaw); + ASSERT (HobLength >=3D sizeof (*BootManagerMenuFile)); + DEBUG ((DEBUG_INFO, " Revision =3D 0x%x\n", BootManagerMenuFile->Head= er.Revision)); + DEBUG ((DEBUG_INFO, " Length =3D 0x%x\n", BootManagerMenuFile->Head= er.Length)); + DEBUG ((DEBUG_INFO, " FileName =3D %g\n", &BootManagerMenuFile->Fil= eName)); + return EFI_SUCCESS; +} + // // Mappint table for dump Guid Hob information. // This table can be easily extented. @@ -422,7 +444,8 @@ GUID_HOB_PRINT_HANDLE GuidHobPrintHandleTable[] =3D { {&gUefiAcpiBoardInfoGuid, PrintAcpiBoardInfoGuidHob, = "gUefiAcpiBoardInfoGuid(Acpi Guid)"}, {&gUniversalPayloadPciRootBridgeInfoGuid, PrintPciRootBridgeInfoGuidHob,= "gUniversalPayloadPciRootBridgeInfoGuid(Pci Guid)"}, {&gEfiMemoryTypeInformationGuid, PrintMemoryTypeInfoGuidHob, = "gEfiMemoryTypeInformationGuid(Memory Type Information Guid)"}, - {&gUniversalPayloadExtraDataGuid, PrintExtraDataGuidHob, = "gUniversalPayloadExtraDataGuid(PayLoad Extra Data Guid)"} + {&gUniversalPayloadExtraDataGuid, PrintExtraDataGuidHob, = "gUniversalPayloadExtraDataGuid(PayLoad Extra Data Guid)"}, + {&gEdkiiBootManagerMenuFileGuid, PrintBootManagerMenuGuidHob, = "gEdkiiBootManagerMenuFileGuid(Boot Manager Menu File Guid)"} }; =20 /** diff --git a/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf b/Ue= fiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf index 416a620598..3ee449219d 100644 --- a/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf +++ b/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf @@ -70,6 +70,7 @@ gUniversalPayloadAcpiTableGuid gUniversalPayloadPciRootBridgeInfoGuid gUniversalPayloadSmbios3TableGuid + gEdkiiBootManagerMenuFileGuid =20 [FeaturePcd.IA32] gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode ## CONSUMES --=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 (#79979): https://edk2.groups.io/g/devel/message/79979 Mute This Topic: https://groups.io/mt/85270353/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-