From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from userp2130.oracle.com (userp2130.oracle.com [156.151.31.86]) by mx.groups.io with SMTP id smtpd.web12.8825.1611643625194674426 for ; Mon, 25 Jan 2021 22:47:05 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@oracle.com header.s=corp-2020-01-29 header.b=u3gYTPQG; spf=pass (domain: oracle.com, ip: 156.151.31.86, mailfrom: ankur.a.arora@oracle.com) Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 10Q6a3ol054946; Tue, 26 Jan 2021 06:47:02 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2020-01-29; bh=7DHNoT91MtJFzMhEBvW0ixXWB1S8RLGtWlpmYOMA0gc=; b=u3gYTPQGiQvgZmx6zMtMZEy+bGP8uXTcelfHJndSBYM4S4g7NSi9LUgUseqKQfCuUkIe GIcfNVU6lFwdv0LDPBwkooDnJfZdEt5JlJ6BG339fEF9Z7MVA6faN7Dlstxel6QlzmPk 8YupSJiTNFhGxddKpyFCJAZGPbmpQhtb3WqFDa/IezlfZktth7ciaRNslQ2eka/sAalD CyO6aEt4koRVsAfZMm8uiAO/CFILZT03PerChk26mTbBEpSeHxIqUk1AVGNflPo7mqqo 6apjZy0f9/Ho18lg8U4zpj6alwi/Vnm3ZFrw6th9T09NwO8LS/a+dk3tEWnDipg3r+W+ Fg== Received: from userp3030.oracle.com (userp3030.oracle.com [156.151.31.80]) by userp2130.oracle.com with ESMTP id 368b7qrny9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 26 Jan 2021 06:47:01 +0000 Received: from pps.filterd (userp3030.oracle.com [127.0.0.1]) by userp3030.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 10Q6a68A097113; Tue, 26 Jan 2021 06:45:01 GMT Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12lp2177.outbound.protection.outlook.com [104.47.59.177]) by userp3030.oracle.com with ESMTP id 368wqw1qcn-5 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 26 Jan 2021 06:45:01 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gl4nJEy8jvWk75BsZ2xLzOUmf7plNbI/JzjBhWJWz74nylK0WzZ8mecKHfHoeqKTg5IeRUS8AuHOfEVRSzyxIjpzHram4re+iouHLQIME4zX5jtSHEys8qGL3uU4XSEF9yrQy3o8L2MUcbHRU8GYv5wHy38+Wq7lAh5bSxhfodVVEL2S37XmwqphH10vf2vrZg5MlXSe3DLyqyFlvHlPnMk+Z5T3QIH1rRZsn7z4teMXSXbtrOt3VtUIdCXvbj+OroOdnjfRP6LEvrQxk0Nb/KmykBx0ulxQwDVuCUy6NYZvoLQJuRs1slDvRafo02zkHyh11sVPj1T2uvFvn8vcFg== 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=7DHNoT91MtJFzMhEBvW0ixXWB1S8RLGtWlpmYOMA0gc=; b=SJw51HcAtNMwNUVduMxSSLfb2wMZzvKi4CtSZK2vMjJvhFlvs03NfRV1+45m0t1Ocl8yci+MY5DIIudL8eNsg0jrlhvM/3/fboa9blC/8GoC/iH52ZDLkE3YpyzlxpsmyW8bVsVmEzgHaULGxSaIuKXtDFiEgcN6hYNJIpU3euv+gIFEg+Nl2hbQ8VjaF1ReyGQNTlwv5OshcUIFPwuQms4UQwwi0PnvggqjAnevV0+rAG1a9mZ7DWAu7mDuy/pH4fIj7/6Xsvcd7pVFcwg2HhTn75atuprjt+AyjLDykxUxjTlv1emhThI07cMc7pMjywmVuAba7c/oMsDFr2INTw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7DHNoT91MtJFzMhEBvW0ixXWB1S8RLGtWlpmYOMA0gc=; b=pu5VSvn0TarOS+WTDz11x+3TNxIjPRFjx53UoqLjvCQNs0TBqqBU5uFrix5Exk+J+tIF8k0QD8ns5XRx+jRnERT8d5K60ycJobr5PK2+pwQDZzhPUOYVeipkFUM64F6enYuL8x9hfEGcXhmsvgpTd2hZbtY0hJWM4j981vic1Gc= Authentication-Results: edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=none action=none header.from=oracle.com; Received: from CY4PR10MB1718.namprd10.prod.outlook.com (2603:10b6:910:9::17) by CY4PR1001MB2184.namprd10.prod.outlook.com (2603:10b6:910:45::37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3763.14; Tue, 26 Jan 2021 06:44:59 +0000 Received: from CY4PR10MB1718.namprd10.prod.outlook.com ([fe80::39dc:6ba7:9397:cb6]) by CY4PR10MB1718.namprd10.prod.outlook.com ([fe80::39dc:6ba7:9397:cb6%6]) with mapi id 15.20.3784.019; Tue, 26 Jan 2021 06:44:59 +0000 From: "Ankur Arora" To: devel@edk2.groups.io Cc: lersek@redhat.com, imammedo@redhat.com, boris.ostrovsky@oracle.com, Ankur Arora , Jordan Justen , Ard Biesheuvel , Aaron Young Subject: [PATCH v5 9/9] OvmfPkg/SmmControl2Dxe: negotiate CPU hot-unplug Date: Mon, 25 Jan 2021 22:44:40 -0800 Message-Id: <20210126064440.299596-10-ankur.a.arora@oracle.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210126064440.299596-1-ankur.a.arora@oracle.com> References: <20210126064440.299596-1-ankur.a.arora@oracle.com> X-Originating-IP: [70.36.60.91] X-ClientProxiedBy: MWHPR18CA0061.namprd18.prod.outlook.com (2603:10b6:300:39::23) To CY4PR10MB1718.namprd10.prod.outlook.com (2603:10b6:910:9::17) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (70.36.60.91) by MWHPR18CA0061.namprd18.prod.outlook.com (2603:10b6:300:39::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.12 via Frontend Transport; Tue, 26 Jan 2021 06:44:56 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ecafc1ba-6ace-4379-3659-08d8c1c5e4f3 X-MS-TrafficTypeDiagnostic: CY4PR1001MB2184: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ul/DXcbPsnZzBSA1dO27QF+y/HCmjUbGO9y4T/xGvjnr9n8AMKjKVfqYPOisQjkQX3J/oWfbew3csOFsyoxZhA9C4mKY5+f0qB3KhL7PJ06MWuB46PvXbQ4qQQoVzAJGAHPbNCUWTUEQYb9U9LmiYn1f756F+eqYApTGOFQRzNt1BCXAT/n+HE5g6iCaVm9OHBosSH1OeOHPoFnDSAdxbJ7g4o0+QU7DGU3G55Nm9daIJU8VAI58E2iEBJPhZFY50BAhSlIGSESDMp/NXFLNLYV+qePvg96tNKsctzVdd/W+xyNI0uoI8vXce/GpyXR4ncEAjGG0TrZb7DaK0KENuuZUYF8BuQd+5CZntnpxHE5NAeTJmvR6/9955wL8jjFPy8P3+qwKwH7Y7lUPNK4DWkkG4y2U9xrCCgIq+KS2eHTwft/5+BFRNt84gxdOG1fX+phpRY/I9bj+dAQLeQ2dz88m30zE1ZENFSMAO+Zi6+QZkWDUR8N5dycoP6yHpkKXgGC5Lvp84FCes72IZh3KYA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CY4PR10MB1718.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(396003)(39860400002)(376002)(346002)(136003)(69590400011)(6916009)(2616005)(4326008)(6512007)(52116002)(956004)(66556008)(6486002)(36756003)(186003)(6506007)(26005)(66476007)(6666004)(478600001)(8676002)(8936002)(83380400001)(966005)(1076003)(2906002)(86362001)(5660300002)(66946007)(19627235002)(103116003)(316002)(54906003)(16526019)(107886003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?9U7SMQnnaTwOeEQWTlDn8v3SYuhbdPk90xGHkwxDl27ahqVhgXiwbi1LGTNl?= =?us-ascii?Q?tKPg8mRQfc1v910Qo4CeQl1x55UtZIXEWOyGgBr8BHy2i/XzHXEC46jPhAeA?= =?us-ascii?Q?WFsAq6sMdtY5qmVtRvbwU5jO7jvL3b3jnCTeYGSKF/bhmXE8eNU6zYyNczGf?= =?us-ascii?Q?akjFJJyMksjo/psxLRgConYQITpjN8X3X/qEa1BwMoLLCN4YXglHA5Tqvt8D?= =?us-ascii?Q?fvwjaug2IN3z8W/A0UJQoN1ZZifoRs2rPXLEJrMJgf1nx6aYk98EKkxxhw3/?= =?us-ascii?Q?tk0J1haMZ2QD+k49XMF5ysUIuTO8B8U4ljiVglH64WVaBQ1r7vwIQd3F3vr9?= =?us-ascii?Q?ZWj8+udii93I6DDCjcCzjS/fYx3ddylhijwkl1lXtkEzbmsN5Jg1CFSI4wnO?= =?us-ascii?Q?oqsUAcieu+M8r4pvOZz14R/nM91MIYI6pvogB3vP32X1IfyyatHuz6zejtEp?= =?us-ascii?Q?rqeWBnLu8EsI17qYFbgkGnNltHvT0CI1Q391sRWC94/SWJqDxVAXLeBPORKp?= =?us-ascii?Q?dG6jaWVmn9AOUeguEab30kr9IQCdOkjQ0Ht/MVEiFzuQiN6jg3MI74QsREJo?= =?us-ascii?Q?TZvrhS5pUoxmpsL0TjrIRE0E+jCgLInU3dDLX2rE8SMqZ6h/q8BUdUmNwsqm?= =?us-ascii?Q?xA7mgjhwQSX6R0p7QEXi0GO5KhocV3hRWrnHU95448yMqF3DJBl3nGFKH2Kl?= =?us-ascii?Q?X+KhuIVtM/NonwLa/zs5uwcdYNEWF+n0pdLVTtLf7NfweBXBv06/6Z4Ug7Aw?= =?us-ascii?Q?62qWHGme2tnKLdJTwaXcuUN8/rn+Q8BvxrhhRUsJBr1HIbk3cTnYJXU1th/I?= =?us-ascii?Q?jaxJ8UOnlmW3xGgzLMMgKh3xrv4SKfAVfQQGw5YN1g4opKqggeONPgqBEg6A?= =?us-ascii?Q?az89dGDCuG/sFGiJYUSYEeMafLimQhs1tb36/ALQpR2wB/skvsxfqAfVXpOw?= =?us-ascii?Q?cP3ud4mDGEpsYzdfamQYt6DonO608FvJ4Bpesh32eHlrkZQGgOFlps1IEXez?= =?us-ascii?Q?g6TxwNyGWKRyPDOqdxeNeV5Cu4xakwfIt52HUJEVpaBZorcDuLd1pVbiPaHu?= =?us-ascii?Q?iQn2eWok?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: ecafc1ba-6ace-4379-3659-08d8c1c5e4f3 X-MS-Exchange-CrossTenant-AuthSource: CY4PR10MB1718.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jan 2021 06:44:56.8876 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: bKN+omVyFwM3d0OpsoZWCO6I4P4KgIC7Ioeadb9T4vB125QCX/WkN/q6dWv8SHYi5ZZqV1GwBz86aU/fuqubgyWNrbc4FIW8f4I9R1Wuecs= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR1001MB2184 X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=9875 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 spamscore=0 phishscore=0 adultscore=0 mlxlogscore=999 malwarescore=0 suspectscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2101260035 X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=9875 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 spamscore=0 phishscore=0 adultscore=0 impostorscore=0 malwarescore=0 lowpriorityscore=0 bulkscore=0 priorityscore=1501 mlxscore=0 clxscore=1015 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2101260035 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain As part of the negotiation treat ICH9_LPC_SMI_F_CPU_HOT_UNPLUG as a subfeature of feature flag ICH9_LPC_SMI_F_CPU_HOTPLUG, so enable it only if the other is also being negotiated. Cc: Laszlo Ersek Cc: Jordan Justen Cc: Ard Biesheuvel Cc: Igor Mammedov Cc: Boris Ostrovsky Cc: Aaron Young Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3132 Signed-off-by: Ankur Arora --- OvmfPkg/SmmControl2Dxe/SmiFeatures.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/OvmfPkg/SmmControl2Dxe/SmiFeatures.c b/OvmfPkg/SmmControl2Dxe/= SmiFeatures.c index c9d875543205..af01104d69c6 100644 --- a/OvmfPkg/SmmControl2Dxe/SmiFeatures.c +++ b/OvmfPkg/SmmControl2Dxe/SmiFeatures.c @@ -29,6 +29,13 @@ //=0D #define ICH9_LPC_SMI_F_CPU_HOTPLUG BIT1=0D =0D +// The following bit value stands for "enable CPU hot unplug, and inject a= n SMI=0D +// with control value ICH9_APM_CNT_CPU_HOT_UNPLUG upon hot unplug", in the= =0D +// "etc/smi/supported-features" and "etc/smi/requested-features" fw_cfg fi= les.=0D +// Can only be negotiated alongside ICH9_LPC_SMI_F_CPU_HOTPLUG.=0D +//=0D +#define ICH9_LPC_SMI_F_CPU_HOT_UNPLUG BIT2=0D +=0D //=0D // Provides a scratch buffer (allocated in EfiReservedMemoryType type memo= ry)=0D // for the S3 boot script fragment to write to and read from.=0D @@ -112,7 +119,8 @@ NegotiateSmiFeatures ( QemuFwCfgReadBytes (sizeof mSmiFeatures, &mSmiFeatures);=0D =0D //=0D - // We want broadcast SMI, SMI on CPU hotplug, and nothing else.=0D + // We want broadcast SMI, SMI on CPU hotplug, on CPU hot-unplug=0D + // and nothing else.=0D //=0D RequestedFeaturesMask =3D ICH9_LPC_SMI_F_BROADCAST;=0D if (!MemEncryptSevIsEnabled ()) {=0D @@ -120,8 +128,18 @@ NegotiateSmiFeatures ( // For now, we only support hotplug with SEV disabled.=0D //=0D RequestedFeaturesMask |=3D ICH9_LPC_SMI_F_CPU_HOTPLUG;=0D + RequestedFeaturesMask |=3D ICH9_LPC_SMI_F_CPU_HOT_UNPLUG;=0D }=0D mSmiFeatures &=3D RequestedFeaturesMask;=0D +=0D + if (!(mSmiFeatures & ICH9_LPC_SMI_F_CPU_HOTPLUG) &&=0D + (mSmiFeatures & ICH9_LPC_SMI_F_CPU_HOT_UNPLUG)) {=0D + DEBUG ((DEBUG_WARN, "%a CPU host-features %Lx, requested mask %Lx\n",= =0D + __FUNCTION__, mSmiFeatures, RequestedFeaturesMask));=0D +=0D + mSmiFeatures &=3D ~ICH9_LPC_SMI_F_CPU_HOT_UNPLUG;=0D + }=0D +=0D QemuFwCfgSelectItem (mRequestedFeaturesItem);=0D QemuFwCfgWriteBytes (sizeof mSmiFeatures, &mSmiFeatures);=0D =0D @@ -162,8 +180,9 @@ NegotiateSmiFeatures ( if ((mSmiFeatures & ICH9_LPC_SMI_F_CPU_HOTPLUG) =3D=3D 0) {=0D DEBUG ((DEBUG_INFO, "%a: CPU hotplug not negotiated\n", __FUNCTION__))= ;=0D } else {=0D - DEBUG ((DEBUG_INFO, "%a: CPU hotplug with SMI negotiated\n",=0D - __FUNCTION__));=0D + DEBUG ((DEBUG_INFO, "%a: CPU hotplug%s with SMI negotiated\n",=0D + __FUNCTION__,=0D + (mSmiFeatures & ICH9_LPC_SMI_F_CPU_HOT_UNPLUG) ? ", unplug" : ""));= =0D }=0D =0D //=0D --=20 2.9.3