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.web10.4848.1615530434478996917 for ; Thu, 11 Mar 2021 22:27:14 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@oracle.com header.s=corp-2020-01-29 header.b=ZmcpV5cO; 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 12C6A7Ik178512; Fri, 12 Mar 2021 06:27:11 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=nOhyQYWxPMB/Ll/aIs9h+tZp4+HvVz8O7MSZMdON6VA=; b=ZmcpV5cO4V6BJZIYDJSu0wQ6R4M/sv/GqRGtzapjTkXaRRbYIe0Ftwj2UxB4sb/cWLrc BWVU5PEKKTsIjdKBY/v/FxXmF8JKKAlheE8tq+b/wWpvqLUVuQX+BiFszyszD5Nn3+qN ITu++9ua52ljrf8tCl5saqPIB8aemcxLwKalm3TwND17T6Hy7kDQRq0ZTj/L27ajr1jI TpCIufGnpT+YynqRMCh0p1U7FPxCIqltMUWE833cUeYpFiAQjbbP5JYBb76AA/krwBkW jlXwsnAGjHCbqRqLg5GzP/7eS+cv9xUFanhydEC5t5LN5ThXsYcuxPK2+sIVqVwFBbhJ ug== Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by userp2130.oracle.com with ESMTP id 37415rgyeg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 12 Mar 2021 06:27:11 +0000 Received: from pps.filterd (userp3020.oracle.com [127.0.0.1]) by userp3020.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 12C6PAsL055220; Fri, 12 Mar 2021 06:27:11 GMT Received: from nam02-dm3-obe.outbound.protection.outlook.com (mail-dm3nam07lp2049.outbound.protection.outlook.com [104.47.56.49]) by userp3020.oracle.com with ESMTP id 374kgw3bq3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 12 Mar 2021 06:27:11 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eqlN4DxSdLd9OyCAncyaX3WHw6bEHOCpB8L0qRWse4Dii3PbnquF7+lttvhnuMUb7MNp0GvXwVT6U3Nwsq4ZdsNQxUFKXBMYu0WX9xu/V7nvl505P9iwXlgIoDQC8sBB2rEzdU54OV1PgC9BoQWy0ePhGcWCVpBSWzypE/M2u1IQPrYdVi0A+mW2G/XpkZECEo71zzHnDMq23LeoNR/P2pPkr58Vk9nDl0eUBWCjTnS0yTLfDtHmz7VTcG6RiCDrGKAhQcQR3tANfXEUv3bTZ+9RwsUcp8NpxAVk5GNRKRNxK8mjI2V3GRgcilEBQjfNXqD2opLb9VfuV1H0MlrADA== 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=nOhyQYWxPMB/Ll/aIs9h+tZp4+HvVz8O7MSZMdON6VA=; b=czWAV0vd8xfhdK0hYpWo0ZHWXQ18qT2ymh1XSkWMx4pUDbsVgQ9h8drOfBIclx5Pdek4tI/0TxZgrGJLYM7x44tDjd6GOOgebtXJlW0U0FR72dIFfS0J13bSHq5Ty8uLEiSVFrszlvhEssa8GHKrv2kyU5cAibtpcP/B1GjES9QmE+7+TbXW3b8PYc4sCKEV9ivACbmua0bTsyV2sckase6e9yTwz/D9yEzoUx3G+0cyYRnBnBwH2hzQfGbHYD6yHfBgUtxQNSEOf/rDbhG63bH5hGgxoeMp8OQUuSxk4Ay1UlzB9WNfEUkC01uttjQS140kqKS1RjQx4LZWwutP9w== 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=nOhyQYWxPMB/Ll/aIs9h+tZp4+HvVz8O7MSZMdON6VA=; b=eGSAqFhUhv5XlcC6prQqpuReoVX2xfSupp1bBWLJu0TmQvKbVDuM7pCPTQ10PrpZ0YLp1nBrOU9h/O5JMote1lty2bIQq/lEAAPe2bB0Y/HoOhgbJ6WLoqjuVcCuTdOyGhg0fBbO+Eyz5auwYg8xe9cV2MQJKGYsv0hFSyAzDUw= 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 SJ0PR10MB4605.namprd10.prod.outlook.com (2603:10b6:a03:2d9::24) by BYAPR10MB3191.namprd10.prod.outlook.com (2603:10b6:a03:14f::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3890.24; Fri, 12 Mar 2021 06:27:09 +0000 Received: from SJ0PR10MB4605.namprd10.prod.outlook.com ([fe80::a021:790:7ce6:6f16]) by SJ0PR10MB4605.namprd10.prod.outlook.com ([fe80::a021:790:7ce6:6f16%6]) with mapi id 15.20.3912.030; Fri, 12 Mar 2021 06:27:09 +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 v9 03/10] OvmfPkg/CpuHotplugSmm: add Qemu Cpu Status helper Date: Thu, 11 Mar 2021 22:26:49 -0800 Message-Id: <20210312062656.2477515-4-ankur.a.arora@oracle.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210312062656.2477515-1-ankur.a.arora@oracle.com> References: <20210312062656.2477515-1-ankur.a.arora@oracle.com> X-Originating-IP: [148.87.23.12] X-ClientProxiedBy: MWHPR02CA0018.namprd02.prod.outlook.com (2603:10b6:300:4b::28) To SJ0PR10MB4605.namprd10.prod.outlook.com (2603:10b6:a03:2d9::24) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from prion.us.oracle.com (148.87.23.12) by MWHPR02CA0018.namprd02.prod.outlook.com (2603:10b6:300:4b::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3912.17 via Frontend Transport; Fri, 12 Mar 2021 06:27:08 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f62ad2f4-7e80-4e64-9f8b-08d8e51fdd1f X-MS-TrafficTypeDiagnostic: BYAPR10MB3191: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4714; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5d5UUtJ8Zp5eOP9shK601A164NG/mIVTltshvOGAegaaVuYZoh+w+bxCM/dsWvDohvyMczZLTKaCSUzGXnM7CjdbRqeDML+hHMWy3yalA3q1j0EGGm34QDPvZOUSyTAQnAuy0TTf+S3lNVseujFIkVAwa20SaIWrpNzeXJUaHyUV63G+nVc3/cESDQUT3S2MLbB58WVmvN45S3VXXirhHsQ7Vl5iTTxa/ELYJpigjZQux5YYGpPK76voX6rBEt7t4URl+ta3NLqbcQo6p9om0amEGokdNYmWm82ffssrqVglte1nKEou8+hnAIBa3L6LjJ5JV/61SVq+068Ldc3qJYmdf5SSBm1zFidQfNFwNiE4npDhnPuth/aa21A9lPHVgm6eXISMtypMZOaJfWqGJEyTavKWiL35fT8f8LKZQURdHLXQJF09lNJejEbv4VoJapQzmVBvfAVqc2cUGbJ0sZWeRL5cVz6EZZ/e0uiAcMyrB4TJGPzj5+fbh3kAF+e+WPuB9WWtve+KGfgk0/DWSiDYydOp82IuBO+AYz4MArJdgtZB37n1lEibPt6GrYtd37UWfpgy3/veutrXMJJmQV1knJDAKXpP7JrQb8O5O2Y= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR10MB4605.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(346002)(39860400002)(396003)(376002)(366004)(136003)(54906003)(86362001)(4326008)(36756003)(478600001)(66556008)(66476007)(66946007)(316002)(83380400001)(5660300002)(2906002)(6916009)(103116003)(966005)(6486002)(26005)(2616005)(956004)(6666004)(186003)(107886003)(7696005)(16526019)(52116002)(1076003)(8936002)(8676002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?Bp0/vSRqcSCv5ZF/mfrzblgohytIvpPR++9rEyrXZNEOs69fKMqTRpqZtwxl?= =?us-ascii?Q?u5cBRgQ2+wyea5bViAZbmfb5Ylq/mSqFhwIvQJ3HFUHGC77ZdFjdPF7/SEK1?= =?us-ascii?Q?jvb0vmZL7HGfuqwEZPi7u+eAUQ47nachfNV/Se0i+9LyeAy2TtupM1voVX49?= =?us-ascii?Q?7kVIC3QGN9hVgeh90VvYotvw1tsxSFc1OfqFWkSVBz0tlkBTlyH31MCR3+Jm?= =?us-ascii?Q?xy2Edcn5ojNHVnONMrtfiy3S5bglktR3za4Vg2LN29fmP4IMduSAXrEgPb2s?= =?us-ascii?Q?RveiaQ1er64ofscmJe6MqUEMf48htXfzKU2mcxY9/alnKzW+cF9SbFtBKc6E?= =?us-ascii?Q?jko02xsMfgd/fwXIwrn76nZa2jSjqicEaJgG09STuCFw/eB91/Fq1K5q8Orm?= =?us-ascii?Q?0x1FLslxmMgAiW6uy4KisYJgGU6nHwkJQEJTKIvG4ZPm1y0DtwEivjQS7yTb?= =?us-ascii?Q?NNzDNm5W+HpU4EvLdJwBwqNcWopE384Uod83NjSlDFFjXnGD9feGs95m0oPV?= =?us-ascii?Q?P1UD5ZKtdCvUAyv0uOcwhSYkNRTEla/sKM7GVvyRYlTl7UPM16V/jzJrEH1D?= =?us-ascii?Q?QJ7cLQLfjy/r5PqFhotDSuGGVixAQafymeO/gwRwJnSj7HAb7iWUIsRyYg09?= =?us-ascii?Q?64/X2jjkIgbjNBZIb9688ZVBkduW6q34g1Sejk9IzBZCZ4kS86690mUAbQsC?= =?us-ascii?Q?cNj0goOY2J9G1/ZODPGtZYAa2ByhgWCsbnZVQTnDt7OJ4dd0jK96NXhE7CFp?= =?us-ascii?Q?h2pFMxA7ZTczGIHDV12GlNbQ+KQKWQ+DZ3A9kT9iEdkUxBuxUAcA6bTJjYPQ?= =?us-ascii?Q?T8r0/EXHgvAeHgWVLcskkAZdvmAnD5+nDG1+oLgkxjxqIfOqvf8MoEwxLz99?= =?us-ascii?Q?lxXlldYJH2ETnvFpZAVVEYAdQ1/xj0Ael/VdJY1dHF7Uma3HWuYU85QeEE37?= =?us-ascii?Q?aOfEazBpCmQQ3nR6Wb+W4ChBSYqsnSbVFlqtm9HhfMG3vg8m6A0mUENXXpaO?= =?us-ascii?Q?K523t8mvMG70tascmNocxMwNk2aHm6u0ePk1Fvt526OVh1HKK5ZAEDbbIsN9?= =?us-ascii?Q?RdOd58X7nQulVKv70M1EEV/bbzSs6wsAp6+QIWsAtlb+/00DSLJ+d4cicwpZ?= =?us-ascii?Q?J5aAtB6lfEt9nGWOml8PA1hRgiOjATTAgqkOlplRFE2LsATT0jvf455Z+x8o?= =?us-ascii?Q?I1+pgNOPQjtpkieCRMirBAJpPjFuMTXKSNtvLxFL31skAMVzBFaPA0MFSiGQ?= =?us-ascii?Q?63Lm6fWijeNebaZ+054SsxD7E4D/92djpmXcbvXV1YdVSsHIYg70lyetDNom?= =?us-ascii?Q?K7AtAvZoWGJTXsUTLkP0togv?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: f62ad2f4-7e80-4e64-9f8b-08d8e51fdd1f X-MS-Exchange-CrossTenant-AuthSource: SJ0PR10MB4605.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Mar 2021 06:27:09.1291 (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: dTxl2abGWk5dfwGkspyQMunHejbzbG9pz8fb+l36sOCgjB4ZrI9s4QvsQAiie/P9kJEexUVtq5uV+D4jHe4S4tM2f8k8QPvaiRWT2zUcEl4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR10MB3191 X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=9920 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 adultscore=0 malwarescore=0 bulkscore=0 suspectscore=0 mlxscore=0 mlxlogscore=999 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2103120044 X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=9920 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 lowpriorityscore=0 impostorscore=0 mlxlogscore=999 malwarescore=0 suspectscore=0 adultscore=0 phishscore=0 spamscore=0 priorityscore=1501 bulkscore=0 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2103120043 Content-Transfer-Encoding: 8bit Content-Type: text/plain Add QemuCpuhpWriteCpuStatus() which will be used to update the QEMU CPU status register. On error, it hangs in a similar fashion as other helper functions. 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=3132 Signed-off-by: Ankur Arora Reviewed-by: Laszlo Ersek --- OvmfPkg/CpuHotplugSmm/QemuCpuhp.h | 6 ++++++ OvmfPkg/CpuHotplugSmm/QemuCpuhp.c | 22 ++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/OvmfPkg/CpuHotplugSmm/QemuCpuhp.h b/OvmfPkg/CpuHotplugSmm/QemuCpuhp.h index 3e2c2192e1c0..8bb3c66e9b44 100644 --- a/OvmfPkg/CpuHotplugSmm/QemuCpuhp.h +++ b/OvmfPkg/CpuHotplugSmm/QemuCpuhp.h @@ -42,6 +42,12 @@ QemuCpuhpWriteCpuSelector ( ); VOID +QemuCpuhpWriteCpuStatus ( + IN CONST EFI_MM_CPU_IO_PROTOCOL *MmCpuIo, + IN UINT8 CpuStatus + ); + +VOID QemuCpuhpWriteCommand ( IN CONST EFI_MM_CPU_IO_PROTOCOL *MmCpuIo, IN UINT8 Command diff --git a/OvmfPkg/CpuHotplugSmm/QemuCpuhp.c b/OvmfPkg/CpuHotplugSmm/QemuCpuhp.c index 8434dd446b96..dc86ab96777a 100644 --- a/OvmfPkg/CpuHotplugSmm/QemuCpuhp.c +++ b/OvmfPkg/CpuHotplugSmm/QemuCpuhp.c @@ -114,6 +114,28 @@ QemuCpuhpWriteCpuSelector ( } VOID +QemuCpuhpWriteCpuStatus ( + IN CONST EFI_MM_CPU_IO_PROTOCOL *MmCpuIo, + IN UINT8 CpuStatus + ) +{ + EFI_STATUS Status; + + Status = MmCpuIo->Io.Write ( + MmCpuIo, + MM_IO_UINT8, + ICH9_CPU_HOTPLUG_BASE + QEMU_CPUHP_R_CPU_STAT, + 1, + &CpuStatus + ); + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_ERROR, "%a: %r\n", __FUNCTION__, Status)); + ASSERT (FALSE); + CpuDeadLoop (); + } +} + +VOID QemuCpuhpWriteCommand ( IN CONST EFI_MM_CPU_IO_PROTOCOL *MmCpuIo, IN UINT8 Command -- 2.9.3