From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by mx.groups.io with SMTP id smtpd.web10.17210.1684832201321944592 for ; Tue, 23 May 2023 01:56:41 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=KJY4EXHj; spf=pass (domain: kernel.org, ip: 139.178.84.217, mailfrom: ardb@kernel.org) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id D4E7B60E06 for ; Tue, 23 May 2023 08:56:40 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 45923C4339C for ; Tue, 23 May 2023 08:56:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684832200; bh=1hsUPtC3grB+Nj0OcYcz6KqEUGtffkTMTM8HZZ5eAAg=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=KJY4EXHjPp3LM90PmFwfq2097KDv9Aghv+fzaHRxhVq4/xpqX7iacc1nNlCM8j4hY mYZ7uqCpT2bbeLcQfQQlzgWaKjAq85uR8vg4G0cG+xNkYyN2ZbB2JIixv68j5r2WLf 1mAK1xtojNADRZrpbh8NPJ6eJvzhtvNoBhxSALRzmPLTGnzS6ZxusRu6lXubo1ScDD SVv8dallU6HMJ8SS1nZFRS3aghyn33BnKxDdYstq8GANRQP6zuDDGNfLJgCpCR9qlE qDL6qxQOLiB58nmRQPZiHnZO4wgy7up10yVyx3SkV/nbwteAqNzsIWBSAGTByaXhcP A7YqlzFmOuoKg== Received: by mail-lf1-f42.google.com with SMTP id 2adb3069b0e04-4f122ff663eso7674257e87.2 for ; Tue, 23 May 2023 01:56:40 -0700 (PDT) X-Gm-Message-State: AC+VfDz4CNH4s0ilxv03Xpoq7zUNsM9dnTh0SHzA/WtHXb4KisLGLqBs f33UzoNHz75K+yE3+SP64EVXD6B0N4a3aEbdHfk= X-Google-Smtp-Source: ACHHUZ6MFWswRMlzgdw53OLYLdgeMm++ac2nZn7S1R1iHccHWhgP7iwYP0bHqvz8EXZVzuhrH47khNUajdqyZkxxyKU= X-Received: by 2002:a19:ad41:0:b0:4f3:a641:a971 with SMTP id s1-20020a19ad41000000b004f3a641a971mr4073254lfd.44.1684832198264; Tue, 23 May 2023 01:56:38 -0700 (PDT) MIME-Version: 1.0 References: <20230523082551.447335-1-kraxel@redhat.com> In-Reply-To: <20230523082551.447335-1-kraxel@redhat.com> From: "Ard Biesheuvel" Date: Tue, 23 May 2023 10:56:26 +0200 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [edk2-devel] [PATCH 1/1] OvmfPkg/PlatformPei: drop S3Verification() To: devel@edk2.groups.io, kraxel@redhat.com, Rebecca Cran Cc: Oliver Steffen , Ard Biesheuvel , Pawel Polawski , Ray Ni , Jiewen Yao , =?UTF-8?B?TMOhc3psw7Mgw4lyc2Vr?= , Jordan Justen Content-Type: text/plain; charset="UTF-8" (cc Rebecca) On Tue, 23 May 2023 at 10:26, 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 Reviewed-by: Ard Biesheuvel I spotted another implementation of this function in OvmfPkg/Bhyve/PlatformPei/Platform.c, which appears to be unused. Rebecca, mind sending a patch to get rid of that too? Thanks. > --- > 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 > > > > > >