From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mx.groups.io with SMTP id smtpd.web09.27974.1605486927852115010 for ; Sun, 15 Nov 2020 16:35:27 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.43, mailfrom: guo.dong@intel.com) IronPort-SDR: SFfcpsaTs+vGD7+cJC9JafX6wAiu1sWw7/UUTew9hhVm8ERazb1P77zD+FP3wmgR5vjjLfqHaH aYmtHWecw41Q== X-IronPort-AV: E=McAfee;i="6000,8403,9806"; a="255397680" X-IronPort-AV: E=Sophos;i="5.77,481,1596524400"; d="scan'208";a="255397680" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Nov 2020 16:35:26 -0800 IronPort-SDR: 3uZHYI7otJr4cOoV2jobHXU9bWxH8Yct0uWYxVONTC1ikHvvofLY0FIuBslnVfqTGik1BRdeF6 gLYX5NTwFZNw== X-IronPort-AV: E=Sophos;i="5.77,481,1596524400"; d="scan'208";a="543395981" Received: from gdong1-mobl.amr.corp.intel.com ([10.209.37.18]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Nov 2020 16:35:26 -0800 From: "Guo Dong" To: devel@edk2.groups.io Cc: maurice.ma@intel.com, benjamin.you@intel.com Subject: [edk2-devel] [PATCH V2 0/1] UefiPayloadPkg: Remove PEI phase from Payload Date: Sun, 15 Nov 2020 17:35:21 -0700 Message-Id: X-Mailer: git-send-email 2.16.2.windows.1 Hi All, This patch removed UEFI payload PEI phase to make UEFI payload simple. It uses UefiPayloadEntry module to bridge bootloader and DXE phase. Original DSC files UefiPayloadIa32.dsc and UefiPayloadIa32X64.dsc are replaced by a single DSC UefiPayloadPkg.dsc. Pure IA32 support is replaced by Pure X64 support. IA32 Entry point with X64 DXE phase is still supported. Changes in V2: Addressed all the review comments from Maurice. Fixed debug msg in UefiPayloadEntry. Updated the Handoff HOB to DXE core to include Payload FV. Synced the GHCB changes from DxeIpl to UefiPayloadEntry. V1: It is not necessary to have a PEI phase in the UEFI payload since no specific PEI task is required. This patch adds a UefiPayloadEntry driver to get UEFI Payload required information from the bootloaders, convert them into a HOB list, load DXE core and transfer control to it. Here is the change details: 1) Removed PEI phase, including Peicore, BlSupportPei, SecCore, etc. 2) Added UefiPayloadEntry driver. this is the only driver before DXE core. 3) Added Pure X64 support, dropped Pure IA32 (Could add later if required) 64bit payload with 32bit entry point is still supported. 4) Use one DSC file UefiPayloadPkg.dsc to support X64 and IA32X64 build. Removed UefiPayloadIa32.dsc and UefiPayloadIa32X64.dsc Tested with SBL and coreboot on QEMU. Refs: https://github.com/tianocore/edk2/pull/1127 CC: maurice.ma@intel.com CC: benjamin.you@intel.com Signed-off-by: Guo Dong Guo Dong (1): UefiPayloadPkg: Remove PEI phase from Payload UefiPayloadPkg/BlSupportPei/BlSupportPei.h | 39 - UefiPayloadPkg/BlSupportPei/BlSupportPei.inf | 73 -- UefiPayloadPkg/BuildAndIntegrationInstructions.txt | 32 +- UefiPayloadPkg/Include/Library/BlParseLib.h | 4 +- UefiPayloadPkg/Library/HobLib/Hob.c | 706 ++++++++++++++++ UefiPayloadPkg/Library/HobLib/HobLib.inf | 39 + UefiPayloadPkg/SecCore/FindPeiCore.c | 193 ----- UefiPayloadPkg/SecCore/Ia32/SecEntry.nasm | 78 -- UefiPayloadPkg/SecCore/Ia32/Stack.nasm | 72 -- UefiPayloadPkg/SecCore/SecCore.inf | 58 -- UefiPayloadPkg/SecCore/SecMain.c | 288 ------- UefiPayloadPkg/SecCore/SecMain.h | 131 --- UefiPayloadPkg/UefiPayloadEntry/Ia32/DxeLoadFunc.c | 365 ++++++++ .../UefiPayloadEntry/Ia32/IdtVectorAsm.nasm | 71 ++ UefiPayloadPkg/UefiPayloadEntry/Ia32/SecEntry.nasm | 46 + UefiPayloadPkg/UefiPayloadEntry/LoadDxeCore.c | 307 +++++++ UefiPayloadPkg/UefiPayloadEntry/MemoryAllocation.c | 201 +++++ .../UefiPayloadEntry.c} | 451 ++++------ UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.h | 134 +++ .../UefiPayloadEntry/UefiPayloadEntry.inf | 93 ++ UefiPayloadPkg/UefiPayloadEntry/X64/DxeLoadFunc.c | 107 +++ UefiPayloadPkg/UefiPayloadEntry/X64/SecEntry.nasm | 47 ++ .../UefiPayloadEntry/X64/VirtualMemory.c | 939 +++++++++++++++++++++ .../UefiPayloadEntry/X64/VirtualMemory.h | 330 ++++++++ UefiPayloadPkg/UefiPayloadPkg.dec | 5 +- ...efiPayloadPkgIa32X64.dsc => UefiPayloadPkg.dsc} | 57 +- UefiPayloadPkg/UefiPayloadPkg.fdf | 32 +- UefiPayloadPkg/UefiPayloadPkgIa32.dsc | 585 ------------- 28 files changed, 3576 insertions(+), 1907 deletions(-) delete mode 100644 UefiPayloadPkg/BlSupportPei/BlSupportPei.h delete mode 100644 UefiPayloadPkg/BlSupportPei/BlSupportPei.inf create mode 100644 UefiPayloadPkg/Library/HobLib/Hob.c create mode 100644 UefiPayloadPkg/Library/HobLib/HobLib.inf delete mode 100644 UefiPayloadPkg/SecCore/FindPeiCore.c delete mode 100644 UefiPayloadPkg/SecCore/Ia32/SecEntry.nasm delete mode 100644 UefiPayloadPkg/SecCore/Ia32/Stack.nasm delete mode 100644 UefiPayloadPkg/SecCore/SecCore.inf delete mode 100644 UefiPayloadPkg/SecCore/SecMain.c delete mode 100644 UefiPayloadPkg/SecCore/SecMain.h create mode 100644 UefiPayloadPkg/UefiPayloadEntry/Ia32/DxeLoadFunc.c create mode 100644 UefiPayloadPkg/UefiPayloadEntry/Ia32/IdtVectorAsm.nasm create mode 100644 UefiPayloadPkg/UefiPayloadEntry/Ia32/SecEntry.nasm create mode 100644 UefiPayloadPkg/UefiPayloadEntry/LoadDxeCore.c create mode 100644 UefiPayloadPkg/UefiPayloadEntry/MemoryAllocation.c rename UefiPayloadPkg/{BlSupportPei/BlSupportPei.c => UefiPayloadEntry/UefiPayloadEntry.c} (52%) create mode 100644 UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.h create mode 100644 UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf create mode 100644 UefiPayloadPkg/UefiPayloadEntry/X64/DxeLoadFunc.c create mode 100644 UefiPayloadPkg/UefiPayloadEntry/X64/SecEntry.nasm create mode 100644 UefiPayloadPkg/UefiPayloadEntry/X64/VirtualMemory.c create mode 100644 UefiPayloadPkg/UefiPayloadEntry/X64/VirtualMemory.h rename UefiPayloadPkg/{UefiPayloadPkgIa32X64.dsc => UefiPayloadPkg.dsc} (90%) delete mode 100644 UefiPayloadPkg/UefiPayloadPkgIa32.dsc -- 2.16.2.windows.1