From nobody Mon Apr 29 14:08:47 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+77381+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+77381+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1625093448; cv=none; d=zohomail.com; s=zohoarc; b=brXY1jw0KGpH2YTHoLdfkhpW6X58eCEJ1p0O1k8gVlnsFBppqztgQ1hMdezv9UBYGjpnzjPihr1v8BK62GK57frCb0WBFHLp2tFt5SmrgFMDi68CNxwtGoeZskZ5mQecxM5JnGJy4hHWRHsygXe4Zxx0JKTM3ahgi/vxQ+N1m4s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1625093448; h=Cc:Date:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:Message-ID:Reply-To:Sender:Subject:To; bh=Q4/O+l852XQHHnNvkMGl1PSHdzAh5vEZYZyApkp/RyM=; b=nU1wu3+isKPabXbCO6ciIKqo5LP1hKziARwPlb4fLxtuaGFAPkfcrkMl1phvfBTwIEQqygSZ7F8WVZXQRwY9OrnHm4WIBB8lsXEORAXgJPLEjQSR075jceXdSaz8ZktX0qpvN6I//5/jV3Cu2IodiIwj7/HWC6jxOobJUJZQDTg= 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+77381+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 1625093448179451.06590048613236; Wed, 30 Jun 2021 15:50:48 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id uC1QYY1788612x4igxtfGf5o; Wed, 30 Jun 2021 15:50:47 -0700 X-Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mx.groups.io with SMTP id smtpd.web11.4311.1625093442343959510 for ; Wed, 30 Jun 2021 15:50:42 -0700 X-IronPort-AV: E=McAfee;i="6200,9189,10031"; a="205434881" X-IronPort-AV: E=Sophos;i="5.83,312,1616482800"; d="scan'208";a="205434881" X-Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jun 2021 15:50:40 -0700 X-IronPort-AV: E=Sophos;i="5.83,312,1616482800"; d="scan'208";a="455410467" X-Received: from gdong1-mobl.amr.corp.intel.com ([10.209.132.52]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jun 2021 15:50:40 -0700 From: "Guo Dong" To: devel@edk2.groups.io Cc: maurice.ma@intel.com, benjamin.you@intel.com Subject: [edk2-devel] [PATCH] UefiPayloadPkg: Fix the build failure Date: Wed, 30 Jun 2021 15:50:36 -0700 Message-Id: <20210630225036.34272-1-guo.dong@intel.com> 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,guo.dong@intel.com X-Gm-Message-State: qHTysHRsZrFDstv5NqFee3g0x1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1625093447; bh=npQZDJo7hb652n+QV7+X3f+85na5goulhzi4WrqGgTc=; h=Cc:Date:From:Reply-To:Subject:To; b=IQyuDA7zhHfUOI4Xwdu6//8qQOSXf3pWToq153qGPeDAW/imnCHbgN07S2RxBZlfCO5 WlgfpxgpHOtqFOtiPyJrLPvTYAAXwF+iWIjk4EUuYNZucQ/yJ/XyN0Zyk6GksSC39zrzQ 4NzEaxCmoc897M5VlKy6oknOmkJqWuXOVMo= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" For non-universal payload, HandoffHobTable is used without initialization. This patch fixed this failure. Signed-off-by: Guo Dong Reviewed-by: Maurice Ma --- UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c | 3 +-- UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.c | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c b/UefiPaylo= adPkg/UefiPayloadEntry/UefiPayloadEntry.c index ed956c447c..ae16f25c7c 100644 --- a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c +++ b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c @@ -559,7 +559,6 @@ PayloadEntry ( { EFI_STATUS Status; PHYSICAL_ADDRESS DxeCoreEntryPoint; - EFI_HOB_HANDOFF_INFO_TABLE *HandoffHobTable; UINTN MemBase; UINTN HobMemBase; UINTN HobMemTop; @@ -603,7 +602,7 @@ PayloadEntry ( IoWrite8 (LEGACY_8259_MASK_REGISTER_MASTER, 0xFF); IoWrite8 (LEGACY_8259_MASK_REGISTER_SLAVE, 0xFF); =20 - Hob.HandoffInformationTable =3D HandoffHobTable; + Hob.HandoffInformationTable =3D (EFI_HOB_HANDOFF_INFO_TABLE *) GetFirstH= ob(EFI_HOB_TYPE_HANDOFF); HandOffToDxeCore (DxeCoreEntryPoint, Hob); =20 // Should not get here diff --git a/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.c b/Uefi= PayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.c index a67653eb11..7a00a56ab9 100644 --- a/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.c +++ b/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.c @@ -364,7 +364,6 @@ _ModuleEntryPoint ( { EFI_STATUS Status; PHYSICAL_ADDRESS DxeCoreEntryPoint; - EFI_HOB_HANDOFF_INFO_TABLE *HandoffHobTable; EFI_PEI_HOB_POINTERS Hob; EFI_FIRMWARE_VOLUME_HEADER *DxeFv; =20 @@ -393,8 +392,7 @@ _ModuleEntryPoint ( IoWrite8 (LEGACY_8259_MASK_REGISTER_MASTER, 0xFF); IoWrite8 (LEGACY_8259_MASK_REGISTER_SLAVE, 0xFF); =20 - HandoffHobTable =3D (EFI_HOB_HANDOFF_INFO_TABLE *) GetFirstHob(EFI_HOB_T= YPE_HANDOFF); - Hob.HandoffInformationTable =3D HandoffHobTable; + Hob.HandoffInformationTable =3D (EFI_HOB_HANDOFF_INFO_TABLE *) GetFirstH= ob(EFI_HOB_TYPE_HANDOFF); HandOffToDxeCore (DxeCoreEntryPoint, Hob); =20 // Should not get here --=20 2.16.2.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 (#77381): https://edk2.groups.io/g/devel/message/77381 Mute This Topic: https://groups.io/mt/83904719/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-