From nobody Fri Mar 29 07:04:13 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+80471+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+80471+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1631260899; cv=none; d=zohomail.com; s=zohoarc; b=O5YfO1PBOqXispTvfsoW8WSPWP4MbSn4u8Jhn2FVCFxAfouFu0AzoqgCqJuDp2cS7pHCKG1nT7ouUFYpCbRKMU/5aUPKD0HjocRDSsI3A5r+EjfO1YAFPMViTFaAzj++/SBqFWVFbhtVIOGPA9hwY8CsASPir1ShCpC9WY5k83E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631260899; 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=JjwD6C2C4/96mG06zvxWEW15sYuHsWs9OQTSX3pudts=; b=DZPQ8yikxM3guFPzQIqFAy94RjM8LqdbS4ej9152jiROHYYUnLQt/C7jhU7EqevBj0UA8gY5K2bVNXOYuPHlzrnnS3xhRf0IJ50qSQWHaxwrNJUHCZ/YBwukHMOmWJIPyjOzSEVv3oJNqyaT88VvWR0t/JZjMv2Cuo59N/4oowQ= 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+80471+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 1631260899514179.4096453857627; Fri, 10 Sep 2021 01:01:39 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id oMyLYY1788612xOAayv1fndq; Fri, 10 Sep 2021 01:01:39 -0700 X-Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mx.groups.io with SMTP id smtpd.web12.6199.1631260895965185484 for ; Fri, 10 Sep 2021 01:01:38 -0700 X-IronPort-AV: E=McAfee;i="6200,9189,10102"; a="306587655" X-IronPort-AV: E=Sophos;i="5.85,282,1624345200"; d="scan'208";a="306587655" X-Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Sep 2021 01:01:38 -0700 X-IronPort-AV: E=Sophos;i="5.85,282,1624345200"; d="scan'208";a="540338276" X-Received: from duntan-mobl.ccr.corp.intel.com ([10.238.1.156]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Sep 2021 01:01:36 -0700 From: "duntan" To: devel@edk2.groups.io Cc: duntan , Guo Dong , Ray Ni , Maurice Ma , Benjamin You , Zhiguang Liu Subject: [edk2-devel] [Patch V3 1/2] UefiPayloadPkg: Fix the bug in dump guid HOB info functions Date: Fri, 10 Sep 2021 16:01:10 +0800 Message-Id: <20210910080111.113-2-dun.tan@intel.com> In-Reply-To: <20210910080111.113-1-dun.tan@intel.com> References: <20210910080111.113-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: mk4Ia3lqf3cxFinQcrPHOoJ4x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1631260899; bh=DSD030vxJmYb6CrlFGjCRUdFQvyM1XGKeAI+k09XhnE=; h=Cc:Date:From:Reply-To:Subject:To; b=r70/u5ziCnMYnaVIJMulwYT6VZDFeUM3uuKFRUtVNH9SiSWNefG/gkGpd8S/pfOr9E3 EFEsZNBNY2WdBGVWBuNen7TxPz/WziwyBXgaO55crOoCVoR2xh1l7ITf2pHzIzEZcysLw sWPSZgGVD0FvSBxkvmPuJTWggy9pjImdpMs= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1631260900405100002 Content-Type: text/plain; charset="utf-8" From: duntan The input HobLength of PrintHandler should be data size instead of whole le= ngth of HOB Cc: Guo Dong Reviewed-by: Ray Ni Cc: Maurice Ma Cc: Benjamin You Reviewed-by: Zhiguang Liu Signed-off-by: Dun Tan --- 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 (#80471): https://edk2.groups.io/g/devel/message/80471 Mute This Topic: https://groups.io/mt/85504620/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 Fri Mar 29 07:04:13 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+80472+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+80472+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1631260916; cv=none; d=zohomail.com; s=zohoarc; b=CPMKCS4IMouc4GzwPmoo3Zw3MxvDmRueGcYLocN0d/1M3ORhvVMq6Xrsfa0jU8YJc85lku66nIbVIjzBo3tbxW1xcR/3p52WGd7otEvyu/HOPchXWr/cvffCBEd5qmHiNjBf27mi6lo2KPBTuk1qFqdBZhyNTYsz8ei9KmxP8es= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631260916; 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=y93vFrthb3bE/WDsSn8LZLMb9k8LdBaOpzuKw6GUG9U=; b=ZG+8erHymQFHb67YQl7Oz8e6toa02WAr1m+QHtvWXXEQzb3xGZIKhX8PkcVoVgDYdZLf0/q0FoRWFHWnLSQ+pJ12N25CVFxTQgbK9PMrimJZ0GoqyPHYmW+K6PZgRnM5sfbgFWHGJbP+Xif2rnYhWxyBiV9RRM+8CI0pek/eq1M= 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+80472+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 1631260916266789.5287161515706; Fri, 10 Sep 2021 01:01:56 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id iIjOYY1788612xxGuV7w5AEA; Fri, 10 Sep 2021 01:01:55 -0700 X-Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mx.groups.io with SMTP id smtpd.web08.6241.1631260914894944153 for ; Fri, 10 Sep 2021 01:01:55 -0700 X-IronPort-AV: E=McAfee;i="6200,9189,10102"; a="201216118" X-IronPort-AV: E=Sophos;i="5.85,282,1624345200"; d="scan'208";a="201216118" X-Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Sep 2021 01:01:50 -0700 X-IronPort-AV: E=Sophos;i="5.85,282,1624345200"; d="scan'208";a="540338343" X-Received: from duntan-mobl.ccr.corp.intel.com ([10.238.1.156]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Sep 2021 01:01:48 -0700 From: "duntan" To: devel@edk2.groups.io Cc: duntan , Guo Dong , Ray Ni , Maurice Ma , Benjamin You , Zhiguang Liu Subject: [edk2-devel] [Patch V3 2/2] UefiPayloadPkg: Dump hob info from gEdkiiBootManagerMenuFileGuid Date: Fri, 10 Sep 2021 16:01:11 +0800 Message-Id: <20210910080111.113-3-dun.tan@intel.com> In-Reply-To: <20210910080111.113-1-dun.tan@intel.com> References: <20210910080111.113-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: RbS4U2BFmbeaEH3RZNT7tQ5Wx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1631260915; bh=Tc63Ts7cp14h/szQEdhBXdvPzt0iYkRL7HjOInkiBdI=; h=Cc:Date:From:Reply-To:Subject:To; b=Ld40u4JJXcNBrYnlMejXvVHSefwtKwL1ENvPXVyRPcHv8ZmLfV4OEzXmhxu2uzA80Ar d4ViSi3jqg5w1XveYtO+wvdIoypkJYVO97QO84nlyfcxcgFabLkir7hTxfvXHUNV2XYv6 lFPo47+WoyvurCL/ptTFhVzhNHirNVWD9nY= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1631260917652100001 Content-Type: text/plain; charset="utf-8" From: duntan V1: Dump this hob infomation from gEdkiiBootManagerMenuFileGuid V2: Delete the duplicated assertions V3: Add input parameter in Comment Cc: Guo Dong Reviewed-by: Ray Ni Cc: Maurice Ma Cc: Benjamin You Reviewed-by: Zhiguang Liu Signed-off-by: Dun Tan --- UefiPayloadPkg/UefiPayloadEntry/PrintHob.c | 26 +++++++++++= ++++++++++++++- UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf | 1 + 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/UefiPayloadPkg/UefiPayloadEntry/PrintHob.c b/UefiPayloadPkg/Ue= fiPayloadEntry/PrintHob.c index f93aeec472..265d47ca9d 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,28 @@ PrintMemoryTypeInfoGuidHob ( return EFI_SUCCESS; } =20 +/** + Print the information in EdkiiBootManagerMenuFileGuid. + @param[in] HobRaw A pointer to the start of gEdkiiBootManagerMe= nuFileGuid HOB. + @param[in] HobLength The size of the data buffer. + @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 +445,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 (#80472): https://edk2.groups.io/g/devel/message/80472 Mute This Topic: https://groups.io/mt/85504622/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-