From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-002e3701.pphosted.com (mx0b-002e3701.pphosted.com [148.163.143.35]) by mx.groups.io with SMTP id smtpd.web11.6331.1630373497425319212 for ; Mon, 30 Aug 2021 18:31:49 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@hpe.com header.s=pps0720 header.b=Xh/ea3xK; spf=temperror, err=temporary DNS error (domain: hpe.com, ip: 148.163.143.35, mailfrom: prvs=087783c359=gary.lin@hpe.com) Received: from pps.filterd (m0148664.ppops.net [127.0.0.1]) by mx0b-002e3701.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 17V1IriE003321; Tue, 31 Aug 2021 01:31:36 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hpe.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-type : content-transfer-encoding : mime-version; s=pps0720; bh=wgx4U3rYjglbg2vTYtnExLchpUkF54eCiA3VvVgMbtU=; b=Xh/ea3xKFdIoA6xCxZ+fj6lbr0qfLiOOQuMN6/pYPWI/3/AwaIvUy/tdy+AQPCZqsYjW WwG0XRUbhxNGPaM38U13oQwJoFPl33QK+9tspZ6HORhiaAHlKnKUmav62wjgKwwSqw1Q vTDDUs6iL4ZwA/uNQ/nxjK8SE9Mc+G0wdVl8CUAmn9aeFXwmyCd5Yo8hQ9Rc/o/u5gZY GadHYZM6SCL98lUWNQzadaLVHFAPL9TxMsVuIPUulRDr7W/rgteIzT+hQBkSqChL49oh s+Ca6Z6m5Qn/pIZr8RId0CsI/DHQuSjVFepKCxhE6m6UhnqXIe1udS4quthsPUzgHDTe /w== Received: from g9t5009.houston.hpe.com (g9t5009.houston.hpe.com [15.241.48.73]) by mx0b-002e3701.pphosted.com with ESMTP id 3arpqs8jnr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 31 Aug 2021 01:31:36 +0000 Received: from G9W8455.americas.hpqcorp.net (g9w8455.houston.hp.com [16.216.161.94]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by g9t5009.houston.hpe.com (Postfix) with ESMTPS id B5E565C; Tue, 31 Aug 2021 01:31:35 +0000 (UTC) Received: from G1W8108.americas.hpqcorp.net (2002:10c1:483c::10c1:483c) by G9W8455.americas.hpqcorp.net (2002:10d8:a15e::10d8:a15e) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Tue, 31 Aug 2021 01:31:35 +0000 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (15.241.52.10) by G1W8108.americas.hpqcorp.net (16.193.72.60) with Microsoft SMTP Server (TLS) id 15.0.1497.18 via Frontend Transport; Tue, 31 Aug 2021 01:31:35 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cpL4h7mO+GYK3Ou0xcRpOWfWYwz13DZrYx/bQvpR2oMLs9tK+f2u1Ln5JYMt95TciXyTtHLLTJy/JxiwaPRPm5bxNYnSY/q0xpdeWT02m4lO/OOFErtLvYdYbukOO42p9hMPAvHxRfuBjJoV/Vype34HRvfwOanKgqgUastJLvu/+LJeINyLTOBim7kqM8OZR3b9n1CJVsgN20BM5v/aAuXCSLZw6yd/uJeMQcw+RbPI82fsa0C6pp6Cp1P9ckzckCuVu4hN/d6ru6o/MTMYOnIZfiWtPkptaLmigpvpb6F4HGBmEa3XYxHCs7ZZ2SnsnXX2xOKaxzCJ4/7w+4x7jw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=wgx4U3rYjglbg2vTYtnExLchpUkF54eCiA3VvVgMbtU=; b=H8GwL40W1ac/cZGEpwAS5Lln8DORel7dOrcCT93ZgMtkpdfg5EEe/ITkbJ4gPLZLA/+/kh2j7K57i7PHybHWcf0ZORfMpuNGZbt/bK1lq7EUL6b4Tz79Nm4cjs5nxnNA/szHOVWZpZVNaVrs4+8JcpLtpwdJu7dpvmWSuix26noulx7To8YSoT/YseBTjOkCx2INcUzreZtAUuGWpw+0n70Qi/H+HRNZiwqHzDR9DvAEZvYQuKOOYC7461ugJGGJzR1lI4YPSTuu7vCK8X+vnInYF4ajjlkgZoHPM/wiT0kw7aAYiSdmi83VxU6YN6EjrmnrXYUm5daaOWjJqLattg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=hpe.com; dmarc=pass action=none header.from=hpe.com; dkim=pass header.d=hpe.com; arc=none Authentication-Results: edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=none action=none header.from=hpe.com; Received: from AT5PR8401MB0387.NAMPRD84.PROD.OUTLOOK.COM (2a01:111:e400:741f::21) by AT5PR8401MB0355.NAMPRD84.PROD.OUTLOOK.COM (2a01:111:e400:7425::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.24; Tue, 31 Aug 2021 01:31:34 +0000 Received: from AT5PR8401MB0387.NAMPRD84.PROD.OUTLOOK.COM ([fe80::106b:abb8:386b:a2db]) by AT5PR8401MB0387.NAMPRD84.PROD.OUTLOOK.COM ([fe80::106b:abb8:386b:a2db%9]) with mapi id 15.20.4436.019; Tue, 31 Aug 2021 01:31:34 +0000 From: "Lin, Gary (HPS OE-Linux)" To: CC: Ard Biesheuvel , Jiewen Yao , Jordan Justen , Jim Fehlig , Joey Li , Philippe Mathieu-Daude , Gerd Hoffmann , Jiewen Yao Subject: [RESEND PATCH v3 2/4] OvmfPkg/LockBoxLib: use PcdAcpiS3Enable to detect S3 support Date: Tue, 31 Aug 2021 09:31:13 +0800 Message-ID: <20210831013115.23110-3-gary.lin@hpe.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210831013115.23110-1-gary.lin@hpe.com> References: <20210831013115.23110-1-gary.lin@hpe.com> X-ClientProxiedBy: HKAPR04CA0008.apcprd04.prod.outlook.com (2603:1096:203:d0::18) To AT5PR8401MB0387.NAMPRD84.PROD.OUTLOOK.COM (2a01:111:e400:741f::21) X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost (111.240.119.140) by HKAPR04CA0008.apcprd04.prod.outlook.com (2603:1096:203:d0::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.18 via Frontend Transport; Tue, 31 Aug 2021 01:31:34 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9558a681-004e-4e19-8736-08d96c1f11a1 X-MS-TrafficTypeDiagnostic: AT5PR8401MB0355: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:663; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DlHqFeUsZfrYQmTQKks2LV1HHQ0l/VVq98+AelWPNaRCOzXkmlSyExza6ooilDp/URQGDAzXhFxAGwmFTqO8HvhOIvM+cfVWe7SJaqY55M2KHozLxWludJaz1zb9wxUvwk2oFX/WlbX0FWBLNwMA1eub0PDT0WuPZ2/AO6nRiCsGqKXL3/oHE5Im+ulQvZko3b+WMeYY3PBV5nORGpquQp4bcQHANlRv2SXGniJFaxk9/a3Cn49lcwrb+p5Lcdlf6COeF8qs6cj3XLsVKBksS8tFkgqSqvyy9YJCdtq9Uxgwy4/AlIzvD94dxeZSVbRQ4Aa6PC1KS7+f4NJGB6lkSLKqzEJdav43r84V/ebTwLi9Ekasec7em67c3kaSAloNIed/iA41IENTJoENa2+y6fmwCwCct2noUEGl+uw/WzUu/7j7k3ImaJAVbqNbKPJSeI3L2BTRdhoqS2zWa1iMR14x1+3yaKHFCgoqBaDOZZeimGgOJys+W7AK+0TOyAFf3npREbjHmL22JDNgKhO4VtgPD5hW24fKPGLX+Vs4ChFduB2/zMbhlngSJJD6+6isRmb0IAxWrlV8k0fsbYwQkVUz5u5P0Y+l57N6Packz8l85y5liLJ/b350q73sJHnNfMKrKbb5Y2Z+KNS3UjHyReIljA71eefjlyf/x+jwW4bsMklRofkUHQySk+576N18kW0bI3xloca6jUTtCKD8KY0cSaS1viZZ15u3AGAi1Ho= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AT5PR8401MB0387.NAMPRD84.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(136003)(376002)(396003)(39860400002)(346002)(366004)(66946007)(83380400001)(2906002)(2616005)(66556008)(86362001)(8676002)(956004)(6666004)(186003)(19627235002)(8936002)(4326008)(66476007)(36756003)(6496006)(44832011)(6486002)(1076003)(54906003)(966005)(5660300002)(6916009)(316002)(478600001)(26005)(38100700002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?lgWjtQtGF6mvOSGmkDPF9+wKxMQvTcuQmNJS6QPrQ4rYDh/EQKgvhQjoR/6/?= =?us-ascii?Q?5YlngWTpktmIHAEdrCyH+cIQH3VetvpC6powF+iazJOdz4QpnWHatVrLxPHw?= =?us-ascii?Q?lKLolVSVD5olsRhpIf9WzY3v9zkRkmAblODuuDaR8qNgdp4j/wkWvLK1er25?= =?us-ascii?Q?whZRsVY7zZQLOk/rhOFp9VxtIfDRld3AiDt4wOzZeY+lVMJW6ECXkJiHECGn?= =?us-ascii?Q?kL0WwofWWawpcKx/ngNEa8fnlluBioGZYGtzkfM14YkoemHZU9trr+AXWkOu?= =?us-ascii?Q?ctXXC8eKVyvZ9Tr/Du7Qtpjl0ZMLFMHL7PqrB7/KNeX0XSXNpxnyvVXLQjme?= =?us-ascii?Q?JKFYUbIHYcvVbp6j+Db5maacG4xuxzB5tHLkdi1qRFsksKsZHQ4hFFMpJEA/?= =?us-ascii?Q?yB8wVoZZXOje0ctfAD9jimQb/KCLpuTh25wUqFbqHBJe3PVx9cKcjVcjo92u?= =?us-ascii?Q?fmzcl7XQ4fCqj4sA4Z9tDyxJ0Sy0eCIQ2w8zUCgNt8qQng20n0oxv6CGKKeq?= =?us-ascii?Q?s7l5XhtIERSPM0+/ibAwt6h3l7weFqvncyFok7+7Zhzl7db2seCTYiHuy4Nz?= =?us-ascii?Q?XK4AMgTk6TGXVGOSk0b6IirumD1dVaa3YG5jEI2tm8TnRRh3W3RsyZUrJt2s?= =?us-ascii?Q?uP+Fu4cRyKY/NwLeAfFqvzwUQWW4dDRzV0byHiQ9PktFEaVFcfaWwmXnfQuj?= =?us-ascii?Q?QBAXN+iRi4tNd+Kv3XqWk4OdoaMGGlpo/ZokcWzNn3iiGQB2JNghvHlk5DE8?= =?us-ascii?Q?zufCfDMnFdw8nPz+HRrQbwCcPtQJeB5Tp6EudmWj8IFLyrVjfVWoi2Uqp57R?= =?us-ascii?Q?T4onwKKQ1CVn0nE1CR86qMGadl2wLY+p3L9x2WQJIu4bnzxeNq9AHddcTqJV?= =?us-ascii?Q?I54UOes0Ca7U0ap6uyhYzXF5py1SBsGEIV+ucXsLHKwCJZkrYUYOpuDqJeFY?= =?us-ascii?Q?o0YXB6vF3SfIwd8hLmfzcv1J5l2sJCDk39xL/AjrCEkT/7Jk1iCNhNlv5YmU?= =?us-ascii?Q?HEORrtjzZnQJOAp+luZ2GXQOcwUcXCzRrzqjhqIStjdOu+f53evdbRvBeKlX?= =?us-ascii?Q?/is/Ot5gslyZXZY4iqEp3mZtLmgt3FHcTwoNL6w3kZ4acKKWh5ejLUubwqdg?= =?us-ascii?Q?1bXOJZrCUSSuNX09ep+2WmS5NONC1LQ4EN/i0F6WGLaH+R2hShpVEJbZHEb0?= =?us-ascii?Q?y9cXIIiZAFmJposLxJ+c6oA3KFjGjpCV6rjjc+13Zr0GE2Mbt+uDeaMwpnWG?= =?us-ascii?Q?3XVmL+K6hEb8+BulpQbzWNtMu6pYaA7+d63ZiSVVGcluJZKffaEf8Cx7VOPT?= =?us-ascii?Q?VzEyFwHdHiKP5oX+3Ifo9XBw?= X-MS-Exchange-CrossTenant-Network-Message-Id: 9558a681-004e-4e19-8736-08d96c1f11a1 X-MS-Exchange-CrossTenant-AuthSource: AT5PR8401MB0387.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2021 01:31:34.6699 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 105b2061-b669-4b31-92ac-24d304d195dc X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: U3GfM8+RKAYNfRdrUaYfSRo4bEAcf7vd9qoA4IMi+ARXOGNcOQjI76g6epL1GqeSAmENduETmojGQfUl4cuNgQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AT5PR8401MB0355 X-OriginatorOrg: hpe.com X-Proofpoint-GUID: fS4-nGKetWRnNNGsfPWVzY4_Hshw-1q8 X-Proofpoint-ORIG-GUID: fS4-nGKetWRnNNGsfPWVzY4_Hshw-1q8 X-Proofpoint-UnRewURL: 0 URL was un-rewritten MIME-Version: 1.0 X-HPE-SCL: -1 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.391,18.0.790 definitions=2021-08-30_06:2021-08-30,2021-08-30 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 lowpriorityscore=0 mlxlogscore=999 adultscore=0 phishscore=0 suspectscore=0 mlxscore=0 malwarescore=0 bulkscore=0 clxscore=1015 impostorscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2107140000 definitions=main-2108310006 Content-Type: text/plain Content-Transfer-Encoding: 8bit To avoid the potential inconsistency between PcdAcpiS3Enable and QemuFwCfgS3Enabled(), this commit modifies LockBoxLib to detect S3 support by PcdAcpiS3Enable as modules in MdeModulePkg do. Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3573 Cc: Ard Biesheuvel Cc: Jiewen Yao cc: Jordan Justen Cc: Jim Fehlig Cc: Joey Li Signed-off-by: Gary Lin Reviewed-by: Philippe Mathieu-Daude Reviewed-by: Gerd Hoffmann Reviewed-by: Jiewen Yao Tested-by: Jim Fehlig --- v3: - Add the bugzilla link --- OvmfPkg/Library/LockBoxLib/LockBoxDxeLib.inf | 3 +-- OvmfPkg/Library/LockBoxLib/LockBoxDxe.c | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/OvmfPkg/Library/LockBoxLib/LockBoxDxeLib.inf b/OvmfPkg/Library/LockBoxLib/LockBoxDxeLib.inf index 38bcc577084a..9140b1ba9de9 100644 --- a/OvmfPkg/Library/LockBoxLib/LockBoxDxeLib.inf +++ b/OvmfPkg/Library/LockBoxLib/LockBoxDxeLib.inf @@ -33,8 +33,6 @@ [LibraryClasses] BaseMemoryLib DebugLib UefiBootServicesTableLib - QemuFwCfgLib - QemuFwCfgS3Lib [Protocols] gEfiLockBoxProtocolGuid ## SOMETIMES_PRODUCES @@ -42,6 +40,7 @@ [Protocols] [Pcd] gUefiOvmfPkgTokenSpaceGuid.PcdOvmfLockBoxStorageBase gUefiOvmfPkgTokenSpaceGuid.PcdOvmfLockBoxStorageSize + gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiS3Enable [FeaturePcd] gUefiOvmfPkgTokenSpaceGuid.PcdSmmSmramRequire diff --git a/OvmfPkg/Library/LockBoxLib/LockBoxDxe.c b/OvmfPkg/Library/LockBoxLib/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 @@ -117,7 +115,7 @@ LockBoxDxeLibInitialize ( Status = LockBoxLibInitialize (); if (!EFI_ERROR (Status)) { - if (QemuFwCfgS3Enabled ()) { + if (PcdGetBool (PcdAcpiS3Enable)) { // // When S3 enabled, the first driver run with this library linked will // have this library constructor to install LockBox protocol on the -- 2.31.1