From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-002e3701.pphosted.com (mx0a-002e3701.pphosted.com [148.163.147.86]) by mx.groups.io with SMTP id smtpd.web12.6338.1630373511240261200 for ; Mon, 30 Aug 2021 18:31:55 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@hpe.com header.s=pps0720 header.b=WtZ3YO2F; spf=temperror, err=temporary DNS error (domain: hpe.com, ip: 148.163.147.86, mailfrom: prvs=087783c359=gary.lin@hpe.com) Received: from pps.filterd (m0134422.ppops.net [127.0.0.1]) by mx0b-002e3701.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 17V1Hdva015098; Tue, 31 Aug 2021 01:31:51 GMT 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=15ravEoEwFue5O54PLUXf6syYfMB6ItJcpaBwbHNLtE=; b=WtZ3YO2FoEq3Pdgx9FHa7Wm89MesYYqdGudAJCeK7MONZBshdeAiNz7c/B4f6TzCyAQ7 44LfEnIAkmre4gPgSiKfPtAZCaoh7yMHHzyLn7lNSdSioun0Da7iliF9p7cSk8Dmu2DR PemucCr3wgEpdDoQwMCZ8Ca8/7tZZIxuyoyuTI0+Kst+ahL/67QEoEWQf5nNByBTrBCP d0h9h+pSjLWBQvRYiFcyLzEZx0qdgZzcK/5ss0W3IXaeM/7/56ToIbmchm30NWs4SA7N s3js+7nJ87/JiQ8zfzqG6tCpq1s98c9WpYoh9+JIJcFL3nvwdY8/F/7E9l1h/c0Syajx +A== Received: from g4t3426.houston.hpe.com (g4t3426.houston.hpe.com [15.241.140.75]) by mx0b-002e3701.pphosted.com with ESMTP id 3as6xj9b9g-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 31 Aug 2021 01:31:50 +0000 Received: from G2W6310.americas.hpqcorp.net (g2w6310.austin.hp.com [16.197.64.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by g4t3426.houston.hpe.com (Postfix) with ESMTPS id 3B26459; Tue, 31 Aug 2021 01:31:50 +0000 (UTC) Received: from G9W8454.americas.hpqcorp.net (2002:10d8:a104::10d8:a104) by G2W6310.americas.hpqcorp.net (2002:10c5:4034::10c5:4034) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Tue, 31 Aug 2021 01:31:49 +0000 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (15.241.52.12) by G9W8454.americas.hpqcorp.net (16.216.161.4) with Microsoft SMTP Server (TLS) id 15.0.1497.18 via Frontend Transport; Tue, 31 Aug 2021 01:31:50 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Kn9vaJ04UfVCYyUR9qI59hCWMRoCjYvCnAEFSD+5ZwfMAGjeSo91GsMiZs29uRZRG1SUq2CBQ5Y6TF0f8nqINaSFEV8NMYGJ+VL6UZP5hPX181SkJrwLiAy7Rot5WwskWEp+lbeKdMNzrBIQpFQlbBZ09eQ2nBTjGxIjElL+cBJlp4X/0/LVDVW2fPpbyV6E6eR3r/i+dpN46G0e9ifwHqrknzWHX9jdL+d/w8dDlBfuUqLFIpijBDBGXrE+2trH8tog1F+59MKjnUd2hjbOBq8gG2TC991Sb3atNIRKE4uS8fCda8BVGfzxTEta6DICK0B6InPQcd58/kelz7FcyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=15ravEoEwFue5O54PLUXf6syYfMB6ItJcpaBwbHNLtE=; b=WLNh5CLx1RyjFtarYYcyYeYI/IJIlNrDQN0t3HjlgD/1rkwqVk2/19ek+nWie+m3lvQ1Vh3UlLjk3zvGlaTyQ4A7cUi1Q3/e3BhoBMFeEMfGy/39yvzpWMFDe091TYC4PF3PeTHfdrGTFa0T0jOmyxs09+pg7bteLXSJdkBx56ZeSz5RhWocGN+PGriYCN3BV9raUelV64ut88vEkK8/ofjmuIIFuCQ5kphka0y3jK8M3b4fWB0AB4HP/ymkr1DOhXBdi4apm8jPqY9z6guGZPxY7wnNFjFqKRYMQeugcUuTVy0AJ6v6uapITbQfJWV3U3+9oBd0Ft4AYwR/5l8xQw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=hpe.com; dmarc=pass action=none header.from=hpe.com; dkim=pass header.d=hpe.com; arc=none 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:48 +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:48 +0000 From: "Lin, Gary (HPS OE-Linux)" To: CC: Ard Biesheuvel , Jiewen Yao , Jordan Justen , Jim Fehlig , Joey Li , Gerd Hoffmann , Jiewen Yao Subject: [RESEND PATCH v3 4/4] OvmfPkg/SmmControl2Dxe: use PcdAcpiS3Enable to detect S3 support Date: Tue, 31 Aug 2021 09:31:15 +0800 Message-ID: <20210831013115.23110-5-gary.lin@hpe.com> 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: HKAPR04CA0002.apcprd04.prod.outlook.com (2603:1096:203:d0::12) To AT5PR8401MB0387.NAMPRD84.PROD.OUTLOOK.COM (2a01:111:e400:741f::21) X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost (111.240.119.140) by HKAPR04CA0002.apcprd04.prod.outlook.com (2603:1096:203:d0::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.20 via Frontend Transport; Tue, 31 Aug 2021 01:31:48 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b6ce75c6-fdaa-4538-17e1-08d96c1f1a0f X-MS-TrafficTypeDiagnostic: AT5PR8401MB0355: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:525; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 09lfR1felQEQ0npeUTG8cDx3Znr7x5hBVMNw6r/oAPGcAnvWaNLiD/dnxb4GTWtOwPnANGa+I9pyRFNaIgcOldUkAf5ZhaxaDDk8K2sfntp9530hFzMGjDIdUVEDGru4/8b1n/dlSw6JMlEwcVQXNFw9FD55CUB1PrBdFvX5yveomMkDMsKUrPqM4azR9r0kigXEfAVSjaA8e6KCTIVREzCMQeXNbVBkHipN1SS1pPlaYFu1s4oMVkeMRiJcaohMsK1joKYnShNFqe+f7tan2JdBudczmDTEKvedr93uGsJ5jw8UfjWGBcSh7khOKY6/XwW3f6SKHtAUmhMYacis4Gn8i5xJZfsUrZHWMgOyeF6Y1Pmr6ChzmWBQIy91ttbY6RQDbPM8XhXzDPQDsuMJl62FF61O5bvfkE1UhzkPs/yY1FKMiglW9Uc/T6b5r/9UhLHa39zLCI0iRhV/DXpjNL6qcpcATg3BSOxtgxOllnNKac2KnBtxfVZIa4+VzqklcBWfijiWqhNamMxfCR2C09enSjdKoACEP7INeLmYXo8r3CGqN9h9K5ZrLTEpt4utyOJdhHmcY7ZfE5ALe0pD5fb3oS/Qgm5DmeF5eNxpUPn/xnXq7pRCd6OOpdrzkO2f3bbVkwhJYTOqficojJclLLqnlvlVQibqrSeDyUcWsraQWMIz1RgcRAhLDZqg+4qB+vr7XPSfKEEMZM6Zo9PvLSPYXAhBvlf/2z451zgfiNs= X-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?rR6soJDodzAubnblFzPb88NTHbc0OhM4sA+KtURZhwBBv0ERi22fKAyaU3yG?= =?us-ascii?Q?T6KlvK5VywrBEvID5J3vCq9Jvqm71T149xnpneVy9nuNDVUoTOdbWXjZ28MI?= =?us-ascii?Q?MLN/Ihz8PksbUlcwja+Q5L03bnJczkr2hBGpyAk6L6EmMbhC6+3G8XmUjAJP?= =?us-ascii?Q?DnRdH/CtuTHBDdy4jPDeZjuTJyADyPFF41TeDU/HRXqeDvShU+5EJGxR4Iwz?= =?us-ascii?Q?hgDb5QtzRUideWG8G4fIvmztALY08vCH37274GN7bOHsU4YKRK+0iiY/xNpE?= =?us-ascii?Q?2TWvUPgviHkkHc0LDpTf1rto6/9J6MbhgAmHScUxoLGFftIK+5gR8lVKQ9Z/?= =?us-ascii?Q?kZ47DN5zG8TciVV+jLj084QHAfiRUymZ2LUIPFjQHc/HRG7M9JI02SlNobKL?= =?us-ascii?Q?zzF2hMzzMJHO6iqZEnFnqHgkbLg+wv/VkmUguShf+Bfwx19Iizmz6+AmKKGL?= =?us-ascii?Q?w0rLUo1wDiy7wBJtnztF5zQcuxo4V/ImnwLyNOdh0klzDZpqSZ09ZjatXNqb?= =?us-ascii?Q?BLgC7+eBQeTrPgWKOciCVbMsAEoaRg5zaaU9BEwUNaTFQRe7QXnKg+b74BOI?= =?us-ascii?Q?pR5/ssWmF758OsXwT2Cbn6m40rN7dgWIxcJsQvjTY0LRVOBKhUxpVtPSUSv1?= =?us-ascii?Q?gPdYhFjLhMFepfEGAZO2FWY4Kiyo4SA96MtN9qW7RPeGWSLveWCogaYTjdPy?= =?us-ascii?Q?wbL5rFfVqRmWgFaTl68kS3jR9PXrxmnxGM3lABtbQATB7t6gNvfj128LV5YZ?= =?us-ascii?Q?g3KmwVXyTHIRjVL5ZCcirwpq2PvYRMJM7Pa701MsZXBstW7iCyEmUn1DGSzz?= =?us-ascii?Q?8J6Lh/tNhesJU0Xb24QAcAXuqsMVo0DlXtUJUj7auX7dEcTEwi1O6tUzmB6r?= =?us-ascii?Q?YgWq5JhK+9KmfcMIJWulxLsgMsCQg+ZN1IeTw0OCIfhPKerN/PPaazReUWd8?= =?us-ascii?Q?Lq2VCv3Xswvbk4UPYx1oy/Oi1CJ5iaCM7kdsIO/xcmoQbMLsuC4KigwXYWab?= =?us-ascii?Q?zK/O6zoPz+NgfwSO1NprFqEboLyqE1uuwlsPLz3tVTtsRuLz3nF9cncYeFiQ?= =?us-ascii?Q?PcCsGM+tKRACR3ZoiGem0NcMsqACQCLAtwMu7w0AhYSwliqvrI+flQTiiMjM?= =?us-ascii?Q?1TsqPzfUaWDfY+MpxZ16vVjXAFLOcH58La2EQ3LDV3uWluyBjWg0xFWQNalc?= =?us-ascii?Q?LT0uPJvy9gnz9mC+NhFXkp8hc5TSQmY33D6lCR/9iCdetjawfArbE8Hawt7F?= =?us-ascii?Q?J7y5Bbcun2TtINdXt3mKG9zo+Ua45ZiwSUmJvJCUeYBNqHQRkRDLtfOts1rL?= =?us-ascii?Q?rmDrAdgn3TyH4b7+RlAadgZG?= X-MS-Exchange-CrossTenant-Network-Message-Id: b6ce75c6-fdaa-4538-17e1-08d96c1f1a0f X-MS-Exchange-CrossTenant-AuthSource: AT5PR8401MB0387.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2021 01:31:48.7828 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 105b2061-b669-4b31-92ac-24d304d195dc X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: iTJ087qUWd8f3eiO8VaxzgpMHfN3+lw/qom7LY9n8UjN8Mx/8BdrEVbj/KN28Tfx+i46D5k/No2senQ8BZSeMA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AT5PR8401MB0355 X-OriginatorOrg: hpe.com X-Proofpoint-ORIG-GUID: VEnkYyKJgHwsxqjA_Bkb4BmUI0ju45Uy X-Proofpoint-GUID: VEnkYyKJgHwsxqjA_Bkb4BmUI0ju45Uy X-Proofpoint-UnRewURL: 0 URL was un-rewritten MIME-Version: 1.0 X-HPE-SCL: -1 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 malwarescore=0 mlxscore=0 impostorscore=0 phishscore=0 adultscore=0 suspectscore=0 priorityscore=1501 spamscore=0 bulkscore=0 mlxlogscore=959 clxscore=1015 lowpriorityscore=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 SmmControl2Dxe 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: Gerd Hoffmann Reviewed-by: Jiewen Yao Tested-by: Jim Fehlig --- v3: - Add the bugzilla link --- OvmfPkg/SmmControl2Dxe/SmmControl2Dxe.inf | 2 ++ OvmfPkg/SmmControl2Dxe/SmmControl2Dxe.c | 4 +--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/OvmfPkg/SmmControl2Dxe/SmmControl2Dxe.inf b/OvmfPkg/SmmControl2Dxe/SmmControl2Dxe.inf index b8fdea8deb84..4cad56516f49 100644 --- a/OvmfPkg/SmmControl2Dxe/SmmControl2Dxe.inf +++ b/OvmfPkg/SmmControl2Dxe/SmmControl2Dxe.inf @@ -39,6 +39,7 @@ [Sources] [Packages] MdePkg/MdePkg.dec + MdeModulePkg/MdeModulePkg.dec OvmfPkg/OvmfPkg.dec UefiCpuPkg/UefiCpuPkg.dec @@ -62,6 +63,7 @@ [Protocols] [Pcd] gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmApSyncTimeout ## SOMETIMES_PRODUCES gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmSyncMode ## SOMETIMES_PRODUCES + gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiS3Enable [FeaturePcd] gUefiOvmfPkgTokenSpaceGuid.PcdSmmSmramRequire diff --git a/OvmfPkg/SmmControl2Dxe/SmmControl2Dxe.c b/OvmfPkg/SmmControl2Dxe/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 = NegotiateSmiFeatures (); - if (QemuFwCfgS3Enabled ()) { + if (PcdGetBool (PcdAcpiS3Enable)) { VOID *Registration; // -- 2.31.1