From nobody Mon Feb 9 20:10:48 2026 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+96910+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+96910+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1669986639; cv=none; d=zohomail.com; s=zohoarc; b=QweeXbJAWInkkUR0Pf+8/Cexslw0X+WSoX8ObHOniKFyFX+MHfwRC6qq0/bFsXPpH7vnHh0+WbFfFm3FI3Dyswt3TNzhl/TuBhhtW+g/xi5uqfbP76EiXUx2vxABmYBwkm6eNWxFVAMO6BT0Ll7BmV8g+rETWaXgn8ddshNwoYA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669986639; 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=/2jYoKYenT9wAWBOx8aIfBz/Dx3osv54mgqTX+t0oRw=; b=j7oFSAyFGzt5C9IolKBfjkTYjAFcdBNaJu7qaqpiH/tCk3P0sr0l3ryX6G0y4y+4Nb70bdUmfD5NbaGwwqrRllmcxnDNx6kMz5E1lJ3DXvwmKj4qDiEMpDt8m9UcikTezAz/hd968bR/qs6RgHAckNwAWdZ6JsZij/TkuDkHDe8= 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+96910+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 1669986639485245.11804973681205; Fri, 2 Dec 2022 05:10:39 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id 8vUcYY1788612xZt44kWzOOp; Fri, 02 Dec 2022 05:10:39 -0800 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web11.74536.1669986637972626002 for ; Fri, 02 Dec 2022 05:10:38 -0800 X-Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-644-MsmtmOWBNRCUnmdwqvBdVA-1; Fri, 02 Dec 2022 08:10:32 -0500 X-MC-Unique: MsmtmOWBNRCUnmdwqvBdVA-1 X-Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 81146800159; Fri, 2 Dec 2022 13:10:31 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.79]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2639840C94AA; Fri, 2 Dec 2022 13:10:31 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id F15A41801560; Fri, 2 Dec 2022 14:10:09 +0100 (CET) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Bob Feng , Yuwei Chen , Erdem Aktas , Jordan Justen , Peter Grehan , Rebecca Cran , Liming Gao , Ard Biesheuvel , Gerd Hoffmann , Jiewen Yao , Min Xu , Brijesh Singh , Oliver Steffen , Pawel Polawski , Tom Lendacky , James Bottomley Subject: [edk2-devel] [PATCH 10/14] OvmfPkg/PlatformPei: remove mPlatformInfoHob Date: Fri, 2 Dec 2022 14:10:05 +0100 Message-Id: <20221202131009.3190040-11-kraxel@redhat.com> In-Reply-To: <20221202131009.3190040-1-kraxel@redhat.com> References: <20221202131009.3190040-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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,kraxel@redhat.com X-Gm-Message-State: esc1X7Ltblp9x73W8eyQ9yq9x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1669986639; bh=jQnrMhn47qYi45AWJTBPpkHHB4jJX+KAJKFz7QSHlbU=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=OwQ/xVOULxrjRHl3PlC+ka87J3jEDuqJG8wAaJQvz+FuKUmrDwsSMpLChnvjv9fEiAU qCtCR4FR6SGZPfYgODF0aBcr6XFSk1lXpIolXEuFatSeDOEsoJX97yDlbE1NGOLsyL8ii wjfsEImDxTJLmfaCBHJol/vKb+vsPewGoxc= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1669986641353100005 Content-Type: text/plain; charset="utf-8"; x-default="true" Stop using the mPlatformInfoHob global variable. Let BuildPlatformInfoHob() allocate and return PlatformInfoHob instead. Signed-off-by: Gerd Hoffmann --- OvmfPkg/PlatformPei/Platform.h | 4 +- OvmfPkg/PlatformPei/Platform.c | 71 ++++++++++++++++++---------------- 2 files changed, 39 insertions(+), 36 deletions(-) diff --git a/OvmfPkg/PlatformPei/Platform.h b/OvmfPkg/PlatformPei/Platform.h index 0c0558f0626c..86f603ff649c 100644 --- a/OvmfPkg/PlatformPei/Platform.h +++ b/OvmfPkg/PlatformPei/Platform.h @@ -13,8 +13,6 @@ #include #include =20 -extern EFI_HOB_PLATFORM_INFO mPlatformInfoHob; - VOID AddressWidthInitialization ( IN OUT EFI_HOB_PLATFORM_INFO *PlatformInfoHob @@ -98,7 +96,7 @@ IntelTdxInitialize ( /** * @brief Builds PlatformInfo Hob */ -VOID +EFI_HOB_PLATFORM_INFO * BuildPlatformInfoHob ( VOID ); diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c index d8c4499804fb..ebce2ba1290e 100644 --- a/OvmfPkg/PlatformPei/Platform.c +++ b/OvmfPkg/PlatformPei/Platform.c @@ -41,8 +41,6 @@ =20 #include "Platform.h" =20 -EFI_HOB_PLATFORM_INFO mPlatformInfoHob =3D { 0 }; - EFI_PEI_PPI_DESCRIPTOR mPpiBootMode[] =3D { { EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST, @@ -305,12 +303,18 @@ MaxCpuCountInitialization ( /** * @brief Builds PlatformInfo Hob */ -VOID +EFI_HOB_PLATFORM_INFO * BuildPlatformInfoHob ( VOID ) { - BuildGuidDataHob (&gUefiOvmfPkgPlatformInfoGuid, &mPlatformInfoHob, size= of (EFI_HOB_PLATFORM_INFO)); + EFI_HOB_PLATFORM_INFO PlatformInfoHob; + EFI_HOB_GUID_TYPE *GuidHob; + + ZeroMem (&PlatformInfoHob, sizeof PlatformInfoHob); + BuildGuidDataHob (&gUefiOvmfPkgPlatformInfoGuid, &PlatformInfoHob, sizeo= f (EFI_HOB_PLATFORM_INFO)); + GuidHob =3D GetFirstGuidHob (&gUefiOvmfPkgPlatformInfoGuid); + return (EFI_HOB_PLATFORM_INFO *)GET_GUID_HOB_DATA (GuidHob); } =20 /** @@ -329,69 +333,70 @@ InitializePlatform ( IN CONST EFI_PEI_SERVICES **PeiServices ) { - EFI_STATUS Status; + EFI_HOB_PLATFORM_INFO *PlatformInfoHob; + EFI_STATUS Status; =20 DEBUG ((DEBUG_INFO, "Platform PEIM Loaded\n")); + PlatformInfoHob =3D BuildPlatformInfoHob (); =20 - mPlatformInfoHob.SmmSmramRequire =3D FeaturePcdGet (PcdSmmSmramRequi= re); - mPlatformInfoHob.SevEsIsEnabled =3D MemEncryptSevEsIsEnabled (); - mPlatformInfoHob.PcdPciMmio64Size =3D PcdGet64 (PcdPciMmio64Size); - mPlatformInfoHob.DefaultMaxCpuNumber =3D PcdGet32 (PcdCpuMaxLogicalProce= ssorNumber); + PlatformInfoHob->SmmSmramRequire =3D FeaturePcdGet (PcdSmmSmramRequi= re); + PlatformInfoHob->SevEsIsEnabled =3D MemEncryptSevEsIsEnabled (); + PlatformInfoHob->PcdPciMmio64Size =3D PcdGet64 (PcdPciMmio64Size); + PlatformInfoHob->DefaultMaxCpuNumber =3D PcdGet32 (PcdCpuMaxLogicalProce= ssorNumber); =20 PlatformDebugDumpCmos (); =20 if (QemuFwCfgS3Enabled ()) { DEBUG ((DEBUG_INFO, "S3 support was detected on QEMU\n")); - mPlatformInfoHob.S3Supported =3D TRUE; + PlatformInfoHob->S3Supported =3D TRUE; Status =3D PcdSetBoolS (PcdAcpiS3Enable, TRUE); ASSERT_EFI_ERROR (Status); } =20 - S3Verification (&mPlatformInfoHob); - BootModeInitialization (&mPlatformInfoHob); + S3Verification (PlatformInfoHob); + BootModeInitialization (PlatformInfoHob); =20 // // Query Host Bridge DID // - mPlatformInfoHob.HostBridgeDevId =3D PciRead16 (OVMF_HOSTBRIDGE_DID); - AddressWidthInitialization (&mPlatformInfoHob); + PlatformInfoHob->HostBridgeDevId =3D PciRead16 (OVMF_HOSTBRIDGE_DID); + AddressWidthInitialization (PlatformInfoHob); =20 - MaxCpuCountInitialization (&mPlatformInfoHob); + MaxCpuCountInitialization (PlatformInfoHob); =20 - if (mPlatformInfoHob.SmmSmramRequire) { - Q35BoardVerification (&mPlatformInfoHob); - Q35TsegMbytesInitialization (&mPlatformInfoHob); - Q35SmramAtDefaultSmbaseInitialization (&mPlatformInfoHob); + if (PlatformInfoHob->SmmSmramRequire) { + Q35BoardVerification (PlatformInfoHob); + Q35TsegMbytesInitialization (PlatformInfoHob); + Q35SmramAtDefaultSmbaseInitialization (PlatformInfoHob); } =20 - PublishPeiMemory (&mPlatformInfoHob); + PublishPeiMemory (PlatformInfoHob); =20 - PlatformQemuUc32BaseInitialization (&mPlatformInfoHob); + PlatformQemuUc32BaseInitialization (PlatformInfoHob); =20 - InitializeRamRegions (&mPlatformInfoHob); + InitializeRamRegions (PlatformInfoHob); =20 - if (mPlatformInfoHob.BootMode !=3D BOOT_ON_S3_RESUME) { - if (!mPlatformInfoHob.SmmSmramRequire) { + if (PlatformInfoHob->BootMode !=3D BOOT_ON_S3_RESUME) { + if (!PlatformInfoHob->SmmSmramRequire) { ReserveEmuVariableNvStore (); } =20 - PeiFvInitialization (&mPlatformInfoHob); - MemTypeInfoInitialization (&mPlatformInfoHob); - MemMapInitialization (&mPlatformInfoHob); - NoexecDxeInitialization (&mPlatformInfoHob); + PeiFvInitialization (PlatformInfoHob); + MemTypeInfoInitialization (PlatformInfoHob); + MemMapInitialization (PlatformInfoHob); + NoexecDxeInitialization (PlatformInfoHob); } =20 InstallClearCacheCallback (); - AmdSevInitialize (&mPlatformInfoHob); - if (mPlatformInfoHob.HostBridgeDevId =3D=3D 0xffff) { - MiscInitializationForMicrovm (&mPlatformInfoHob); + AmdSevInitialize (PlatformInfoHob); + if (PlatformInfoHob->HostBridgeDevId =3D=3D 0xffff) { + MiscInitializationForMicrovm (PlatformInfoHob); } else { - MiscInitialization (&mPlatformInfoHob); + MiscInitialization (PlatformInfoHob); } =20 IntelTdxInitialize (); InstallFeatureControlCallback (); - BuildPlatformInfoHob (); =20 return EFI_SUCCESS; } --=20 2.38.1 -=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 (#96910): https://edk2.groups.io/g/devel/message/96910 Mute This Topic: https://groups.io/mt/95405215/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-