From mboxrd@z Thu Jan 1 00:00:00 1970 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 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.93, mailfrom: guo.dong@intel.com) 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" 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" 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> X-Mailer: git-send-email 2.16.2.windows.1 For non-universal payload, HandoffHobTable is used without initialization. This patch fixed this failure. Signed-off-by: Guo Dong --- 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/UefiPayloadPkg/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); - Hob.HandoffInformationTable = HandoffHobTable; + Hob.HandoffInformationTable = (EFI_HOB_HANDOFF_INFO_TABLE *) GetFirstHob(EFI_HOB_TYPE_HANDOFF); HandOffToDxeCore (DxeCoreEntryPoint, Hob); // Should not get here diff --git a/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.c b/UefiPayloadPkg/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; @@ -393,8 +392,7 @@ _ModuleEntryPoint ( IoWrite8 (LEGACY_8259_MASK_REGISTER_MASTER, 0xFF); IoWrite8 (LEGACY_8259_MASK_REGISTER_SLAVE, 0xFF); - HandoffHobTable = (EFI_HOB_HANDOFF_INFO_TABLE *) GetFirstHob(EFI_HOB_TYPE_HANDOFF); - Hob.HandoffInformationTable = HandoffHobTable; + Hob.HandoffInformationTable = (EFI_HOB_HANDOFF_INFO_TABLE *) GetFirstHob(EFI_HOB_TYPE_HANDOFF); HandOffToDxeCore (DxeCoreEntryPoint, Hob); // Should not get here -- 2.16.2.windows.1