From nobody Mon Apr 29 08:58:50 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+78848+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+78848+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1628351141; cv=none; d=zohomail.com; s=zohoarc; b=YiVCd4EmejWz5gt6BbuZStWkx0wR5puMnL+ON+G+h3wmB2pzEKFVAwDd2Kh7M8I8a8Q9ZiBScHxIKLVYI942VrxZkvGljTuoBcbPmQEFnqM1byVnYdasZ4FWLoolW5TBqqpp1E3fhIMfC0RUM9D+GIaPgHGuFGJnxHWsbTEasH8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1628351141; 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=dCTt0BWFRCqw/IXiP00EMF9sQo/MmXsXOn1cHyP0IYg=; b=jlM6vVsm3ILu0JyZeA0ZD7PI8c5RGNntvlQDAVwnKCs0PwD91s+mce5fXU/0UtdSR39PMchMV/pn4RjqkBUwgl9tA1nTu/3pRUaZC9ts7F4Opv7eMfybEebDHnAtWvHzb1V1oluMmJj1zsJQNK8+p8j2labIMXMnlCe0z7rOZ+U= 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+78848+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 162835114190137.53542924820738; Sat, 7 Aug 2021 08:45:41 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id xREmYY1788612xPku7AErjYc; Sat, 07 Aug 2021 08:45:41 -0700 X-Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) by mx.groups.io with SMTP id smtpd.web11.7197.1628347881640878376 for ; Sat, 07 Aug 2021 07:51:21 -0700 X-Received: by mail-yb1-f201.google.com with SMTP id c19-20020a25c0130000b029059337c4e310so5680367ybf.3 for ; Sat, 07 Aug 2021 07:51:21 -0700 (PDT) X-Gm-Message-State: HPuHQ86kddbxzxwIkRogBPhFx1787277AA= X-Google-Smtp-Source: ABdhPJxH67Irb6Ap45S7XmPQVmaiH4vjRgLQshRf7Zf1iE3ANexrHXPbkC2ba0Ey47u0zTatdEtYrul+RMXu0oFp X-Received: from ratho96.c.googlers.com ([fda3:e722:ac3:cc00:3:22c1:c0a8:aae]) (user=chengchieh job=sendgmr) by 2002:a25:be09:: with SMTP id h9mr20548489ybk.239.1628347880705; Sat, 07 Aug 2021 07:51:20 -0700 (PDT) Date: Sat, 7 Aug 2021 14:51:03 +0000 In-Reply-To: <20210807145106.2236803-1-chengchieh@google.com> Message-Id: <20210807145106.2236803-2-chengchieh@google.com> Mime-Version: 1.0 References: <20210807145106.2236803-1-chengchieh@google.com> Subject: [edk2-devel] [PATCH v2 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 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=1628351141; bh=8VJYTRbe/87qOL3m3LixvEwq6C3A+QHfvjuVr6rM6t4=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=szJif5wN32+24OesHhy0slviIDUu4G9g1g4pbAJOzP0Pv02gVj76utROheGNl6VfdSG baPIZ1O7hBxgQlE4ZqKsoZc+2wvAckPqBW2RbMWMyCdIQB0O0MGWpzOUNvA2zVrJX7u2+ Yvi1g7yOD32PiASWDeDZhQblxVKNC9pj08Q= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1628351142845100009 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 --- UefiPayloadPkg/UefiPayloadPkg.dsc | 16 +- UefiPayloadPkg/Library/LbParseLib/LbParseLib.inf | 39 +++++ UefiPayloadPkg/Library/LbParseLib/Linuxboot.h | 47 +++++ UefiPayloadPkg/Library/LbParseLib/LbParseLib.c | 182 +++++= +++++++++++++++ UefiPayloadPkg/Library/PciHostBridgeLib/PciHostBridgeSupport.c | 6 +- 5 files changed, 283 insertions(+), 7 deletions(-) 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..34ca18069983 --- /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..410062af314a --- /dev/null +++ b/UefiPayloadPkg/Library/LbParseLib/LbParseLib.c @@ -0,0 +1,182 @@ +/** @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 =3D + (UefiPayloadConfig*)(UINTN)(PcdGet32(PcdPayloadFdMemBase) - SIZE_64K= B); + 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; + int Index; + + Config =3D GetUefiPayLoadConfig(); + + DEBUG((DEBUG_INFO, "MemoryMap #entries: %d\n", Config->NumMemoryMapEntri= es)); + + MemoryMapEntry* 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.32.0.605.g8dce9f2422-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 (#78848): https://edk2.groups.io/g/devel/message/78848 Mute This Topic: https://groups.io/mt/84731095/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:58:50 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+78849+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+78849+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1628351142; cv=none; d=zohomail.com; s=zohoarc; b=JdNSD2SZ+3avHevDFVN2kWRfittaG5aMJ3u9Tn5pcnOWtIUpreQ+mN151DAlj4Bkal4NJzsGdIJlf06v4OtDMldw596nqYFPUXSA3vRiy8db5Dwi4h9dWwKLmMS0sONhLagcdBBQkoBdS02gXzWPsR6kxuNgm/5SNUmIeXbT4sQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1628351142; 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=O1VbWoMoj/3cBarU+AlKp/fsbIgqqOzhwXClvurIzPM=; b=YyByS7kQme9Gs1NQ3scr36KXOdkoOlk5GCuZGHZlvHT4Ds/SoNTzWUM8sPQJoSEvOK8L5Fsmr3gTGumKOTlD7YfvVFWykaejxpkawvRZHHUzSwRriAxYnGwMUTe5S5uCZ8YWJzpOPZgoqDjWQWC2PgAfjWwSzZDILEGcqkWTtyg= 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+78849+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1628351142182161.56570359962677; Sat, 7 Aug 2021 08:45:42 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id QELBYY1788612xfl8JLrItnu; Sat, 07 Aug 2021 08:45:41 -0700 X-Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) by mx.groups.io with SMTP id smtpd.web12.6886.1628347900460627075 for ; Sat, 07 Aug 2021 07:51:40 -0700 X-Received: by mail-pl1-f202.google.com with SMTP id s3-20020a1709029883b029012b41197000so6719145plp.16 for ; Sat, 07 Aug 2021 07:51:40 -0700 (PDT) X-Gm-Message-State: 56NXpa5T3t9lcCeP1aaSPMDQx1787277AA= X-Google-Smtp-Source: ABdhPJziATtFbVnbq8pkP/JMFB7MiQE+PTIaq8J5bGiM5PMSd0T9awLC62hQrltPXbTuXNdQJbXVfFSbY4bvKKD7 X-Received: from ratho96.c.googlers.com ([fda3:e722:ac3:cc00:3:22c1:c0a8:aae]) (user=chengchieh job=sendgmr) by 2002:a17:902:bf46:b029:12c:75f6:f643 with SMTP id u6-20020a170902bf46b029012c75f6f643mr1866035pls.6.1628347899780; Sat, 07 Aug 2021 07:51:39 -0700 (PDT) Date: Sat, 7 Aug 2021 14:51:04 +0000 In-Reply-To: <20210807145106.2236803-1-chengchieh@google.com> Message-Id: <20210807145106.2236803-3-chengchieh@google.com> Mime-Version: 1.0 References: <20210807145106.2236803-1-chengchieh@google.com> Subject: [edk2-devel] [PATCH v2 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 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=1628351141; bh=wLjqH/UsFjnZ5BoKNbUa1w8rVOVtFIqRUvN+Yn0OdHQ=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=axWT2PP/K6VcH9Ln3Z7U1BhQ0mmC4mU5d/BqCkbYybqBaUXx0w7UQsFXclVMb1DXBFs adK+508c8P/UH1WBpXIRC55Kgjvvfhm9U3qGZVAE8XINMaGBS0na6I4HW1hqfZmQYN3OK +y8HT/AwxKrSYFvnCGaJq+r7T8RrWNTycPI= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1628351142812100006 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 --- 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.32.0.605.g8dce9f2422-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 (#78849): https://edk2.groups.io/g/devel/message/78849 Mute This Topic: https://groups.io/mt/84731096/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:58:50 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+78850+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+78850+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1628351143; cv=none; d=zohomail.com; s=zohoarc; b=B/WF1ndiOcGVCTgCQdJZmQjOK1H8KwAGRoBCwAAuB3ie+vmEz86FyPwf7tUd/kmHbWjqniWnDrWBI1KXxtcjKnxFNPrpLDqINJ8+svC7u1LHoDY6Sk08gm5Y0pl9p5K9+7+BTqbsQ3HBC+paRThlF4xujfT7ktL4ZAbPkfvF03U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1628351143; 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=X7ptaqqnBaj7mGeJrYdlgpTd/argK1JwZgtji7zCCTM=; b=dV/pgxafQSX1lYQ7jawqr+NN3ROX7/k9xND3p0EBwE0lVwt8CILv/WVynVQHjuXwOanBzvu1a4RK5SYSnc0HJLc+YCdTwt1L/hmjM2t5r6k4T8X3oSE0ikrwJNEzlPOQCUiML9kIWyKxE//Jfp32Uba0zKzGLrevKqefn2SkW9o= 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+78850+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1628351143035103.56737939584832; Sat, 7 Aug 2021 08:45:43 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id Q786YY1788612x5ObDOFhQcj; Sat, 07 Aug 2021 08:45:42 -0700 X-Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) by mx.groups.io with SMTP id smtpd.web08.6991.1628347905175555522 for ; Sat, 07 Aug 2021 07:51:45 -0700 X-Received: by mail-pj1-f73.google.com with SMTP id 16-20020a17090a1990b029017582e03c3bso17692641pji.7 for ; Sat, 07 Aug 2021 07:51:45 -0700 (PDT) X-Gm-Message-State: oBnkYk3qSRz5YxBkcL42OGjOx1787277AA= X-Google-Smtp-Source: ABdhPJxJ2z6nTImUAd/tX01/ZvdRV/IYVXmOMh6ak6W8Zd1OZ3TmpyqdMAUuhpYPUY/XNiuSl1ESmYsUejXeVe1n X-Received: from ratho96.c.googlers.com ([fda3:e722:ac3:cc00:3:22c1:c0a8:aae]) (user=chengchieh job=sendgmr) by 2002:a62:1a4c:0:b029:3b8:3265:5f92 with SMTP id a73-20020a621a4c0000b02903b832655f92mr10351598pfa.4.1628347904506; Sat, 07 Aug 2021 07:51:44 -0700 (PDT) Date: Sat, 7 Aug 2021 14:51:05 +0000 In-Reply-To: <20210807145106.2236803-1-chengchieh@google.com> Message-Id: <20210807145106.2236803-4-chengchieh@google.com> Mime-Version: 1.0 References: <20210807145106.2236803-1-chengchieh@google.com> Subject: [edk2-devel] [PATCH v2 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 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=1628351142; bh=WskSrar65a1L14Aum4JbP/j3hEulcsOxp7f69B6USsI=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=XtqRPM8Rtd+5NVpC0hHdhVJncDJKXdB5aTauovWc6dpa7UZFfznW4AWgPaqMNqbF7WH ojpDBcerd9rKjrnyA0CeBUKjuhfxi7nDQkIJeN4XkdYstgJJXz2eKCZdzs8ew3ZI9b2G1 gYOwGpGPZECuvRY+dX2LJbnJnz+USbb9R4I= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1628351144849100021 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 --- 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.32.0.605.g8dce9f2422-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 (#78850): https://edk2.groups.io/g/devel/message/78850 Mute This Topic: https://groups.io/mt/84731097/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:58:50 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+78851+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+78851+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1628351143; cv=none; d=zohomail.com; s=zohoarc; b=MisbSZenO3njGPFT++KfShWQ+cagQx3JV7MRjr5SoggiaLJyyn1gVvvqFuqPIo3CSQzgN3bhL23ijnuwUrWwjHk8n+jVnMabiinEZWO5HoXPIPMUbQ1aCoTkrUClGAkxfjIMaN7AXJb/AOUeI+T9OG9E4W90nS4NsnU/PFxgmZc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1628351143; 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=fGXtZTE8k3I2oF8roPSpo4hzlTKrQBo/O/CEy5tthag=; b=fWVU3LP0+AKNWn6/GKd5MQgjVOfFZ4bJl69Wt69mHvhk9TovHHf6h7IrvG1Headwlx5AbNlDeLTsgRKSezA7InrjqsZLbrYlqGHz6KC87S7qMuqfcOIcu3XyxhXU7OCXeAiZHYmu9PVr+0D5xhf+oAict7sOFydnoGBEBAdLAmQ= 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+78851+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1628351143429562.713077694882; Sat, 7 Aug 2021 08:45:43 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id PAr2YY1788612xMMyOhhnRox; Sat, 07 Aug 2021 08:45:43 -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.web08.6992.1628347910420456272 for ; Sat, 07 Aug 2021 07:51:50 -0700 X-Received: by mail-yb1-f202.google.com with SMTP id o3-20020a2541030000b0290557cf3415f8so12619637yba.1 for ; Sat, 07 Aug 2021 07:51:50 -0700 (PDT) X-Gm-Message-State: MsAKj81lqXOAeBsAk8lckBUux1787277AA= X-Google-Smtp-Source: ABdhPJxUZs2aQ5qWiEZbPMxHlPNgkeKzt3I4mEva9RiqSGjtlhMOz4MAav57cKFI4udEdHRJdLNLMDmv8sEayNTZ X-Received: from ratho96.c.googlers.com ([fda3:e722:ac3:cc00:3:22c1:c0a8:aae]) (user=chengchieh job=sendgmr) by 2002:a25:8b90:: with SMTP id j16mr18906963ybl.493.1628347909530; Sat, 07 Aug 2021 07:51:49 -0700 (PDT) Date: Sat, 7 Aug 2021 14:51:06 +0000 In-Reply-To: <20210807145106.2236803-1-chengchieh@google.com> Message-Id: <20210807145106.2236803-5-chengchieh@google.com> Mime-Version: 1.0 References: <20210807145106.2236803-1-chengchieh@google.com> Subject: [edk2-devel] [PATCH v2 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 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=1628351143; bh=PJkf+WTS0OT9IXY+39DhMAKhmCIN4x7JL4DKn9WPhUU=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=a/igWd+Ax42or4ShTahXpg0oRoY0Ip3NmOXkAeA8QL/OKRyqP8rTqrSr/ISLZPrAccN N6cqbFgkrfgjxeZGBPdx58nuln3CuplpJ+MIh78qfY/WVJELt2UcNzcABMMVfARj3yudw 7y2H+z84lwpeGyPCo+yWPajRKKXVSo3j8RY= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1628352046624100002 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 --- 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.32.0.605.g8dce9f2422-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 (#78851): https://edk2.groups.io/g/devel/message/78851 Mute This Topic: https://groups.io/mt/84731098/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-