From nobody Sun May 12 02:19:40 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+93577+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+93577+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1662722115; cv=none; d=zohomail.com; s=zohoarc; b=NBmjWtz+cU2YcHbdMuWYxtxiSD2YjLqTLQo00BN5wktESgMPY1zDYKBuC1zTf8r8HcyQQQIHmGh6KSgNc0ZLx028TWD08/ss/L06Rb5Os9M3hKPW8WyoDLhMjMjTGPIV4kotTmmTLa8S147cb+TPqAyVLeCiSHe+cAoUKRWo0CI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1662722115; h=Content-Type:Content-Transfer-Encoding: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=+4kGMfLrb+n5BzZS9J0Fa+QZLYEa7h03ZTp12PplB3E=; b=OuYnQ4tsh5kI2xDpfETXKiS+gjP8/gtTTlnubWehTsgJJzgZjd//xOMfoBdqKxDNnwrTb3XVlIf/kcLTJo6aiQIesqWO2fwU6DQcSNcNk2NYa3127ysqeq0Lj7nHIX1srnXEDXhu1VMQqWmMNNFBGzXL/060mBrZ945gocfDgng= 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+93577+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 1662722115229334.5579861308636; Fri, 9 Sep 2022 04:15:15 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 5r3CYY1788612xVJymryDarC; Fri, 09 Sep 2022 04:15:14 -0700 X-Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mx.groups.io with SMTP id smtpd.web11.12.1662722113511350722 for ; Fri, 09 Sep 2022 04:15:13 -0700 X-Received: by mail-wr1-f52.google.com with SMTP id b5so2171080wrr.5 for ; Fri, 09 Sep 2022 04:15:13 -0700 (PDT) X-Gm-Message-State: KIXg5llQSP6gMSDg4NX68nFfx1787277AA= X-Google-Smtp-Source: AA6agR6AFQFIH0l9a0jlVM5sTBhxHuKl+0D3oKfLKgjNIj5H530QFPavmATEgCD8hVhfLKAwLMJwZg== X-Received: by 2002:adf:f8ca:0:b0:226:e456:1896 with SMTP id f10-20020adff8ca000000b00226e4561896mr7869846wrq.177.1662722111527; Fri, 09 Sep 2022 04:15:11 -0700 (PDT) X-Received: from localhost.localdomain (eth-east-parth2-46-193-66-249.wb.wifirst.net. [46.193.66.249]) by smtp.gmail.com with ESMTPSA id i11-20020adfb64b000000b00228df23bd51sm240537wre.82.2022.09.09.04.15.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Sep 2022 04:15:10 -0700 (PDT) From: =?UTF-8?B?VGjDqW8gSmVobA==?= To: devel@edk2.groups.io Cc: Leif Lindholm , Michael D Kinney , Isaac Oram , Pedro Falcato , Gerd Hoffmann , Stefan Hajnoczi Subject: [edk2-devel] [[edk2-platforms] Patch V2 2/4] QemuOpenBoardPkg: Enable stage 2 Date: Fri, 9 Sep 2022 13:15:02 +0200 Message-Id: <20220909111504.1661-3-theojehl76@gmail.com> In-Reply-To: <20220909111504.1661-1-theojehl76@gmail.com> References: <20220909111504.1661-1-theojehl76@gmail.com> MIME-Version: 1.0 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,theojehl76@gmail.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1662722114; bh=dVzTxOdyFIolxVJrmgqWjBijyFRqe5pyUKYfdUj4JDs=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=AsNEu6btcn1q8x1MTZTR6eNNx2fqE89UZ/PR1A8TcRM35nZehFVo0519Rna8VVmRy+b nELWnKlF0wcRN556jdk3c7HquAHvqdSsqSdZhdMmlqzdMLHhzB1yRG40522MKUEeHuVdR lY7h8g/z79IACa8hDvdh0bC5PmLIwwZvLcA= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1662722115817100008 Content-Type: text/plain; charset="utf-8" Enables MinPlatform stage 2 (memory init) functionality. Cc: Leif Lindholm Cc: Michael D Kinney Cc: Isaac Oram Cc: Pedro Falcato Cc: Gerd Hoffmann Cc: Stefan Hajnoczi Signed-off-by: Th=C3=A9o Jehl --- Platform/Qemu/QemuOpenBoardPkg/Include/Dsc/Stage2.dsc.inc = | 31 ++++++++++ Platform/Qemu/QemuOpenBoardPkg/QemuOpenBoardPkg.dsc = | 5 +- Platform/Qemu/QemuOpenBoardPkg/QemuOpenBoardPkg.fdf = | 10 +++ Platform/Qemu/QemuOpenBoardPkg/Library/BoardInitLib/BoardInitLib.c = | 5 +- Platform/Qemu/QemuOpenBoardPkg/Library/QemuOpenFwCfgLib/QemuOpenFwCfgLib.c= | 8 +-- 5 files changed, 52 insertions(+), 7 deletions(-) diff --git a/Platform/Qemu/QemuOpenBoardPkg/Include/Dsc/Stage2.dsc.inc b/Pl= atform/Qemu/QemuOpenBoardPkg/Include/Dsc/Stage2.dsc.inc new file mode 100644 index 000000000000..9862f1f5f384 --- /dev/null +++ b/Platform/Qemu/QemuOpenBoardPkg/Include/Dsc/Stage2.dsc.inc @@ -0,0 +1,31 @@ +## @file +# Common DSC content to begin Stage 2 enabling +# +# @copyright +# Copyright (C) 2022 Th=C3=A9o Jehl +# +# SPDX-License-Identifier: BSD-2-Clause-Patent +## + +[LibraryClasses.Common] + ResetSystemLib | OvmfPkg/Library/ResetSystemLib/BaseResetSystem= Lib.inf + PciHostBridgeLib | OvmfPkg/Library/PciHostBridgeLib/PciHostBridge= Lib.inf + PciHostBridgeUtilityLib | OvmfPkg/Library/PciHostBridgeUtilityLib/PciHos= tBridgeUtilityLib.inf + DxeHardwareInfoLib | OvmfPkg/Library/HardwareInfoLib/DxeHardwareInf= oLib.inf + +[LibraryClasses.Common.PEIM] + MpInitLib | UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf + TimerLib | OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.= inf + +[LibraryClasses.Common.DXE_DRIVER, LibraryClasses.Common.DXE_RUNTIME_DRIVE= R, LibraryClasses.Common.DXE_SMM_DRIVER, LibraryClasses.Common.UEFI_DRIVER,= LibraryClasses.Common.UEFI_APPLICATION, LibraryClasses.Common.SMM_CORE] + PciLib | OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI4= 40FxQ35.inf + +[Components.$(PEI_ARCH)] + UefiCpuPkg/CpuMpPei/CpuMpPei.inf + MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPolicyPeiPostMem.inf + MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPostMem.inf + MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf + +[Components.$(DXE_ARCH)] + MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf + MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf diff --git a/Platform/Qemu/QemuOpenBoardPkg/QemuOpenBoardPkg.dsc b/Platform= /Qemu/QemuOpenBoardPkg/QemuOpenBoardPkg.dsc index e170f5235340..897ba727cdb2 100644 --- a/Platform/Qemu/QemuOpenBoardPkg/QemuOpenBoardPkg.dsc +++ b/Platform/Qemu/QemuOpenBoardPkg/QemuOpenBoardPkg.dsc @@ -17,7 +17,7 @@ OUTPUT_DIRECTORY =3D Build/$(PLATFORM_NAME) BUILD_TARGETS =3D DEBUG | RELEASE | NOOPT SKUID_IDENTIFIER =3D ALL - SMM_REQUIRED =3D TRUE + SMM_REQUIRED =3D FALSE =20 !ifndef $(PEI_ARCH) !error "PEI_ARCH must be specified to build this feature!" @@ -38,7 +38,7 @@ OvmfPkg/OvmfPkg.dec =20 [PcdsFixedAtBuild] - gMinPlatformPkgTokenSpaceGuid.PcdBootStage | 1 + gMinPlatformPkgTokenSpaceGuid.PcdBootStage | 2 =20 gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel | = 0x802A00C7 gEfiMdePkgTokenSpaceGuid.PcdFixedDebugPrintErrorLevel | = 0x802A00C7 @@ -127,6 +127,7 @@ !include MinPlatformPkg/Include/Dsc/CorePeiLib.dsc !include MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc !include QemuOpenBoardPkg/Include/Dsc/Stage1.dsc.inc +!include QemuOpenBoardPkg/Include/Dsc/Stage2.dsc.inc =20 [LibraryClasses.Common] QemuOpenFwCfgLib | QemuOpenBoardPkg/Library/QemuOpenFwCfgLib/Qemu= OpenFwCfgLib.inf diff --git a/Platform/Qemu/QemuOpenBoardPkg/QemuOpenBoardPkg.fdf b/Platform= /Qemu/QemuOpenBoardPkg/QemuOpenBoardPkg.fdf index ccd18d559fa9..548397dedb5b 100644 --- a/Platform/Qemu/QemuOpenBoardPkg/QemuOpenBoardPkg.fdf +++ b/Platform/Qemu/QemuOpenBoardPkg/QemuOpenBoardPkg.fdf @@ -155,6 +155,16 @@ SET gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = =3D 0x800000 !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf FvNameGuid =3D 5A1D6978-BABE-42F9-A629-F7B3B6A1E1BD =20 + INF UefiCpuPkg/CpuMpPei/CpuMpPei.inf + + INF MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPolicyPeiPostMem= .inf + INF MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInitPostMem.inf + + INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf + + INF MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.i= nf + INF MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf + [FV.FvBsp] !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf FvNameGuid =3D FCA0BC4A-994D-4EF9-BD56-A8C45872C2A8 diff --git a/Platform/Qemu/QemuOpenBoardPkg/Library/BoardInitLib/BoardInitL= ib.c b/Platform/Qemu/QemuOpenBoardPkg/Library/BoardInitLib/BoardInitLib.c index 17b0b703fe59..e85d99403fb1 100644 --- a/Platform/Qemu/QemuOpenBoardPkg/Library/BoardInitLib/BoardInitLib.c +++ b/Platform/Qemu/QemuOpenBoardPkg/Library/BoardInitLib/BoardInitLib.c @@ -34,7 +34,10 @@ BoardDetect ( =20 DEBUG ((DEBUG_INFO, "BoardDetect()\n")); =20 - //Retrieve chipset device ID and vendor ID + // + // Retrieve chipset device ID and vendor ID + // + DeviceID =3D PciCf8Read16 (PCI_CF8_LIB_ADDRESS (0, 0, 0, PCI_DEVICE_ID_O= FFSET)); VendorID =3D PciCf8Read16 (PCI_CF8_LIB_ADDRESS (0, 0, 0, PCI_VENDOR_ID_O= FFSET)); =20 diff --git a/Platform/Qemu/QemuOpenBoardPkg/Library/QemuOpenFwCfgLib/QemuOp= enFwCfgLib.c b/Platform/Qemu/QemuOpenBoardPkg/Library/QemuOpenFwCfgLib/Qemu= OpenFwCfgLib.c index ec3ca9d5b644..dc7a9241aff3 100644 --- a/Platform/Qemu/QemuOpenBoardPkg/Library/QemuOpenFwCfgLib/QemuOpenFwCfg= Lib.c +++ b/Platform/Qemu/QemuOpenBoardPkg/Library/QemuOpenFwCfgLib/QemuOpenFwCfg= Lib.c @@ -103,14 +103,14 @@ QemuFwCfgIsPresent ( =20 @param String Pointer to an ASCII string to match in the database @param FWConfigFile Buffer for the config file - @retval EFI_STATUS - Entry was found, FWConfigFile is populated - @retval EFI_ERROR - Entry was not found + @retval EFI_STATUS Entry was found, FWConfigFile is populated + @retval EFI_ERROR Entry was not found **/ EFI_STATUS EFIAPI QemuFwCfgFindFile ( - IN CHAR8 *String, - OUT QEMU_FW_CFG_FILE *FWConfigFile + IN CHAR8 *String, + OUT QEMU_FW_CFG_FILE *FWConfigFile ) { QEMU_FW_CFG_FILE FirmwareConfigFile; --=20 2.32.1 (Apple Git-133) -=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 (#93577): https://edk2.groups.io/g/devel/message/93577 Mute This Topic: https://groups.io/mt/93570150/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-