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.web08.6536.1630373504708306601 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=U6lPegnT; 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 (m0134425.ppops.net [127.0.0.1]) by mx0b-002e3701.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 17V1J81L026505; Tue, 31 Aug 2021 01:31:43 GMT 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=XXXVZTk8LlnNdxp+J8Edrv0SsQ6o1xVzYG45tb4fQEE=; b=U6lPegnTmZwU+8vTZv9IraRjD660e+R/o2ueLsUBk5ZncE6oHEmel99lDjfxh+8THDvt eNM/rOVT6xePzbdU9dmlPc3F8fHnAFepec/6O42B1puoeUd4v/jjqOt2XQ/uMl2VQukJ eZ5M/w3D4EtMA/cnIuglK8eSzgWJLnivalG1mbo1nNwNUJOMf+4cb68gF03WdCadyn3n Q9NlInlYRttSe2ENB7WD1WN2xo4z9DIri0Pmam9jVtcpzkVTRIsYqq+JfGWSOEJjcXe7 DIVHvsOrvC4u/304SJh8L+WmpD8VoFHKnAroS6w+4d+EQ9YuMotUEa0qWz4Z9i+XEHVv Iw== Received: from g2t2352.austin.hpe.com (g2t2352.austin.hpe.com [15.233.44.25]) by mx0b-002e3701.pphosted.com with ESMTP id 3arqcv09px-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 31 Aug 2021 01:31:43 +0000 Received: from G9W9210.americas.hpqcorp.net (g9w9210.houston.hpecorp.net [16.220.66.155]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by g2t2352.austin.hpe.com (Postfix) with ESMTPS id C0E0885; Tue, 31 Aug 2021 01:31:42 +0000 (UTC) Received: from G9W9210.americas.hpqcorp.net (2002:10dc:429b::10dc:429b) by G9W9210.americas.hpqcorp.net (2002:10dc:429b::10dc:429b) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Tue, 31 Aug 2021 01:31:42 +0000 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (15.241.52.10) by G9W9210.americas.hpqcorp.net (16.220.66.155) with Microsoft SMTP Server (TLS) id 15.0.1497.18 via Frontend Transport; Tue, 31 Aug 2021 01:31:42 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Bs29tcfsk5Nf5oE+abd5T8xukNwzJes8yriCskU0Wpu9ZoV2uY0z6anmZBaP9PYqCP23Hflv3B6oGxzAAjvTmjzv/4HBMj88ujLe5ZwOl3lMbpfWHZaH4vVxjGrT8aBo7V1mSUGPRDb+K9Jdd1B2r1s0P5T3VLh7N9/beC/f+ZjS75LTe/f1tOlgO8n6AAdzHPee0M8nvAqvwftt1uOSfzwau00YGBh3RALFST9z/dcDSeSijA5M4twTv8hXh9OIC08qdI8YUHWOQbml2e3YSOKr32fKCaWQGeGnhu1pb4F/TqESpFePxkyXHYhlUHYVWiZ5tLO+W+u8+8MYBIv7aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=XXXVZTk8LlnNdxp+J8Edrv0SsQ6o1xVzYG45tb4fQEE=; b=OYPOyUwQiUP8yGbl54M59sB22JYFbx6AdXKUpjJHIV4q/JblM6wt/ph376g6B9BImsHSiNkgzDWsGBeUtPb9qpzUwJtICIliL3EqMvOU1R5ET3VHDIjgppqnodHeVnHUTBxl/F8yz2ddIYVz3AD71bAW0x1pbJada3n94eTMtlv8p0pfM0pcmaAuNOuTNCMscx5KCycvWW6OJpTQv8XoOTvAA/wF2DIafnbhHZyQv64XHBPwpoixmyomW3cwTfi0Fp/3/w4WTDcJFtNDlTcwNQYcQD0h/3oRqUJlPusbF0RsDdY40xhZmgEQmqlYYlCw56hbU0P2bGS4ccN04mxjJg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=hpe.com; dmarc=pass action=none header.from=hpe.com; dkim=pass header.d=hpe.com; arc=none 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:41 +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:41 +0000 From: "Lin, Gary (HPS OE-Linux)" To: CC: Ard Biesheuvel , Jiewen Yao , Jordan Justen , Jim Fehlig , Joey Li , Gerd Hoffmann , Jiewen Yao Subject: [RESEND PATCH v3 3/4] OvmfPkg/PlatformBootManagerLib: use PcdAcpiS3Enable to detect S3 support Date: Tue, 31 Aug 2021 09:31:14 +0800 Message-ID: <20210831013115.23110-4-gary.lin@hpe.com> 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: HKAPR04CA0007.apcprd04.prod.outlook.com (2603:1096:203:d0::17) To AT5PR8401MB0387.NAMPRD84.PROD.OUTLOOK.COM (2a01:111:e400:741f::21) X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost (111.240.119.140) by HKAPR04CA0007.apcprd04.prod.outlook.com (2603:1096:203:d0::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.17 via Frontend Transport; Tue, 31 Aug 2021 01:31:41 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 12c9ddea-01e4-4f9b-39cb-08d96c1f15d9 X-MS-TrafficTypeDiagnostic: AT5PR8401MB0355: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:843; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EPHclHyrHxkLYV7xmP1kyeOYbJ7iq2wihIPVv0de/Mo+BGWry7OvZOn+TkZik0Tqf1yF56oLBykoI9O/61XjA0H8wjtT9+wv76CJwfxznispqouw0xV64ypV3IZwV0mcJTNHrYemQZ4x2oabyuTDprcaRU9d+PKxbxVg3fBtoxaLrbaZ6e3b+od9C1HKpXgrsGwcwIxAn1m0OY5DnO0r88ZPSIdMP1Vo8sGPvYczKyaO5JK3jl/fpk/jmNScTiiuWEVTViaHvg0KJSqCnU2I9go6DzS9yjvFs+Qroaq6w+zyWZTlI2RphNCCWOSsacUitArMUwvPEC8LS+a8OmCW7QpR2BlBVk4huCEWVYykB7wsgsz40TbgxgWW42O44bly8In2IJF1bQr6VAHbP4Gaycep46vIdAg9L9951gIq+LAYblC86SMBnUimIjA4MyNrzBV6vDFcSShDDJOzETPe+BAaqPqU9FtvA18bHSQh/ZvXCU82+OAKEMlXLjtDghAdSRJfhLWMgoS2bZHZkg/oMBYlRJHCJzApEAvJTkm4KoIYuQdvrNsWuFvl5i2rRiyASNN8rFiny61g9SmCdOKiMisRs/4/BkYG+tVtXBcV8GMRVjtSzXx8N25ei5MOju7ah5yuaPrHLfO3sSt4a6vLCzQXcm9UkMEiOKDai9yJSC1Sb5MDBgVmdR+RqbZg3etkI1jTvSesO8Z8BWhFev2g7Fuw2Seci5FZq44JGqBFqTU= X-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?M8jtn0ghDSJID3c9KohGvZ6+5EYjnWjBjUduUmjP6y/c1RHyJPEIW7pd4D4n?= =?us-ascii?Q?0h4qPC2hmBFnj9vVuDHj2Gapd6Pc9PoxH0hibt7qYdG1OdXxBql+tl3IAN/d?= =?us-ascii?Q?MAEtOmBZ4RCLpBdKaSRz6s9gjppFcdscQpsqsBjzMo4XektCYH/sQ9/5lGcf?= =?us-ascii?Q?DivBAf6IyOg227viyHaVTEEXo4tKrB3KwH4ULudOySHLza2X3V3fIfG6L2+J?= =?us-ascii?Q?kgl2qmkQ/WR5taG/UCWIJiiM2LZhz+bgCiItLPOf6JQ+31amCeC49BG0EGrc?= =?us-ascii?Q?0BMx1vZbAQiMA9HFjVwyrkng+UaCM/sDjFrezEBPl/hDYRs/kKuHF0nYaCUA?= =?us-ascii?Q?XHAA7GzmR7iTM74lTgWnu1oUqOWe4UqxfG21x3KC1gFhySOk0ssYlM0ioviG?= =?us-ascii?Q?Dest6YgWXTtb7TcHG0ccUiRF2Wm7M6GW0tG9vbrc4yjuoUd928NOvB3fa1tH?= =?us-ascii?Q?jVMvByupaEDXSEgsVL/GucsR5+QIUPRkNFJttCvyfR2pTorF0dRKW6VH3fe5?= =?us-ascii?Q?znul0GPNP1uBxi7h1AftkoWsNG3EQrokvev8hpUbBcyRGy028LKvJj403uJT?= =?us-ascii?Q?7lNNn0rKiI6QMv5IYa2wi2ngGcG+dYVh+jUx+p6yov0oOM3k+qO6tF3V6xPn?= =?us-ascii?Q?wZRxAc1RrpTbmA9bmDJM/fvnrEOYGmyP5LxUw5VfiSSFjUUBnpj0ZTK1cWdC?= =?us-ascii?Q?W1HizjlpdVZPSCUvtqI0It982irDwGJN3+0D6scEe/BYpPy3zozvlOulAfh6?= =?us-ascii?Q?hIleQCekFYrnKUtnIaPotkaqnfFxguUW8xpDMmsu5ESlx7Taensh/N6AeTdP?= =?us-ascii?Q?Gt0GPFBedLGSoiMQyeph8ufjxtXyd4Al9zMlyu7kCGpyEGxptn8l4PdJvHQh?= =?us-ascii?Q?CQ6fVIL6480jACvIQyHNBSqkU/dgX3Z/mPIaxPme95TEBug58Ijod17PSTux?= =?us-ascii?Q?zgiDarQdO9s+/l5xK1/71z1+oYS2dfT0wyM2AeRakltJ5wH+r63F45Atn8ta?= =?us-ascii?Q?hy4d96BcChpS/SUoOwPUMVy9rbYuFAou4T96BtOUQIp9loarH4g8f4/oGsto?= =?us-ascii?Q?6a5u6vi1mkwzFdUOFRm381daBN45ZJ9OpiiunxkcnfIuHbxVpsaXSl7dDc2g?= =?us-ascii?Q?aPHcMmqvXa7WWQENKOYanoPzNZJTKDW9yw8v7sxH+HzEr7Z8RcdkUw/zqjqA?= =?us-ascii?Q?p2+2fWa6z2Ze4fZprMKDiq1lu+bSEmqQMwkNp116kN8T8GsaUsQbWiLdB9XI?= =?us-ascii?Q?EG6GtTfj47U9f5x9kv0X7ZCQxBF36+vwRFby/4tHXcAohF7MsN1pu088THrs?= =?us-ascii?Q?J/1vKIKqc3f8JZS94lAKlmyM?= X-MS-Exchange-CrossTenant-Network-Message-Id: 12c9ddea-01e4-4f9b-39cb-08d96c1f15d9 X-MS-Exchange-CrossTenant-AuthSource: AT5PR8401MB0387.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2021 01:31:41.7178 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 105b2061-b669-4b31-92ac-24d304d195dc X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: VRD+MYF62JVCmSCliHodSBNVnL0uYaNitM02tYflmYCf9YY7j0oHWXjsDKjZ6h4VHJ0VaeVkTsC6qbBcLY17yA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AT5PR8401MB0355 X-OriginatorOrg: hpe.com X-Proofpoint-GUID: VjrdRCgc7RMzddN5I7EikHvS18fDwwVR X-Proofpoint-ORIG-GUID: VjrdRCgc7RMzddN5I7EikHvS18fDwwVR X-Proofpoint-UnRewURL: 0 URL was un-rewritten MIME-Version: 1.0 X-HPE-SCL: -1 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 clxscore=1015 impostorscore=0 suspectscore=0 mlxscore=0 lowpriorityscore=0 adultscore=0 bulkscore=0 spamscore=0 malwarescore=0 phishscore=0 priorityscore=1501 mlxlogscore=914 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 PlatformBootManagerLib 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 --- .../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); - 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. -- 2.31.1