From mboxrd@z Thu Jan 1 00:00:00 1970 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.web10.4589.1684919484191917455 for ; Wed, 24 May 2023 02:11:24 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=NolBnySh; spf=pass (domain: redhat.com, ip: 170.10.133.124, mailfrom: kraxel@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684919483; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kDQODNKckiIBL3SUV68IrcyGNieaqQ7Z30eERX6reA0=; b=NolBnyShaRYd6m6gzm29YcqyybNBtMgZKGOLpiIMk4YmP/ksmWN/dIQm+nHX2eKgur1tdw qpG9jmCx1lQ/g4fr9qI2WtCMYNkFTQdfQrOrlpTtIW5ByNMPEYUrhwlF5yZk2o1RUL7pWA usqpPL/Q64MoqT4VcVRj0qpz8dznWu8= 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-372-K4UO-0hJPw-8f57StJUKAA-1; Wed, 24 May 2023 05:11:20 -0400 X-MC-Unique: K4UO-0hJPw-8f57StJUKAA-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7D95C101A53A; Wed, 24 May 2023 09:11:19 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.39.192.48]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2B909140E95D; Wed, 24 May 2023 09:11:19 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id B0DCB18007AC; Wed, 24 May 2023 11:11:17 +0200 (CEST) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Rebecca Cran , =?UTF-8?q?L=C3=A1szl=C3=B3=20=C3=89rsek?= , Pawel Polawski , Oliver Steffen , Jordan Justen , Ard Biesheuvel , Ray Ni , Jiewen Yao , Gerd Hoffmann , Ard Biesheuvel Subject: [PATCH v2 1/1] OvmfPkg/PlatformPei: drop S3Verification() Date: Wed, 24 May 2023 11:11:17 +0200 Message-Id: <20230524091117.302120-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true Not needed any more, SMM + 64-bit PEI + S3 suspend works now. While being at it also remove it from Bhyve (where it is dead code). Fixed by commits: - 8bd2028f9ac3 ("MdeModulePkg: Supporting S3 in 64bit PEI") - 6acf72901a2e ("UefiCpuPkg: Supporting S3 in 64bit PEI") See also https://bugzilla.tianocore.org/show_bug.cgi?id=4195 Signed-off-by: Gerd Hoffmann Reviewed-by: Ard Biesheuvel Reviewed-by: Laszlo Ersek Reviewed-by: Ray Ni --- OvmfPkg/Bhyve/PlatformPei/Platform.c | 29 -------------------------- OvmfPkg/PlatformPei/Platform.c | 31 ---------------------------- 2 files changed, 60 deletions(-) diff --git a/OvmfPkg/Bhyve/PlatformPei/Platform.c b/OvmfPkg/Bhyve/PlatformPei/Platform.c index 2523e49e368a..5bfe435327c1 100644 --- a/OvmfPkg/Bhyve/PlatformPei/Platform.c +++ b/OvmfPkg/Bhyve/PlatformPei/Platform.c @@ -491,35 +491,6 @@ DebugDumpCmos ( } } -VOID -S3Verification ( - VOID - ) -{ - #if defined (MDE_CPU_X64) - if (FeaturePcdGet (PcdSmmSmramRequire) && mS3Supported) { - DEBUG (( - DEBUG_ERROR, - "%a: S3Resume2Pei doesn't support X64 PEI + SMM yet.\n", - __func__ - )); - DEBUG (( - DEBUG_ERROR, - "%a: Please disable S3 on the QEMU command line (see the README),\n", - __func__ - )); - DEBUG (( - DEBUG_ERROR, - "%a: or build OVMF with \"OvmfPkgIa32X64.dsc\".\n", - __func__ - )); - ASSERT (FALSE); - CpuDeadLoop (); - } - - #endif -} - /** Fetch the number of boot CPUs from QEMU and expose it to UefiCpuPkg modules. Set the mMaxCpuCount variable. diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c index c56247e294f2..f5dc41c3a8c4 100644 --- a/OvmfPkg/PlatformPei/Platform.c +++ b/OvmfPkg/PlatformPei/Platform.c @@ -230,36 +230,6 @@ ReserveEmuVariableNvStore ( ASSERT_RETURN_ERROR (PcdStatus); } -STATIC -VOID -S3Verification ( - IN EFI_HOB_PLATFORM_INFO *PlatformInfoHob - ) -{ - #if defined (MDE_CPU_X64) - if (PlatformInfoHob->SmmSmramRequire && PlatformInfoHob->S3Supported) { - DEBUG (( - DEBUG_ERROR, - "%a: S3Resume2Pei doesn't support X64 PEI + SMM yet.\n", - __func__ - )); - DEBUG (( - DEBUG_ERROR, - "%a: Please disable S3 on the QEMU command line (see the README),\n", - __func__ - )); - DEBUG (( - DEBUG_ERROR, - "%a: or build OVMF with \"OvmfPkgIa32X64.dsc\".\n", - __func__ - )); - ASSERT (FALSE); - CpuDeadLoop (); - } - - #endif -} - STATIC VOID Q35BoardVerification ( @@ -354,7 +324,6 @@ InitializePlatform ( ASSERT_EFI_ERROR (Status); } - S3Verification (PlatformInfoHob); BootModeInitialization (PlatformInfoHob); // -- 2.40.1