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.web08.3357.1611882008266317122 for ; Thu, 28 Jan 2021 17:00:08 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@oracle.com header.s=corp-2020-01-29 header.b=a9kzRaCo; 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 10T0eJ8e041428; Fri, 29 Jan 2021 01:00:04 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=7DyDBLKrhQWru9roBkQCWe9/RsVfjy9XMv9V9+fWzjc=; b=a9kzRaCoupeAca5b1j4MdZf6bJA528d2E+OBhnWvxClQUPrvby+EOhBoZniXmrtHgoQz szp2NaZjTSCHe4KfWlX84PLHIMmf3ZJyUDTneLzw5CK1gmXkjNztUjTX4J00aXsV+VmC mjeldh9ivoO1D01lKCcWX9HetXYDLxnmVZOBqmzYkJVLCbS7V04vSKB6j1m6eP9ZLFJF M/WlzMEJLrP/j2t8BMp/UmoQ+fb19IDV7p7UC8x4b0rdpyW+9gXaFar5VD24yFYorVVf TcJHeci68swSvWVr0eBQPF1Lo+3s6K92DusrSXHZnizsLVP45Fj6DFXTZJGafGGP2EC2 3w== Received: from userp3030.oracle.com (userp3030.oracle.com [156.151.31.80]) by userp2130.oracle.com with ESMTP id 368b7r6uw8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 29 Jan 2021 01:00:04 +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 10T0eGVG081743; Fri, 29 Jan 2021 01:00:03 GMT Received: from nam11-co1-obe.outbound.protection.outlook.com (mail-co1nam11lp2172.outbound.protection.outlook.com [104.47.56.172]) by userp3030.oracle.com with ESMTP id 368wr13e5c-4 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 29 Jan 2021 01:00:03 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=L/1NoALG9E+igW1GsKZ632Jc7jTNnRKYJ6ioLfLYrt//cyripSX6CA65cwFos9bc5ViisjgNbNFt5q/F5JnKA1Ui890zkhO9R1PPisqb9FDNgMQPB3DENS6fMKVsULXXvu8s/28DPNw6yEuO/6PPQrDUejIGDdIAenDjeo60syyYZm8Pgjci3y/BK9nP3HIlqr1G0Q61zUTo6Tr9gKpgUsPeVbiKLReKdulotMwhnQH77EMdOl0l5/CGdTGuRKMT3tkIGWIBSFaMc2AdUPYyrbUGkEc4UYMPaJu1LA8aaHyOnI5C2BTWG7iZsSnjRgKuGEtNyt3XP0xEHd1z6ePOjg== 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=7DyDBLKrhQWru9roBkQCWe9/RsVfjy9XMv9V9+fWzjc=; b=dj/hFTJNJ1pDvrNBzQhUidLn7EAn2YIjs4K2uFOHlG6nc5iWU/wU4UZlemjb2AVyN+NuXacaQcFTh/AS5ayKPlvtyrkC7TaxLiHyLq7IMU17RdQmC612It0GXA0Jq5dj0dCEGCVza3+pTTcVYOES7OzRhYJE+ZfseF/oPBRbI/JwGFp6W6MtVG+MKwktrzCI1jMfX2MHfcRutpPw8y+ZsY4t1f1j1TTDZ3FAN8R0DLK92ZUm96X3UNo/bvAcvD1VHHT8zAWaYTAd+lAEwGvpzdfD/5O/pYTVOxeFs1nbq5m39GktKRF1YTJDtBCn5Jvu+d7JtaBnBeTD+iqsvxvGhw== 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=7DyDBLKrhQWru9roBkQCWe9/RsVfjy9XMv9V9+fWzjc=; b=ZatMn2qymGCTEmGtPBiG6jLByCsNsLWO3WW8xirOuSlBllq7JFAL+ia5KfRk9/bCoAp2shNVD6HGrHYF/sn0A9f+OP14RSYjcHA1MwVjIa5Y3rgKRZP8Uol92DJm4t1mpp8ew879Jy9OGZBbzmoYi6l/KJRm2c8m6CbP2YkQ/Rg= 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 CY4PR1001MB2246.namprd10.prod.outlook.com (2603:10b6:910:41::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.16; Fri, 29 Jan 2021 01:00:01 +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.3805.019; Fri, 29 Jan 2021 01:00:01 +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 v6 3/9] OvmfPkg/CpuHotplugSmm: add Qemu Cpu Status helper Date: Thu, 28 Jan 2021 16:59:44 -0800 Message-Id: <20210129005950.467638-4-ankur.a.arora@oracle.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210129005950.467638-1-ankur.a.arora@oracle.com> References: <20210129005950.467638-1-ankur.a.arora@oracle.com> X-Originating-IP: [148.87.23.8] X-ClientProxiedBy: MWHPR1401CA0022.namprd14.prod.outlook.com (2603:10b6:301:4b::32) To CY4PR10MB1718.namprd10.prod.outlook.com (2603:10b6:910:9::17) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from prion.us.oracle.com (148.87.23.8) by MWHPR1401CA0022.namprd14.prod.outlook.com (2603:10b6:301:4b::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3805.17 via Frontend Transport; Fri, 29 Jan 2021 01:00:00 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 35e69161-59b5-4322-c676-08d8c3f134ef X-MS-TrafficTypeDiagnostic: CY4PR1001MB2246: 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: qmS1sWuju/7DNizXLrhkXVf5TTt3x8UByK3ZVz+z/hdnmaPHekEB582m8qLyypt9YIWpJpPOOL5nSHrRvpRF3C5Er55czEa3OyRvRgXOC9vkvtKGY9eN5ern7ggjGoGZHH+uLAsCAFSm6U8qQeneEA5INNh2AzHYfya7FDS5PiZ3YEQOikm0tgDtla2WGKu9lH+dD8DJ4UfDpLErVqYaGHRi+sDe4H7w/XsVlsFJdP3r8IWiWF/pg+mnJzRo5X16ayC8O4ngnJ+1NWflJ9WsukTA7af555t+nIIa/cqi/PGPq3us/DlGk+WP1Haj9WBDy/0ShOcBOO6st9QotMHHcIjd8uIKlHSgubrxhrQZ2nefLuuD45IKDR7+gUQndnwKCpJbFgZYtTXfU6L8iVTxjY+8g1yWhralPfMf8Fl5jgXX8+u0rKczMBAaa8w76G7/1abWfpuUVM1KjdSPnq2o2gRNFcFnH3C/Xhk4iu0vBPIWfAuTeYtVywFp/hzsMnE/N4z9raKFPx/be3gBaEW7pt1PuUHa2uwUV/74w0qLRRQUclGZDdmde0IYNKNdh0BY4fYIXXU4C6m5nK8LONIUDdBGBm+pQksF9ONVijXrsiQ= 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)(39860400002)(346002)(376002)(396003)(136003)(8936002)(107886003)(2906002)(66946007)(66476007)(66556008)(36756003)(1076003)(103116003)(16526019)(956004)(966005)(7696005)(478600001)(52116002)(54906003)(6486002)(86362001)(83380400001)(6666004)(8676002)(186003)(5660300002)(4326008)(6916009)(26005)(316002)(2616005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?8yj7nbecUWZ1P+7nxXi+/2FulZBDnG6dlNQSoXQC42b5PmexG1vB71FirPlf?= =?us-ascii?Q?J/ZrH46fqSPVn8n3pfLqBwWneuVKIPd3Qv/izT5CIAIKF44fK9IS8wXWLeXy?= =?us-ascii?Q?xO9Kxu1pfayaUCVq6OgjpPmbpYhL3AnYR9zDhCIhtS9yRONZ+tSt/36z6sLl?= =?us-ascii?Q?gb8G53gojsSYZNoj+tmcGULSavLZXU9xxxqNPkhmAObk2XtREf7YW3C7ZmFI?= =?us-ascii?Q?88BZd+ZW8f2F/KDgHsy0LgNSIEhEHt+enx35t6l3y7GIlWKXJw0k4Y0jvdB5?= =?us-ascii?Q?G5yJoZRj5MAqr/OYhq5HZkv+7CfcsDiiaKtaNHfFhZs169tlhmZEstgwWIr2?= =?us-ascii?Q?r2U22lZQWX59Vf9eGrwGbRm7YxSdv0CCJ/Fbk1DPcrzRFf2quKJH3V3I8B6E?= =?us-ascii?Q?mCQEo7lVoIDnj4ovYfGf1aJGoHvPW6GypZURh5F1v0ZMf+w4YirGyZiCtR9p?= =?us-ascii?Q?HPY0M9NysFDNc3VQw9EQ3kdmzTeclninIyAN9S0LNLOSQ/P2qWNGRwYv7sTZ?= =?us-ascii?Q?wv0urFeBcbw/IByPAONd/Bpz5bHZJo/XW4KIrJzT5jfu3jMWigSqjD2Vf74k?= =?us-ascii?Q?5wzYF/ujwzILk9fC+bWnvg7t4MpjVoqgTd1kQhMvUtv+oqTw2AH9QhEr/dNV?= =?us-ascii?Q?X+ZpmldYteS3tUejdx9HXAYR73mOlxpncV2jHRy3t4IGPDu2Oenf51tZf6MT?= =?us-ascii?Q?KzbKFu7a5RNCDx5rcyEG5VY4bTMYZ2zIuP1oMsAHLxRYLwGxwMjoelq1jbDa?= =?us-ascii?Q?Cvgi+fVn3+33GVVJgV8ahwtcys0gCmuNRHMSwpRanj06N/ypAfgu/hd5GEYw?= =?us-ascii?Q?XcqNxohC7HCSe3arp5fRPmVJD3Fb+mHVjo2ls8SxH0XLxpl8Zcx4BvlNuwyj?= =?us-ascii?Q?Fih+foTsDj+s+5fKSGeAja5t9OxWcWgxkR7F2NI6lc6iZdVr5RbGa/mUn9mH?= =?us-ascii?Q?JPeED/qgguJJjRA9hq8d211tKZfj1z/rvMQcMR+thRCcZP4aUJZtPDG/ZGAW?= =?us-ascii?Q?63AZnuw4SDdu8XntUsnKN6TFxyaAIc4Q3uCUoMLwO2I59k2hNdRiV0T7lKu4?= =?us-ascii?Q?oUF4cXuA?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 35e69161-59b5-4322-c676-08d8c3f134ef X-MS-Exchange-CrossTenant-AuthSource: CY4PR10MB1718.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jan 2021 01:00:01.7448 (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: BLr9UIwstrlQqPAaKJEgTYqiNL87H8hqkpo/PlMAdynRVkpJ5DIwxDZlA2lTSZ2S60wo0g0fDF/DWuclXFmlUU1WYKj1vkWxo0c/npl1L40= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR1001MB2246 X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=9878 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-2101290001 X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=9878 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-2101290001 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 --- 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 8adaa0ad91f0..804809846890 100644 --- a/OvmfPkg/CpuHotplugSmm/QemuCpuhp.h +++ b/OvmfPkg/CpuHotplugSmm/QemuCpuhp.h @@ -30,6 +30,12 @@ QemuCpuhpReadCpuStatus ( IN CONST EFI_MM_CPU_IO_PROTOCOL *MmCpuIo ); +VOID +QemuCpuhpWriteCpuStatus ( + IN CONST EFI_MM_CPU_IO_PROTOCOL *MmCpuIo, + IN UINT8 CpuStatus + ); + UINT32 QemuCpuhpReadCommandData ( IN CONST EFI_MM_CPU_IO_PROTOCOL *MmCpuIo diff --git a/OvmfPkg/CpuHotplugSmm/QemuCpuhp.c b/OvmfPkg/CpuHotplugSmm/QemuCpuhp.c index f871e50c377b..ed44264de934 100644 --- a/OvmfPkg/CpuHotplugSmm/QemuCpuhp.c +++ b/OvmfPkg/CpuHotplugSmm/QemuCpuhp.c @@ -67,6 +67,28 @@ QemuCpuhpReadCpuStatus ( return CpuStatus; } +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 (); + } +} + UINT32 QemuCpuhpReadCommandData ( IN CONST EFI_MM_CPU_IO_PROTOCOL *MmCpuIo -- 2.9.3