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.web10.18183.1684836447518582207 for ; Tue, 23 May 2023 03:07:27 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=jSzj1GbE; spf=pass (domain: redhat.com, ip: 170.10.129.124, mailfrom: lersek@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684836446; 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: in-reply-to:in-reply-to:references:references; bh=m/Hdzoy2lZQTU+d0HBtMYYB7+ycdmC3L6zUKmRrN3SI=; b=jSzj1GbE6Edg9zP06xaEW+tn+J1HORdSKlNGBkQ4iOy90BMDW2Dc9Zos51ffFaJfsuAGfx SUNwudPf0qSgEVkv2tqzsPoFVN/SQf8l4EcFpWHICCmA8Co2NPz7xy4bjqODzJsD7bAKTC 8C6yV5jb8Xv+DHOC8u9bBBo+zCnhKrU= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-121-ixBMxbwKO0SKreLknls1yQ-1; Tue, 23 May 2023 06:07:22 -0400 X-MC-Unique: ixBMxbwKO0SKreLknls1yQ-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 889633C0C88B; Tue, 23 May 2023 10:07:21 +0000 (UTC) Received: from [10.39.195.170] (unknown [10.39.195.170]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AAFD0202696C; Tue, 23 May 2023 10:07:19 +0000 (UTC) Message-ID: <113cff81-23b9-8400-d998-dfe35175fe4f@redhat.com> Date: Tue, 23 May 2023 12:07:17 +0200 MIME-Version: 1.0 Subject: Re: [PATCH 1/1] OvmfPkg/PlatformPei: drop S3Verification() To: Gerd Hoffmann , devel@edk2.groups.io Cc: Oliver Steffen , Ard Biesheuvel , Pawel Polawski , Ray Ni , Jiewen Yao , Jordan Justen References: <20230523082551.447335-1-kraxel@redhat.com> From: "Laszlo Ersek" In-Reply-To: <20230523082551.447335-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 5/23/23 10:25, Gerd Hoffmann wrote: > 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); > > // Reviewed-by: Laszlo Ersek