From nobody Mon Apr 29 08:10:38 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+79722+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+79722+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1629730270; cv=none; d=zohomail.com; s=zohoarc; b=gTCS322+yKcVC/St9P+vHQdRRR0ppF2GdJ0E/1yrZCoFria7ZoeP/x8rY8IVO1rcaFQVmPkVGVbuQhz7WfMxUs0flsiwK3d9VmfCW2euPx+ArvblMScXOzE7YB8ighMOEveigU1f+Xd2YFwLB23+i36OxWNYphLRfdDQWbJFh+Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629730270; h=Content-Type: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=SI8PtaEEtdl7QugeaWy3Rlrvs7vKPl/JRLegh6GeZ0k=; b=YGIkrjVW8UuCOChYS7X/aFi/tlBiAB8i0cKMnN4D2MuO2KKjH1NgXW1gbM/gRA5L4p8lV29vyMaR5evt+TrpkfAyL2FZir2vl3wA1nUP3t6Q/Ujx3S1YbpJPW1SHbAKxbQpEmKXXQQOCAv25snPJZ3bttONBFpsowpjBlRGob+w= 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+79722+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1629730270187954.6196914819963; Mon, 23 Aug 2021 07:51:10 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id KqR7YY1788612xI5E0iekF9I; Mon, 23 Aug 2021 07:51:09 -0700 X-Received: from mail-pf1-f202.google.com (mail-pf1-f202.google.com [209.85.210.202]) by mx.groups.io with SMTP id smtpd.web12.20220.1629700415344016069 for ; Sun, 22 Aug 2021 23:33:35 -0700 X-Received: by mail-pf1-f202.google.com with SMTP id g17-20020aa781910000b0290360a5312e3eso8169617pfi.7 for ; Sun, 22 Aug 2021 23:33:34 -0700 (PDT) X-Gm-Message-State: 2bOU0Po0QfMiRdshgCJdeMupx1787277AA= X-Google-Smtp-Source: ABdhPJxk+rJSm2ErlxCrms34J1gdIhf5UmZ7i1I1aXA6Gxkyv+kNy4ATX111qe/mAt7K8cfHMnWh472pcSxarybm X-Received: from ratho96.c.googlers.com ([fda3:e722:ac3:cc00:3:22c1:c0a8:aae]) (user=chengchieh job=sendgmr) by 2002:a17:90a:702:: with SMTP id l2mr525935pjl.0.1629700413688; Sun, 22 Aug 2021 23:33:33 -0700 (PDT) Date: Mon, 23 Aug 2021 06:33:09 +0000 In-Reply-To: <20210823063312.2323801-1-chengchieh@google.com> Message-Id: <20210823063312.2323801-2-chengchieh@google.com> Mime-Version: 1.0 References: <20210823063312.2323801-1-chengchieh@google.com> Subject: [edk2-devel] [PATCH v3 1/4] UefiPayloadPkg: Add LINUXBOOT payload target From: "Cheng-Chieh Huang via groups.io" To: devel@edk2.groups.io Cc: Cheng-Chieh Huang , Daniel Schaefer , Trammell Hudson , Maurice Ma , Guo Dong , Benjamin You , Ray Ni 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,chengchieh@google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1629730269; bh=6K8Ymbuv6ygC9ryoaiYJzEHyrkF7gm6nV1FHAOq4gMo=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=xb005Kiae6TIpk1wUIXescKefh40ZPJNKyWzIUCoePBaIXEvXFoGJtSVkkJ6QEi1TFU ddg8weEZ8clbEA/lLO3UQGpXf71zRK7t5DS0ckh0HUrSaIE7cymxpyf6WZY7CHJHgpGEC SCTTn+G4XIW9UiiYBaZtN/P+0YWfp/Qaxzg= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1629730271513100005 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Initial commit to support linuxboot payload. Signed-off-by: Cheng-Chieh Huang Cc: Cheng-Chieh Huang Cc: Daniel Schaefer Cc: Trammell Hudson Cc: Maurice Ma Cc: Guo Dong Cc: Benjamin You Cc: Ray Ni --- UefiPayloadPkg/UefiPayloadPkg.dsc | 16 +- .../Library/LbParseLib/LbParseLib.inf | 39 ++++ UefiPayloadPkg/Library/LbParseLib/Linuxboot.h | 47 +++++ .../Library/LbParseLib/LbParseLib.c | 187 ++++++++++++++++++ .../PciHostBridgeLib/PciHostBridgeSupport.c | 6 +- 5 files changed, 288 insertions(+), 7 deletions(-) create mode 100644 UefiPayloadPkg/Library/LbParseLib/LbParseLib.inf create mode 100644 UefiPayloadPkg/Library/LbParseLib/Linuxboot.h create mode 100644 UefiPayloadPkg/Library/LbParseLib/LbParseLib.c diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc b/UefiPayloadPkg/UefiPayload= Pkg.dsc index bcedf1c746b4..54576ba485b7 100644 --- a/UefiPayloadPkg/UefiPayloadPkg.dsc +++ b/UefiPayloadPkg/UefiPayloadPkg.dsc @@ -33,6 +33,7 @@ [Defines] # # SBL: UEFI payload for Slim Bootloader # COREBOOT: UEFI payload for coreboot + # LINUXBOOT: UEFI payload for linuxboot # DEFINE BOOTLOADER =3D SBL =20 @@ -93,6 +94,9 @@ [Defines] =20 [BuildOptions] *_*_*_CC_FLAGS =3D -D DISABLE_NEW_DEPRECATED_INTERFACES +!if $(BOOTLOADER) =3D=3D "LINUXBOOT" + *_*_*_CC_FLAGS =3D -D LINUXBOOT_PAYLOAD +!endif GCC:*_UNIXGCC_*_CC_FLAGS =3D -DMDEPKG_NDEBUG GCC:RELEASE_*_*_CC_FLAGS =3D -DMDEPKG_NDEBUG INTEL:RELEASE_*_*_CC_FLAGS =3D /D MDEPKG_NDEBUG @@ -222,11 +226,13 @@ [LibraryClasses] !endif PlatformSupportLib|UefiPayloadPkg/Library/PlatformSupportLibNull/Platfor= mSupportLibNull.inf !if $(UNIVERSAL_PAYLOAD) =3D=3D FALSE - !if $(BOOTLOADER) =3D=3D "COREBOOT" - BlParseLib|UefiPayloadPkg/Library/CbParseLib/CbParseLib.inf - !else - BlParseLib|UefiPayloadPkg/Library/SblParseLib/SblParseLib.inf - !endif + !if $(BOOTLOADER) =3D=3D "COREBOOT" + BlParseLib|UefiPayloadPkg/Library/CbParseLib/CbParseLib.inf + !elseif $(BOOTLOADER) =3D=3D "LINUXBOOT" + BlParseLib|UefiPayloadPkg/Library/LbParseLib/LbParseLib.inf + !else + BlParseLib|UefiPayloadPkg/Library/SblParseLib/SblParseLib.inf + !endif !endif =20 DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf diff --git a/UefiPayloadPkg/Library/LbParseLib/LbParseLib.inf b/UefiPayload= Pkg/Library/LbParseLib/LbParseLib.inf new file mode 100644 index 000000000000..d75ba8db8cf3 --- /dev/null +++ b/UefiPayloadPkg/Library/LbParseLib/LbParseLib.inf @@ -0,0 +1,39 @@ +## @file +# Linuxboot Table Parse Library. +# +# Copyright (c) 2021, the u-root Authors. All rights reserved.
+# SPDX-License-Identifier: BSD-2-Clause-Patent +# +## + +[Defines] + INF_VERSION =3D 0x00010005 + BASE_NAME =3D LbParseLib + FILE_GUID =3D DBA15E1E-4C16-47DF-93C0-AB5888ED14C3 + MODULE_TYPE =3D BASE + VERSION_STRING =3D 1.0 + LIBRARY_CLASS =3D BlParseLib + +# +# The following information is for reference only and not required by the = build tools. +# +# VALID_ARCHITECTURES =3D IA32 X64 +# + +[Sources] + LbParseLib.c + +[Packages] + MdePkg/MdePkg.dec + MdeModulePkg/MdeModulePkg.dec + UefiPayloadPkg/UefiPayloadPkg.dec + +[LibraryClasses] + BaseLib + BaseMemoryLib + IoLib + DebugLib + PcdLib + +[Pcd] + gUefiPayloadPkgTokenSpaceGuid.PcdPayloadFdMemBase diff --git a/UefiPayloadPkg/Library/LbParseLib/Linuxboot.h b/UefiPayloadPkg= /Library/LbParseLib/Linuxboot.h new file mode 100644 index 000000000000..b3b7e70a7ccb --- /dev/null +++ b/UefiPayloadPkg/Library/LbParseLib/Linuxboot.h @@ -0,0 +1,47 @@ +/** @file + LinuxBoot PEI module include file. +**/ +#ifndef __LINUXBOOT_PEI_H_INCLUDED__ +#define __LINUXBOOT_PEI_H_INCLUDED__ + +#if defined(_MSC_VER) +#pragma warning(disable : 4200) +#endif + +#pragma pack(1) +typedef struct SerialPortConfigStruct { + UINT32 Type; + UINT32 BaseAddr; + UINT32 Baud; + UINT32 RegWidth; + UINT32 InputHertz; + UINT32 UartPciAddr; +} SerialPortConfig; + +typedef struct MemoryMapEntryStruct { + UINT64 Start; + UINT64 End; + UINT32 Type; +} MemoryMapEntry; + +typedef struct UefiPayloadConfigStruct { + UINT64 Version; + UINT64 AcpiBase; + UINT64 AcpiSize; + UINT64 SmbiosBase; + UINT64 SmbiosSize; + SerialPortConfig SerialConfig; + UINT32 NumMemoryMapEntries; + MemoryMapEntry MemoryMapEntries[0]; +} UefiPayloadConfig; +#pragma pack() + +#define UEFI_PAYLOAD_CONFIG_VERSION 1 + +#define LINUXBOOT_MEM_RAM 1 +#define LINUXBOOT_MEM_DEFAULT 2 +#define LINUXBOOT_MEM_ACPI 3 +#define LINUXBOOT_MEM_NVS 4 +#define LINUXBOOT_MEM_RESERVED 5 + +#endif // __LINUXBOOT_PEI_H_INCLUDED__ diff --git a/UefiPayloadPkg/Library/LbParseLib/LbParseLib.c b/UefiPayloadPk= g/Library/LbParseLib/LbParseLib.c new file mode 100644 index 000000000000..48d174dfc078 --- /dev/null +++ b/UefiPayloadPkg/Library/LbParseLib/LbParseLib.c @@ -0,0 +1,187 @@ +/** @file + This library will parse the linuxboot table in memory and extract those = required + information. + + Copyright (c) 2021, the u-root Authors. All rights reserved.
+ SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ + + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +// Retrieve UefiPayloadConfig from Linuxboot's uefiboot +UefiPayloadConfig* +GetUefiPayLoadConfig() +{ + UefiPayloadConfig *Config; + Config =3D (UefiPayloadConfig*)(UINTN)(PcdGet32(PcdPayloadFdMemBase) - S= IZE_64KB); + if (Config->Version !=3D UEFI_PAYLOAD_CONFIG_VERSION) { + DEBUG((DEBUG_ERROR, "Expect payload Config version: %d, but get %d\n", + UEFI_PAYLOAD_CONFIG_VERSION, Config->Version)); + CpuDeadLoop (); + } + return Config; +} + +// Align the address and add memory rang to MemInfoCallback +VOID +AddMemoryRange ( + IN BL_MEM_INFO_CALLBACK MemInfoCallback, + IN UINTN start, + IN UINTN end, + IN int type + ) { + MEMROY_MAP_ENTRY MemoryMap; + UINTN AlignedStart; + UINTN AlignedEnd; + AlignedStart =3D ALIGN_VALUE(start, SIZE_4KB); + AlignedEnd =3D ALIGN_VALUE(end, SIZE_4KB); + // Conservative adjustment on Memory map. This should happen when bootin= g from + // non UEFI bios and it may report a memory region less than 4KB. + if (AlignedStart > start && type !=3D LINUXBOOT_MEM_RAM) { + AlignedStart -=3D SIZE_4KB; + } + if (AlignedEnd > end + 1 && type =3D=3D LINUXBOOT_MEM_RAM) { + AlignedEnd -=3D SIZE_4KB; + } + MemoryMap.Base =3D AlignedStart; + MemoryMap.Size =3D AlignedEnd - AlignedStart; + MemoryMap.Type =3D type; + MemoryMap.Flag =3D 0; + MemInfoCallback(&MemoryMap, NULL); +} + +/** + Acquire the memory information from the linuxboot table in memory. + + @param MemInfoCallback The callback routine + @param Params Pointer to the callback routine parameter + + @retval RETURN_SUCCESS Successfully find out the memory information. + @retval RETURN_NOT_FOUND Failed to find the memory information. + +**/ +RETURN_STATUS +EFIAPI +ParseMemoryInfo ( + IN BL_MEM_INFO_CALLBACK MemInfoCallback, + IN VOID* Params + ) { + UefiPayloadConfig *Config; + MemoryMapEntry* entry; + int Index; + + Config =3D GetUefiPayLoadConfig(); + + DEBUG((DEBUG_INFO, "MemoryMap #entries: %d\n", Config->NumMemoryMapEntri= es)); + + entry =3D &Config->MemoryMapEntries[0]; + for (Index =3D 0; Index < Config->NumMemoryMapEntries; Index++) { + DEBUG((DEBUG_INFO, "Start: 0x%lx End: 0x%lx Type:%d\n", entry->Start, + entry->End, entry->Type)); + AddMemoryRange(MemInfoCallback, entry->Start, entry->End, entry->Type); + entry++; + } + return RETURN_SUCCESS; +} + +/** + Acquire acpi table and smbios table from linuxboot + + @param SystemTableInfo Pointer to the system table info + + @retval RETURN_SUCCESS Successfully find out the tables. + @retval RETURN_NOT_FOUND Failed to find the tables. + +**/ +RETURN_STATUS +EFIAPI +ParseSystemTable ( + OUT SYSTEM_TABLE_INFO* SystemTableInfo + ) { + UefiPayloadConfig *Config; + + Config =3D GetUefiPayLoadConfig(); + SystemTableInfo->AcpiTableBase =3D Config->AcpiBase; + SystemTableInfo->AcpiTableSize =3D Config->AcpiSize; + + SystemTableInfo->SmbiosTableBase =3D Config->SmbiosBase; + SystemTableInfo->SmbiosTableSize =3D Config->SmbiosSize; + + return RETURN_SUCCESS; +} + +/** + Find the serial port information + + @param SERIAL_PORT_INFO Pointer to serial port info structure + + @retval RETURN_SUCCESS Successfully find the serial port information. + @retval RETURN_NOT_FOUND Failed to find the serial port information . + +**/ +RETURN_STATUS +EFIAPI +ParseSerialInfo ( + OUT SERIAL_PORT_INFO* SerialPortInfo + ) { + UefiPayloadConfig *Config; + Config =3D GetUefiPayLoadConfig(); + + SerialPortInfo->BaseAddr =3D Config->SerialConfig.BaseAddr; + SerialPortInfo->RegWidth =3D Config->SerialConfig.RegWidth; + SerialPortInfo->Type =3D Config->SerialConfig.Type; + SerialPortInfo->Baud =3D Config->SerialConfig.Baud; + SerialPortInfo->InputHertz =3D Config->SerialConfig.InputHertz; + SerialPortInfo->UartPciAddr =3D Config->SerialConfig.UartPciAddr; + + return RETURN_SUCCESS; +} + +/** + Find the video frame buffer information + + @param GfxInfo Pointer to the EFI_PEI_GRAPHICS_INFO_HOB str= ucture + + @retval RETURN_SUCCESS Successfully find the video frame buffer +information. + @retval RETURN_NOT_FOUND Failed to find the video frame buffer informa= tion . + +**/ +RETURN_STATUS +EFIAPI +ParseGfxInfo ( + OUT EFI_PEI_GRAPHICS_INFO_HOB* GfxInfo + ) { + // Not supported + return RETURN_NOT_FOUND; +} + +/** + Find the video frame buffer device information + + @param GfxDeviceInfo Pointer to the EFI_PEI_GRAPHICS_DEVICE_INFO_H= OB +structure + + @retval RETURN_SUCCESS Successfully find the video frame buffer +information. + @retval RETURN_NOT_FOUND Failed to find the video frame buffer informa= tion. + +**/ +RETURN_STATUS +EFIAPI +ParseGfxDeviceInfo ( + OUT EFI_PEI_GRAPHICS_DEVICE_INFO_HOB* GfxDeviceInfo + ) { + return RETURN_NOT_FOUND; +} diff --git a/UefiPayloadPkg/Library/PciHostBridgeLib/PciHostBridgeSupport.c= b/UefiPayloadPkg/Library/PciHostBridgeLib/PciHostBridgeSupport.c index b0268f05069c..a4f714f765ea 100644 --- a/UefiPayloadPkg/Library/PciHostBridgeLib/PciHostBridgeSupport.c +++ b/UefiPayloadPkg/Library/PciHostBridgeLib/PciHostBridgeSupport.c @@ -40,8 +40,9 @@ AdjustRootBridgeResource ( IN PCI_ROOT_BRIDGE_APERTURE *PMemAbove4G ) { +#ifndef LINUXBOOT_PAYLOAD UINT64 Mask; - +#endif // // For now try to downgrade everything into MEM32 since // - coreboot does not assign resource above 4GB @@ -80,7 +81,7 @@ AdjustRootBridgeResource ( PMemAbove4G->Base =3D MAX_UINT64; PMemAbove4G->Limit =3D 0; } - +#ifndef LINUXBOOT_PAYLOAD // // Align IO resource at 4K boundary // @@ -98,6 +99,7 @@ AdjustRootBridgeResource ( if (Mem->Base !=3D MAX_UINT64) { Mem->Base &=3D ~Mask; } +#endif } =20 /** --=20 2.33.0.rc2.250.ged5fa647cd-goog -=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 (#79722): https://edk2.groups.io/g/devel/message/79722 Mute This Topic: https://groups.io/mt/85086924/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 Mon Apr 29 08:10:38 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+79723+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+79723+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1629730270; cv=none; d=zohomail.com; s=zohoarc; b=d5387dWbL5P6bA7jDlAcMPjDDYE7Pp5g6oowqhJV63Aa5EWhWLafA/LXngXzbwm5dCpAcF9vqEGY7/5gmEZ3J/pBk6lUKurGBjDfE2/xqiGl5Ft/SheNCM7g3FUDbYMB6Xjd+GyNViGlfsAnByMlGPRGUvzvS01jtoFup/6myMM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629730270; h=Content-Type: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=Pq0E03mvZ5AtOHcG4Pn5bLcldCzhDOvVeskFcD0Qams=; b=NJaTlxfqt6cwNTmVOXuMFYkDbe8RgR8sJw4LlcSi7YIpyldnPhgNKObGiTMVTfDy7rAvrkceDDIXKhoZ3xQ/Ee710xkMs72ay2/z62IXwGL8mnsecMfMly1CivlrjtOH4br5Bx2XP1GUv8SO7QT/rLPMgK8T+UJGLmVF1YS9YEQ= 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+79723+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1629730270661441.6090645126302; Mon, 23 Aug 2021 07:51:10 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id BZ4WYY1788612xluSCKw44b9; Mon, 23 Aug 2021 07:51:10 -0700 X-Received: from mail-pg1-f202.google.com (mail-pg1-f202.google.com [209.85.215.202]) by mx.groups.io with SMTP id smtpd.web10.20291.1629700418747929004 for ; Sun, 22 Aug 2021 23:33:38 -0700 X-Received: by mail-pg1-f202.google.com with SMTP id q23-20020a6562570000b029023cbfb4fd73so9789833pgv.14 for ; Sun, 22 Aug 2021 23:33:38 -0700 (PDT) X-Gm-Message-State: zUzN5qJTwz7IxLhFgbYtrmfex1787277AA= X-Google-Smtp-Source: ABdhPJz4fx4ejp7/BVHTpyf6Z0yDjHUQkIuKNtmBsbPeYKlux8moKUFkn+kcA1JlPMqVGcCinCMXf0dofncjTq74 X-Received: from ratho96.c.googlers.com ([fda3:e722:ac3:cc00:3:22c1:c0a8:aae]) (user=chengchieh job=sendgmr) by 2002:a17:90b:46c3:: with SMTP id jx3mr11322124pjb.137.1629700417535; Sun, 22 Aug 2021 23:33:37 -0700 (PDT) Date: Mon, 23 Aug 2021 06:33:10 +0000 In-Reply-To: <20210823063312.2323801-1-chengchieh@google.com> Message-Id: <20210823063312.2323801-3-chengchieh@google.com> Mime-Version: 1.0 References: <20210823063312.2323801-1-chengchieh@google.com> Subject: [edk2-devel] [PATCH v3 2/4] UefiPayloadPkg: Use legacy timer in Linuxboot payload From: "Cheng-Chieh Huang via groups.io" To: devel@edk2.groups.io Cc: Cheng-Chieh Huang , Guo Dong , Daniel Schaefer , Trammell Hudson , Maurice Ma , Benjamin You , Ray Ni 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,chengchieh@google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1629730270; bh=bC3HDi/yX4CAiQ5OyjxxaXFnhg3jdBvO7zyh3G2ly/w=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=TnmAtG0xUagVq7sGEqA7LeCSnO8uyDEIb8EYu0mMaZNukYwAfYNCo7+RlT+PIONUdv4 BSXpk1UlXk782946iCNRstH5IZD7NFizw7CF+jyfv5xfAgddoQJujWrCyZbgoFYyTQbsY u6ELo62FccnBNzRF3PGSRRNDOvLZCJ8XBsY= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1629730271516100006 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" HPET timer may fail to init after prior linux taking over. Signed-off-by: Cheng-Chieh Huang Reviewed-by: Guo Dong Cc: Cheng-Chieh Huang Cc: Daniel Schaefer Cc: Trammell Hudson Cc: Maurice Ma Cc: Guo Dong Cc: Benjamin You Cc: Ray Ni --- UefiPayloadPkg/UefiPayloadPkg.dsc | 6 ++++++ UefiPayloadPkg/UefiPayloadPkg.fdf | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc b/UefiPayloadPkg/UefiPayload= Pkg.dsc index 54576ba485b7..e56e6f4a5379 100644 --- a/UefiPayloadPkg/UefiPayloadPkg.dsc +++ b/UefiPayloadPkg/UefiPayloadPkg.dsc @@ -438,7 +438,13 @@ [Components.X64] NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanc= eManagerUiLib.inf } =20 +!if $(BOOTLOADER) =3D=3D "LINUXBOOT" + OvmfPkg/8254TimerDxe/8254Timer.inf + OvmfPkg/8259InterruptControllerDxe/8259.inf +!else PcAtChipsetPkg/HpetTimerDxe/HpetTimerDxe.inf +!endif + MdeModulePkg/Universal/Metronome/Metronome.inf MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf diff --git a/UefiPayloadPkg/UefiPayloadPkg.fdf b/UefiPayloadPkg/UefiPayload= Pkg.fdf index 041fed842cd8..f57a8b4bf3d3 100644 --- a/UefiPayloadPkg/UefiPayloadPkg.fdf +++ b/UefiPayloadPkg/UefiPayloadPkg.fdf @@ -101,7 +101,12 @@ [FV.DXEFV] INF UefiCpuPkg/CpuDxe/CpuDxe.inf INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf INF MdeModulePkg/Application/UiApp/UiApp.inf +!if $(BOOTLOADER) !=3D "LINUXBOOT" INF PcAtChipsetPkg/HpetTimerDxe/HpetTimerDxe.inf +!else +INF OvmfPkg/8254TimerDxe/8254Timer.inf +INF OvmfPkg/8259InterruptControllerDxe/8259.inf +!endif INF MdeModulePkg/Universal/Metronome/Metronome.inf INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf --=20 2.33.0.rc2.250.ged5fa647cd-goog -=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 (#79723): https://edk2.groups.io/g/devel/message/79723 Mute This Topic: https://groups.io/mt/85086925/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 Mon Apr 29 08:10:38 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+79724+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+79724+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1629730270; cv=none; d=zohomail.com; s=zohoarc; b=jzfe5DER60fcahdnuddGdQGPaTSZMDPglyU55GQmcpGVrUVEhTVxYcKMmnyGTf9q0k02cyfjm9jEAIvJJMMhMx5I77TUtv8rThJazd3V8I+BtH5ruOMhbBVVKI5rzwGWlmkVPuxojr7OFzK/UFR83+xvB3I4Lh0F9gCH2rv11ec= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629730270; h=Content-Type: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=tYi16CkaOdk21tsrATE3bwiPgYJYf2EzfzxxFbgHA0k=; b=HTaU1La2RlWM1hlaceNK61ORHJ2wvZT4qJMLwFUa0UEnHcLwkzFCRr/+zx9cXs7EQvU5jduDQXGAkf1Kdgn6gK0rwOvG1XIKlUC3aHwhwcQPP+ZhvL99DvIDxn/XaoHMhX3yKhoIcmcM1Zk79RC5cIz5w6WTzeOSG2tyBqFvTZc= 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+79724+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1629730270958501.35597109782896; Mon, 23 Aug 2021 07:51:10 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id nphcYY1788612xOxaUYkJEQV; Mon, 23 Aug 2021 07:51:10 -0700 X-Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) by mx.groups.io with SMTP id smtpd.web10.20292.1629700422648000372 for ; Sun, 22 Aug 2021 23:33:42 -0700 X-Received: by mail-pj1-f74.google.com with SMTP id ne16-20020a17090b375000b0018f4f0ba3fbso476131pjb.9 for ; Sun, 22 Aug 2021 23:33:42 -0700 (PDT) X-Gm-Message-State: 1tJbWCMg3hXv5919N1ez1ap7x1787277AA= X-Google-Smtp-Source: ABdhPJztz5Jhg734WkMax+5E6NDn5iwJ6tzegsJ5Hj+qcOcxWQPRaeePUIchyL+MQHqbdnY8NkmYUkfZ2o/dU5CW X-Received: from ratho96.c.googlers.com ([fda3:e722:ac3:cc00:3:22c1:c0a8:aae]) (user=chengchieh job=sendgmr) by 2002:a17:90a:2f88:: with SMTP id t8mr18399474pjd.2.1629700421566; Sun, 22 Aug 2021 23:33:41 -0700 (PDT) Date: Mon, 23 Aug 2021 06:33:11 +0000 In-Reply-To: <20210823063312.2323801-1-chengchieh@google.com> Message-Id: <20210823063312.2323801-4-chengchieh@google.com> Mime-Version: 1.0 References: <20210823063312.2323801-1-chengchieh@google.com> Subject: [edk2-devel] [PATCH v3 3/4] UefiPayloadPkg: Update maximum logic processor to 256 From: "Cheng-Chieh Huang via groups.io" To: devel@edk2.groups.io Cc: Cheng-Chieh Huang , Guo Dong , Daniel Schaefer , Trammell Hudson , Maurice Ma , Benjamin You , Ray Ni 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,chengchieh@google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1629730270; bh=HK53QQk4v+bFDZYy8GjkLlDgeS8zc3O5Ft5bV7xLqqI=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=rc0MYJFJ6gtm2hWHw79/O21ZquHqO96h6xgAbVAzWXyjCLtotGiQ9BUiTCo0UBT1fR9 k9drwSvSppKEtJNzC5B8WbdSPxoIRdZ7XnuOephRDuSQD7l9Q1/PeV6nRSbv+EzpAr2rv yr6aIVtqJL9XbfwECyKtvB8GlmVl3VaRU/s= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1629730271519100007 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Signed-off-by: Cheng-Chieh Huang Reviewed-by: Guo Dong Cc: Cheng-Chieh Huang Cc: Daniel Schaefer Cc: Trammell Hudson Cc: Maurice Ma Cc: Guo Dong Cc: Benjamin You Cc: Ray Ni --- UefiPayloadPkg/UefiPayloadPkg.dsc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc b/UefiPayloadPkg/UefiPayload= Pkg.dsc index e56e6f4a5379..8aa5f18cd35c 100644 --- a/UefiPayloadPkg/UefiPayloadPkg.dsc +++ b/UefiPayloadPkg/UefiPayloadPkg.dsc @@ -40,7 +40,7 @@ [Defines] # # CPU options # - DEFINE MAX_LOGICAL_PROCESSORS =3D 64 + DEFINE MAX_LOGICAL_PROCESSORS =3D 256 =20 # # PCI options --=20 2.33.0.rc2.250.ged5fa647cd-goog -=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 (#79724): https://edk2.groups.io/g/devel/message/79724 Mute This Topic: https://groups.io/mt/85086926/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 Mon Apr 29 08:10:38 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+79725+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+79725+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1629730271; cv=none; d=zohomail.com; s=zohoarc; b=MPW7o48a0fAJOtrkXULSx/2KpIFVQszyuLB7GSseMrbMcOusK+R7uOwjoyvrDiJCslPLtLQJcNimb3Jge8wMQP0+s20Q5QguNo5x9QB4h0sA9yGffmXJX2MGY+yqAPvGKnu8Wh50oi3JPpb6/w3o3K5sfaKuRf2tGYhQ4X4d4JA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629730271; h=Content-Type: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=BnluKojuB3G3SpJV0vlkuB3XoM9g1SLEQ4aUOzxmnNk=; b=iq6vAMtabAyMRiBSvOiEjXiP0AsTQBt3ywXSW+SioHTngvTKKyYKtyZ4KAyPglpxVW54GduUSsYC/4HHDvbr7d3ryEmWexEJzdiY92wsRSRJan2Reyo10aLTQGBF1a4K0QfQ2UyyZ60xQv0LMoKh6EBka2UU4oA4CniZkw/itbE= 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+79725+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1629730271541433.2566095454249; Mon, 23 Aug 2021 07:51:11 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 0BW3YY1788612xWwcj3sBniA; Mon, 23 Aug 2021 07:51:11 -0700 X-Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) by mx.groups.io with SMTP id smtpd.web09.20289.1629700425692660588 for ; Sun, 22 Aug 2021 23:33:45 -0700 X-Received: by mail-yb1-f202.google.com with SMTP id i32-20020a25b2200000b02904ed415d9d84so15651424ybj.0 for ; Sun, 22 Aug 2021 23:33:45 -0700 (PDT) X-Gm-Message-State: 8PvATTIZOVdMyb44Sz3YmjLix1787277AA= X-Google-Smtp-Source: ABdhPJxtPOd3FE2NxakC2rB7lBFMOUhGQ08rLBU3LpTclAE9NA7oSB2EjeNODTSctKymzAfFOCkdorGEDiXnjIK2 X-Received: from ratho96.c.googlers.com ([fda3:e722:ac3:cc00:3:22c1:c0a8:aae]) (user=chengchieh job=sendgmr) by 2002:a25:b983:: with SMTP id r3mr41309839ybg.430.1629700424815; Sun, 22 Aug 2021 23:33:44 -0700 (PDT) Date: Mon, 23 Aug 2021 06:33:12 +0000 In-Reply-To: <20210823063312.2323801-1-chengchieh@google.com> Message-Id: <20210823063312.2323801-5-chengchieh@google.com> Mime-Version: 1.0 References: <20210823063312.2323801-1-chengchieh@google.com> Subject: [edk2-devel] [PATCH v3 4/4] UefiPayloadPkg: Reserve Payload config in runtime services data From: "Cheng-Chieh Huang via groups.io" To: devel@edk2.groups.io Cc: Cheng-Chieh Huang , Daniel Schaefer , Trammell Hudson , Maurice Ma , Guo Dong , Benjamin You , Ray Ni 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,chengchieh@google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1629730271; bh=BnRM3tN2rLY7m5n8B7nOHa8TwXQHbq54kwN8hUhVMJc=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=muAwvo8QKCYo2o6iCJF6oIcWO0vBTtcj3G6fMyGYKWZg3HlsSHwMJlJyuwIuSrmiSTX KcRh0YAtXm0Sqs7G33dFxQcPyEkl9A8vomEEWIZMQdm0bCsBGFF2Fyvlu5Dz/xhqGxERy dZ/MqaJvQKfxGu6SW3EihsUalVpzMMX5YYw= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1629730273621100017 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Signed-off-by: Cheng-Chieh Huang Cc: Cheng-Chieh Huang Cc: Daniel Schaefer Cc: Trammell Hudson Cc: Maurice Ma Cc: Guo Dong Cc: Benjamin You Cc: Ray Ni --- UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c b/UefiPaylo= adPkg/UefiPayloadEntry/UefiPayloadEntry.c index ae16f25c7c0e..5bace742d73e 100644 --- a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c +++ b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c @@ -517,6 +517,10 @@ BuildGenericHob ( =20 // The UEFI payload FV BuildMemoryAllocationHob (PcdGet32 (PcdPayloadFdMemBase), PcdGet32 (PcdP= ayloadFdMemSize), EfiBootServicesData); + #ifdef LINUXBOOT_PAYLOAD + // The UEFI payload config FV + BuildMemoryAllocationHob (PcdGet32 (PcdPayloadFdMemBase) - SIZE_64KB, SI= ZE_64KB, EfiRuntimeServicesData); + #endif =20 // // Build CPU memory space and IO space hob --=20 2.33.0.rc2.250.ged5fa647cd-goog -=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 (#79725): https://edk2.groups.io/g/devel/message/79725 Mute This Topic: https://groups.io/mt/85086927/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-