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.129.124]) by mx.groups.io with SMTP id smtpd.web11.16542.1684830357554479418 for ; Tue, 23 May 2023 01:25:57 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=iCrr8SLt; spf=pass (domain: redhat.com, ip: 170.10.129.124, mailfrom: kraxel@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684830356; 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=Hbz7zMCNfG4ede7i6jqaDpE+tHsyw7/WeACyUm09jik=; b=iCrr8SLtUJFqm5D/El5jXyRQdO80iR34rRcGgM+7p8LtM4GO7UqbXikXqEd4LYQRxPEyD5 oyLgilYzIkseXn5wV0VCPfGYeuVD4kBRdaifFISEiDrk2n/739uMlggS/u4Hs+Ry3oqoCl tvbzpTJ5U+Z0Z3fw+4qiyBY5eKGyrkA= 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-447-qsychIAnMpW_niIuTL8k7g-1; Tue, 23 May 2023 04:25:53 -0400 X-MC-Unique: qsychIAnMpW_niIuTL8k7g-1 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 40A8B800141; Tue, 23 May 2023 08:25:53 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.39.192.37]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0AAAA202696C; Tue, 23 May 2023 08:25:53 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 9EB3C180614D; Tue, 23 May 2023 10:25:51 +0200 (CEST) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Oliver Steffen , Ard Biesheuvel , Pawel Polawski , Gerd Hoffmann , Ray Ni , Jiewen Yao , =?UTF-8?q?L=C3=A1szl=C3=B3=20=C3=89rsek?= , Jordan Justen Subject: [PATCH 1/1] OvmfPkg/PlatformPei: drop S3Verification() Date: Tue, 23 May 2023 10:25:51 +0200 Message-Id: <20230523082551.447335-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 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. 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 --- OvmfPkg/PlatformPei/Platform.c | 31 ------------------------------- 1 file changed, 31 deletions(-) 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