From nobody Mon May 6 01:03:05 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+79247+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+79247+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 162883521700046.6412609918691; Thu, 12 Aug 2021 23:13:37 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id SjrNYY1788612xdZsBtoIty9; Thu, 12 Aug 2021 23:13:36 -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.33292.1628835215868328229 for ; Thu, 12 Aug 2021 23:13:36 -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 17D649x7003746; Fri, 13 Aug 2021 06:13:34 GMT X-Received: from g4t3425.houston.hpe.com (g4t3425.houston.hpe.com [15.241.140.78]) by mx0b-002e3701.pphosted.com with ESMTP id 3ad2027s0j-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 13 Aug 2021 06:13:33 +0000 X-Received: from G1W8106.americas.hpqcorp.net (g1w8106.austin.hp.com [16.193.72.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by g4t3425.houston.hpe.com (Postfix) with ESMTPS id BF47ABD; Fri, 13 Aug 2021 06:13:31 +0000 (UTC) X-Received: from G9W8674.americas.hpqcorp.net (16.220.49.0) by G1W8106.americas.hpqcorp.net (16.193.72.61) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Fri, 13 Aug 2021 06:13:31 +0000 X-Received: from G9W9210.americas.hpqcorp.net (2002:10dc:429b::10dc:429b) by G9W8674.americas.hpqcorp.net (2002:10dc:3100::10dc:3100) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Fri, 13 Aug 2021 06:13:31 +0000 X-Received: from NAM12-BN8-obe.outbound.protection.outlook.com (15.241.52.13) by G9W9210.americas.hpqcorp.net (16.220.66.155) with Microsoft SMTP Server (TLS) id 15.0.1497.18 via Frontend Transport; Fri, 13 Aug 2021 06:13:30 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=D8hhMkBGyV1idL+MCXEYJhRA3HvcqKx5mEUJpXt3FyDVCZyuYqoHUQdHwhhI64gCqy1k8Ybz2s3pno7rSmQfjEqazcYESgRy+GsNbNEjb6LlYBogsDwfMHTuR3OtD2jxe+BE1BK9s4MPu1D+zDK801pfj/kBukYd6VG4/jhN584mFpXOMwUM4d/qCUhCn134hFzoaccHOW5+a7gop+h+aL4XM7u8ePV66+PgMWNS+xTvZliv+1xlvUUS+XMlVAEX3uuJRl2bR1TPcucURvcsg9P9JvvNTrT71E/ejtx8nA2QjEUWrQM++QSRCe5sK4hsOFCWIkWfrjN0qlmWrYyFZg== 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=C7Ow+KfMeMhdELl6nKGwZqwLE6qYIseEbfsHBR97/08=; b=VpbBPF13/DI5p8xmNy5u/Rax8FoBRh/lDGV5STVP95dK/3kRLiRYoXIFEcG95qltLMt9c3X4wgcw3swak4S3N1kDh/XEfRwnES1kUWogWdMlwmiI6a7ywMM0NU32zYO+aWo933AaDusEbI6PecHUXffqjPiFcBYWAGe0UVWLmVKOWev9hm8Syy8MGdqvHJuOFIPDT0eyX7CA1FGliKOnQMuTO/hxLT7tu4ubkVPhaEUaQQjDWE+ZsdG9fawevfUFbswicA+9JUyhv844vdgocV4kk6EoruCYg0kkG6GTbRRPB7v6HPRCuz1/Fhiug+wS67MrH8EUyEI+/e1PfpVuiw== 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 AT5PR8401MB1185.NAMPRD84.PROD.OUTLOOK.COM (2a01:111:e400:7420::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.17; Fri, 13 Aug 2021 06:13:24 +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.4415.018; Fri, 13 Aug 2021 06:13:24 +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 v2 1/5] OvmfPkg/OvmfXen: set PcdAcpiS3Enable at initialization Date: Fri, 13 Aug 2021 14:13:01 +0800 Message-ID: <20210813061305.17519-2-gary.lin@hpe.com> In-Reply-To: <20210813061305.17519-1-gary.lin@hpe.com> References: <20210813061305.17519-1-gary.lin@hpe.com> X-ClientProxiedBy: HK2PR02CA0221.apcprd02.prod.outlook.com (2603:1096:201:20::33) To AT5PR8401MB0387.NAMPRD84.PROD.OUTLOOK.COM (2a01:111:e400:741f::21) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from localhost (111.240.110.200) by HK2PR02CA0221.apcprd02.prod.outlook.com (2603:1096:201:20::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.14 via Frontend Transport; Fri, 13 Aug 2021 06:13:24 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c0343e4b-e7a7-4324-1cba-08d95e217550 X-MS-TrafficTypeDiagnostic: AT5PR8401MB1185: 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: O9FEwqOOEnz1qWZtabUg5aTFCyPcdCgsB527mIe6ukG2I7NrJNgPgTPKeK5GEHtVmjQkw9n5+ugX5pnv93gMSiQi/7bEAW77lTKFKcH+MRbwxW29GJ2FS8mqaZn2TYqsDnBUyXNnEPpaTuGN/2G+bO1gENjh8RbdPKcoYk5IkTWpqSwXyLSdCtM2bCZ7Ht+BRu0ZfxFezebYSgv4LqzyqUCyd5w0WGx+JrAEEUvHNjyRBKSyC3cdlGuZTqmprS+Gy7XIQpxt5k0fTM7UGbw+SAOvLAnaLK6dr8sKHvFTNBbxlSQtfsPwta2/WfAc10yeaLMnNP7Q6A9v3HLhD8f3ztFuAmCgB307OiLOnhen/BG9u8Xr0Wli7rtKjES72GY3e3F1tEgw/2pzOnYJbH9xDfQbutU07QaTrhUf7fvu0m6X0YFrsQ7l8RxEuQh4uzKI2MEiatl2PKGRkR2Fw115TzcZ16CaOZeEULnrvOVHz0FC04xXzk/F74q46+bPBx13x3kU6gsNyYX2BG6XQjWN407h8nkXliQMoFHpe1oE95TmMBOQwQ/ydNwS9wIMzxZlXhzHwXwJRyd1WABlW+AOn9zDWsQJClcAmz/wDO6XG9hT6TnQBx6hYnGjJ4zRWfYApAkBVBBS2NAUuGAAvoHGRQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?2xgPmyJhaF3LB3Z79aafm4DcyDjUbliCHPBAGkO/p+KEjD/AJS7dC1t3YblA?= =?us-ascii?Q?o0p9DuInKOOegYewACRhlVlYA23jUMbzuiktcd2S46K3GKY136yFttJ9C0K9?= =?us-ascii?Q?iULeVuV7a0aynb3EANLGAF7ol1A7Zin2hR1S0EL+TiH6AeErQ4IsHsDxXeq4?= =?us-ascii?Q?dAjtPiaA9JhN7t0Y8MwCWT1mvk1OnqV9FXFrCLcdFRhZpHNz7FvoVdDCtFfp?= =?us-ascii?Q?tzed+VyMRxKx811vEH9953bH7Bikls+EMsNTm6o60q5MA1cbk0gZwQpZmIwh?= =?us-ascii?Q?EL4N0HZZt5Dy1a39GUxqvzwW3AVYDoZN4s/RzcjSmH5FFTuWwNLtQciVUO9g?= =?us-ascii?Q?JbhxWCzDE00lORkQDLdxwuAfbf71Q+wHFvmemDSRI/Tq6nxIL8+7zRaby7CS?= =?us-ascii?Q?LHxVmhXkrsVKvJSUVzyk4gyLoh3FVmJK+034dhq47eZKecTUNk15xibnf6uX?= =?us-ascii?Q?n9SORr0lQ3G/uUh8ROVKIfM13r4ZvALO7ZjD/ZXEwkT/PTAfp59HYRSvcwV7?= =?us-ascii?Q?d2lc/Uu4D41MIF+Glkzu90CXWO2haxV0Z3v0IfFjpPKiowSwxu3ZE37w3SbZ?= =?us-ascii?Q?4l2W/Di29lSWFtc6Ki9HooKtWj2vvzEG+XxWhw2xksazlffaiYhExQ4lcEbk?= =?us-ascii?Q?sFXDmY/zCxaMwlOcjpICIW5dbUhc2tleCiWy0MntGnc7nWjrVqUnAxL8gMJg?= =?us-ascii?Q?lMCQs2PtfHeVQJaKaCFBgXTNQpG7jgYB1DnsXKPlKUiHD+mUju1+HrZtOeDe?= =?us-ascii?Q?UJkxpgS5qr7UvGanIEqDOK+a3NMiSRJIrVp4OIVBAbgp46zhHj4wbgyI4UcV?= =?us-ascii?Q?1dAHp8B/X4xOAJVeTbbUUBWZ5M2v6leCmVt0XFJs6ISdrgEwMEbgh5ZIxPOn?= =?us-ascii?Q?QdbdmEkc6f7AOwJ+Kc/Vt4e3mMAnQxJOMi4NVRQRi757V+mh3CtO6NnffWY0?= =?us-ascii?Q?eaPe4zo1wU0CfiTyC9jm2avqQ6IcKeZtyFeIToITNQKDpU+Q+tpd4w21tmcO?= =?us-ascii?Q?1eDWpGTyMz8wgXTle1A3IJzUnJjXO+Ot2H0pVUctikmnJicy2VAMc5lN+uLF?= =?us-ascii?Q?5muD8fssv5+tOntUEh0JUqVXA1Ft23HaUJMJRvr3vVhRuy/2PYV7vbz4lG9u?= =?us-ascii?Q?0MSqq2EspDphJMZIhlWpkYPncGNvFkX2p90qzS6dHyZCnP3sde20GIf5+Qi6?= =?us-ascii?Q?15KBXPevW9mtrXq8a+G5ZhrZGpxfhDZQEWIskma3k3jD5Io7Ee+5ts3DTEZz?= =?us-ascii?Q?bKrOKGefRKOKf47tayAeChhkDN4T2gX+AlzCB27xEYhRwTJFXQY2wt7ADap2?= =?us-ascii?Q?vGqQ31sDH+qKEb0w5RCvrPUy?= X-MS-Exchange-CrossTenant-Network-Message-Id: c0343e4b-e7a7-4324-1cba-08d95e217550 X-MS-Exchange-CrossTenant-AuthSource: AT5PR8401MB0387.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Aug 2021 06:13:24.5981 (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: hl/gsC7pd3kqM4quYpdXXkzlSCXoYcPsrEwJomCQRLPmMVDmrRQTiUpUsy4gIMs77qOhpnchQup8KkRePw0BYg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AT5PR8401MB1185 X-OriginatorOrg: hpe.com X-Proofpoint-ORIG-GUID: TpB-2louNStq6WMsD-MqxTP6ZM9JKEcm X-Proofpoint-GUID: TpB-2louNStq6WMsD-MqxTP6ZM9JKEcm 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: xKvMqR6OyhB5KAP7UgGY5OSJx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1628835216; bh=pNlBwiR9YK+DEmNfJa2iqkacVOzHFIe90fSS79EBzuY=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=GW2YFwV7pEv2coHNFHKy8iWEoQZBq+kF1AYCc4d5KYYXC6dmTEMEHhhrdcGh1Sd3r8M I53SRVy20EPb04lCr6A/mL0MRAiyr4DeBgcFF8Dlne+35LiYlWKegglBXsPsHWmiXXY2W mGESrMnxkMrYQCJcwgp09B9jnvrSTpDHUos= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1628835218926100005 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". If "acpi_s3" is set as "True" in xl.cfg, then the S3 Support bit is set and passed with fw_cfg. 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 --- 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 (#79247): https://edk2.groups.io/g/devel/message/79247 Mute This Topic: https://groups.io/mt/84857773/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 Mon May 6 01:03:05 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+79246+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+79246+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 1628835216496171.22995586680474; Thu, 12 Aug 2021 23:13:36 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id NNI8YY1788612xJxDyQ3woJA; Thu, 12 Aug 2021 23:13:36 -0700 X-Received: from mx0a-002e3701.pphosted.com (mx0a-002e3701.pphosted.com [148.163.147.86]) by mx.groups.io with SMTP id smtpd.web11.33291.1628835215469237194 for ; Thu, 12 Aug 2021 23:13:35 -0700 X-Received: from pps.filterd (m0150241.ppops.net [127.0.0.1]) by mx0a-002e3701.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 17D64sO1016239; Fri, 13 Aug 2021 06:13:34 GMT X-Received: from g4t3426.houston.hpe.com (g4t3426.houston.hpe.com [15.241.140.75]) by mx0a-002e3701.pphosted.com with ESMTP id 3ad7eb4na9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 13 Aug 2021 06:13:34 +0000 X-Received: from G4W9121.americas.hpqcorp.net (g4w9121.houston.hp.com [16.210.21.16]) (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 635D26A; Fri, 13 Aug 2021 06:13:33 +0000 (UTC) X-Received: from G9W8453.americas.hpqcorp.net (2002:10d8:a0d3::10d8:a0d3) by G4W9121.americas.hpqcorp.net (2002:10d2:1510::10d2:1510) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Fri, 13 Aug 2021 06:13:33 +0000 X-Received: from NAM12-BN8-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; Fri, 13 Aug 2021 06:13:33 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LmOHzS70zPt7PBSOxXvzLQvuae9OleEkDxMexdFPwuDx7BJ7AtuUvjfYzUTPXJ6Hr4mFgnQsA73ED4plAmq+Rp/2LQlGE0/2x2x0iXoxd2O90jNWZM6aS5SJSaCIWeuVWenX9qNrERzGGaYvc2JZG2PrgOynyXYlx5fe/6SO5ZujWdxzjLtLhSzOHP5zhmUWPj5v1UstnRC7pvmI0ImBNABGFsqj1fySChD37jWDOamJvO/AgDm3KzcWrKBz0XWm2TkrpMWSoMevqt3aOYfV4kxtVUuydJag7s4NuF2z55M7Z29oyLFEAqfie4KXaMZevEN0gB4zx/FuNFlXK5GJCQ== 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=yuHQgB/Oj0BuTo3Uh/YWvkxg4JSYWuY5qGZKc+HxT20=; b=RXZpgZH8MgsiSYH1mjVEl4WeckYldcRBRwNfTsroMDsBbAptCYcZ0305JLFbhzwZzhra+ZL8oYeEXWJNUiOZWv9Ki9n9G5cFvNUUkKM8UUY9rd+Kn4xIts7pGLGzXmGFkjcoBl12/Y8uMZMw5RLTa5KUJtSXTPivxH2iij8Rdw5LUyQqK94fJNaI1DRM6xBNamADRy4udmNfzuu/HaVon9N38EF2+S8AKqB1mDNxHHrtk67dy+ik/y7nclSpwnmITkJg1loLhvxW5cw598eydhLaqMchBQQ+ze1WTsemfSCpol5yQ5oUlh8ZAfVm9DH8oNUs8YlrNxviEVJJ3awnmA== 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 AT5PR8401MB1185.NAMPRD84.PROD.OUTLOOK.COM (2a01:111:e400:7420::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.17; Fri, 13 Aug 2021 06:13:32 +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.4415.018; Fri, 13 Aug 2021 06:13:32 +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 v2 2/5] OvmfPkg/OvmfXen: add QemuKernelLoaderFsDxe Date: Fri, 13 Aug 2021 14:13:02 +0800 Message-ID: <20210813061305.17519-3-gary.lin@hpe.com> In-Reply-To: <20210813061305.17519-1-gary.lin@hpe.com> References: <20210813061305.17519-1-gary.lin@hpe.com> X-ClientProxiedBy: HK2PR02CA0219.apcprd02.prod.outlook.com (2603:1096:201:20::31) To AT5PR8401MB0387.NAMPRD84.PROD.OUTLOOK.COM (2a01:111:e400:741f::21) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from localhost (111.240.110.200) by HK2PR02CA0219.apcprd02.prod.outlook.com (2603:1096:201:20::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.14 via Frontend Transport; Fri, 13 Aug 2021 06:13:31 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9cae7ed2-6bb7-4382-8c10-08d95e2179c0 X-MS-TrafficTypeDiagnostic: AT5PR8401MB1185: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:792; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Message-Info: uvRq4g/C0m1CTfRu/jdeOoJpbJP/x2VoByHQQM38zKQlux/KfNthgYQGszH8EkvGKemswvWn12gGI0X6ME1SAolQA2EZTMuVEOrP/KiYkuKCIE/Gi1ENr8dwZRhsucsqKOTE6iWRwr9baAcQZOP9fy/E8djnIxyjiS8XbMerDTjRcb831hshWfuPoM+Vlt91VmLIC5QXxW538P0XTFmtxO4jkIqw5bhwhLwQHPCrpq/tOyco6LdqiFZvWQCApnns7fcH86VjOlk36QYEBBklbU6vLKctXT3yP1jcYwmByrclCamYBgAl1v0CkmBQ4YAhex7pCD0vVNkoRY/Ynhv1oRUa0EcpdPwubaI5M3NtmBzykMU9gOe5oJ40XqvhhzAiUo78G+uH9sOAZFcHPESq4CW8uW1ECNvkEGWD1aoEDMXKP5eJ3WMR5yWyMKU8tbwAu36mYvr2Phx95j0C4wqrYWffUbkfh++ZhXsDhPBlalY9hMrU2lDxvSMzJ1vXalqZ62I0qlx13zu644oAKmdgsZjhbO+lUTAAeC4YcTdGqCM/KYpFQzQJIv4nXyqEMmAttU0NqHL0h5Tbpa0gUDsW2290pbFcgetjB3Se4yewwyqAS54RN4Jn2+2PALJtior+6T7AAOlCFI2Uso/ccbYF0g== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?xPPYMiakfs0cZZMt6ojN+1XlF6znKPzzW6Hy6JPFsicYMTAjtG4PxNMTkmAz?= =?us-ascii?Q?JUZNw1ntZ216gGrm4R4+/0o83aKnLoJtD2QozXzw/2V+VGcvv/b3t/QBwmxZ?= =?us-ascii?Q?FHrodeeur6y8yWD58Lfu831/+IRhNbbFe8j9gn6Hfq2ygAtd9Wbh4BFr0d9K?= =?us-ascii?Q?RjVeF9aPWJRFs66Apns+aLQ/NMgvyeD6ct44Pm5+LKRSaYx2IdvfoHRCJwTj?= =?us-ascii?Q?af7SfxOdYfqY0hYVbTQwnkbaSErj/M6HW+y+Gt9f4vawK6RBNkZDKlSGP5vj?= =?us-ascii?Q?Ud1jB/4LIZajM0O2aRBYatqJFUNMDTSsNTf0SJfFFRPROQHlTnS60Nfqw4e8?= =?us-ascii?Q?PcZkWM1FyKYovbVFZLsgraDnKKwvDZyzPjyOUtLjMHnsx1wEJ4jemBhx9oFW?= =?us-ascii?Q?CRA5OQcwMFklyoRWwprxE/IR9wcKGKNbDl8//DbJQkWG3aieb0UvtEVe5In2?= =?us-ascii?Q?JxX6Bao5a8LGaxtkAN0pMaj4QIPQYrbC9ekucSSi0FbcipdYeut1Q38uJcOl?= =?us-ascii?Q?efjrlCiQHrISlYgUf61gpDqrIMsZbDvSBhBHiN0EDDMpSQ/C+x/UI/ILeWxN?= =?us-ascii?Q?ZUBlE/habaODrnpz/2z8Uaj03j1r5c3tGUu5Zf1SI+0uAZdWttgHc3MMyn9f?= =?us-ascii?Q?Gb26BPUpEd1PEItwlgTmsmEhgay0GFQeZURuWzisEVb5BPwMGwR8+VrU7V/0?= =?us-ascii?Q?jqJAFG0TuFgh1vdxAyfEyuMcP2yhYaWGi0QGz59cKtPKwheDDh84eeiETvoF?= =?us-ascii?Q?+GYRWJVTeAANaxyvqQU0JUe5/o/IAKypnMLOX+2hx+2yDuYSgi0zGlBFybx5?= =?us-ascii?Q?SCxdyOhQ8gdFz3Y3MYqCaBaN3/ICcsNuDD9Og0OQUjAPEZXANYRG2Wr2fxIh?= =?us-ascii?Q?VmF41YyVm2qdRLSWaABCJCnLn0jxdOYmF/EJ1L9f9vjRf8n1H5GBzSTF0YS+?= =?us-ascii?Q?LQC26wpQlQtQzrfwWC+p/YuO/+YO0e0bsbdVYq9byBZecxmuJx9X0wWdgjNA?= =?us-ascii?Q?g5J8dJzPU2X74OjuDPj9txtW9QlLpqU95M6DJaHH0ZEG0dc1Nw0QCysy3GRr?= =?us-ascii?Q?9SLJgpjJpddxunRVsq/2OKmyLVEhCB4d77K1pFBYYzWO6S/hPtJ7TT2BeQ47?= =?us-ascii?Q?LVdahcSqzjfHA1REfITBIozGAWSj85K5VkTwrfC48CHBu2nz7FomH3QnwSSZ?= =?us-ascii?Q?Ya0jlZf7zhR08euSS93MaBHtgQuNLLq4VM41NPMmN9grtwpvOAUxjdcGcXvP?= =?us-ascii?Q?OPYWwB2tBpBGEqRACx+KATiS3f2prwXMnJixvKQAumvYzOjNsRa1SIIR57Wy?= =?us-ascii?Q?iX4LCEHwBNiKQwgdvkV7ZsxV?= X-MS-Exchange-CrossTenant-Network-Message-Id: 9cae7ed2-6bb7-4382-8c10-08d95e2179c0 X-MS-Exchange-CrossTenant-AuthSource: AT5PR8401MB0387.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Aug 2021 06:13:32.0528 (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: AlPGh2yCNA4bQvkyOldNGNHXltX3FsRtGqLwWZJR2hPR2Vh5fl32wxDCi8omM4hL403OBgDLFk9718uGI04rOw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AT5PR8401MB1185 X-OriginatorOrg: hpe.com X-Proofpoint-ORIG-GUID: 68DGmKxKUzn7gWSRN3UEFwPsYi-ZmlJF X-Proofpoint-GUID: 68DGmKxKUzn7gWSRN3UEFwPsYi-ZmlJF 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: fQ0yAURVcqVddYSqtzLVofbKx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1628835216; bh=69F6OSH99tabFzXUlYK+zMNP98xs7O7D58KJUpynzsE=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=fOT5Q3wq5OtE7PNsKrfCR+DRG1LAOqTifwKPk6vt9CHJaePYKUsJv+diijqVC6AP74n jBLzZaeGU+gHVB2c61Y/YRoWtDeXUdaVpdcP6KBNIx4g6wgD05Qph36qilpwWP8bTVXF/ ijG4W/LHsEu1NRhHmz5k/N61PJ5WB/W86NI= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1628835216892100002 Content-Type: text/plain; charset="utf-8" Without QemuKernelLoaderFsDxe, QemuLoadKernelImage() couldn't download the kernel, initrd, and kernel command line from QEMU's fw_cfg. 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 Acked-by: Anthony PERARD --- OvmfPkg/OvmfXen.dsc | 1 + OvmfPkg/OvmfXen.fdf | 1 + 2 files changed, 2 insertions(+) diff --git a/OvmfPkg/OvmfXen.dsc b/OvmfPkg/OvmfXen.dsc index 3c1ca6bfd493..1a9c06c164a8 100644 --- a/OvmfPkg/OvmfXen.dsc +++ b/OvmfPkg/OvmfXen.dsc @@ -587,6 +587,7 @@ [Components] NULL|OvmfPkg/Csm/LegacyBootMaintUiLib/LegacyBootMaintUiLib.inf !endif } + OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf OvmfPkg/XenIoPvhDxe/XenIoPvhDxe.inf OvmfPkg/XenIoPciDxe/XenIoPciDxe.inf OvmfPkg/XenBusDxe/XenBusDxe.inf diff --git a/OvmfPkg/OvmfXen.fdf b/OvmfPkg/OvmfXen.fdf index aeb9336fd5b7..8b5823555937 100644 --- a/OvmfPkg/OvmfXen.fdf +++ b/OvmfPkg/OvmfXen.fdf @@ -324,6 +324,7 @@ [FV.DXEFV] INF MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.= inf INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf INF MdeModulePkg/Application/UiApp/UiApp.inf +INF OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf INF MdeModulePkg/Universal/PrintDxe/PrintDxe.inf INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf --=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 (#79246): https://edk2.groups.io/g/devel/message/79246 Mute This Topic: https://groups.io/mt/84857772/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 Mon May 6 01:03:05 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+79248+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+79248+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 1628835223829438.42698476315513; Thu, 12 Aug 2021 23:13:43 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id hbLXYY1788612xftnE8cVOId; Thu, 12 Aug 2021 23:13:43 -0700 X-Received: from mx0a-002e3701.pphosted.com (mx0a-002e3701.pphosted.com [148.163.147.86]) by mx.groups.io with SMTP id smtpd.web09.33185.1628835222833938984 for ; Thu, 12 Aug 2021 23:13:43 -0700 X-Received: from pps.filterd (m0134421.ppops.net [127.0.0.1]) by mx0b-002e3701.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 17D6DDK6011189; Fri, 13 Aug 2021 06:13:42 GMT X-Received: from g2t2353.austin.hpe.com (g2t2353.austin.hpe.com [15.233.44.26]) by mx0b-002e3701.pphosted.com with ESMTP id 3adhef8pd5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 13 Aug 2021 06:13:41 +0000 X-Received: from G4W10205.americas.hpqcorp.net (g4w10205.houston.hpecorp.net [16.207.82.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by g2t2353.austin.hpe.com (Postfix) with ESMTPS id 2B5EB65; Fri, 13 Aug 2021 06:13:41 +0000 (UTC) X-Received: from G9W9210.americas.hpqcorp.net (2002:10dc:429b::10dc:429b) by G4W10205.americas.hpqcorp.net (2002:10cf:520f::10cf:520f) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Fri, 13 Aug 2021 06:13:40 +0000 X-Received: from NAM12-BN8-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; Fri, 13 Aug 2021 06:13:40 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XkxhhDyZoEnn2k1SmkyOAQjLlqcsKUJLG0iov+YyLGrSwV1dB33AqN1X4YjUgrqlzSP11r+rzs1dQj5bUXac3Mx0A2oixQfvi5H6skveIm+aKOS7nbwrGChOzKb68TGwSH0p6NQR47z+a4pmyQ5S4xgcPRmRyPZpC7MSjDZBKJOkoLVy11q5i4tcRStufVD9REtyrbq3Pl81vxAbuxGi0uZUKYspUuuAIcyoPLqq60bPYWalW5FUv0v/DTapS5SEvjqD70+w9lEKB0toW3VZlF5+xbPgExVdU/bJOz1obSSslWM8BNtN/sZn0/2rtglvRhkt9KLsCXs1HRoIo003eg== 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=f8/ordlpUanLZE+X+lRMNvFTizj27QYH+7UMxxyVVUo=; b=j4GnLU3sSWoNgxbfY2vuvahoPWX9Qkn8wyQlhjkY0lcgUbAlsj2Pp+AOSNN+EbeIb5dIEVYL/+9haUzoaxIq5u79Mhpb7S71AK73xBBeMkE9SdPbW4PEcP2o4Dfcy7DN6xyekocYA5t0noJLnQnsuWI9dOyQygibBsVnn/AiRXv2DLYZPnp8mhJ/esBlohFpzar/6ILpZV4+0LfuHjD4nk2Nyc6SlgMiKEy04pEwlp25zzfeD1hV05VnNDmDe27qJLZhLiNxMgr/VUU+kMYa/1iZaXzUdw+A56rbbhKfA0pYuhqp0AqhDUUgbS0IAn7Qugw3PQmJPlQeYOmPhC7aKg== 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 AT5PR8401MB1185.NAMPRD84.PROD.OUTLOOK.COM (2a01:111:e400:7420::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.17; Fri, 13 Aug 2021 06:13:40 +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.4415.018; Fri, 13 Aug 2021 06:13:39 +0000 From: "Lin, Gary (HPS OE-Linux)" To: CC: Ard Biesheuvel , Jiewen Yao , Jordan Justen , Jim Fehlig , Joey Li Subject: [edk2-devel] [PATCH v2 3/5] OvmfPkg/LockBoxLib: use PcdAcpiS3Enable to detect S3 support Date: Fri, 13 Aug 2021 14:13:03 +0800 Message-ID: <20210813061305.17519-4-gary.lin@hpe.com> In-Reply-To: <20210813061305.17519-1-gary.lin@hpe.com> References: <20210813061305.17519-1-gary.lin@hpe.com> X-ClientProxiedBy: HK2PR02CA0222.apcprd02.prod.outlook.com (2603:1096:201:20::34) To AT5PR8401MB0387.NAMPRD84.PROD.OUTLOOK.COM (2a01:111:e400:741f::21) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from localhost (111.240.110.200) by HK2PR02CA0222.apcprd02.prod.outlook.com (2603:1096:201:20::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.14 via Frontend Transport; Fri, 13 Aug 2021 06:13:39 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0974cb75-b555-4b77-d272-08d95e217e66 X-MS-TrafficTypeDiagnostic: AT5PR8401MB1185: 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: ye6JXpDhnBcF3EXihk7AaRGleNQ/NLvWxJSUPf6qw6bO5RYM/l5lMVkWpnEnZRfo5+jGxLw9hDd5Fx69JiVOX4OvOv0R5nc6Bd9dPwamwzvB9t5yrrp5I9sMU/CIOPA2V0Vp8ihOH34T4pDJXoNqJh5mIT4VFp678C/dYxNO+j2ZddpyKAoo5zNFKhPejNbPNc9nBsT7Xkvf7eH39rCgm1n11OrUnzZIHLFBcJVkiX3xHEh1HVBzfNIQt+v5hmmTpGHiFNw2quNWhNmCFsaE1Cm0FUqVnmhFu946TO1pOin7tuWom9UCPHG1LLRbIALQ+JW1nIqx4x1mVkeGCnkGAGI2B7bpN2lcJzIMv4vI3pw9N/SF0gO8CQjUwZLQ3zOzESdeG0R1c7IpJ5CBdN22YSCiE3ObQfQ4VrGOlSHxvPdw92T9dFX7aaQd9zv2Q2DKd8udirR0lZ3xIgiH06EdLMY+6ureohcikjUMBxkCgLQMvnB4dgQotgEWW4cURh3pQbQ+4o5Hut8PE9gy8pdOwptVCMD8p/n6Q9seotGFLFgLRJb1axh8t6gSLd6nyS/yCpdTT+vEVErdLBZkwD75vCvZ+xZDgXbrm4mnKH8HFymayWbxY1xNgbIv+Ezm0ivtrt+lAXhgNlQEU3Dk2k10Xg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?e2b9A3WXEkUy7exLF7HktLWJcTezVH7C5dj18E/lAq8TfoSCsxibDa0p0XjZ?= =?us-ascii?Q?7Ow6CPYEMZuGOQiyV/Bt2PUVkAjEnXS7Chq0F3Oi0wMxa3R8jbwh9apEXmp/?= =?us-ascii?Q?iNhJbrhYSEZDfsnqVV5SL18R4DKJsw4Zz/SRYpnnaS6Bc6qVYt/KaS18Qqc1?= =?us-ascii?Q?nnr3Zoxlwq1D68fdp72QUOw+tNq6ljAIy0/LFIAHN1OL6lNKlQRiYAjK+grv?= =?us-ascii?Q?6aW8VpVzY7eQLxjSf7wn2TPLyh6M1VvLRCOot4cEai8XCkBO9T7zCTe1eJno?= =?us-ascii?Q?VoFqysIeVPoE41guKaKSubM2oGufL2Su1ddmh/0StRdiTTNOz4pLdDgpLIb5?= =?us-ascii?Q?oDCXo1phhNV8IirSk5Cj9e2L6Dg2RhQi2nYphFAC/xJjEH35ltS+nHHuQF8Z?= =?us-ascii?Q?bDrfTfwiARCWd4zGOt2g0cFIuKcXpWTCysOMKkbYZvrkdcTkVElEGnfC7zAn?= =?us-ascii?Q?um/p6TpShmiUZEofqjxBdW8kf/iTYKy2VTndbwLo62TceA+uIKd3Azz4mE1w?= =?us-ascii?Q?DSmJEkRKlNag6/Mx6+WHFqN2OVoTbBa8vo9GFUVNWs7/IAPnk19Djn2SUOAE?= =?us-ascii?Q?u8p3ls5BJNOxXUXJ1utYKRbTa7Ku1F2aEttz2c6KOCoOYut/oSzXr3TkWHZ4?= =?us-ascii?Q?YG/w0s7HgHln+jlZTkTFVQSn8W+JJ7LRCsuR7bip/07bzEFeZUn5uMrz9HaZ?= =?us-ascii?Q?A2sePpXHKa1s47PWEYE2UUwtnzvlS9BxN2OE7YbWNIw12N1ILdCI6dVbOugn?= =?us-ascii?Q?lQOCxqqb5LTlzb/bP+IwsEH/4KTxIlacaqEQa70YFpoXT4QycJbCUAOxH7Pd?= =?us-ascii?Q?vpkd8kzJpCatvIbCzmdd9D5WE8qSHILXJ4oHIrbl6Vl6T7YK1Hl2z5ftQHCa?= =?us-ascii?Q?8r1IZinXHeJoRQgTbIQs7s2DQN7duvLBGh589L0RMt5QCBXCtsV/X2FiH33T?= =?us-ascii?Q?aH6g06Fd3kC810hY/kYGUohYSchsZyz7GARTNfv1pneJzp+oNs/lSUHyK7sr?= =?us-ascii?Q?15oEcdqyqsrPh9WWctwEw3zs8IWbXSoc8tuxKHFt90OM9Om/btzJ99NyyyWy?= =?us-ascii?Q?kwmWAbEJb6xnCBTTVbThkQURd2anthoCp/YLgaczPzc2hn1zM+r/ieNGfB/y?= =?us-ascii?Q?QjXn1iHsk9HkqLQDRT54v/dOfbSrI52KaRtH1a8zWVMSO653kSRvF3VKMWoT?= =?us-ascii?Q?HeQm98LZYXNJ4vQzg4G4A4/bi8bcBs1JOoVgzNemtyphsEu29jIyCtFBnGyp?= =?us-ascii?Q?z+gNFOf4nJYtk2d6HIyrBRPw0wLhds5Bo8WhplphD7VqATCVUCfA4HGncrnY?= =?us-ascii?Q?YJpILL4pdF8yhGyjbQv6ZW08?= X-MS-Exchange-CrossTenant-Network-Message-Id: 0974cb75-b555-4b77-d272-08d95e217e66 X-MS-Exchange-CrossTenant-AuthSource: AT5PR8401MB0387.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Aug 2021 06:13:39.8454 (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: J5Gepf5igVK3vYBURVdLl7JXLgdOFybvWx5pt2pIO7s7I1ON1tZQ+m1UxmK/ymu2Yl7Uusm/bvee9m/Xk6tdxA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AT5PR8401MB1185 X-OriginatorOrg: hpe.com X-Proofpoint-ORIG-GUID: 8n56Ca5a03EEM87gsVcZ8DwXwPMYdghk X-Proofpoint-GUID: 8n56Ca5a03EEM87gsVcZ8DwXwPMYdghk 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: kz6wyPDt2HFcGmL8cnejBkaLx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1628835223; bh=BPErYqFTTgrZX9NQhoHfNlly9AyhgC8RgdyVRfQdaJc=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=tOXaIRlpv3tcWZIao6FVOWjc8voWuEjb7pX2fW3hF+AUU6HQimcpBOCSQDp7yJG0O1r OH1IdVeOcqj3Wtli0nxhTs+OuLEwdeevk+IsK2s9S9xWUA4J/d0A9Bx9aDjdf3ndk17cl hw8MgZscwFU+6skNBFyI9i3ZQQIJXOoZv9A= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1628835225299100002 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. Cc: Ard Biesheuvel Cc: Jiewen Yao cc: Jordan Justen Cc: Jim Fehlig Cc: Joey Li Signed-off-by: Gary Lin --- 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 (#79248): https://edk2.groups.io/g/devel/message/79248 Mute This Topic: https://groups.io/mt/84857776/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 Mon May 6 01:03:05 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+79249+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+79249+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 1628835231139224.52460138934828; Thu, 12 Aug 2021 23:13:51 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 03P9YY1788612xyWFXaJRpdu; Thu, 12 Aug 2021 23:13: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.web08.33195.1628835229948107976 for ; Thu, 12 Aug 2021 23:13:50 -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 17D6Dlww025943; Fri, 13 Aug 2021 06:13:49 GMT X-Received: from g4t3425.houston.hpe.com (g4t3425.houston.hpe.com [15.241.140.78]) by mx0b-002e3701.pphosted.com with ESMTP id 3ad15w02n9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 13 Aug 2021 06:13:48 +0000 X-Received: from G1W8106.americas.hpqcorp.net (g1w8106.austin.hp.com [16.193.72.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by g4t3425.houston.hpe.com (Postfix) with ESMTPS id 5E7C58D; Fri, 13 Aug 2021 06:13:48 +0000 (UTC) X-Received: from G4W9336.americas.hpqcorp.net (16.208.33.86) by G1W8106.americas.hpqcorp.net (16.193.72.61) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Fri, 13 Aug 2021 06:13:46 +0000 X-Received: from G4W10204.americas.hpqcorp.net (2002:10cf:5210::10cf:5210) by G4W9336.americas.hpqcorp.net (2002:10d0:2156::10d0:2156) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Fri, 13 Aug 2021 06:13:46 +0000 X-Received: from NAM12-BN8-obe.outbound.protection.outlook.com (15.241.52.13) by G4W10204.americas.hpqcorp.net (16.207.82.16) with Microsoft SMTP Server (TLS) id 15.0.1497.18 via Frontend Transport; Fri, 13 Aug 2021 06:13:45 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WP1T2Epn3M6rSa4O/eaunKdvYOTJF4hRoqGqm1GDXNUahoy2Xm7XcR3ey79N7nzdpZj0V2xD08QarDaVtVRUmdEVK20BpjezL4HES+47AcTphjSgFci5g55/ghNaVEN5MPzcYksimxJYrPNZNAEP4W2BX/tT0cR6y+F95fnhwG9go2za0MSfPswTkkDSUfcaiQMJwkpa273BBWwIQxtnQ+hC6uZuIleqzoL9r8/JIIuxBEMlXiVN/hCkfZCwKpnOCS2A77MnQgql0tqf+9pywPfyNFD+bJ+mXE4NUULfaAe3YqXbLP49h73JwUfsH5FENZBAZ6mC+HiEvK8ghnEmag== 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=qBBWi/qL61HkehDNY2ksbCYEdw5Thue6OyNqbbSmEZs=; b=kpI0fidbEVtRVQKmMJgc9vdGd1+xNQVQ9ojxmjTw1fZL4GqhLH8VkH2hKntX/7723375N1DibkHzC63BSI7z2tgzCMGaUjpCiOuMRqwX1/mL7GujvMSkh+g4aVvwGAe6wcMC/x1gli9nXZ8SxMK0CLQBdSTx39BPyJ5s4guQxSU8mvLvZdiL38VljKIiagr5z5ScQYsfxud4vljI613PHe4FxO2PI6FmNCl7GgiK7KetZ+aCZACYhFK+rE9yepg2mFszc6ZvZRm7xJBRGDu5/NwtPde0FdzdVKr/vBXFw2jPG7zthBRkc2wYESRobRrEjMginC1HiKpz6QaudbWv5Q== 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 AT5PR8401MB1185.NAMPRD84.PROD.OUTLOOK.COM (2a01:111:e400:7420::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.17; Fri, 13 Aug 2021 06:13:45 +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.4415.018; Fri, 13 Aug 2021 06:13:45 +0000 From: "Lin, Gary (HPS OE-Linux)" To: CC: Ard Biesheuvel , Jiewen Yao , Jordan Justen , Jim Fehlig , Joey Li Subject: [edk2-devel] [PATCH v2 4/5] OvmfPkg/PlatformBootManagerLib: use PcdAcpiS3Enable to detect S3 support Date: Fri, 13 Aug 2021 14:13:04 +0800 Message-ID: <20210813061305.17519-5-gary.lin@hpe.com> In-Reply-To: <20210813061305.17519-1-gary.lin@hpe.com> References: <20210813061305.17519-1-gary.lin@hpe.com> X-ClientProxiedBy: HK2PR02CA0222.apcprd02.prod.outlook.com (2603:1096:201:20::34) To AT5PR8401MB0387.NAMPRD84.PROD.OUTLOOK.COM (2a01:111:e400:741f::21) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from localhost (111.240.110.200) by HK2PR02CA0222.apcprd02.prod.outlook.com (2603:1096:201:20::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.14 via Frontend Transport; Fri, 13 Aug 2021 06:13:44 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8b2df629-ce12-4d82-3934-08d95e218167 X-MS-TrafficTypeDiagnostic: AT5PR8401MB1185: 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: 6JRUUsqVsbKOH4iqkjO2XinR5lI32hFl3fZD8GhJKzgUwFeT5DUikMFzOE7RwGY55U92YUKfmxa1RMYGXsL50ID5x176ATX818LXZlFnEsCWIm3SBDHQ/jXeSlRpZXuZ2sBUZlBAiM6v00Zv/3e41xAbJ18u3NqDCn/ySy6QEcamd4x0nj+DRUj2hx6V82cas1D5hkFb9iZOD3aNKwNfBdI9sEc9tv0eAPB+vD1a14iVMhDY4ssxc/t8OkNXBDSYn73575c8qT68Lz2hoWK2S33CdAuGLyouxBbVQxnENcPDfvoIQOkhlJ/d5Hm45WCWMuK9l1GSXUVNfsWcMOVfrwMV9xzjuyei25QzsKHiw3JvR9YvYQDbkhFcrXeSPuo0tUWyl0OKg5HSW5yxAC5HIzoNfLSXreXt35uemJj0Id/5/wgrd+hhMJ9EcZHG9fEFAbQXTUXXJrgom7RATwCnvmsq0Cby5E5Dpq8CpAqs53vnqIViCI1x1Z3mWlWoHLiGK6aZC992Lb5mmX9I/lS2CH5wEvXV4Lo2+NXlnCna0q2Ej+M2rRhBcRhWZnvlopzp8kIyE+Y1j/O9HG00jQnJXo+A/A2ieyBgjSN/VXy5R3Jx4lobRtGQp/eb0a04RRU+8w6XNrVchmPbFmKGMFqUcA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?NK+FHvuACywbF3qbEEzNUprRaVHIsnYF4Nyx5V6snC3MEdGsQ6wm8zldMUod?= =?us-ascii?Q?ZUlS68xwJldjLu3PRXoQZ8xOEs3L3ELzdK551YI5c5/LBrJA22Os4cLUplC9?= =?us-ascii?Q?xVNgXxQxdc18C/29SDpTej9lByPXH8B257jYGFkCcHGtLOW2mWJYVLN4wEkt?= =?us-ascii?Q?Z7gGxB3OVIdVTXsrPPcrr7vWG+0kz1EQJUJDnNvgxEaJmKdRZM+wYTOH0rn4?= =?us-ascii?Q?N7v3XKbm+e79kPTXrrYRlupJGs+GdHGjV5IqValSwEFzeBfA83+QrUgGmdWP?= =?us-ascii?Q?op2b1niLLziPE2H330O73XZppk8RfeBqv4EJaKaUGrZK+lxXW8utdOUfkH+c?= =?us-ascii?Q?9ErSwx5wyyj2P6igr2GjXf+Uj832teR9S9HyfaBTUHvhv193TehQaapgHmsw?= =?us-ascii?Q?TzZVpAjKjZc/h06dcQtXvPmP+PXja//DJCbkJJF76Zh+woF24LZg1rQUZT/s?= =?us-ascii?Q?CjrORN8EUVQeEsZPW6hPeYOPiqQiwlv4jC7HUR5FFW6+ppZKy3EV4pllNq6z?= =?us-ascii?Q?UC5OSeb312785jsTgYD/6ThpvId97cYME+HC+zs0EeJ8yif82N7s5IkcVc5/?= =?us-ascii?Q?aSDXWIiCb9YkjJmPwU7INOGrGnaWe4E7+dQ34AdleuEjY/ILK2oHjm/LYxzI?= =?us-ascii?Q?yQ2Xzo0y+nB23XEnmvNnsLVnGlXxW7RunaZRn81hpEYy3/E4KdzcQrEuF9xu?= =?us-ascii?Q?6qwbi5ef9oZOY/W780bGI8e28Cjt88RFXbLlzgoDrOc9sYZ1F8djRbZ+Q8fZ?= =?us-ascii?Q?cvgqCAlVLCTQ6I9gsKy7nx2ObQ9SEToNK7fz6OK3uT63KFXTJeRk78fSlw+w?= =?us-ascii?Q?XJfviizmK4NmVX2bTv6FJ0ZEQnpiGtgnLc+0VaGVc/5M54AjxgNUsItWSiKF?= =?us-ascii?Q?mi0mLnZpQ3ZtAgapkpAqGCyXyh/S4Obkc9vAOmsNboJqDvPTkxLCmtAo9m7u?= =?us-ascii?Q?m4YGfLG9kvxIGGXXvVKgk0xHnVekXoF4QfeIZy80TL/jfDPy8h+3uVFjoSXE?= =?us-ascii?Q?DEIJte7YDf62ncOX6pFxOmxhzhXeaPspZ71GifKqzc7q3D6qh+st1pT81d1H?= =?us-ascii?Q?vDy3IA4XuRXP6xhovKa6xti663UKTpSG/Jxz+82AuwYjGKWzgjk4RxrmX2Xe?= =?us-ascii?Q?qv567EjFQ7Xy+ijqdPx8VSNw5KGJFc5v5q0wRmiHIa0cVoxSEsFfq0xGE6iA?= =?us-ascii?Q?I1bmTabEH234iDZ8FCkYlvR5UP9+ToFdFLKE5Mkz048iXi28ImlV2xgUi/vj?= =?us-ascii?Q?0raAStYNuefmBnANFWFtiXZFDjq3g7oDrLoZjhX3VAB6QI5gdpewC/nAq2cg?= =?us-ascii?Q?pmx9icKhctyCJnGDSmp6ldS/?= X-MS-Exchange-CrossTenant-Network-Message-Id: 8b2df629-ce12-4d82-3934-08d95e218167 X-MS-Exchange-CrossTenant-AuthSource: AT5PR8401MB0387.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Aug 2021 06:13:44.8902 (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: KEuSoiCManpf+p3QUsaV0Vpl/W9kJN6WdVFqXiFARKryCtIiVWWPZ7hm1f2YUW/Y5r5ZmCnReysXY4Mo23radw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AT5PR8401MB1185 X-OriginatorOrg: hpe.com X-Proofpoint-GUID: x8vBFSEYaiZ6wt8THjq9HKAfuMjEPd2j X-Proofpoint-ORIG-GUID: x8vBFSEYaiZ6wt8THjq9HKAfuMjEPd2j 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: 046Hu8WWNrfxfdUhQxPKD7fLx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1628835230; bh=SdkhfxSWkkZABcO+GDlaR3KezFcXQ3PLjs1YqpFx7jE=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=Kxgj5tdyMI+m/AIRm6gOlWcnP1GBREDHQt3b9aDeAatczLwB50H97a1+CwZWMnU7JsI C/mTxRCYCDz+XhOqryGWPQPEQTl/ChxTPF6bVWpfJ3ekkfgtUKjG6p/yZiqt7t1Ttv4O5 ZCq4tXeiI+KzcobKPvy8YfAcLFXHHbdJ2Kw= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1628835231711100001 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. Cc: Ard Biesheuvel Cc: Jiewen Yao cc: Jordan Justen Cc: Jim Fehlig Cc: Joey Li Signed-off-by: Gary Lin --- .../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 (#79249): https://edk2.groups.io/g/devel/message/79249 Mute This Topic: https://groups.io/mt/84857781/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 Mon May 6 01:03:05 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+79250+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+79250+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 1628835236475274.9817092843656; Thu, 12 Aug 2021 23:13:56 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id ePHLYY1788612xSk25FL2sUW; Thu, 12 Aug 2021 23:13: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.web11.33294.1628835235453330245 for ; Thu, 12 Aug 2021 23:13:55 -0700 X-Received: from pps.filterd (m0150242.ppops.net [127.0.0.1]) by mx0a-002e3701.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 17D632Tn026227; Fri, 13 Aug 2021 06:13:55 GMT X-Received: from g2t2352.austin.hpe.com (g2t2352.austin.hpe.com [15.233.44.25]) by mx0a-002e3701.pphosted.com with ESMTP id 3acr2dkrjv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 13 Aug 2021 06:13:54 +0000 X-Received: from G9W8456.americas.hpqcorp.net (g9w8456.houston.hp.com [16.216.161.95]) (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 E042E9C; Fri, 13 Aug 2021 06:13:53 +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; Fri, 13 Aug 2021 06:13:53 +0000 X-Received: from NAM12-BN8-obe.outbound.protection.outlook.com (15.241.52.10) by G4W9120.americas.hpqcorp.net (16.210.21.15) with Microsoft SMTP Server (TLS) id 15.0.1497.18 via Frontend Transport; Fri, 13 Aug 2021 06:13:53 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Wg7az5kHMTMX7JTBjQ01gwIZqK9s6VTVPA42IXeH9tprZJLa3vgR987cgEcZpLl2dahc10CuFd25fQoKhn1udtRHhiLYmSJy6WUABbNyN3CS1jaTY4NYftWieI8Fw+RRh0n4VuJJzr5fxGZwMNXMxDjxCLGD2I2pIyeC8HksqssWUys8lr22dvBO8FysedmX4ImIgaX3qYOUQp5aAPH6RJ46wtsR+/WqgnmDRF43Vu6fVXXXvrfd0uw45bdDyzg9rVfzxn+EhaEwkbgMGXC3bS2YXtWvgzW9l5wKxrFCG7ePzdAjjXuQN2ylv/DtwhQY9ASc7wUkrqX2t/ElIAUqwQ== 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=4Sal6jv7GAAG+FGBjRpnTtOGRC3R3Ufi8PEm6HppZF8=; b=TNJpMArQEVVU+plsrEFN4OiF4fzQm7lR9mJ4NCXQHtN8L0blvZPr45acowpRzZVZSc3jWZCFp/PLpiH0bQtEhBN4ayq1sbi11ve0uKHnfLYvA6FHuy3JBFW5q7p8o8Sz7EVeEpb1T4CV087AQfAuMR+Q8cQXrt/Cj21I7C8zRc4VBu7NPoyTBF1/jhHsBKKhnnrnRHm0P/o+QeVOjq1vv+WS73vvBvHP1CWon90RM868ekAGdGmih8zQUTXT0yVEF5fJFG9h+moCS+LDCEYKKg93Dbj70mOy3RrZLAK+H9D0aA+MiNpO/vbMgoPLCYYRx2g6KdueQe6S9+r7RrvE1A== 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 AT5PR8401MB1185.NAMPRD84.PROD.OUTLOOK.COM (2a01:111:e400:7420::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.17; Fri, 13 Aug 2021 06:13:52 +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.4415.018; Fri, 13 Aug 2021 06:13:52 +0000 From: "Lin, Gary (HPS OE-Linux)" To: CC: Ard Biesheuvel , Jiewen Yao , Jordan Justen , Jim Fehlig , Joey Li Subject: [edk2-devel] [PATCH v2 5/5] OvmfPkg/SmmControl2Dxe: use PcdAcpiS3Enable to detect S3 support Date: Fri, 13 Aug 2021 14:13:05 +0800 Message-ID: <20210813061305.17519-6-gary.lin@hpe.com> In-Reply-To: <20210813061305.17519-1-gary.lin@hpe.com> References: <20210813061305.17519-1-gary.lin@hpe.com> X-ClientProxiedBy: HK2PR02CA0150.apcprd02.prod.outlook.com (2603:1096:202:16::34) To AT5PR8401MB0387.NAMPRD84.PROD.OUTLOOK.COM (2a01:111:e400:741f::21) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from localhost (111.240.110.200) by HK2PR02CA0150.apcprd02.prod.outlook.com (2603:1096:202:16::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.15 via Frontend Transport; Fri, 13 Aug 2021 06:13:51 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2b830851-22c1-4bc8-f28e-08d95e2185d0 X-MS-TrafficTypeDiagnostic: AT5PR8401MB1185: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:409; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Message-Info: YnxpQ/yctZOaIfAfygRenHHK8Unys0E+QoD9hkIz8TG3Oo+d3WI8CYxCcRSMWZS1r94Tt15uIGaaviIyGkhguYC7mC1e5M0xnTGseFCHEMOp5JaADgl6M+rzIsyEKYvyoglXbOWhx4YXTO6idP+TheZctz4wQdJ73Wg3zWNWcGQsvIa5UduNwfnu4inpade/TuQTwXn1s8df07C3svvIzTAFYl+OnSJCWR67PX5uj2PXScLGYRPIDUNu1LgVPxMWAIGTPPPhq46H3ysSvboW04GOf8agVKgYCGja4Yn+kE5Vu5tkbMEUUkmnJLnC8gEucP8fXvzftpzda8nMVcBw6iW3jdRXaUVav+i7m5HUbyKjiBlItzeK2BLhiBTh0R7nS6JTsk+gaOYUBWY2UX3RmxplxmbwHMCa2fEM/2NlCgf+ICIFiUG55XOVjrHRcBUQkcaIFPSytIT92iqgCJtaynzn2tAC5vhtjo6iaqAeOmPMSVXTbURXCKkQsW9b6bIaA7PBR58W1xcFO1GndkCP4n4eVhi8WuAJKX35B+ilRSUT2HicU7GxJZcKAKmTZCnDWf5z6UqXdciN1+Ek2oZeQJwDaXi6fzqb2j6KHkk57p5KSrlZhUf4PK1bh81No4EqYAmLmVh5NupnZTBm/gxemQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?AAskHk2T89z/aeANxd3pbK4DZAhYn9L0GZKWXeuRriBWV5cX8lRpyKNta85h?= =?us-ascii?Q?ZE7G9KEHlwjL+pw6i7+ZFQlY5QLycZKAY2GNTKwmRlIc0i6QBOQ/9S/O/Uvm?= =?us-ascii?Q?+s9VxQ5M/ndVGyBEgKj1wTEx7sVuLu2ldbMV4WdSc3MH4l8MJ4YyM9bMucMv?= =?us-ascii?Q?VueV2aBQ4YY+k3ijD7cJ4H1PNeUqShRdB+Dm5nSAhgRyQDxUiwTS3YfaD310?= =?us-ascii?Q?RX335NaWwTxVKtPKzYGNhSS9x54WD85tYTX2Q3fSJc3+r42Z75WggyhcJMub?= =?us-ascii?Q?FvnoYWwE7m4rCFRpCnlaiGDOsHTS6Z88uDsnINjw463BVVdsXycEVU4H7z9g?= =?us-ascii?Q?vDpYb3LDumPIZzyx+s1o96YdLjtKzdOyGk2MJU6onmPp6vCqzgH04RsmS5dw?= =?us-ascii?Q?sO44ZmaZW9rWoEPJss5rfh33Cr5VQR2NZyzeu67UBLJDj5k+pL/ZTyLY+/Bt?= =?us-ascii?Q?oLH5B0cZkN/jEdzc3X1rd29f/BZQdQ6SzyWqtlut95fABnj9gIrn+LHQ553f?= =?us-ascii?Q?G5UlM9YQZzZoIt/wPUmlnF672GwmZEJ1Q2W7FZvYwQ/Dh99GvX2y0rFX27NQ?= =?us-ascii?Q?jCIekbIirOLQ18NWJLLrwe1UIdvSU84csN1zscPz8tDvmasgKZp3G0kLaQDk?= =?us-ascii?Q?9qzBHb3+zevfz7rHS7I1EwqoVZkEMJvBZC3EXqlMAyAFLFAIMTycm00kZSlu?= =?us-ascii?Q?Wqjun4+RgcWK0W3hxJD8XKwih41Jafe8VcplevSuBGC+bsRCrM6Ig6OqbH4z?= =?us-ascii?Q?kUJ8qsQYwsN13YLncJDibwRxD2/XwixM9nZPqsIWuK7Hy4gZGeyzJ8EWZSov?= =?us-ascii?Q?hWdQ1dMxOTMwXGKdsATyNxBAS+QYY+LYFDymJHftFBEQ++EUBQVMwI3TWqg7?= =?us-ascii?Q?yyb4AnhaeKfyVLXQVEsIinOnF2mmo+UK/Wz5Eo/J7ytD5bHtzargCyKzOAtw?= =?us-ascii?Q?0JngK5tmLmWufd7apZq8CHHyVdQuX6xfWx/UlH6ByRLcEN4Y/360NQ6AaFCQ?= =?us-ascii?Q?UTQOK8if1yirRhe3+Qm69DLMj3O9R+1NsttZWCy0wyWh9WCsZ9MZV/FfeUQs?= =?us-ascii?Q?xjD1SbjHBO3fGaZhABQYYAFz5S6R/BWR9TmqjZYNOZYFzdtKOTX3BGm5d7Go?= =?us-ascii?Q?EWcdNVYYbyPX+ftnZmJT5ScKOzCEYJYQVJDiqbuc/GuE9jEEx/BOqTFR7MIH?= =?us-ascii?Q?58oIx6YOYMDWYi4FAUPH21+1bO2N/EobgYS0tVzT+eqt2UAbzm4Rer0iYjOQ?= =?us-ascii?Q?cQUhTQtrsvWqNAfIS/IcKl2Wm1/WYEStthVjyMjmqiSP+5NPlwHdNGfucgP6?= =?us-ascii?Q?PNPLrSEMVO4yV/9y73MZowDg?= X-MS-Exchange-CrossTenant-Network-Message-Id: 2b830851-22c1-4bc8-f28e-08d95e2185d0 X-MS-Exchange-CrossTenant-AuthSource: AT5PR8401MB0387.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Aug 2021 06:13:52.2880 (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: u0WyPQ8aIiSku1bhyjNp42JZXZT9RBNafsuRvGgfcmNNHLn0oFU+ceEd8ItkVlFUkAYp7moYbFhZ41SHM/GpCA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AT5PR8401MB1185 X-OriginatorOrg: hpe.com X-Proofpoint-GUID: MYvXMEI6qsDsPC-bq-kME6bXhvfgFpek X-Proofpoint-ORIG-GUID: MYvXMEI6qsDsPC-bq-kME6bXhvfgFpek 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: nT4DJ18LeqJJyzZBM3P7955Px1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1628835235; bh=XQteAsf2XfaQPs1vViteE+gvLPxcoh/UPk5a1w3mGB8=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=JE4gmcoharpqbeJC6d0Pu9qzpgrJKQsaaOTbo9PZEAs+sB5BJukUijRJc5DAgB4EZdS a74o5mDOg5LDar6plVge3rcVow7/ycRwyUdECkV65aIUB3uuLFfb2dM3I6LZ4lwvWAmub r0eiu301ff5Lotj2jaIViNC+aTPM6Tzw1Pc= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1628835238031100001 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. Cc: Ard Biesheuvel Cc: Jiewen Yao cc: Jordan Justen Cc: Jim Fehlig Cc: Joey Li Signed-off-by: Gary Lin --- 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 (#79250): https://edk2.groups.io/g/devel/message/79250 Mute This Topic: https://groups.io/mt/84857782/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-