From nobody Mon Feb 9 16:44:59 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+96908+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+96908+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1669986634; cv=none; d=zohomail.com; s=zohoarc; b=JL9A1A/VCC/VPrXrBzB8iT/SJ4/AnYlAd1W5btOnr05sOdgqD7cF5Tf5H/DDITeLISduY7ghjnnhvqjkiGPqBW9bvCaYOtnc9MzocYNu5VyygJjBg1c6aDAjZdyWIHJj2DRaYu7kgXpSRypiJ/7/MlAnT/uahsUPzTG3ZRT5dP4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669986634; 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=bWstvkf5J5lqc7QJ0UlFRyM19BkgLuqEejw+XsaO+B0=; b=g/Uk2Gn4NDLPLHCjBQoTzqow2qKW66zZdTW6vXGfRRUwpMAVGp15FWoQe6Nxu2bcDjSZjFWwsyRic+3GoaC6PMs8EZ2HFf9tDGq7Po+4Gyv7VSB3UCQRGdIaKXnOg/VPx3MrdiNustCM67uSWDI6WcrpO1nyxGKyuZ0BRoH/dOM= 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+96908+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 1669986634475413.15038903015545; Fri, 2 Dec 2022 05:10:34 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id WWLjYY1788612xvFHudo3cXM; Fri, 02 Dec 2022 05:10:34 -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.74533.1669986633407771711 for ; Fri, 02 Dec 2022 05:10:33 -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-628-L1D5Ad5DPMqmsYmt7D8YPA-1; Fri, 02 Dec 2022 08:10:29 -0500 X-MC-Unique: L1D5Ad5DPMqmsYmt7D8YPA-1 X-Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CB081101A528; Fri, 2 Dec 2022 13:10:28 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.79]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 96BF82028CE4; Fri, 2 Dec 2022 13:10:28 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id ED670180155F; 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 09/14] OvmfPkg/PlatformPei: Verification: stop using mPlatformInfoHob Date: Fri, 2 Dec 2022 14:10:04 +0100 Message-Id: <20221202131009.3190040-10-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.4 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: fGR5hiiGLB5wRDe9rLbFZcvix1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1669986634; bh=dfFmkFww8vUbDXfxUClKLvMP0bxp1K6LkQmTmRWvQ1Q=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=o5ujjs4tBrfAmSiUjHZ5dYKSAHdZcicNMdEn0ZfARtBLpc3LzuSf+wlVOb/atu165vC H+v+37Ql0wdHQKUNIZBUyw0s+FXshpFi9Sp1eLLJXsSKQPmcqsixbPmoO9HsJQpfrw9BZ uY2FF28rcA6hmvOQoyJ13/VTHeL3iAYS8Tg= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1669986635358100033 Content-Type: text/plain; charset="utf-8"; x-default="true" Stop using the mPlatformInfoHob global variable in S3Verification() and Q35BoardVerification() functions. Pass a pointer to the PlatformInfoHob instead. Signed-off-by: Gerd Hoffmann --- OvmfPkg/PlatformPei/Platform.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c index 7f3a26092626..d8c4499804fb 100644 --- a/OvmfPkg/PlatformPei/Platform.c +++ b/OvmfPkg/PlatformPei/Platform.c @@ -231,13 +231,14 @@ ReserveEmuVariableNvStore ( ASSERT_RETURN_ERROR (PcdStatus); } =20 +STATIC VOID S3Verification ( - VOID + IN EFI_HOB_PLATFORM_INFO *PlatformInfoHob ) { #if defined (MDE_CPU_X64) - if (mPlatformInfoHob.SmmSmramRequire && mPlatformInfoHob.S3Supported) { + if (PlatformInfoHob->SmmSmramRequire && PlatformInfoHob->S3Supported) { DEBUG (( DEBUG_ERROR, "%a: S3Resume2Pei doesn't support X64 PEI + SMM yet.\n", @@ -260,12 +261,13 @@ S3Verification ( #endif } =20 +STATIC VOID Q35BoardVerification ( - VOID + IN EFI_HOB_PLATFORM_INFO *PlatformInfoHob ) { - if (mPlatformInfoHob.HostBridgeDevId =3D=3D INTEL_Q35_MCH_DEVICE_ID) { + if (PlatformInfoHob->HostBridgeDevId =3D=3D INTEL_Q35_MCH_DEVICE_ID) { return; } =20 @@ -274,7 +276,7 @@ Q35BoardVerification ( "%a: no TSEG (SMRAM) on host bridge DID=3D0x%04x; " "only DID=3D0x%04x (Q35) is supported\n", __FUNCTION__, - mPlatformInfoHob.HostBridgeDevId, + PlatformInfoHob->HostBridgeDevId, INTEL_Q35_MCH_DEVICE_ID )); ASSERT (FALSE); @@ -345,7 +347,7 @@ InitializePlatform ( ASSERT_EFI_ERROR (Status); } =20 - S3Verification (); + S3Verification (&mPlatformInfoHob); BootModeInitialization (&mPlatformInfoHob); =20 // @@ -357,7 +359,7 @@ InitializePlatform ( MaxCpuCountInitialization (&mPlatformInfoHob); =20 if (mPlatformInfoHob.SmmSmramRequire) { - Q35BoardVerification (); + Q35BoardVerification (&mPlatformInfoHob); Q35TsegMbytesInitialization (&mPlatformInfoHob); Q35SmramAtDefaultSmbaseInitialization (&mPlatformInfoHob); } --=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 (#96908): https://edk2.groups.io/g/devel/message/96908 Mute This Topic: https://groups.io/mt/95405213/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-