From nobody Wed May 8 15:50:21 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+79708+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+79708+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 1629702602159544.17556821407; Mon, 23 Aug 2021 00:10:02 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id BY2DYY1788612xYr37G5xby1; Mon, 23 Aug 2021 00:10:01 -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.20249.1629702592897015850 for ; Mon, 23 Aug 2021 00:10:01 -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 17N73iVY008781; Mon, 23 Aug 2021 07:09:50 GMT X-Received: from g9t5008.houston.hpe.com (g9t5008.houston.hpe.com [15.241.48.72]) by mx0b-002e3701.pphosted.com with ESMTP id 3ajtsvmuxr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 23 Aug 2021 07:09:50 +0000 X-Received: from G9W8456.americas.hpqcorp.net (exchangepmrr1.us.hpecorp.net [16.216.161.95]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by g9t5008.houston.hpe.com (Postfix) with ESMTPS id 0B0DC59; Mon, 23 Aug 2021 07:09:50 +0000 (UTC) X-Received: from G4W9120.americas.hpqcorp.net (2002:10d2:150f::10d2:150f) by G9W8456.americas.hpqcorp.net (2002:10d8:a15f::10d8:a15f) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Mon, 23 Aug 2021 07:09:49 +0000 X-Received: from NAM12-DM6-obe.outbound.protection.outlook.com (15.241.52.11) by G4W9120.americas.hpqcorp.net (16.210.21.15) with Microsoft SMTP Server (TLS) id 15.0.1497.18 via Frontend Transport; Mon, 23 Aug 2021 07:09:49 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ex3yl42y4OC1pIdhsss0WzloS49u6JfNyDwJ3v8A0mbGU/0w4GPcQM7YSoJCLdMC/7h9RfBtmwnEE3Q8rDOLhSvozk7LmIMJElr/y3YfGGQsu8XxhHujdHiw4gtMloGrkIgmhgUfleWbQV3oWf7d95ERFpR9zeubuvtSdbuA3Bvs9PBWShOpx2GZxY7D0MCqRhslahlQOVN6XkCcBpjCLI2B1aEMBWINQw3a3kuhnCwAkM44c1yrsxEf8Oka5KIGmynbK19Sf1G3/3ie7qP/myORrv87vpWUX01Ru5jjqVZERn05z9kWe1fri4fUl9eHJvop7z8FGtJMBL2CkQsnrA== 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=ZEAEWivEjYFB1vasRm10+/D4rLrIq38Rtio8l1UNsxg=; b=nCckhTGogG+ah9S6SHwh8vSsaZMrhbA7CHaL22WRog/9RJ3JwkUBgfAWBr321DMhKqFfzv5DcD9qgLvF94W6eoQnMA9yclZzeHWIid0QeT1rZO4mqR9WUYiKWgcAe8ELGk4rs62+XXdj/mv/93L1Fe4SDckYTDFRsUEZrCkKZGy1fZl+a8G6Ft/kTmhtZHPg7+90MsWpszEc5tTQTA+ws9RvDnYJa0SjgE4wqtaR8U+wI0i5iFm3NSQ2yXUqUYtNIRfkJSmWi3fok+B5FgdLG487U7kAWTPogCyOUYaXLdPRDd7aYYMw9oFdRPYaNbo0b96kUpVw9FPGyfD4nxPgHg== 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 AT5PR8401MB1106.NAMPRD84.PROD.OUTLOOK.COM (2a01:111:e400:7421::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.22; Mon, 23 Aug 2021 07:09: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; Mon, 23 Aug 2021 07:09:48 +0000 From: "Lin, Gary (HPS OE-Linux)" To: CC: Ard Biesheuvel , Jiewen Yao , Jordan Justen , Anthony Perard , Julien Grall , Jim Fehlig , Joey Li Subject: [edk2-devel] [PATCH v3 1/4] OvmfPkg/OvmfXen: set PcdAcpiS3Enable at initialization Date: Mon, 23 Aug 2021 15:09:22 +0800 Message-ID: <20210823070925.10095-2-gary.lin@hpe.com> In-Reply-To: <20210823070925.10095-1-gary.lin@hpe.com> References: <20210823070925.10095-1-gary.lin@hpe.com> X-ClientProxiedBy: HK2PR03CA0062.apcprd03.prod.outlook.com (2603:1096:202:17::32) To AT5PR8401MB0387.NAMPRD84.PROD.OUTLOOK.COM (2a01:111:e400:741f::21) X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from localhost (111.240.132.81) by HK2PR03CA0062.apcprd03.prod.outlook.com (2603:1096:202:17::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.5 via Frontend Transport; Mon, 23 Aug 2021 07:09:47 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9a733964-bd4d-4489-ee17-08d96604fe50 X-MS-TrafficTypeDiagnostic: AT5PR8401MB1106: 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: TD7cbegkcujFvOO55IZgemU+zjWCE9Bj7/mxbTwjKNmFZW7b/NClUmtwjhtfcwrDj66kcQ84Iv6QJhLGbaI0/dUwvoeGjIsyLnRccuvy+sQClx2I3IvVKQ/qFD/ZLGKcK7gY7gGRtSXRC8K2jiV4l+Uhq6Qjzq21i4kq+TOeIZCpcyUmhKzMpkvLsFlCSH/zp2L4/jqgIDK8jcLWLnOa2xE9IMeblPo1XFJmMvsksCdQa8THRH7ot+jAf+w8A2bWkMEIHZBmppP82J2nWXjo3EQLg0PfmLz8buk9jBPL7Oj2H23ih3yJQJca9Yz9K70JZUOGQcjxVPdI04+znv9F+Gk8sauRQqpM2w0S8SJ/MweQokc348lPnxW7QzYt21vf5I1qF5Fi2LogDq+7+pLRebID6/lfo+YHzfHwny+Ak5wcG9JQ7VRDCJn7kOJJmV208+xtiOy6xYNbVtQyypL/zNevJdGl7F68FYLxfUJa4/yxkmocmPH2/OQuxhD3iiQfBiHjc/zyICJdsT5Fp+9d/IP/kHzduiHJgyU7gB6nmnOfmiqLHAkylaKIvyrCMDOqT4wDv/p3848MHffpA6CLJzEFmMLILNYtZ8exnOuAhBmDZ85nS7SsRphPgeySzETTMeW2AQB2vkkku08ccFJust2bpDNVr1vY9HGvfxvm1zddTzirvyEGcIvLO8OrFKS4dTCm9HPUYgMsmtwP3ohUggw2MhSVTj6nDo3HgszPf9Y= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?HlcEzOh6Bmb7suyq47gqXa5nyQieTjgXoXiZpYSHtyvww+2TO05bF+fr28qC?= =?us-ascii?Q?NrSrbC/JhALkaU1nvdwwl+w3eboH/+DyGYUGYce2nFgk6WxE2u6zQcY2ZT/o?= =?us-ascii?Q?KYx48xblWpFHAy9uM5MEQd6n1e4Snr1+t36OZj71K2pvTF09Uclb+uzz4DpN?= =?us-ascii?Q?82Kxcu/yLzo+dYyiK0q/lzQ6NyGscpIa+De16YY9gOsTsxyPD4jQjJ/vN8cH?= =?us-ascii?Q?aYYbmm8Crpnf7jXFkOJD9hf9XlqqkVAcGzw1OaOIYBEsQ5eZXSQ86GxVrq1E?= =?us-ascii?Q?48IwSGt4AwXVOu+j7WWz98YMjdZgtwFGhDagFhHsqXpwN6REzhGJ3xCKPxTh?= =?us-ascii?Q?lhY7hW6qAyARS/9jKbEsCJSL0KAMx/ScN6CejGmfcFmNN2IryJoeErhCoN56?= =?us-ascii?Q?YTfZkR08p2sDyvJN1EIcMriSq6sLuElbrQy7LxZSyqoosGum5H7D9yuEDXvQ?= =?us-ascii?Q?7JQ9Mil+YcEc5XTxutjewc/KnDxXGvDvEFr0ZPHxquYvqu/jlkWu7CcDrh1t?= =?us-ascii?Q?5lynmx6SsT42pjKFaVU8SFzz+cVb8DOEA3k+0YqM3o09WHJFNqHTfxYwLkLB?= =?us-ascii?Q?kUsMfBB0qlW07koHOL4WRnF/7BrVSqMbaN5vJ7P2IcUFEPoWJ4O3utUE48V9?= =?us-ascii?Q?8XHe7iUjW8cu6ctvoPYNxCl2HsSN7bFruMfdN+SrdBqN4wa6Hp5OKziE9JqS?= =?us-ascii?Q?2mU4vOgQrhmpKkkDYRQixKLHPZ8F1D2DkgIZcVV9XhKRAjjEYsuBBfxv2nSZ?= =?us-ascii?Q?dzh504EZKhkm8uqfqpCX4oHQJInUqBz9vdfgd8n4rxyv+jIMFFpUXkjgPsXa?= =?us-ascii?Q?BwlhtnaUEFCat568R0nLG/wOqka1fQNEEXRIR1e6AkXluyDbj0XxshlKioHv?= =?us-ascii?Q?IOWWW/3xGpRiISiGvbEUxZtBDldtCUu2qiAoNQdD+g7fhp6JjnJxqtD8t4jU?= =?us-ascii?Q?SYqzJma4Y6p9JWHJObARWDtE2q/E2SvZswVTbwnE2QuS8s7jfRPqEFaKIj2G?= =?us-ascii?Q?o3LyPptuZMy9F4uhE1cp8X8/XYqtSu1KopcEvRedQefnatvTHNln+cEvL69G?= =?us-ascii?Q?++Jx4QRAHGIKkUivjniHCAG7v0btFqX2uv8/TPpJXHV6/mit/HqbrCb+4i8i?= =?us-ascii?Q?LVkOiMQeLWSR6d8pTmqBvA8qVeptc+UcmMe4JyPRql2S4UT8KAOmEbAA5Tu4?= =?us-ascii?Q?+OgTeApEw8RcbKoRqhJ/ir8DE90/wcmGGh+9hZL1xqgZM+1Z7bZ7v6L8X641?= =?us-ascii?Q?/NF0T9176NNFuxSsDa4HfOSruMmhAVT/bqUyNdBJ+/+d6WDaXmrcP1yU8xrW?= =?us-ascii?Q?hcDq4I1eq9F9HutjkVdSzQxA?= X-MS-Exchange-CrossTenant-Network-Message-Id: 9a733964-bd4d-4489-ee17-08d96604fe50 X-MS-Exchange-CrossTenant-AuthSource: AT5PR8401MB0387.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Aug 2021 07:09:48.3464 (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: gozxNkzDPjKm+bF2VG5ua3vPCywUWsZ+SQgGGLumXS36oS4qfT6uEzxyZs2/tjsU/6auHiprnpIRfG+ALT8ZTA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AT5PR8401MB1106 X-OriginatorOrg: hpe.com X-Proofpoint-GUID: 4jOqqRNYSddnjTNvKYC6MlQjRaHYBxxM X-Proofpoint-ORIG-GUID: 4jOqqRNYSddnjTNvKYC6MlQjRaHYBxxM 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: StmGjf810FTTJAWKxHwx2Rgtx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1629702601; bh=wnTeFiRHI4iwtyltpLHmtW198ytX5H+nq5mto7NqFWI=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=LCSPDdK13kB5W2BFHSTLCmce6SxZvNl1OyVkpqrtWT7yMYTF9LMDluW7jTdou7Lyas0 v4dNyBk/dzJ3sVYd2XdVhPkAf6SE47WqPqws69SEJbVIBVuB5RX47SWA/47tqk4HwtoGP ZGQY1srgotQAHZBf9NBzmLhy5q8u24pjpck= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1629702602589100005 Content-Type: text/plain; charset="utf-8" https://bugzilla.tianocore.org/show_bug.cgi?id=3D3573 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. 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 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 Tested-by: Jim Fehlig --- 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 (#79708): https://edk2.groups.io/g/devel/message/79708 Mute This Topic: https://groups.io/mt/85080301/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 Wed May 8 15:50:21 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+79709+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+79709+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 1629702609266392.1095613328474; Mon, 23 Aug 2021 00:10:09 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id xBMPYY1788612xs2Wos3orce; Mon, 23 Aug 2021 00:10:08 -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.20250.1629702599710281912 for ; Mon, 23 Aug 2021 00:10:07 -0700 X-Received: from pps.filterd (m0150244.ppops.net [127.0.0.1]) by mx0b-002e3701.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 17N72hpo027200; Mon, 23 Aug 2021 07:09:58 GMT X-Received: from g9t5008.houston.hpe.com (g9t5008.houston.hpe.com [15.241.48.72]) by mx0b-002e3701.pphosted.com with ESMTP id 3ajt57d67j-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 23 Aug 2021 07:09:58 +0000 X-Received: from G1W8108.americas.hpqcorp.net (g1w8108.austin.hp.com [16.193.72.60]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by g9t5008.houston.hpe.com (Postfix) with ESMTPS id 07F1459; Mon, 23 Aug 2021 07:09:58 +0000 (UTC) X-Received: from G9W8453.americas.hpqcorp.net (2002:10d8:a0d3::10d8:a0d3) by G1W8108.americas.hpqcorp.net (2002:10c1:483c::10c1:483c) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Mon, 23 Aug 2021 07:09:57 +0000 X-Received: from NAM12-DM6-obe.outbound.protection.outlook.com (15.241.52.12) by G9W8453.americas.hpqcorp.net (16.216.160.211) with Microsoft SMTP Server (TLS) id 15.0.1497.18 via Frontend Transport; Mon, 23 Aug 2021 07:09:57 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XaGtv/6rnEFwlGjlAdY+BmATmyeDR3p3Kc1Uczvmq5AM8IdUORFSQmH3Zl6Wx605JTuagCTi3gv+lAwJjSJesvpvSjaIXp2E3lKUs7qH/eKQlmpyqE32cWkM6cTK8ARLIPpJTUQjvtTfDo3dSAFqYPa9b5UIVSZ1JsfmiPcvHnb9RfTI6r+E+px2bHLZhSMleSESNHywXldViEs6KbDQQ/MaSuqW+viacjEYR9So6RLTRwJYRbzKQOBLdalPjKitUni5o1smubSapucVBFBmJUBfy9ptlLHqzKV/Hm20yfZfVRqMuPcfFdBatvTLlHy1cT6nUf598DYv0VoIDbU/9A== 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=g7dmEI/SE8dvfdEm4mkZhLIFXG/o87a8oOATJ7IhTio=; b=cO5EmiLmgPP62NtjthCLl3JwymCDCkflae+VynoQNWwp6KLJYfdtSUz5F+cOTg1NGFJiQF/WquG5Bwfp6Odz8OzmbqDyqS5VGULALtqRHYS9Pxm0mYzYLx4aqvLbpdpqIcgWOlr++NNIVWviSkY2v7nfATHnrAq6vb8jjrSu6lXfmQp/5+z2PvjL1ZnEBbsVoOb4cBmrFV4qOaJlWvJWky3JskfPp5+cT2sXgyksgda2duWvwFhYc3LwIAYEEltbP95tQflVbktEIONteyrvLRJ+jeOeu5BIDLXgUIWmoSRCabC5rNmYhwm0F+PKZSAhANfkjig6HVVs2VadxIdYWA== 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 AT5PR8401MB1106.NAMPRD84.PROD.OUTLOOK.COM (2a01:111:e400:7421::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.22; Mon, 23 Aug 2021 07:09:56 +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; Mon, 23 Aug 2021 07:09:56 +0000 From: "Lin, Gary (HPS OE-Linux)" To: CC: Ard Biesheuvel , Jiewen Yao , Jordan Justen , Jim Fehlig , Joey Li Subject: [edk2-devel] [PATCH v3 2/4] OvmfPkg/LockBoxLib: use PcdAcpiS3Enable to detect S3 support Date: Mon, 23 Aug 2021 15:09:23 +0800 Message-ID: <20210823070925.10095-3-gary.lin@hpe.com> In-Reply-To: <20210823070925.10095-1-gary.lin@hpe.com> References: <20210823070925.10095-1-gary.lin@hpe.com> X-ClientProxiedBy: HK2PR02CA0185.apcprd02.prod.outlook.com (2603:1096:201:21::21) To AT5PR8401MB0387.NAMPRD84.PROD.OUTLOOK.COM (2a01:111:e400:741f::21) X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from localhost (111.240.132.81) by HK2PR02CA0185.apcprd02.prod.outlook.com (2603:1096:201:21::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.19 via Frontend Transport; Mon, 23 Aug 2021 07:09:55 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f6dcd0ae-3b55-4078-5080-08d96605033a X-MS-TrafficTypeDiagnostic: AT5PR8401MB1106: 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: 8fF9/ZVG5zdZ9H7dltnjwCUpajXxPoYAnOqlp4jbN3OZsWINfyjB/smBrAZNhpNMu30ncMOt7F2jer6gze/YJ5jfaVIcwbFyZmaVampCjR/0BTmzxQ5Hia/SCZzet6W/Jc/hsuS7WUXnIUtN7I3kgUOfDMHqLd91oVzGe42pM/fMnffXosxZTqcDntDYnbRDCLxaab6xV5z2EUj57Kpy4lzCPBx0cubWbMvK1i0YPovTe/xg0xqaPJyjKjkqRqUFG5n/rV6i9x8WUOJbnow35lxumIv2SDRsCaQH+j0HT4PCcdu0xaMLGydoYHXMghSX2zhpQLBMaByY6Is+Fna++yarZjgGZYfY3LbAgemHgOB3+vMs9XCk/xHydffmMkkWZbza7nm9yUXc9Dho7/kguLiAc1Qe0fRvm/xVQl4uxSvlkrZ/aahBFDbGJFDmFeiaRC+T8kVrTTM0zl2gkSbOIihV/VKJNJxd5dKxowG/+4L/TQgmjVwz6lEoVLDGGly59+8Dbc86ziJ7VFNv1WCeiRLblRPg4KCzD3XvG2IUbg2UqEyjlPVxn9RjRLpvJ/f69ZOnySELHUGJmmIQyDUk3UyvQDWgSV5ln4cZaOnl2pSYb81slObh2aWnISgqPdrAcOPZWdoODFEgMb2yHH9gFDJQ06boBi/TT81HUKd6yDIA3XzLPxmgJh00FKf0qCRifWZ8+z7NoDa+yGswcoraHzUOm2a7bxLDb1kORFR8a24= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?/6MLd4Q9+aOSdGtd6n1O7t1Jp6jMc4mCqda6jP5c7huhh/4C8kX6f2MRiQiO?= =?us-ascii?Q?v24EHpJpUEhVNLXdZ7vSk5TpJeIW7r4ybowUJuIH3pAnm45CL2oqwsUvlLjr?= =?us-ascii?Q?8E6vrCk7/1o+spZ7cX+2h1fgXe3qo3KYhgNY1bEAHcOv0SqdH466HbpMW7uI?= =?us-ascii?Q?fMHY0kWwCvqXjWj/Qd9MfJwHzchXtrlkMZAFvK91SePFDzXUEEi6D4yJehlS?= =?us-ascii?Q?J1KZmmxpfyYbmoUyr73Ro2CEpt7wA+CzpVpy7hX5c8uiKE7q1yX/wQoNAP8P?= =?us-ascii?Q?Eor59682vDX7eORhVz2nO2zpEFaO6lblHo0h0H/OekABvizM3YLZ+jLVYAjC?= =?us-ascii?Q?MBfs15KrjIN8mdi7LZ9TxI2bKCp0sMxg+VxCPe6S/WUG2/38EZyVjdht/hsg?= =?us-ascii?Q?GjpDjxSTzlu07GqMaw2zZX0JM+1nYwYK9zmbd93WLxKYO/xpwGaLvD6rheII?= =?us-ascii?Q?ISDVpiN7d4W5grOoEfWpnZ6L00jysXsQ+Fh58Q+VObUP4KWUa9vfZLCWPfcZ?= =?us-ascii?Q?8HHJPhI4IzemQ37qBXM1wvlqAPC7ThFyKkX6xtkRq94erZcY73Pp05znGyVb?= =?us-ascii?Q?vL2NMn2tWIDH8HM9QGaf4YOjJPY9XWVtoAy65Kbodms8QpTv+AijaMZCP6zu?= =?us-ascii?Q?YbMKaB6YpmNclc8Zik2c/ucs4wecvbK+m4Quh3u8Y7NnAejYiCvEN2pMP7RG?= =?us-ascii?Q?3iXiqVMwKfzsRpXqLaTdgR2kLbZ4+GAHcRpPaSWuEa+5yvmlsdWCHOTLIr0e?= =?us-ascii?Q?WGS89k4jAoHrYxBuc/T4qjzePUhHQgZQ29tzBGzwfR5rNrm2hWP6aq2fHxre?= =?us-ascii?Q?6s4XaOxMw+YZtB0WhibnbhDepEkjgXyvguPy8v7RyDZWKcvcMMtYMCU+7Mq5?= =?us-ascii?Q?c2uHG75q5CIPtxrNscQHVdzsvwMu+It5J+oW6+nMksSRLQP3SvPs8PkyLBvl?= =?us-ascii?Q?a9fWjXiWJxLxcBJePURhEUZdNBmaDKhqxVsw9ykX1KwmaKrwvj+YvRhXhLv7?= =?us-ascii?Q?SDB8vwPCIadJwNRQpX91yPl5Nh5oiSzeQBPwaEs8eA0Ghio7ukf3jfVFW7Ff?= =?us-ascii?Q?aMk5fcCXlDv/m5NSmyZR9njlm2puK1rwfsbBZwD+L1cQfdSJlxhRAUVpdLYt?= =?us-ascii?Q?/XUp8q9cJsA3GKQifjrOcl3LHiajTxstkkeiwL0z3KuehEpM8lk1O8a5Mgln?= =?us-ascii?Q?FadqZUEizgsci5kc9td8g+FBADwl8wx8X5sQWAoMz+6BlfBlGrstqaPbvwKG?= =?us-ascii?Q?E7LhOK9v68+Oqd1OlnBzUMd9dEUtSw+uhwC0lRzaBf7zXappp2Xiu/79dN/g?= =?us-ascii?Q?6DZwFycvRG0AqxCStuEjllGx?= X-MS-Exchange-CrossTenant-Network-Message-Id: f6dcd0ae-3b55-4078-5080-08d96605033a X-MS-Exchange-CrossTenant-AuthSource: AT5PR8401MB0387.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Aug 2021 07:09:56.5758 (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: z1kRQ/CH9vYQibjxnHMG6Om/HdM4LUTD/efL/pFOi6+Azop2riyBAHbX08MKxdRJ3Z3YVgVbTYGLZGbXRMpIOA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AT5PR8401MB1106 X-OriginatorOrg: hpe.com X-Proofpoint-ORIG-GUID: _m84WpPyvFF6joBeh1A1pBS9uvvHXNf- X-Proofpoint-GUID: _m84WpPyvFF6joBeh1A1pBS9uvvHXNf- 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: apHjFwF2sxYNFiwMwyRKLmSKx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1629702608; bh=5ENP3OqTxujETCPxc1JDFwHK8drPWcBZws/G3txzID4=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=MQyLMmKfKADEH9Dd7ooDsJBuyeqDW9OZtXuBDPsQTNmELvhGEyTIwyTykA1Q/ajB/ku 5U5CRHzE1kFmeEPB29NjEWAHEcfVeTBgkpyFw1+UZ0CFKYRgzyTH2sWRWjjnC7fKc+rqE YaqC1MNmGXSxayVQntqu8c42yjv7O1Lmq5s= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1629702611392100002 Content-Type: text/plain; charset="utf-8" https://bugzilla.tianocore.org/show_bug.cgi?id=3D3573 To avoid the potential inconsistency between PcdAcpiS3Enable and QemuFwCfgS3Enabled(), this commit modifies LockBoxLib to detect S3 support by PcdAcpiS3Enable as modules in MdeModulePkg do. v3: - Add the bugzilla link 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: Philippe Mathieu-Daude Tested-by: Jim Fehlig --- 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 (#79709): https://edk2.groups.io/g/devel/message/79709 Mute This Topic: https://groups.io/mt/85080302/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 Wed May 8 15:50:21 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+79710+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+79710+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 1629702620319971.4112968476308; Mon, 23 Aug 2021 00:10:20 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id FV6fYY1788612xyHCjBxoMx4; Mon, 23 Aug 2021 00:10:20 -0700 X-Received: from mx0b-002e3701.pphosted.com (mx0b-002e3701.pphosted.com [148.163.143.35]) by mx.groups.io with SMTP id smtpd.web09.20532.1629702611205024974 for ; Mon, 23 Aug 2021 00:10:19 -0700 X-Received: from pps.filterd (m0134423.ppops.net [127.0.0.1]) by mx0b-002e3701.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 17N73Y0H028739; Mon, 23 Aug 2021 07:10:10 GMT X-Received: from g4t3427.houston.hpe.com (g4t3427.houston.hpe.com [15.241.140.73]) by mx0b-002e3701.pphosted.com with ESMTP id 3ajq0ep0aq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 23 Aug 2021 07:10:10 +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 g4t3427.houston.hpe.com (Postfix) with ESMTPS id 7118583; Mon, 23 Aug 2021 07:10:09 +0000 (UTC) X-Received: from G4W9120.americas.hpqcorp.net (2002:10d2:150f::10d2:150f) by G9W8455.americas.hpqcorp.net (2002:10d8:a15e::10d8:a15e) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Mon, 23 Aug 2021 07:10:09 +0000 X-Received: from NAM12-DM6-obe.outbound.protection.outlook.com (15.241.52.12) by G4W9120.americas.hpqcorp.net (16.210.21.15) with Microsoft SMTP Server (TLS) id 15.0.1497.18 via Frontend Transport; Mon, 23 Aug 2021 07:10:09 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iXIaA2C6CQA4gGCxHdHmcPghcHuVOs8M/YoIwYyAfuQN7yatNp+KPV7H6xxkrVMMBLeeLsp+GPeofyXwPdU0mq+p7AdPV8i0vd2tnS/5p//4BSP1WESWr1w2E0oLb0zZnvKkjbfxom8nXJjkB6HTJ0r3AMwtNBwwjcOZtApGjwhf7NorL9AIbATMC1luCt6vf9xPFHL0WvJgKOYMmE03oko9BcAQnkl1aXY2i0Eq3cU1PwxtRQ8yyUddWIYta6o1guaqx7lTuaupvBr2X1/Io2J1cvvMWZgPnIurCG1IAa97Bs3nmlkkOfP6iZPjP4GcqJhOUV/fvRD57FTO1pNXqQ== 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=lEClfpZoyD0wUko2aGNUczw79D4K/8oVLObQolLLRA4=; b=VWe4CWGEls4yyLLnRl7arQaBt0oXO+Wgr+v4SiOVUytpRARJoZ39G/ReURw9dq2KnChN7RTiEB2nbB7ST/oxA8aiDQ0X4maaCe1Y2ImRIMxVD9h+EcmQ5j4AuG4/vla5mTU3ETdp7ibmHQofOzr+vB19ORjvMKohlFxo6qD1Xg8uT9DzDM0Yk/Flbh2RZSCPBoGtG20+HtSJHNuLFCz4AFSVg3qad9Rhzk7Px7RCOuh0kGjV5rH/gvE33eGhp7oFMAKC8kO5K/vfZ+JI7wGpJzM9bkrYZ2ERqz2Lp004zj295vHvhaz64P6lDo45RhX1sa9rXtFWMaScvDXnsa6u2A== 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 AT5PR8401MB1106.NAMPRD84.PROD.OUTLOOK.COM (2a01:111:e400:7421::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.22; Mon, 23 Aug 2021 07:10:08 +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; Mon, 23 Aug 2021 07:10:08 +0000 From: "Lin, Gary (HPS OE-Linux)" To: CC: Ard Biesheuvel , Jiewen Yao , Jordan Justen , Jim Fehlig , Joey Li Subject: [edk2-devel] [PATCH v3 3/4] OvmfPkg/PlatformBootManagerLib: use PcdAcpiS3Enable to detect S3 support Date: Mon, 23 Aug 2021 15:09:24 +0800 Message-ID: <20210823070925.10095-4-gary.lin@hpe.com> In-Reply-To: <20210823070925.10095-1-gary.lin@hpe.com> References: <20210823070925.10095-1-gary.lin@hpe.com> X-ClientProxiedBy: HK2PR02CA0175.apcprd02.prod.outlook.com (2603:1096:201:21::11) To AT5PR8401MB0387.NAMPRD84.PROD.OUTLOOK.COM (2a01:111:e400:741f::21) X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from localhost (111.240.132.81) by HK2PR02CA0175.apcprd02.prod.outlook.com (2603:1096:201:21::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.19 via Frontend Transport; Mon, 23 Aug 2021 07:10:07 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a13fcddf-1a3f-44d2-0cf0-08d966050a29 X-MS-TrafficTypeDiagnostic: AT5PR8401MB1106: 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: dEs/tZYF6l37/5bt4sYbBOo02tJOMWySUr6ZiwaMQfdeasjxlkeHKMOqSU10MbLuooVsR3byyE5XOSbfeJ3AqzEjZRhOCyA8b14cJDXti5MHMT43qe3ETWHyzHqslbaIPS3bT+dEWmtJCMRA4al8fitt705Ci5mGHu42g3OLkU52gr4SLXd0AeB8JpQsL8wgMFyuWZY4D7T5uCzTXeYL9631KPVzPFRzLkrMdYFlYRDAiLIAOlcftEDB0Hbl8W21qDEw+KF4wReaErV+L7prRS6PDPtan9wAH6OQYrOLIf1F4imABSnEfNseMPY27YsZhGbDIUJforeuqqth3Cwg9vxSOok+LXEk1y93Q6T81OcXnxK0D9snUijohTy+oRkMdlmo/FiG7wOkRiiSHL+PravETWBYj+DzcrBdb3qLb3sutPNNS+jI8bjkMuSn2V2wRwLSa+ci846v6r6jeTh+IMTyqGkGTM+isvbCmNZN4aPBAncvqHmGGUKlw+Mbpac7S1pCPBpUfYGAqT3OI3jL3kXHllU2Aqsf44DQDUp5rZ6oYDYMEiiEmgxyBD0MEW5w+0HZ6DpbT0t3XM8Q686+IYiBUWgEPe8XdF6ZQbFAfz0mlL2dUzgcBAjtzNqtLmkWpRD3UMwf7BjxeMqC3U2kPj38KlhuXJhOLtqdLAc0YHsytUpDZZ5kD6Kmu+tEOvSprBqTU0xeAQ867UQjqwc0jpaiwJ3P4g/4t57GvziP5cI= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?lBhJI1miVZVV9diP0452vwsvGGDVdjOZFrQFCxMl59mqkd8wpFfd5B67F1vo?= =?us-ascii?Q?bqQLTcC0zln1s5hhU8HKYhGFtKwmKFmkXIqBhhqYpr/RIAPnCiVzg7pXLgqk?= =?us-ascii?Q?XysJDr7LVZDScyE9tZdAjw2TuoBuzekN9WLkKMJitPrVO7wHKnYXOYT/jZdo?= =?us-ascii?Q?xWhAiotETutXIzYk72+VPyMJawpXBSdDzA2P8vKzG7cTfux/lef06+lDzexP?= =?us-ascii?Q?Rd1y6a+PsCY2a+9poC7/jpriOwLWU98uATFvJFTQq3Gsx1+HmqnkEOyIGZMk?= =?us-ascii?Q?nBseWQpXiYOK9xWtuHMwT91xDll6fmeg3Y/nWnqcmkYFVrOMiGw2cFDKF6IC?= =?us-ascii?Q?tRGN/mtjrK20zm9RzUc/+YYa6RqW5rXhFxYdYhHw9IrekNm88YtcntkuS4af?= =?us-ascii?Q?g0sC6n3wTyG1fcQBkas6RBIoY7II9FggzIdqqs47//uS+ee9tovtOBOCXOMQ?= =?us-ascii?Q?VQ9DjzewXXLy04Z1tPM92iXojyni06C8WQ48v3eOrKEjl2YTMDlY4vnIk7kT?= =?us-ascii?Q?9Xl3UNphJPefxLnBl1sopVfoEEGGqw7leA3pMkYyH2NfqrH3iUgy6DfhU0cs?= =?us-ascii?Q?BfQO15SqljPmiJp+Zz0N7LJq3e58GFZsNV8zNZVc+qpFkVReNRlK1uAWNZqr?= =?us-ascii?Q?1ugjnoR/QYY5cmJlsnAn2YeRvHNBdqtF04wEuI5oMtRw++dXD1WQow+6YoLb?= =?us-ascii?Q?JFG4dULaO27FSv4FsiX5YflgLgh19TZLYnZgbWvnu7a0LxKRmAIFrE58GX+o?= =?us-ascii?Q?u69+xNYwV2wfXvC/CrHYvNv12FRvGk9dm9FyeOdIwGaja4+Si25Qc5XgZXf0?= =?us-ascii?Q?54mkUZ7bdZbR85oHsrlylQgN/uY/kH0TbVL9W0QsYrzhEgQjA9zTcmYdAawX?= =?us-ascii?Q?Kzg5Bxj7C7qwYDp4om4/QmW41gnevWlcMyvHDTbs5sefT6tT5QTCWViwdhM+?= =?us-ascii?Q?uA8VgevZjapVBtZP0LBddu78nbCpiYtbT8u6wA4Q5jQy8gwy/n+q9irN1Eou?= =?us-ascii?Q?jqWjR+5Wq2+gZhHX6X6Pqk2ypO+3oWstIyDwoYanjjxBwtFMt00C/IirTl5o?= =?us-ascii?Q?twLJ7mtxYMuWbYfdEQuLyN5mblTAUSX5FBg/myMP7s16/SC4KsRLnLyGCaQa?= =?us-ascii?Q?JiAhVhbzf+nDeXChayZBg9bXUNnn8pAMCAr1TdkXPcitKtRGDxVThdUWWuU4?= =?us-ascii?Q?Dt/XMtO7nM47kNTNMi2vrOzza2hlFlk0d0v4ECMEKNlTzIb8Vsp4MCN7xXDa?= =?us-ascii?Q?2hAU4GEXxtYyEWk4EKniUOLpWMRDeApXPg8GE2pPw9Pdka3O4fs8kQVe8Bpo?= =?us-ascii?Q?6Alz8NUx3N3EFsP8qgaDwn6U?= X-MS-Exchange-CrossTenant-Network-Message-Id: a13fcddf-1a3f-44d2-0cf0-08d966050a29 X-MS-Exchange-CrossTenant-AuthSource: AT5PR8401MB0387.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Aug 2021 07:10:08.2187 (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: lqFncww//JKFMwMV+3ZtZhS1iDjsdlx+eSk4856s2Dk48Hm+1b4FTyIVOtFrmpAqS7NaDKYVRp7K07rX/tyekw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AT5PR8401MB1106 X-OriginatorOrg: hpe.com X-Proofpoint-GUID: b77iiAEiM-xECW5moLvp0ehiBV3J5ZBw X-Proofpoint-ORIG-GUID: b77iiAEiM-xECW5moLvp0ehiBV3J5ZBw 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: kRhudmgOOolwOhQp1vAScwgsx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1629702620; bh=XRxkn4gy06qjGwco24D2KtueyPmh6UHYsUCOSdaqHnc=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=suueu1KucfF+eelj84f0HdvGzUN8YHF88+E2cynAUDOOOh55k5dqvFkU1Ng4k1GY5uK rS0TOzBQY6KKdnwI0bKubmBEmzt9yY+qiS/2fnR8fCq1DHCjOUaAmy9xpqcQ7HzIqge1e 48CNiusyr6mPipZ+ANVY1FgkkNwGUpeoWGk= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1629702622406100001 Content-Type: text/plain; charset="utf-8" https://bugzilla.tianocore.org/show_bug.cgi?id=3D3573 To avoid the potential inconsistency between PcdAcpiS3Enable and QemuFwCfgS3Enabled(), this commit modifies PlatformBootManagerLib to detect S3 support by PcdAcpiS3Enable as modules in MdeModulePkg do. v3: - Add the bugzilla link Cc: Ard Biesheuvel Cc: Jiewen Yao cc: Jordan Justen Cc: Jim Fehlig Cc: Joey Li Signed-off-by: Gary Lin Reviewed-by: Gerd Hoffmann Tested-by: Jim Fehlig --- .../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 (#79710): https://edk2.groups.io/g/devel/message/79710 Mute This Topic: https://groups.io/mt/85080303/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 Wed May 8 15:50:21 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+79711+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+79711+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 162970262107914.040927870467158; Mon, 23 Aug 2021 00:10:21 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id KrMtYY1788612xJ7MsB1F0NX; Mon, 23 Aug 2021 00:10:20 -0700 X-Received: from mx0b-002e3701.pphosted.com (mx0b-002e3701.pphosted.com [148.163.143.35]) by mx.groups.io with SMTP id smtpd.web09.20533.1629702619989473056 for ; Mon, 23 Aug 2021 00:10:20 -0700 X-Received: from pps.filterd (m0134424.ppops.net [127.0.0.1]) by mx0b-002e3701.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 17N73cOt029503; Mon, 23 Aug 2021 07:10:19 GMT X-Received: from g4t3426.houston.hpe.com (g4t3426.houston.hpe.com [15.241.140.75]) by mx0b-002e3701.pphosted.com with ESMTP id 3ajrfqnn3u-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 23 Aug 2021 07:10:18 +0000 X-Received: from G9W8453.americas.hpqcorp.net (exchangepmrr1.us.hpecorp.net [16.216.160.211]) (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 5AC5960; Mon, 23 Aug 2021 07:10:18 +0000 (UTC) X-Received: from G9W8453.americas.hpqcorp.net (2002:10d8:a0d3::10d8:a0d3) by G9W8453.americas.hpqcorp.net (2002:10d8:a0d3::10d8:a0d3) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Mon, 23 Aug 2021 07:10:18 +0000 X-Received: from NAM12-DM6-obe.outbound.protection.outlook.com (15.241.52.13) by G9W8453.americas.hpqcorp.net (16.216.160.211) with Microsoft SMTP Server (TLS) id 15.0.1497.18 via Frontend Transport; Mon, 23 Aug 2021 07:10:18 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DczOLRsCXCa0olaKexZPtCxv+Mjwl0scdnZPNZAB5MmZhz6M3mpDIp9tBH5/n1gx9/vPzVDNVvkN6mJpgmtngWodlUKmbs0goKli/jnvYMKlqPyt7lsBenzLAkzccxMfLO74nQyzlPNiqprFtS2PghFQGjyRD27JdIBRcMGgV5Ru2gu9rcmueCevyDmWVB9siYEzobFC5OhUEOhyX3K3/dxJLMYYoyx2oy2uK+Akvl0EGAYv3gX8AP6fM8PJlY2Ey5dcCPYmPvTQADcVb6E1qaRKbdSphrjePqzyhLFul8Gahv0dsExgez3IETW2mtA3LpjrdtWXQf4dEM+l0deVtA== 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=m63LYnX9Pplamgj8ORYMYRgDOVc6sDyfZ9EPb06VbEo=; b=nGToBuDkG6LCbSyHgAYnIvTmG3HZq7IpAdwbPoKYciwOyaezsd2wMDfK6u6FTFufPK3aUlR3JA5qVGwNRmH82nm7GXd1Jm4s6ZaYiYn7V8YQZHkYSBH4aKW+7Gg/DzrVHluJBxRf8eLWK2YjE2G50zwB4QIo8J1Cix4Axvfgqk+ePEe7xf8fUYp+G4+g6eeOzgBDkXO+gQHqN0GLDXPyHTQ1Z+9LMidH6Q72cI9+PNyyc1f2lvOFnUnkDJWQmIcDZBIrJYblm4hsf40yRRehoDr3WhlLp678T8HKPcUXXAv/wudozL3ek03ay2aXgmh/thVUlwBgPm7E3bwtzitvzw== 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 AT5PR8401MB1106.NAMPRD84.PROD.OUTLOOK.COM (2a01:111:e400:7421::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.22; Mon, 23 Aug 2021 07:10:17 +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; Mon, 23 Aug 2021 07:10:17 +0000 From: "Lin, Gary (HPS OE-Linux)" To: CC: Ard Biesheuvel , Jiewen Yao , Jordan Justen , Jim Fehlig , Joey Li Subject: [edk2-devel] [PATCH v3 4/4] OvmfPkg/SmmControl2Dxe: use PcdAcpiS3Enable to detect S3 support Date: Mon, 23 Aug 2021 15:09:25 +0800 Message-ID: <20210823070925.10095-5-gary.lin@hpe.com> In-Reply-To: <20210823070925.10095-1-gary.lin@hpe.com> References: <20210823070925.10095-1-gary.lin@hpe.com> X-ClientProxiedBy: HK2PR02CA0184.apcprd02.prod.outlook.com (2603:1096:201:21::20) To AT5PR8401MB0387.NAMPRD84.PROD.OUTLOOK.COM (2a01:111:e400:741f::21) X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from localhost (111.240.132.81) by HK2PR02CA0184.apcprd02.prod.outlook.com (2603:1096:201:21::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.19 via Frontend Transport; Mon, 23 Aug 2021 07:10:16 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cc7f6b56-987b-4425-6bcb-08d966050f75 X-MS-TrafficTypeDiagnostic: AT5PR8401MB1106: 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: yYV33+RKdW9xaaQMM8K1DTGXAvukxSaFlgl4qfsJZygh2mU4kmz+SRcOSvBnkc0ZSYejE1wrfdlNweNSA956iCKyY+SeCWANo+qmBz8azE8ji/JG1V9j18ymrAOARQYcGCEwDzyiwhYzbWvfrdp35PojgKn2eoqW13Zoj0STzd5sGJRQsGwb+6yk+nKCK19LS/SIUg/DWUYHHR1ZV8KBwWMrHYFcrTo52pyUopHejRSWm5RENGThkjP1PoJuzUb7BiI+iH5e2XSJgmwgZnszet7o/N3cYg/abp46b73Vbr4dvdjUGvuIZ+w9Z6LGf7r0o3BlAYGXcLuNn49t/zJ2ug0+BMGaK3EMd17T+SFeykcOu3xGQoykpLRbUkyKlHxhd2fw1zmmaou86jiLZGVMkr5kzFqIBjyookHM34dIrD3Odb7aYKzwwyGmCFUnOWHDFGsVnvttK0ioit539YlMCmhyGDwjBq0oviMn7dBWnxpDy0P1vCLJZKqKcplZK/GkXD9gaxAyuo5iQm4ly1nY2LuKiMGjCYqHDVgFO0YCsETafNukdnHTwmtCXWnWKnWMAToW1AjNIc0WoQfX5tHWjdvUl+r25mdK6GIy0xmZAQx5dA9TSOmAu6bEJRFl6PL0n76WntoYhdhag6WLqUOIHnXZ9uqT7bX9b7Fkw2iUAFqlobWOTvJpaHIeX6bsFYg98097cnlOgD/FjaSfAML3ztlrrL08zYhgGwGh8NaHntc= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?N0BqGEVlAT71LRdO41GsKizR1LMftaUA7crTw1abi2SFXUMm5JjjpZCICsnv?= =?us-ascii?Q?smesLVbR6NvRuiOxAnLGgggYTtA0Udw2wIrfMVYd0LiJhm7W51ZecITpARuy?= =?us-ascii?Q?XN9OuHUmuA6dzY/s0HJgL+jQZ/nA77TC20cDPfYzwJcmeTsEoNrW34Hs9D+q?= =?us-ascii?Q?teLaNXotNQvYzHJQexBy2VPXH1UtnFy3p3Jcl9teCak6iaM5Dqf6omOjKXc3?= =?us-ascii?Q?iGu/tMNOvIFEcVl3k9N8m8V7/WfjDhwR4PrSvv95PeEnXFjV9jlKT4notj7J?= =?us-ascii?Q?0w9YMZgmovhhoTz0it8kpW/RbQ8gH8iK31kqq7NCPOgRy7uMZ9cr5rwrHEzd?= =?us-ascii?Q?+0McfWJPnGbEQWiig8oSY27lVc1p9QMEjZOo18kNnoGuy4UGcTDsQns0haj7?= =?us-ascii?Q?MBjWRQXBv6qlZFFeV7D0p+0N5mlrRUspxAuwt/nG3v38K5cww/x9HBs/cZan?= =?us-ascii?Q?QTfK4bCAK8uW9Qdc5MWHRhu3zMO2acro/z2PmXgIQb8suCmsoa1ygEN3Apuh?= =?us-ascii?Q?kpOtiT3YLkQVoxynPZ5Vqt/Updn50Yb+/CDY6e10JzqQmTlQWm3LuITAaVF2?= =?us-ascii?Q?rt9YpBFmHyOqBgWR9hfcT/S850khw+8JtVD5F4wHievMvoxCrINwuA1cnaTc?= =?us-ascii?Q?sqqfaa345210B8gOS6iuDlkl7IQ9FElFpvlG3SM3r5ZWxHnAmpSFY8Xae2BJ?= =?us-ascii?Q?qowNUC3177hUQ1oKfmvlyaI98CMgQpoLjgyjHlQQtmAvzUQYMIFpIo3glbiq?= =?us-ascii?Q?btxGqqKdkpvN4Ips3GQfhhlYU0xzjykDL9Zhv9DzegOQTqcV4gnxZDNjL6wE?= =?us-ascii?Q?r+0al4t1eSNV6EIT9dBfHZrAiTWaHRNo0l1L5qKej6DO0vs21xw4xDbS/YYo?= =?us-ascii?Q?9HNE2Y9T/+7ivfV+jbPmTh9l7NToTdbCNCmhXQmXJ8tJGu6VYBNZvYcjMok2?= =?us-ascii?Q?Q9ZbYmNhZdYa2ubIooCqolkCfQoGNMoFb5m3xrX2FOSRVAzfaw3PC9cpL65r?= =?us-ascii?Q?llsNR9CF/KWh7tj93/o9ovAorZthkXUxfD5G5vFmlJAPQMykcH4bVHkJoHF6?= =?us-ascii?Q?zG81DvtRAfGeOtutw8SY7EkPhAC9aSC4huSA+t0cV6WmIuM8oTAB24zXb25x?= =?us-ascii?Q?mfIuqIW6QPM2ZX+StZYXnNRLVPrdjpNd3QG1zetkeh4LPIdLGka68NrO8Dgx?= =?us-ascii?Q?6SUFuSo8trreSK2bpgHAPpDoNpXdgKt8XtA/ztoQibOj/qlk2A0bOJwM1H8M?= =?us-ascii?Q?u8ccOaH4fZ8sJZTNi7h77fy7U9dxjqushL5ENubtvimtOqAxd8ziux1Avf7v?= =?us-ascii?Q?C7o8Tj2qO6rwE41p+ASY3Rog?= X-MS-Exchange-CrossTenant-Network-Message-Id: cc7f6b56-987b-4425-6bcb-08d966050f75 X-MS-Exchange-CrossTenant-AuthSource: AT5PR8401MB0387.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Aug 2021 07:10:17.1028 (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: HRawR47g2yn6y7NCGZyATurxSa4cusR+A2eLkM0JZJG9dZuo3Cm2T+jG89JXWKUj8xUpH27Jk4Jne14gfJufew== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AT5PR8401MB1106 X-OriginatorOrg: hpe.com X-Proofpoint-ORIG-GUID: z5k-MCtxCxxMZptjIllEI8SmARGGHSo2 X-Proofpoint-GUID: z5k-MCtxCxxMZptjIllEI8SmARGGHSo2 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: U4Vrd4AtxVbxTFfsWQIBHCKVx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1629702620; bh=CD4wPYdaWyNOvdE6RFQcw5iETmKQQs306DdbBZ9MfiA=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=iZMPfpf07egTBjeu1NSu6hJDtc6YUx4NVimzOGwP7YE4dvqXbDMQsYOLu+/KnF3yl6L hWQsGK4dEbetpnCVbxxx5wdZWeXVPIzFfkXM5BjwTbBMIQ5hLzaBLSk2Tlp28Kdkc0kwp qjU/gTpOuVkoIBPlmc2ZkKqILsEQn0y0h8M= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1629702622539100003 Content-Type: text/plain; charset="utf-8" https://bugzilla.tianocore.org/show_bug.cgi?id=3D3573 To avoid the potential inconsistency between PcdAcpiS3Enable and QemuFwCfgS3Enabled(), this commit modifies SmmControl2Dxe to detect S3 support by PcdAcpiS3Enable as modules in MdeModulePkg do. v3: - Add the bugzilla link Cc: Ard Biesheuvel Cc: Jiewen Yao cc: Jordan Justen Cc: Jim Fehlig Cc: Joey Li Signed-off-by: Gary Lin Reviewed-by: Gerd Hoffmann Tested-by: Jim Fehlig --- 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 (#79711): https://edk2.groups.io/g/devel/message/79711 Mute This Topic: https://groups.io/mt/85080304/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-