From nobody Sat May 4 18:07:53 2024 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+79965+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+79965+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one); dmarc=fail(p=none dis=none) header.from=hpe.com Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1630373505005312.116047389246; Mon, 30 Aug 2021 18:31:45 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id qbg0YY1788612x2hjrQrD4RQ; Mon, 30 Aug 2021 18:31:44 -0700 X-Received: from mx0b-002e3701.pphosted.com (mx0b-002e3701.pphosted.com [148.163.143.35]) by mx.groups.io with SMTP id smtpd.web08.6535.1630373503787235958 for ; Mon, 30 Aug 2021 18:31:44 -0700 X-Received: from pps.filterd (m0150245.ppops.net [127.0.0.1]) by mx0b-002e3701.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 17V1IxGm019295; Tue, 31 Aug 2021 01:31:31 GMT X-Received: from g9t5009.houston.hpe.com (g9t5009.houston.hpe.com [15.241.48.73]) by mx0b-002e3701.pphosted.com with ESMTP id 3aru4bq1p8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 31 Aug 2021 01:31:31 +0000 X-Received: from G9W8454.americas.hpqcorp.net (exchangepmrr1.us.hpecorp.net [16.216.161.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by g9t5009.houston.hpe.com (Postfix) with ESMTPS id A170151; Tue, 31 Aug 2021 01:31:30 +0000 (UTC) X-Received: from G9W8453.americas.hpqcorp.net (2002:10d8:a0d3::10d8:a0d3) by G9W8454.americas.hpqcorp.net (2002:10d8:a104::10d8:a104) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Tue, 31 Aug 2021 01:31:30 +0000 X-Received: from NAM02-SN1-obe.outbound.protection.outlook.com (15.241.52.10) by G9W8453.americas.hpqcorp.net (16.216.160.211) with Microsoft SMTP Server (TLS) id 15.0.1497.18 via Frontend Transport; Tue, 31 Aug 2021 01:31:30 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RZbg4tgisEVs69o0D26671XUReleMo++eimnbStGd6z22bSCORha/1K5wb/k6E0VW2nGH77itWAfnK6DhI8ioBJq/XNhTAvyWu3ZXo/J3qTnGYTV5+vfbXfr7ZKicWFyksNhgd0/2gQcxxeJU1nmKPspsvCt70eRTmHxg+d8+IXwwendZWAcQJqgC/yTVxWUV2M4Y+Oco1Nk8mR93dt7tmlOkXn1gE7/0c0HG+VnJZPRwCMp/DEUn/SFnpkMD9+oWHyNESbNprgBnTzdmwqBYBfzG+pz7FYweeqhcSZCEr7gJL/hM1i+v3mlcntok5Al0wJpIvcao86itukKVqMn1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=sLB3ZCaO+Fc5CJonBj3L/wpC4YUitvM1Gud6tdd1jB0=; b=B4TMtkwR4LD2CW726et96qVbYrMsqzpXI0qNS8nMBe/SlpYF/S4t1BRZYDSaxOEMiv+c42ZyRuca6JRufSHGPX1D/LIyM28PvRCU3sQpRmVzJKfcBH6HPbqehHzV5UlhJHTRniQJb/AKy5IgyuN3mVC/UHAeekSM1b6/EgjFmbyAJYYdzL2pfsoWS5FzowEc7mCWBRijO4VgBNt5hfjnJ8gW6Y3G/lH07DimjTi8VGxr18ctaD3nPuc3xdIoe8te6rJ/A5v7hMCIGJ/ttPqrlDkLrRCwcfD0ResshTcsrbQKTgSWphrISyNS2tWDXPcDUg9MK5kpxfioHTZKBjy59A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=hpe.com; dmarc=pass action=none header.from=hpe.com; dkim=pass header.d=hpe.com; arc=none X-Received: from AT5PR8401MB0387.NAMPRD84.PROD.OUTLOOK.COM (2a01:111:e400:741f::21) by AT5PR8401MB0355.NAMPRD84.PROD.OUTLOOK.COM (2a01:111:e400:7425::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.24; Tue, 31 Aug 2021 01:31:28 +0000 X-Received: from AT5PR8401MB0387.NAMPRD84.PROD.OUTLOOK.COM ([fe80::106b:abb8:386b:a2db]) by AT5PR8401MB0387.NAMPRD84.PROD.OUTLOOK.COM ([fe80::106b:abb8:386b:a2db%9]) with mapi id 15.20.4436.019; Tue, 31 Aug 2021 01:31:28 +0000 From: "Lin, Gary (HPS OE-Linux)" To: CC: Ard Biesheuvel , Jiewen Yao , Jordan Justen , Anthony Perard , Julien Grall , Jim Fehlig , Joey Li , Gerd Hoffmann , Jiewen Yao Subject: [edk2-devel] [RESEND PATCH v3 1/4] OvmfPkg/OvmfXen: set PcdAcpiS3Enable at initialization Date: Tue, 31 Aug 2021 09:31:12 +0800 Message-ID: <20210831013115.23110-2-gary.lin@hpe.com> In-Reply-To: <20210831013115.23110-1-gary.lin@hpe.com> References: <20210831013115.23110-1-gary.lin@hpe.com> X-ClientProxiedBy: HK2PR04CA0059.apcprd04.prod.outlook.com (2603:1096:202:14::27) To AT5PR8401MB0387.NAMPRD84.PROD.OUTLOOK.COM (2a01:111:e400:741f::21) X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from localhost (111.240.119.140) by HK2PR04CA0059.apcprd04.prod.outlook.com (2603:1096:202:14::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.17 via Frontend Transport; Tue, 31 Aug 2021 01:31:27 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: da7667d4-8904-4a5e-8b7c-08d96c1f0dd1 X-MS-TrafficTypeDiagnostic: AT5PR8401MB0355: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Message-Info: c0YY3PniA1GGv+cXOUK34jNJRjjir7Bp/NgI3o7o+tKmzetgci2QZlTdvikWs8tGElyRuopuiEOp2bDeoHsGfGYF/JTzk5J2JLD2jcbthx7fQOyrRdHlzkCdJZsBYQppBfvZrphJqhzOsJIcjYbwk2JqJAypqCJtsRWSGLLwGZGHVjXQGuCQ2Y1iP1kjX02BKesx80qHeEMezBsrNWnv0C+Zizp6cP2RFUTqJ9wVWCv8hs+jtMQ2KEOjHI+Tg+pHOp1uJwfQeHF25ehoietZaI7HdnZiYzGfHIgGbUcLmrHKBRdzcayFyl55vR48nAvNNTN1WTSXLXee9oWr65GRVmd88mkEZ0VAfMz4crYyYrfK0SME8KcxMD29aKja+Z/NfOtDaCY02/UF2wsNEpo0rzQbDWRNjPqntexE4KepcN7SYjKY2ifZhLHzrSjLOEDK1s8eCLZpVlXLOfReEfWzYQuteNU9Ql7G/FGuYywoegSf603i+60Xq7R2kFVV3KTlVvPVbSsySVj4QCN7HKSkIk/T39MQfvYzVsIx43dOmii2Jsa5dlOippKFmIumf0wRtV2L+kSGhtOguX4NFDtO+zdKQ9Yi8nhRg5GbFDg44UAz2ApxuhD0V27Z2Nd++F4bDK0xLTOF+TYCqNYVnpVcGcQewKQ1ycnTc86JDdaowwRWpzYHsixkbRIGyRA+8Zt2SfdHXNURV/FgWTlR053qQ2rMv7vD1BNq83O5RfOnz1M= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?5waVs3h5FsdQyGfPM0DFsyMzgPd8Xl4brLD/3jOz653x4D/aA7xWPjNu+NN/?= =?us-ascii?Q?6XlI4hatLWrxKdeu9m7k1d2a1ri8uR7kXQLI4xYj5uCqYs6+Gnv7SCfLLojr?= =?us-ascii?Q?GNYgkACtX+1sVyJDu7Ke0ntY5tsEx4aOysGumaXTku/RUcAFw8r7ghEPOQID?= =?us-ascii?Q?ZUHIN7pkksoVljM4aDje9hd/mDAlOj657gIGQNAu1yLdq+R2FwOkGblNozEY?= =?us-ascii?Q?E8//iPPjp66QJHlWAyEIU5SGKa+CvPo6RMvf4IFj9ZWHU5oHq9TUMSEYqudc?= =?us-ascii?Q?nQOYdek/GlKPXetYzIWH8MY53oxV3coCatFkCzf1vuanb7O3JeX0CcJMF4XR?= =?us-ascii?Q?f79gky4IJiqiEysOjqKUPzqh0zuxjkcMVlYRcYuGryjOphPrZUxmhL6lRArU?= =?us-ascii?Q?/LduD2wA8puyraQJDKL1rhbYYyU7j3WfIrQeXXuhS8r4HdZa3H+6WGM9hO40?= =?us-ascii?Q?C+smRoa0SDvfaUEs8qsRNkkNDQPn6yf1bthMR+tk9056Fg85ag9pJAKinGLe?= =?us-ascii?Q?VniiawdSAUFYpicsfF2f06baODqL3DIljHlVawpJlAaywHWJoUbQNIxRKWE4?= =?us-ascii?Q?7nXrwo1U5ymZGnbdpztNw19A/GyW7p9ekBnSl6lLM5jQ0pAlC01aCH2ZZZJc?= =?us-ascii?Q?lRfxpXDSmm5W6Nq1oMAPSNRN8gdLyo6cBJUgyLvq2nSSc63rEYALcs0ZwG4p?= =?us-ascii?Q?2Y12RMnVd228yj83B3XtBSYZ73/22WI04/0ptmwW77SK0Y5fEcFfQ5OylR1O?= =?us-ascii?Q?x11n/02z3n+eROAs5docloe3ecmZN8tK5WMveyM59YSVAvj/oFL/xp7TDR3E?= =?us-ascii?Q?iFBFdzwsmmTi6e7lQVUhiMzZgoay9aPama0qqWn3BhNpcWAJzehuGfp3x6AP?= =?us-ascii?Q?xBBhp3OJDfpdu/jSjefjbG6ZuBxXxX6PAxtRoYHcM2YtdZ2CKkBOvDpFtG5D?= =?us-ascii?Q?D52bDdAFS7WQmLNaU7rb0GGpL8aQQpSih40aC2r8xYPlmmJ/FzdY1NQPWmmQ?= =?us-ascii?Q?4416D7rIj7peAU96l9e5ATgtqXZ/l8MGTH5RAtVdCNJJAzbJlHZdLFAItLrF?= =?us-ascii?Q?bCmrZrd3AQ26+WMBd1z6ioh9ZkjNBUhPsQxswVKN1a9nG9kMsoHKj43JGK8W?= =?us-ascii?Q?Ahq9MS4H+7QLR3zfhMRJMUsOGBMnqrelYn+mGBe8W1H1Y4mVyZrFrv6h2TG+?= =?us-ascii?Q?vryzh4c8tA/UojiBClogr+DcTt9L/Yq7g3AKjddHN1WW7wsvRGapHDAgp0o4?= =?us-ascii?Q?hKvHpvOnFv8d6dofYEBa4ixWr5xARpU/YNrXmkSrQFIh/+XuPIc8GZOQEaff?= =?us-ascii?Q?zbZv7uPuUL1qKZENMS4J/0w8?= X-MS-Exchange-CrossTenant-Network-Message-Id: da7667d4-8904-4a5e-8b7c-08d96c1f0dd1 X-MS-Exchange-CrossTenant-AuthSource: AT5PR8401MB0387.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2021 01:31:28.2477 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 105b2061-b669-4b31-92ac-24d304d195dc X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Ml5xfpvM91xaqTU7Z5NK+vPRHLHJLvEBhj3uwDlm5xU2ox+tjkYR5EwuYD8veLwDmnFf8hnlVF3qX7wMgcwsPA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AT5PR8401MB0355 X-OriginatorOrg: hpe.com X-Proofpoint-ORIG-GUID: dDKy9pME7LyGWT98jh59EOjxXtOsiA8r X-Proofpoint-GUID: dDKy9pME7LyGWT98jh59EOjxXtOsiA8r X-Proofpoint-UnRewURL: 0 URL was un-rewritten MIME-Version: 1.0 X-HPE-SCL: -1 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,gary.lin@hpe.com X-Gm-Message-State: Sv6DSLznix7a7Mx3YpZ5r1gUx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1630373504; bh=/Jfp8g7RWwbJaIBFcp6DDSaoZK06Xdnip+2Wem2jabQ=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=fr2Qhk5VufbsafIgY0XGQ6Qw3Cc5/V5yffBuF1IoyWujMswNcG+1FBJHKW2ImpzyjDP LegV37e92fE25KL11kyA/J1v03qcGgwgPNeqapNdeeYMCqCb9vO5XOeBRStpt93Xm8mGc c1frxfaLcc7MmTslympJmhwT1LPHH5XvCxg= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1630373506374100001 Content-Type: text/plain; charset="utf-8" There are several functions in OvmfPkg/Library using QemuFwCfgS3Enabled() to detect the S3 support status. However, in MdeModulePkg, PcdAcpiS3Enable is used to check S3 support. Since InitializeXenPlatform() didn't set PcdAcpiS3Enable as InitializePlatform() did, this made the inconsistency between drivers/functions. For example, S3SaveStateDxe checked PcdAcpiS3Enable and skipped S3BootScript because the default value is FALSE. On the other hand, PlatformBootManagerBeforeConsole() from OvmfPkg/Library called QemuFwCfgS3Enabled() and found it returned TRUE, so it invoked SaveS3BootScript(). However, S3SaveStateDxe skipped S3BootScript, so SaveS3BootScript() asserted due to EFI_NOT_FOUND. This issue mainly affects "HVM Direct Kernel Boot". When used, "fw_cfg" is enabled in QEMU and QemuFwCfgS3Enabled() returns true in that case. Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3573 Cc: Ard Biesheuvel Cc: Jiewen Yao Cc: Jordan Justen Cc: Anthony Perard Cc: Julien Grall Cc: Jim Fehlig Cc: Joey Li Signed-off-by: Gary Lin Reviewed-by: Anthony PERARD Reviewed-by: Gerd Hoffmann Reviewed-by: Jiewen Yao Tested-by: Jim Fehlig --- v3: - Update the description per Anthony's suggestion - Add the bugzilla link v2: - Amend the description and address "HVM Direct Kernel Boot" - Add the comment for the conditional test of QemuFwCfgS3Enabled() - Remove unused QemuFwCfgLib --- OvmfPkg/XenPlatformPei/XenPlatformPei.inf | 2 ++ OvmfPkg/XenPlatformPei/Platform.c | 13 +++++++++++++ 2 files changed, 15 insertions(+) diff --git a/OvmfPkg/XenPlatformPei/XenPlatformPei.inf b/OvmfPkg/XenPlatfor= mPei/XenPlatformPei.inf index 597cb6fcd7ff..20c27ff34b6c 100644 --- a/OvmfPkg/XenPlatformPei/XenPlatformPei.inf +++ b/OvmfPkg/XenPlatformPei/XenPlatformPei.inf @@ -57,6 +57,7 @@ [LibraryClasses] ResourcePublicationLib PeiServicesLib PeimEntryPoint + QemuFwCfgS3Lib MtrrLib MemEncryptSevLib PcdLib @@ -79,6 +80,7 @@ [Pcd] gUefiOvmfPkgTokenSpaceGuid.PcdPciMmio64Base gUefiOvmfPkgTokenSpaceGuid.PcdPciMmio64Size gUefiOvmfPkgTokenSpaceGuid.PcdQ35TsegMbytes + gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiS3Enable gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode diff --git a/OvmfPkg/XenPlatformPei/Platform.c b/OvmfPkg/XenPlatformPei/Pla= tform.c index a811e72ee301..e60478fdb493 100644 --- a/OvmfPkg/XenPlatformPei/Platform.c +++ b/OvmfPkg/XenPlatformPei/Platform.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -423,6 +424,8 @@ InitializeXenPlatform ( IN CONST EFI_PEI_SERVICES **PeiServices ) { + EFI_STATUS Status; + DEBUG ((DEBUG_INFO, "Platform PEIM Loaded\n")); =20 DebugDumpCmos (); @@ -433,6 +436,16 @@ InitializeXenPlatform ( CpuDeadLoop (); } =20 + // + // This S3 conditional test is mainly for HVM Direct Kernel Boot since + // QEMU fwcfg isn't really supported other than that. + // + if (QemuFwCfgS3Enabled ()) { + DEBUG ((DEBUG_INFO, "S3 support was detected on QEMU\n")); + Status =3D PcdSetBoolS (PcdAcpiS3Enable, TRUE); + ASSERT_EFI_ERROR (Status); + } + XenConnect (); =20 BootModeInitialization (); --=20 2.31.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 (#79965): https://edk2.groups.io/g/devel/message/79965 Mute This Topic: https://groups.io/mt/85267094/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- From nobody Sat May 4 18:07:53 2024 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+79968+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+79968+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one); dmarc=fail(p=none dis=none) header.from=hpe.com Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1630373510655833.4205038274488; Mon, 30 Aug 2021 18:31:50 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id ze50YY1788612xeLX6yQBr0V; Mon, 30 Aug 2021 18:31:50 -0700 X-Received: from mx0b-002e3701.pphosted.com (mx0b-002e3701.pphosted.com [148.163.143.35]) by mx.groups.io with SMTP id smtpd.web11.6331.1630373497425319212 for ; Mon, 30 Aug 2021 18:31:49 -0700 X-Received: from pps.filterd (m0148664.ppops.net [127.0.0.1]) by mx0b-002e3701.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 17V1IriE003321; Tue, 31 Aug 2021 01:31:36 GMT X-Received: from g9t5009.houston.hpe.com (g9t5009.houston.hpe.com [15.241.48.73]) by mx0b-002e3701.pphosted.com with ESMTP id 3arpqs8jnr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 31 Aug 2021 01:31:36 +0000 X-Received: from G9W8455.americas.hpqcorp.net (g9w8455.houston.hp.com [16.216.161.94]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by g9t5009.houston.hpe.com (Postfix) with ESMTPS id B5E565C; Tue, 31 Aug 2021 01:31:35 +0000 (UTC) X-Received: from G1W8108.americas.hpqcorp.net (2002:10c1:483c::10c1:483c) by G9W8455.americas.hpqcorp.net (2002:10d8:a15e::10d8:a15e) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Tue, 31 Aug 2021 01:31:35 +0000 X-Received: from NAM02-SN1-obe.outbound.protection.outlook.com (15.241.52.10) by G1W8108.americas.hpqcorp.net (16.193.72.60) with Microsoft SMTP Server (TLS) id 15.0.1497.18 via Frontend Transport; Tue, 31 Aug 2021 01:31:35 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cpL4h7mO+GYK3Ou0xcRpOWfWYwz13DZrYx/bQvpR2oMLs9tK+f2u1Ln5JYMt95TciXyTtHLLTJy/JxiwaPRPm5bxNYnSY/q0xpdeWT02m4lO/OOFErtLvYdYbukOO42p9hMPAvHxRfuBjJoV/Vype34HRvfwOanKgqgUastJLvu/+LJeINyLTOBim7kqM8OZR3b9n1CJVsgN20BM5v/aAuXCSLZw6yd/uJeMQcw+RbPI82fsa0C6pp6Cp1P9ckzckCuVu4hN/d6ru6o/MTMYOnIZfiWtPkptaLmigpvpb6F4HGBmEa3XYxHCs7ZZ2SnsnXX2xOKaxzCJ4/7w+4x7jw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=wgx4U3rYjglbg2vTYtnExLchpUkF54eCiA3VvVgMbtU=; b=H8GwL40W1ac/cZGEpwAS5Lln8DORel7dOrcCT93ZgMtkpdfg5EEe/ITkbJ4gPLZLA/+/kh2j7K57i7PHybHWcf0ZORfMpuNGZbt/bK1lq7EUL6b4Tz79Nm4cjs5nxnNA/szHOVWZpZVNaVrs4+8JcpLtpwdJu7dpvmWSuix26noulx7To8YSoT/YseBTjOkCx2INcUzreZtAUuGWpw+0n70Qi/H+HRNZiwqHzDR9DvAEZvYQuKOOYC7461ugJGGJzR1lI4YPSTuu7vCK8X+vnInYF4ajjlkgZoHPM/wiT0kw7aAYiSdmi83VxU6YN6EjrmnrXYUm5daaOWjJqLattg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=hpe.com; dmarc=pass action=none header.from=hpe.com; dkim=pass header.d=hpe.com; arc=none X-Received: from AT5PR8401MB0387.NAMPRD84.PROD.OUTLOOK.COM (2a01:111:e400:741f::21) by AT5PR8401MB0355.NAMPRD84.PROD.OUTLOOK.COM (2a01:111:e400:7425::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.24; Tue, 31 Aug 2021 01:31:34 +0000 X-Received: from AT5PR8401MB0387.NAMPRD84.PROD.OUTLOOK.COM ([fe80::106b:abb8:386b:a2db]) by AT5PR8401MB0387.NAMPRD84.PROD.OUTLOOK.COM ([fe80::106b:abb8:386b:a2db%9]) with mapi id 15.20.4436.019; Tue, 31 Aug 2021 01:31:34 +0000 From: "Lin, Gary (HPS OE-Linux)" To: CC: Ard Biesheuvel , Jiewen Yao , Jordan Justen , Jim Fehlig , Joey Li , Philippe Mathieu-Daude , Gerd Hoffmann , Jiewen Yao Subject: [edk2-devel] [RESEND PATCH v3 2/4] OvmfPkg/LockBoxLib: use PcdAcpiS3Enable to detect S3 support Date: Tue, 31 Aug 2021 09:31:13 +0800 Message-ID: <20210831013115.23110-3-gary.lin@hpe.com> In-Reply-To: <20210831013115.23110-1-gary.lin@hpe.com> References: <20210831013115.23110-1-gary.lin@hpe.com> X-ClientProxiedBy: HKAPR04CA0008.apcprd04.prod.outlook.com (2603:1096:203:d0::18) To AT5PR8401MB0387.NAMPRD84.PROD.OUTLOOK.COM (2a01:111:e400:741f::21) X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from localhost (111.240.119.140) by HKAPR04CA0008.apcprd04.prod.outlook.com (2603:1096:203:d0::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.18 via Frontend Transport; Tue, 31 Aug 2021 01:31:34 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9558a681-004e-4e19-8736-08d96c1f11a1 X-MS-TrafficTypeDiagnostic: AT5PR8401MB0355: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:663; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Message-Info: DlHqFeUsZfrYQmTQKks2LV1HHQ0l/VVq98+AelWPNaRCOzXkmlSyExza6ooilDp/URQGDAzXhFxAGwmFTqO8HvhOIvM+cfVWe7SJaqY55M2KHozLxWludJaz1zb9wxUvwk2oFX/WlbX0FWBLNwMA1eub0PDT0WuPZ2/AO6nRiCsGqKXL3/oHE5Im+ulQvZko3b+WMeYY3PBV5nORGpquQp4bcQHANlRv2SXGniJFaxk9/a3Cn49lcwrb+p5Lcdlf6COeF8qs6cj3XLsVKBksS8tFkgqSqvyy9YJCdtq9Uxgwy4/AlIzvD94dxeZSVbRQ4Aa6PC1KS7+f4NJGB6lkSLKqzEJdav43r84V/ebTwLi9Ekasec7em67c3kaSAloNIed/iA41IENTJoENa2+y6fmwCwCct2noUEGl+uw/WzUu/7j7k3ImaJAVbqNbKPJSeI3L2BTRdhoqS2zWa1iMR14x1+3yaKHFCgoqBaDOZZeimGgOJys+W7AK+0TOyAFf3npREbjHmL22JDNgKhO4VtgPD5hW24fKPGLX+Vs4ChFduB2/zMbhlngSJJD6+6isRmb0IAxWrlV8k0fsbYwQkVUz5u5P0Y+l57N6Packz8l85y5liLJ/b350q73sJHnNfMKrKbb5Y2Z+KNS3UjHyReIljA71eefjlyf/x+jwW4bsMklRofkUHQySk+576N18kW0bI3xloca6jUTtCKD8KY0cSaS1viZZ15u3AGAi1Ho= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?lgWjtQtGF6mvOSGmkDPF9+wKxMQvTcuQmNJS6QPrQ4rYDh/EQKgvhQjoR/6/?= =?us-ascii?Q?5YlngWTpktmIHAEdrCyH+cIQH3VetvpC6powF+iazJOdz4QpnWHatVrLxPHw?= =?us-ascii?Q?lKLolVSVD5olsRhpIf9WzY3v9zkRkmAblODuuDaR8qNgdp4j/wkWvLK1er25?= =?us-ascii?Q?whZRsVY7zZQLOk/rhOFp9VxtIfDRld3AiDt4wOzZeY+lVMJW6ECXkJiHECGn?= =?us-ascii?Q?kL0WwofWWawpcKx/ngNEa8fnlluBioGZYGtzkfM14YkoemHZU9trr+AXWkOu?= =?us-ascii?Q?ctXXC8eKVyvZ9Tr/Du7Qtpjl0ZMLFMHL7PqrB7/KNeX0XSXNpxnyvVXLQjme?= =?us-ascii?Q?JKFYUbIHYcvVbp6j+Db5maacG4xuxzB5tHLkdi1qRFsksKsZHQ4hFFMpJEA/?= =?us-ascii?Q?yB8wVoZZXOje0ctfAD9jimQb/KCLpuTh25wUqFbqHBJe3PVx9cKcjVcjo92u?= =?us-ascii?Q?fmzcl7XQ4fCqj4sA4Z9tDyxJ0Sy0eCIQ2w8zUCgNt8qQng20n0oxv6CGKKeq?= =?us-ascii?Q?s7l5XhtIERSPM0+/ibAwt6h3l7weFqvncyFok7+7Zhzl7db2seCTYiHuy4Nz?= =?us-ascii?Q?XK4AMgTk6TGXVGOSk0b6IirumD1dVaa3YG5jEI2tm8TnRRh3W3RsyZUrJt2s?= =?us-ascii?Q?uP+Fu4cRyKY/NwLeAfFqvzwUQWW4dDRzV0byHiQ9PktFEaVFcfaWwmXnfQuj?= =?us-ascii?Q?QBAXN+iRi4tNd+Kv3XqWk4OdoaMGGlpo/ZokcWzNn3iiGQB2JNghvHlk5DE8?= =?us-ascii?Q?zufCfDMnFdw8nPz+HRrQbwCcPtQJeB5Tp6EudmWj8IFLyrVjfVWoi2Uqp57R?= =?us-ascii?Q?T4onwKKQ1CVn0nE1CR86qMGadl2wLY+p3L9x2WQJIu4bnzxeNq9AHddcTqJV?= =?us-ascii?Q?I54UOes0Ca7U0ap6uyhYzXF5py1SBsGEIV+ucXsLHKwCJZkrYUYOpuDqJeFY?= =?us-ascii?Q?o0YXB6vF3SfIwd8hLmfzcv1J5l2sJCDk39xL/AjrCEkT/7Jk1iCNhNlv5YmU?= =?us-ascii?Q?HEORrtjzZnQJOAp+luZ2GXQOcwUcXCzRrzqjhqIStjdOu+f53evdbRvBeKlX?= =?us-ascii?Q?/is/Ot5gslyZXZY4iqEp3mZtLmgt3FHcTwoNL6w3kZ4acKKWh5ejLUubwqdg?= =?us-ascii?Q?1bXOJZrCUSSuNX09ep+2WmS5NONC1LQ4EN/i0F6WGLaH+R2hShpVEJbZHEb0?= =?us-ascii?Q?y9cXIIiZAFmJposLxJ+c6oA3KFjGjpCV6rjjc+13Zr0GE2Mbt+uDeaMwpnWG?= =?us-ascii?Q?3XVmL+K6hEb8+BulpQbzWNtMu6pYaA7+d63ZiSVVGcluJZKffaEf8Cx7VOPT?= =?us-ascii?Q?VzEyFwHdHiKP5oX+3Ifo9XBw?= X-MS-Exchange-CrossTenant-Network-Message-Id: 9558a681-004e-4e19-8736-08d96c1f11a1 X-MS-Exchange-CrossTenant-AuthSource: AT5PR8401MB0387.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2021 01:31:34.6699 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 105b2061-b669-4b31-92ac-24d304d195dc X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: U3GfM8+RKAYNfRdrUaYfSRo4bEAcf7vd9qoA4IMi+ARXOGNcOQjI76g6epL1GqeSAmENduETmojGQfUl4cuNgQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AT5PR8401MB0355 X-OriginatorOrg: hpe.com X-Proofpoint-GUID: fS4-nGKetWRnNNGsfPWVzY4_Hshw-1q8 X-Proofpoint-ORIG-GUID: fS4-nGKetWRnNNGsfPWVzY4_Hshw-1q8 X-Proofpoint-UnRewURL: 0 URL was un-rewritten MIME-Version: 1.0 X-HPE-SCL: -1 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,gary.lin@hpe.com X-Gm-Message-State: XD9MQbaomAIY6qFpmtUadwv3x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1630373510; bh=7oEoZJJGF7eE8NQIt71DISEn21dHcNkCKP+AxDla+Ng=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=AFzcoOSZ8OAKOHN6JVv2anKvFKYovS1MC6kEC68fEvGbTiwFyn+1FeN03h0iw1me+Lv EvH0bwX2+SZDFxkoL2pJxBVEJJUhyw14ReXsR1cVa1zDO8IXaztSR/dAsLL0cqkKooDvT BmNdKIJjdLqHHMvBItC8WoL8eYtdBkWz060= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1630373512711100005 Content-Type: text/plain; charset="utf-8" To avoid the potential inconsistency between PcdAcpiS3Enable and QemuFwCfgS3Enabled(), this commit modifies LockBoxLib to detect S3 support by PcdAcpiS3Enable as modules in MdeModulePkg do. Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3573 Cc: Ard Biesheuvel Cc: Jiewen Yao cc: Jordan Justen Cc: Jim Fehlig Cc: Joey Li Signed-off-by: Gary Lin Reviewed-by: Philippe Mathieu-Daude Reviewed-by: Gerd Hoffmann Reviewed-by: Jiewen Yao Tested-by: Jim Fehlig --- v3: - Add the bugzilla link --- OvmfPkg/Library/LockBoxLib/LockBoxDxeLib.inf | 3 +-- OvmfPkg/Library/LockBoxLib/LockBoxDxe.c | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/OvmfPkg/Library/LockBoxLib/LockBoxDxeLib.inf b/OvmfPkg/Library= /LockBoxLib/LockBoxDxeLib.inf index 38bcc577084a..9140b1ba9de9 100644 --- a/OvmfPkg/Library/LockBoxLib/LockBoxDxeLib.inf +++ b/OvmfPkg/Library/LockBoxLib/LockBoxDxeLib.inf @@ -33,8 +33,6 @@ [LibraryClasses] BaseMemoryLib DebugLib UefiBootServicesTableLib - QemuFwCfgLib - QemuFwCfgS3Lib =20 [Protocols] gEfiLockBoxProtocolGuid ## SOMETIMES_PRODUCES @@ -42,6 +40,7 @@ [Protocols] [Pcd] gUefiOvmfPkgTokenSpaceGuid.PcdOvmfLockBoxStorageBase gUefiOvmfPkgTokenSpaceGuid.PcdOvmfLockBoxStorageSize + gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiS3Enable =20 [FeaturePcd] gUefiOvmfPkgTokenSpaceGuid.PcdSmmSmramRequire diff --git a/OvmfPkg/Library/LockBoxLib/LockBoxDxe.c b/OvmfPkg/Library/Lock= BoxLib/LockBoxDxe.c index b28ad4d2dba7..7dc2eea2395a 100644 --- a/OvmfPkg/Library/LockBoxLib/LockBoxDxe.c +++ b/OvmfPkg/Library/LockBoxLib/LockBoxDxe.c @@ -12,8 +12,6 @@ #include #include #include -#include -#include #include #include =20 @@ -117,7 +115,7 @@ LockBoxDxeLibInitialize ( =20 Status =3D LockBoxLibInitialize (); if (!EFI_ERROR (Status)) { - if (QemuFwCfgS3Enabled ()) { + if (PcdGetBool (PcdAcpiS3Enable)) { // // When S3 enabled, the first driver run with this library linked wi= ll // have this library constructor to install LockBox protocol on the --=20 2.31.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 (#79968): https://edk2.groups.io/g/devel/message/79968 Mute This Topic: https://groups.io/mt/85267101/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- From nobody Sat May 4 18:07:53 2024 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+79967+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+79967+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one); dmarc=fail(p=none dis=none) header.from=hpe.com Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1630373509878783.2910327997221; Mon, 30 Aug 2021 18:31:49 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id c6R2YY1788612xLitfmWxGoq; Mon, 30 Aug 2021 18:31:49 -0700 X-Received: from mx0b-002e3701.pphosted.com (mx0b-002e3701.pphosted.com [148.163.143.35]) by mx.groups.io with SMTP id smtpd.web08.6536.1630373504708306601 for ; Mon, 30 Aug 2021 18:31:49 -0700 X-Received: from pps.filterd (m0134425.ppops.net [127.0.0.1]) by mx0b-002e3701.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 17V1J81L026505; Tue, 31 Aug 2021 01:31:43 GMT X-Received: from g2t2352.austin.hpe.com (g2t2352.austin.hpe.com [15.233.44.25]) by mx0b-002e3701.pphosted.com with ESMTP id 3arqcv09px-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 31 Aug 2021 01:31:43 +0000 X-Received: from G9W9210.americas.hpqcorp.net (g9w9210.houston.hpecorp.net [16.220.66.155]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by g2t2352.austin.hpe.com (Postfix) with ESMTPS id C0E0885; Tue, 31 Aug 2021 01:31:42 +0000 (UTC) X-Received: from G9W9210.americas.hpqcorp.net (2002:10dc:429b::10dc:429b) by G9W9210.americas.hpqcorp.net (2002:10dc:429b::10dc:429b) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Tue, 31 Aug 2021 01:31:42 +0000 X-Received: from NAM02-SN1-obe.outbound.protection.outlook.com (15.241.52.10) by G9W9210.americas.hpqcorp.net (16.220.66.155) with Microsoft SMTP Server (TLS) id 15.0.1497.18 via Frontend Transport; Tue, 31 Aug 2021 01:31:42 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Bs29tcfsk5Nf5oE+abd5T8xukNwzJes8yriCskU0Wpu9ZoV2uY0z6anmZBaP9PYqCP23Hflv3B6oGxzAAjvTmjzv/4HBMj88ujLe5ZwOl3lMbpfWHZaH4vVxjGrT8aBo7V1mSUGPRDb+K9Jdd1B2r1s0P5T3VLh7N9/beC/f+ZjS75LTe/f1tOlgO8n6AAdzHPee0M8nvAqvwftt1uOSfzwau00YGBh3RALFST9z/dcDSeSijA5M4twTv8hXh9OIC08qdI8YUHWOQbml2e3YSOKr32fKCaWQGeGnhu1pb4F/TqESpFePxkyXHYhlUHYVWiZ5tLO+W+u8+8MYBIv7aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=XXXVZTk8LlnNdxp+J8Edrv0SsQ6o1xVzYG45tb4fQEE=; b=OYPOyUwQiUP8yGbl54M59sB22JYFbx6AdXKUpjJHIV4q/JblM6wt/ph376g6B9BImsHSiNkgzDWsGBeUtPb9qpzUwJtICIliL3EqMvOU1R5ET3VHDIjgppqnodHeVnHUTBxl/F8yz2ddIYVz3AD71bAW0x1pbJada3n94eTMtlv8p0pfM0pcmaAuNOuTNCMscx5KCycvWW6OJpTQv8XoOTvAA/wF2DIafnbhHZyQv64XHBPwpoixmyomW3cwTfi0Fp/3/w4WTDcJFtNDlTcwNQYcQD0h/3oRqUJlPusbF0RsDdY40xhZmgEQmqlYYlCw56hbU0P2bGS4ccN04mxjJg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=hpe.com; dmarc=pass action=none header.from=hpe.com; dkim=pass header.d=hpe.com; arc=none X-Received: from AT5PR8401MB0387.NAMPRD84.PROD.OUTLOOK.COM (2a01:111:e400:741f::21) by AT5PR8401MB0355.NAMPRD84.PROD.OUTLOOK.COM (2a01:111:e400:7425::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.24; Tue, 31 Aug 2021 01:31:41 +0000 X-Received: from AT5PR8401MB0387.NAMPRD84.PROD.OUTLOOK.COM ([fe80::106b:abb8:386b:a2db]) by AT5PR8401MB0387.NAMPRD84.PROD.OUTLOOK.COM ([fe80::106b:abb8:386b:a2db%9]) with mapi id 15.20.4436.019; Tue, 31 Aug 2021 01:31:41 +0000 From: "Lin, Gary (HPS OE-Linux)" To: CC: Ard Biesheuvel , Jiewen Yao , Jordan Justen , Jim Fehlig , Joey Li , Gerd Hoffmann , Jiewen Yao Subject: [edk2-devel] [RESEND PATCH v3 3/4] OvmfPkg/PlatformBootManagerLib: use PcdAcpiS3Enable to detect S3 support Date: Tue, 31 Aug 2021 09:31:14 +0800 Message-ID: <20210831013115.23110-4-gary.lin@hpe.com> In-Reply-To: <20210831013115.23110-1-gary.lin@hpe.com> References: <20210831013115.23110-1-gary.lin@hpe.com> X-ClientProxiedBy: HKAPR04CA0007.apcprd04.prod.outlook.com (2603:1096:203:d0::17) To AT5PR8401MB0387.NAMPRD84.PROD.OUTLOOK.COM (2a01:111:e400:741f::21) X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from localhost (111.240.119.140) by HKAPR04CA0007.apcprd04.prod.outlook.com (2603:1096:203:d0::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.17 via Frontend Transport; Tue, 31 Aug 2021 01:31:41 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 12c9ddea-01e4-4f9b-39cb-08d96c1f15d9 X-MS-TrafficTypeDiagnostic: AT5PR8401MB0355: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:843; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Message-Info: EPHclHyrHxkLYV7xmP1kyeOYbJ7iq2wihIPVv0de/Mo+BGWry7OvZOn+TkZik0Tqf1yF56oLBykoI9O/61XjA0H8wjtT9+wv76CJwfxznispqouw0xV64ypV3IZwV0mcJTNHrYemQZ4x2oabyuTDprcaRU9d+PKxbxVg3fBtoxaLrbaZ6e3b+od9C1HKpXgrsGwcwIxAn1m0OY5DnO0r88ZPSIdMP1Vo8sGPvYczKyaO5JK3jl/fpk/jmNScTiiuWEVTViaHvg0KJSqCnU2I9go6DzS9yjvFs+Qroaq6w+zyWZTlI2RphNCCWOSsacUitArMUwvPEC8LS+a8OmCW7QpR2BlBVk4huCEWVYykB7wsgsz40TbgxgWW42O44bly8In2IJF1bQr6VAHbP4Gaycep46vIdAg9L9951gIq+LAYblC86SMBnUimIjA4MyNrzBV6vDFcSShDDJOzETPe+BAaqPqU9FtvA18bHSQh/ZvXCU82+OAKEMlXLjtDghAdSRJfhLWMgoS2bZHZkg/oMBYlRJHCJzApEAvJTkm4KoIYuQdvrNsWuFvl5i2rRiyASNN8rFiny61g9SmCdOKiMisRs/4/BkYG+tVtXBcV8GMRVjtSzXx8N25ei5MOju7ah5yuaPrHLfO3sSt4a6vLCzQXcm9UkMEiOKDai9yJSC1Sb5MDBgVmdR+RqbZg3etkI1jTvSesO8Z8BWhFev2g7Fuw2Seci5FZq44JGqBFqTU= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?M8jtn0ghDSJID3c9KohGvZ6+5EYjnWjBjUduUmjP6y/c1RHyJPEIW7pd4D4n?= =?us-ascii?Q?0h4qPC2hmBFnj9vVuDHj2Gapd6Pc9PoxH0hibt7qYdG1OdXxBql+tl3IAN/d?= =?us-ascii?Q?MAEtOmBZ4RCLpBdKaSRz6s9gjppFcdscQpsqsBjzMo4XektCYH/sQ9/5lGcf?= =?us-ascii?Q?DivBAf6IyOg227viyHaVTEEXo4tKrB3KwH4ULudOySHLza2X3V3fIfG6L2+J?= =?us-ascii?Q?kgl2qmkQ/WR5taG/UCWIJiiM2LZhz+bgCiItLPOf6JQ+31amCeC49BG0EGrc?= =?us-ascii?Q?0BMx1vZbAQiMA9HFjVwyrkng+UaCM/sDjFrezEBPl/hDYRs/kKuHF0nYaCUA?= =?us-ascii?Q?XHAA7GzmR7iTM74lTgWnu1oUqOWe4UqxfG21x3KC1gFhySOk0ssYlM0ioviG?= =?us-ascii?Q?Dest6YgWXTtb7TcHG0ccUiRF2Wm7M6GW0tG9vbrc4yjuoUd928NOvB3fa1tH?= =?us-ascii?Q?jVMvByupaEDXSEgsVL/GucsR5+QIUPRkNFJttCvyfR2pTorF0dRKW6VH3fe5?= =?us-ascii?Q?znul0GPNP1uBxi7h1AftkoWsNG3EQrokvev8hpUbBcyRGy028LKvJj403uJT?= =?us-ascii?Q?7lNNn0rKiI6QMv5IYa2wi2ngGcG+dYVh+jUx+p6yov0oOM3k+qO6tF3V6xPn?= =?us-ascii?Q?wZRxAc1RrpTbmA9bmDJM/fvnrEOYGmyP5LxUw5VfiSSFjUUBnpj0ZTK1cWdC?= =?us-ascii?Q?W1HizjlpdVZPSCUvtqI0It982irDwGJN3+0D6scEe/BYpPy3zozvlOulAfh6?= =?us-ascii?Q?hIleQCekFYrnKUtnIaPotkaqnfFxguUW8xpDMmsu5ESlx7Taensh/N6AeTdP?= =?us-ascii?Q?Gt0GPFBedLGSoiMQyeph8ufjxtXyd4Al9zMlyu7kCGpyEGxptn8l4PdJvHQh?= =?us-ascii?Q?CQ6fVIL6480jACvIQyHNBSqkU/dgX3Z/mPIaxPme95TEBug58Ijod17PSTux?= =?us-ascii?Q?zgiDarQdO9s+/l5xK1/71z1+oYS2dfT0wyM2AeRakltJ5wH+r63F45Atn8ta?= =?us-ascii?Q?hy4d96BcChpS/SUoOwPUMVy9rbYuFAou4T96BtOUQIp9loarH4g8f4/oGsto?= =?us-ascii?Q?6a5u6vi1mkwzFdUOFRm381daBN45ZJ9OpiiunxkcnfIuHbxVpsaXSl7dDc2g?= =?us-ascii?Q?aPHcMmqvXa7WWQENKOYanoPzNZJTKDW9yw8v7sxH+HzEr7Z8RcdkUw/zqjqA?= =?us-ascii?Q?p2+2fWa6z2Ze4fZprMKDiq1lu+bSEmqQMwkNp116kN8T8GsaUsQbWiLdB9XI?= =?us-ascii?Q?EG6GtTfj47U9f5x9kv0X7ZCQxBF36+vwRFby/4tHXcAohF7MsN1pu088THrs?= =?us-ascii?Q?J/1vKIKqc3f8JZS94lAKlmyM?= X-MS-Exchange-CrossTenant-Network-Message-Id: 12c9ddea-01e4-4f9b-39cb-08d96c1f15d9 X-MS-Exchange-CrossTenant-AuthSource: AT5PR8401MB0387.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2021 01:31:41.7178 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 105b2061-b669-4b31-92ac-24d304d195dc X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: VRD+MYF62JVCmSCliHodSBNVnL0uYaNitM02tYflmYCf9YY7j0oHWXjsDKjZ6h4VHJ0VaeVkTsC6qbBcLY17yA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AT5PR8401MB0355 X-OriginatorOrg: hpe.com X-Proofpoint-GUID: VjrdRCgc7RMzddN5I7EikHvS18fDwwVR X-Proofpoint-ORIG-GUID: VjrdRCgc7RMzddN5I7EikHvS18fDwwVR X-Proofpoint-UnRewURL: 0 URL was un-rewritten MIME-Version: 1.0 X-HPE-SCL: -1 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,gary.lin@hpe.com X-Gm-Message-State: hOWQNkC4CPP5qHPPFEEWPGPsx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1630373509; bh=xLUJkH7Md6CPoeWYP39Ptvqhx1Vr5NlmuRnJTuyM/7I=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=tWYQ6yU+RAdS+2K6ocuhQ61ctnh7QPJ89aHUxnwcAfvHA/n6+0Zc05HbE3azaWaFKcs xdvrcEW+X7ivbgPfYdmiv3F0WUnjVMPS3HIvCxfQw80pvNqHlR8vUEOU0IM16kQcYOl6t BW4qx05q9+c3F908ur+UjMgfUK4EWPJ990U= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1630373510651100002 Content-Type: text/plain; charset="utf-8" To avoid the potential inconsistency between PcdAcpiS3Enable and QemuFwCfgS3Enabled(), this commit modifies PlatformBootManagerLib to detect S3 support by PcdAcpiS3Enable as modules in MdeModulePkg do. Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3573 Cc: Ard Biesheuvel Cc: Jiewen Yao cc: Jordan Justen Cc: Jim Fehlig Cc: Joey Li Signed-off-by: Gary Lin Reviewed-by: Gerd Hoffmann Reviewed-by: Jiewen Yao Tested-by: Jim Fehlig --- v3: - Add the bugzilla link --- .../Library/PlatformBootManagerLib/PlatformBootManagerLib.inf | 1 + OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.= inf b/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf index e470b9a6a3e5..c249a3cf1e35 100644 --- a/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf +++ b/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf @@ -61,6 +61,7 @@ [Pcd] gUefiOvmfPkgTokenSpaceGuid.PcdEmuVariableEvent gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFlashVariablesEnable gUefiOvmfPkgTokenSpaceGuid.PcdOvmfHostBridgePciDevId + gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiS3Enable gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate ## CONSUMES gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits ## CONSUMES diff --git a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c b/OvmfPkg= /Library/PlatformBootManagerLib/BdsPlatform.c index b0e97429372b..71f63b244828 100644 --- a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c +++ b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c @@ -379,7 +379,7 @@ PlatformBootManagerBeforeConsole ( // EfiEventGroupSignal (&gEfiEndOfDxeEventGroupGuid); =20 - if (QemuFwCfgS3Enabled ()) { + if (PcdGetBool (PcdAcpiS3Enable)) { // // Save the boot script too. Note that this will require us to emit the // DxeSmmReadyToLock event just below, which in turn locks down SMM. --=20 2.31.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 (#79967): https://edk2.groups.io/g/devel/message/79967 Mute This Topic: https://groups.io/mt/85267099/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- From nobody Sat May 4 18:07:53 2024 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+79969+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+79969+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one); dmarc=fail(p=none dis=none) header.from=hpe.com Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 163037351602886.51347818172292; Mon, 30 Aug 2021 18:31:56 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 8JxcYY1788612xjIPZqMnng0; Mon, 30 Aug 2021 18:31:55 -0700 X-Received: from mx0a-002e3701.pphosted.com (mx0a-002e3701.pphosted.com [148.163.147.86]) by mx.groups.io with SMTP id smtpd.web12.6338.1630373511240261200 for ; Mon, 30 Aug 2021 18:31:55 -0700 X-Received: from pps.filterd (m0134422.ppops.net [127.0.0.1]) by mx0b-002e3701.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 17V1Hdva015098; Tue, 31 Aug 2021 01:31:51 GMT X-Received: from g4t3426.houston.hpe.com (g4t3426.houston.hpe.com [15.241.140.75]) by mx0b-002e3701.pphosted.com with ESMTP id 3as6xj9b9g-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 31 Aug 2021 01:31:50 +0000 X-Received: from G2W6310.americas.hpqcorp.net (g2w6310.austin.hp.com [16.197.64.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by g4t3426.houston.hpe.com (Postfix) with ESMTPS id 3B26459; Tue, 31 Aug 2021 01:31:50 +0000 (UTC) X-Received: from G9W8454.americas.hpqcorp.net (2002:10d8:a104::10d8:a104) by G2W6310.americas.hpqcorp.net (2002:10c5:4034::10c5:4034) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Tue, 31 Aug 2021 01:31:49 +0000 X-Received: from NAM02-SN1-obe.outbound.protection.outlook.com (15.241.52.12) by G9W8454.americas.hpqcorp.net (16.216.161.4) with Microsoft SMTP Server (TLS) id 15.0.1497.18 via Frontend Transport; Tue, 31 Aug 2021 01:31:50 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Kn9vaJ04UfVCYyUR9qI59hCWMRoCjYvCnAEFSD+5ZwfMAGjeSo91GsMiZs29uRZRG1SUq2CBQ5Y6TF0f8nqINaSFEV8NMYGJ+VL6UZP5hPX181SkJrwLiAy7Rot5WwskWEp+lbeKdMNzrBIQpFQlbBZ09eQ2nBTjGxIjElL+cBJlp4X/0/LVDVW2fPpbyV6E6eR3r/i+dpN46G0e9ifwHqrknzWHX9jdL+d/w8dDlBfuUqLFIpijBDBGXrE+2trH8tog1F+59MKjnUd2hjbOBq8gG2TC991Sb3atNIRKE4uS8fCda8BVGfzxTEta6DICK0B6InPQcd58/kelz7FcyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=15ravEoEwFue5O54PLUXf6syYfMB6ItJcpaBwbHNLtE=; b=WLNh5CLx1RyjFtarYYcyYeYI/IJIlNrDQN0t3HjlgD/1rkwqVk2/19ek+nWie+m3lvQ1Vh3UlLjk3zvGlaTyQ4A7cUi1Q3/e3BhoBMFeEMfGy/39yvzpWMFDe091TYC4PF3PeTHfdrGTFa0T0jOmyxs09+pg7bteLXSJdkBx56ZeSz5RhWocGN+PGriYCN3BV9raUelV64ut88vEkK8/ofjmuIIFuCQ5kphka0y3jK8M3b4fWB0AB4HP/ymkr1DOhXBdi4apm8jPqY9z6guGZPxY7wnNFjFqKRYMQeugcUuTVy0AJ6v6uapITbQfJWV3U3+9oBd0Ft4AYwR/5l8xQw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=hpe.com; dmarc=pass action=none header.from=hpe.com; dkim=pass header.d=hpe.com; arc=none X-Received: from AT5PR8401MB0387.NAMPRD84.PROD.OUTLOOK.COM (2a01:111:e400:741f::21) by AT5PR8401MB0355.NAMPRD84.PROD.OUTLOOK.COM (2a01:111:e400:7425::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.24; Tue, 31 Aug 2021 01:31:48 +0000 X-Received: from AT5PR8401MB0387.NAMPRD84.PROD.OUTLOOK.COM ([fe80::106b:abb8:386b:a2db]) by AT5PR8401MB0387.NAMPRD84.PROD.OUTLOOK.COM ([fe80::106b:abb8:386b:a2db%9]) with mapi id 15.20.4436.019; Tue, 31 Aug 2021 01:31:48 +0000 From: "Lin, Gary (HPS OE-Linux)" To: CC: Ard Biesheuvel , Jiewen Yao , Jordan Justen , Jim Fehlig , Joey Li , Gerd Hoffmann , Jiewen Yao Subject: [edk2-devel] [RESEND PATCH v3 4/4] OvmfPkg/SmmControl2Dxe: use PcdAcpiS3Enable to detect S3 support Date: Tue, 31 Aug 2021 09:31:15 +0800 Message-ID: <20210831013115.23110-5-gary.lin@hpe.com> In-Reply-To: <20210831013115.23110-1-gary.lin@hpe.com> References: <20210831013115.23110-1-gary.lin@hpe.com> X-ClientProxiedBy: HKAPR04CA0002.apcprd04.prod.outlook.com (2603:1096:203:d0::12) To AT5PR8401MB0387.NAMPRD84.PROD.OUTLOOK.COM (2a01:111:e400:741f::21) X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from localhost (111.240.119.140) by HKAPR04CA0002.apcprd04.prod.outlook.com (2603:1096:203:d0::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.20 via Frontend Transport; Tue, 31 Aug 2021 01:31:48 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b6ce75c6-fdaa-4538-17e1-08d96c1f1a0f X-MS-TrafficTypeDiagnostic: AT5PR8401MB0355: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:525; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Message-Info: 09lfR1felQEQ0npeUTG8cDx3Znr7x5hBVMNw6r/oAPGcAnvWaNLiD/dnxb4GTWtOwPnANGa+I9pyRFNaIgcOldUkAf5ZhaxaDDk8K2sfntp9530hFzMGjDIdUVEDGru4/8b1n/dlSw6JMlEwcVQXNFw9FD55CUB1PrBdFvX5yveomMkDMsKUrPqM4azR9r0kigXEfAVSjaA8e6KCTIVREzCMQeXNbVBkHipN1SS1pPlaYFu1s4oMVkeMRiJcaohMsK1joKYnShNFqe+f7tan2JdBudczmDTEKvedr93uGsJ5jw8UfjWGBcSh7khOKY6/XwW3f6SKHtAUmhMYacis4Gn8i5xJZfsUrZHWMgOyeF6Y1Pmr6ChzmWBQIy91ttbY6RQDbPM8XhXzDPQDsuMJl62FF61O5bvfkE1UhzkPs/yY1FKMiglW9Uc/T6b5r/9UhLHa39zLCI0iRhV/DXpjNL6qcpcATg3BSOxtgxOllnNKac2KnBtxfVZIa4+VzqklcBWfijiWqhNamMxfCR2C09enSjdKoACEP7INeLmYXo8r3CGqN9h9K5ZrLTEpt4utyOJdhHmcY7ZfE5ALe0pD5fb3oS/Qgm5DmeF5eNxpUPn/xnXq7pRCd6OOpdrzkO2f3bbVkwhJYTOqficojJclLLqnlvlVQibqrSeDyUcWsraQWMIz1RgcRAhLDZqg+4qB+vr7XPSfKEEMZM6Zo9PvLSPYXAhBvlf/2z451zgfiNs= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?rR6soJDodzAubnblFzPb88NTHbc0OhM4sA+KtURZhwBBv0ERi22fKAyaU3yG?= =?us-ascii?Q?T6KlvK5VywrBEvID5J3vCq9Jvqm71T149xnpneVy9nuNDVUoTOdbWXjZ28MI?= =?us-ascii?Q?MLN/Ihz8PksbUlcwja+Q5L03bnJczkr2hBGpyAk6L6EmMbhC6+3G8XmUjAJP?= =?us-ascii?Q?DnRdH/CtuTHBDdy4jPDeZjuTJyADyPFF41TeDU/HRXqeDvShU+5EJGxR4Iwz?= =?us-ascii?Q?hgDb5QtzRUideWG8G4fIvmztALY08vCH37274GN7bOHsU4YKRK+0iiY/xNpE?= =?us-ascii?Q?2TWvUPgviHkkHc0LDpTf1rto6/9J6MbhgAmHScUxoLGFftIK+5gR8lVKQ9Z/?= =?us-ascii?Q?kZ47DN5zG8TciVV+jLj084QHAfiRUymZ2LUIPFjQHc/HRG7M9JI02SlNobKL?= =?us-ascii?Q?zzF2hMzzMJHO6iqZEnFnqHgkbLg+wv/VkmUguShf+Bfwx19Iizmz6+AmKKGL?= =?us-ascii?Q?w0rLUo1wDiy7wBJtnztF5zQcuxo4V/ImnwLyNOdh0klzDZpqSZ09ZjatXNqb?= =?us-ascii?Q?BLgC7+eBQeTrPgWKOciCVbMsAEoaRg5zaaU9BEwUNaTFQRe7QXnKg+b74BOI?= =?us-ascii?Q?pR5/ssWmF758OsXwT2Cbn6m40rN7dgWIxcJsQvjTY0LRVOBKhUxpVtPSUSv1?= =?us-ascii?Q?gPdYhFjLhMFepfEGAZO2FWY4Kiyo4SA96MtN9qW7RPeGWSLveWCogaYTjdPy?= =?us-ascii?Q?wbL5rFfVqRmWgFaTl68kS3jR9PXrxmnxGM3lABtbQATB7t6gNvfj128LV5YZ?= =?us-ascii?Q?g3KmwVXyTHIRjVL5ZCcirwpq2PvYRMJM7Pa701MsZXBstW7iCyEmUn1DGSzz?= =?us-ascii?Q?8J6Lh/tNhesJU0Xb24QAcAXuqsMVo0DlXtUJUj7auX7dEcTEwi1O6tUzmB6r?= =?us-ascii?Q?YgWq5JhK+9KmfcMIJWulxLsgMsCQg+ZN1IeTw0OCIfhPKerN/PPaazReUWd8?= =?us-ascii?Q?Lq2VCv3Xswvbk4UPYx1oy/Oi1CJ5iaCM7kdsIO/xcmoQbMLsuC4KigwXYWab?= =?us-ascii?Q?zK/O6zoPz+NgfwSO1NprFqEboLyqE1uuwlsPLz3tVTtsRuLz3nF9cncYeFiQ?= =?us-ascii?Q?PcCsGM+tKRACR3ZoiGem0NcMsqACQCLAtwMu7w0AhYSwliqvrI+flQTiiMjM?= =?us-ascii?Q?1TsqPzfUaWDfY+MpxZ16vVjXAFLOcH58La2EQ3LDV3uWluyBjWg0xFWQNalc?= =?us-ascii?Q?LT0uPJvy9gnz9mC+NhFXkp8hc5TSQmY33D6lCR/9iCdetjawfArbE8Hawt7F?= =?us-ascii?Q?J7y5Bbcun2TtINdXt3mKG9zo+Ua45ZiwSUmJvJCUeYBNqHQRkRDLtfOts1rL?= =?us-ascii?Q?rmDrAdgn3TyH4b7+RlAadgZG?= X-MS-Exchange-CrossTenant-Network-Message-Id: b6ce75c6-fdaa-4538-17e1-08d96c1f1a0f X-MS-Exchange-CrossTenant-AuthSource: AT5PR8401MB0387.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2021 01:31:48.7828 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 105b2061-b669-4b31-92ac-24d304d195dc X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: iTJ087qUWd8f3eiO8VaxzgpMHfN3+lw/qom7LY9n8UjN8Mx/8BdrEVbj/KN28Tfx+i46D5k/No2senQ8BZSeMA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AT5PR8401MB0355 X-OriginatorOrg: hpe.com X-Proofpoint-ORIG-GUID: VEnkYyKJgHwsxqjA_Bkb4BmUI0ju45Uy X-Proofpoint-GUID: VEnkYyKJgHwsxqjA_Bkb4BmUI0ju45Uy X-Proofpoint-UnRewURL: 0 URL was un-rewritten MIME-Version: 1.0 X-HPE-SCL: -1 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,gary.lin@hpe.com X-Gm-Message-State: zTdwtJEMA8ODVvFrAbGx1MZlx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1630373515; bh=Q6B1sw6338gWGmEhZzy+LUA0KzgrwusJEBUSuj2rC6I=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=duTbD9lnIcPaXp0ihb7mcJItKb/OZHKTGkrZpRkVajnljELoTc7S0aPt6yHQ7m9BRiU 6jc27UskhE0itpH8i1g9PypFDviPGTLvmJIJ7SnIituRqPGSwmYCS1SaGsFxw8KUA2tkv 25jwrx6jmOACCjSuW08prBQwMjyCrBQw8W0= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1630373517409100001 Content-Type: text/plain; charset="utf-8" To avoid the potential inconsistency between PcdAcpiS3Enable and QemuFwCfgS3Enabled(), this commit modifies SmmControl2Dxe to detect S3 support by PcdAcpiS3Enable as modules in MdeModulePkg do. Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3573 Cc: Ard Biesheuvel Cc: Jiewen Yao cc: Jordan Justen Cc: Jim Fehlig Cc: Joey Li Signed-off-by: Gary Lin Reviewed-by: Gerd Hoffmann Reviewed-by: Jiewen Yao Tested-by: Jim Fehlig --- v3: - Add the bugzilla link --- OvmfPkg/SmmControl2Dxe/SmmControl2Dxe.inf | 2 ++ OvmfPkg/SmmControl2Dxe/SmmControl2Dxe.c | 4 +--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/OvmfPkg/SmmControl2Dxe/SmmControl2Dxe.inf b/OvmfPkg/SmmControl= 2Dxe/SmmControl2Dxe.inf index b8fdea8deb84..4cad56516f49 100644 --- a/OvmfPkg/SmmControl2Dxe/SmmControl2Dxe.inf +++ b/OvmfPkg/SmmControl2Dxe/SmmControl2Dxe.inf @@ -39,6 +39,7 @@ [Sources] =20 [Packages] MdePkg/MdePkg.dec + MdeModulePkg/MdeModulePkg.dec OvmfPkg/OvmfPkg.dec UefiCpuPkg/UefiCpuPkg.dec =20 @@ -62,6 +63,7 @@ [Protocols] [Pcd] gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmApSyncTimeout ## SOMETIMES_PRODUCES gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmSyncMode ## SOMETIMES_PRODUCES + gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiS3Enable =20 [FeaturePcd] gUefiOvmfPkgTokenSpaceGuid.PcdSmmSmramRequire diff --git a/OvmfPkg/SmmControl2Dxe/SmmControl2Dxe.c b/OvmfPkg/SmmControl2D= xe/SmmControl2Dxe.c index 9547c202880f..be04baf7b288 100644 --- a/OvmfPkg/SmmControl2Dxe/SmmControl2Dxe.c +++ b/OvmfPkg/SmmControl2Dxe/SmmControl2Dxe.c @@ -25,8 +25,6 @@ #include #include #include -#include -#include #include #include #include @@ -238,7 +236,7 @@ SmmControl2DxeEntryPoint ( // mSmiFeatureNegotiation =3D NegotiateSmiFeatures (); =20 - if (QemuFwCfgS3Enabled ()) { + if (PcdGetBool (PcdAcpiS3Enable)) { VOID *Registration; =20 // --=20 2.31.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 (#79969): https://edk2.groups.io/g/devel/message/79969 Mute This Topic: https://groups.io/mt/85267102/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-