From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from aserp2120.oracle.com (aserp2120.oracle.com [141.146.126.78]) by mx.groups.io with SMTP id smtpd.web12.4952.1615530433710301494 for ; Thu, 11 Mar 2021 22:27:13 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@oracle.com header.s=corp-2020-01-29 header.b=yLvwrqPk; spf=pass (domain: oracle.com, ip: 141.146.126.78, mailfrom: ankur.a.arora@oracle.com) Received: from pps.filterd (aserp2120.oracle.com [127.0.0.1]) by aserp2120.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 12C693kV167608; Fri, 12 Mar 2021 06:27:10 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=NTCk2WrFvQNF5TkXALW4K6sgpJkNzV8FnJVhu2jvS0E=; b=yLvwrqPkgdHyALqR+Ptq0Xn0O/QT0o2UMpU0qXp4EecgCjxvBH78F4F4509FE3uEM9m3 EliQ6CAfISjBWmn/+WKVhzFfwrChfAwAkHLksZTW9mKMQdOoNVL9xgKRodm+afb/Ok8f 36vcNM+MmT4pzsA4z3Lw3994Bhope1E+TXpHOVPZa7NT6rOvo1mT6WskA+Tn67vG3znV Hd3GLVApm5FFE9s81ShG8gKsZL2hiZAAtbja25fE9YmHhpzbsK21gcWC0S3BCW3GL58P SDqBYYm0TBOLgM3OndRRXy272ed1OPkSnsRHEQH58+aSzqX7gklKO9HaoHYLWnmSD1Ws yA== Received: from userp3030.oracle.com (userp3030.oracle.com [156.151.31.80]) by aserp2120.oracle.com with ESMTP id 3741pmrya4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 12 Mar 2021 06:27:09 +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 12C6PY04079482; Fri, 12 Mar 2021 06:27:09 GMT Received: from nam02-dm3-obe.outbound.protection.outlook.com (mail-dm3nam07lp2040.outbound.protection.outlook.com [104.47.56.40]) by userp3030.oracle.com with ESMTP id 374kp243k0-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 12 Mar 2021 06:27:08 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DRl1Yk64527aqSpxzyzY674m2DSpFbKPoofsAANyiWA0jkVirJmUY3hHk11vcgikkXN4pBZ5Q9g39R6fQ8owSrG8BtTNeuHDMIYg7Ah6Dfw9NmSEe2N7F3XFssG//hCzBzPyTa5HrLch5Hb1SNF+ISN3Bl1ldhZsaxI6GvDR74xwKDBWzejdICJkcLIWIsZUBER+Rt37ypsUEAmVjs6Fo8zd+LQZWiNTQLHpRT/Oezrl9FCMizNenC21kfBRa+NC7bWiAsLJYg7BGQWBfjqZXp7SXJBkkD+phqrBeUdy53bzqy+s83KCpiUmqW/cVMRW2JV22Xpl5RVwGedWv2fHMQ== 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=NTCk2WrFvQNF5TkXALW4K6sgpJkNzV8FnJVhu2jvS0E=; b=Ai/dR2aztd94e8AFx0SU/R/73TKjIyidG2WbIlbg1YIcaGlwVRP2BJ0C7j2sCVRt1hyRuBkffQgkmwLSlgXd/VcBfsvoZFRhOnu7HYbubVvstYDGBlKk3k/kEZsFQ4bSlCrBVwx0F9noAPNxZVCjsaxYZEOYlL2R5LNvNCk7Dhh0L0GaoUKE0B3SRGB4HO96eutRfNyPtGQSEsKu+hi4W1CjGdBeT05T7yb6yakfBudmJmik41zWOgqo+IpReZAg1M5H61BvLG42NuA2LnGlyNALBSzLi3x/cbQz88T9CJir8IWOwb+CMzTmn+Aafu9ycw3XHhEq8BukPkykVIRbZw== 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=NTCk2WrFvQNF5TkXALW4K6sgpJkNzV8FnJVhu2jvS0E=; b=v2XEPrl0gVUdf1RMnEohXeksdgklcXdnLk41aCpv/b0kHSDIqfD3Tg4/crUYhoUns1fAPPwTP6fCWs0C77QpaaAM0RZ2YVInrAqSIVuHEqqBhYLbzjiD15z7/SZc+lUios9M6ytRP1fTUqh8KL0Jss4TABXJxrNoRDjRM3aCM8s= 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:06 +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:06 +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 01/10] OvmfPkg/CpuHotplugSmm: refactor hotplug logic Date: Thu, 11 Mar 2021 22:26:47 -0800 Message-Id: <20210312062656.2477515-2-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:05 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 48c87423-efdb-4e29-0cf8-08d8e51fdbaa X-MS-TrafficTypeDiagnostic: BYAPR10MB3191: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kAYNfCQ8P81QngEmxJy2UxAlGpI+FvLVvExDTOVo8NwfqJLymD3uyWi45/nKDs9soBUJijW+WDD/tIoM04ze3DNqaBbJPLpqawUD4Uy4Dv+0oz6jRMojOM3FiawJYZgTFhy9zQWoa5ifet5ChnkzADw4G3AjDD6IRJXqysA8dcEVTvkhnUw0P0rUhXtt+9uXpIRMXmth/M5C+EvkRzDRYtqhfoKBDvR611l2bncr4WhkzUKVKEbg4AT8AUP11h12Q02i30W61+uAfD4V5GHckLYqy4w81OYrgNK0t8loXjxfFYLiNa/vmQ4XtD/2iGY4KXG6XlMG30JMXVbPAwmdt924e/NSvgMMLqumOx1nXHUm3On3V9a/4gB0AK+B8lpMKQxmaas2Eq/Veox2ojDsphqHsNARH4lB6wEllG3S9cmAzH3jU1OezdTPp+JglizqxXaSKCSZbNQpte5sRFmZ0lxdfR5JtC/aAC/0ygn0s0KKit5S1EDI7VdRaf7FDDj4WL8Qo0Ly/qC2DnQ1xH1Um0wM9YgWRmSGVxEyz6x9nyn1egVA/T7WXI99134xNlXGbUwotuH7Z9p4OPsTss/47jCE53hQcouVIOPRhRuaTag= 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?ts9SHkFTVoeD2pj/21kXkU1XX7FQgXCl+i50gpD9N7/1q3YflszDDSSTuiaM?= =?us-ascii?Q?76eZya8WYeOJPYjB8t4squRR+wb2mZfzXfPdan3UNN2/RZ2Evs+AIT0/Beia?= =?us-ascii?Q?fojeL2hvRwYfACckhLSOvf/mYoRA3uQVmYy25Qd6FWNXEVltKGtz8l/d8PZH?= =?us-ascii?Q?htn7RuOTW+F+kTJ68DKn1dVhojJw8R82hQLueaFnnLKTPi0HFBC5nSmQMLm/?= =?us-ascii?Q?K9dhk2m7BPruiuQkQAhGydlzI40KoicEWWNX4FwHZ1gryewnAOJUNP9tZyDW?= =?us-ascii?Q?ZIrGXKbjK5lkSlJ1hrVn/7O5F9b72QoA2xH9u23ijmyCL//MigMjh/PrO9rp?= =?us-ascii?Q?Z260hzxO2sLrup6XsqrglLQSC0K0YU96jItpdQEZdqmtdVXBsBxP01ser0xS?= =?us-ascii?Q?zruP7AKZdlvJnkOp9mOlgxm9rkwIo6AX8f2KubRD3fjxSfzLt04aLzVXswck?= =?us-ascii?Q?JVNu5Kt+IpwdRr6EWPkMig70iurbL3624L2nVlXY7WCtWbTuMftiNBxMS9CX?= =?us-ascii?Q?fHqhZHEpJ7qUZpMzUm/rhJsYVTS1qlbY+2pHCjWRI4R/so0QchFsf4fBKiVe?= =?us-ascii?Q?fs110lrTrbdaJBmwpi0wMDBuZGEsSoCwnwIuQ+Ib51bTEvDxhvyWPpXmi1pX?= =?us-ascii?Q?i3sA+klCcBm4os3EDmID11HrvRp/EOmB6lONQgroJPMeEPd5V0tUVN/QoDJ6?= =?us-ascii?Q?OK+FM86oKjY1BCASCHHsv38WenSUh+qFuqhbJFZpSIwgrEi4Rg1qdDY29F/9?= =?us-ascii?Q?vs2A51Hkeiflowu/okpuOFysaqRXP2SfVqmfTwC+qz/ulyWufOvWzhMLtluc?= =?us-ascii?Q?aowOCJIyIw0ta/2zlVbB0Tot5AAkwAbdz0N0pORg4MauA2ck5/gPHVz7teaO?= =?us-ascii?Q?yJ4TKbhWpYU98OkCZTMoeGWbc5qdJc60LteHPRmjiggYgjVDzMkGWFzKbJEb?= =?us-ascii?Q?ev2oSswiu3yo8oMZMKDS/sktB3gjTmLdWppBK0Fp9jfH/3jC02l7zLNU0Ji3?= =?us-ascii?Q?w0CUkPD2gg747LYcjeZS4QzPgtJG+pqYE88hZekwjfX0SKbd/wWRcYTMaQOb?= =?us-ascii?Q?DFeAwpAs9yw9+znQA2u7aNQfVG8hmxureUulPTeilOpdyaDkNQoCSh4gxtJ1?= =?us-ascii?Q?zqzJ0YRjaS9YTpu2iVmukQLBjWHkSOIM6UgDKzrFIy9VcYT9D9XHKkihQP8+?= =?us-ascii?Q?cpijyqDsdPHZEeLw5Z12OMtSWIWbYdwZPwiOBtKMXQRM/pkofcUNHqihmo0g?= =?us-ascii?Q?0aSWqnC2x0HbCK4hMswpE3TAsbJpDWsB0JQIN+XSfLxnZr2rn6NzOiuLz20d?= =?us-ascii?Q?jOduP8B5QT3/EDqCqGD2zmtY?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 48c87423-efdb-4e29-0cf8-08d8e51fdbaa 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:06.6779 (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: exFNFGRX8dbMAxKQ/Zu31uDrKHWBZgRFJLXg43WQZbR7Dy3rCkRMYMSgm9jzM6ETtCrf7r7gQGZRya1Oqb6JFnWuNu7rMdgZZwe49+IlGB8= 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 spamscore=0 suspectscore=0 adultscore=0 phishscore=0 malwarescore=0 mlxscore=0 bulkscore=0 mlxlogscore=999 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 bulkscore=0 mlxlogscore=999 adultscore=0 impostorscore=0 suspectscore=0 clxscore=1015 malwarescore=0 priorityscore=1501 phishscore=0 spamscore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2103120043 Content-Transfer-Encoding: 8bit Content-Type: text/plain Refactor CpuHotplugMmi() to pull out the CPU hotplug logic into ProcessHotAddedCpus(). This is in preparation for supporting CPU hot-unplug. 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/CpuHotplug.c | 210 ++++++++++++++++++++++--------------- 1 file changed, 126 insertions(+), 84 deletions(-) diff --git a/OvmfPkg/CpuHotplugSmm/CpuHotplug.c b/OvmfPkg/CpuHotplugSmm/CpuHotplug.c index cfe698ed2b5e..bf68fcd42914 100644 --- a/OvmfPkg/CpuHotplugSmm/CpuHotplug.c +++ b/OvmfPkg/CpuHotplugSmm/CpuHotplug.c @@ -62,6 +62,129 @@ STATIC UINT32 mPostSmmPenAddress; // STATIC EFI_HANDLE mDispatchHandle; +/** + Process CPUs that have been hot-added, per QemuCpuhpCollectApicIds(). + + For each such CPU, relocate the SMBASE, and report the CPU to PiSmmCpuDxeSmm + via EFI_SMM_CPU_SERVICE_PROTOCOL. If the supposedly hot-added CPU is already + known, skip it silently. + + @param[in] PluggedApicIds The APIC IDs of the CPUs that have been + hot-plugged. + + @param[in] PluggedCount The number of filled-in APIC IDs in + PluggedApicIds. + + @retval EFI_SUCCESS CPUs corresponding to all the APIC IDs are + populated. + + @retval EFI_OUT_OF_RESOURCES Out of APIC ID space in "mCpuHotPlugData". + + @return Error codes propagated from SmbaseRelocate() + and mMmCpuService->AddProcessor(). +**/ +STATIC +EFI_STATUS +ProcessHotAddedCpus ( + IN APIC_ID *PluggedApicIds, + IN UINT32 PluggedCount + ) +{ + EFI_STATUS Status; + UINT32 PluggedIdx; + UINT32 NewSlot; + + // + // The Post-SMM Pen need not be reinstalled multiple times within a single + // root MMI handling. Even reinstalling once per root MMI is only prudence; + // in theory installing the pen in the driver's entry point function should + // suffice. + // + SmbaseReinstallPostSmmPen (mPostSmmPenAddress); + + PluggedIdx = 0; + NewSlot = 0; + while (PluggedIdx < PluggedCount) { + APIC_ID NewApicId; + UINT32 CheckSlot; + UINTN NewProcessorNumberByProtocol; + + NewApicId = PluggedApicIds[PluggedIdx]; + + // + // Check if the supposedly hot-added CPU is already known to us. + // + for (CheckSlot = 0; + CheckSlot < mCpuHotPlugData->ArrayLength; + CheckSlot++) { + if (mCpuHotPlugData->ApicId[CheckSlot] == NewApicId) { + break; + } + } + if (CheckSlot < mCpuHotPlugData->ArrayLength) { + DEBUG ((DEBUG_VERBOSE, "%a: APIC ID " FMT_APIC_ID " was hot-plugged " + "before; ignoring it\n", __FUNCTION__, NewApicId)); + PluggedIdx++; + continue; + } + + // + // Find the first empty slot in CPU_HOT_PLUG_DATA. + // + while (NewSlot < mCpuHotPlugData->ArrayLength && + mCpuHotPlugData->ApicId[NewSlot] != MAX_UINT64) { + NewSlot++; + } + if (NewSlot == mCpuHotPlugData->ArrayLength) { + DEBUG ((DEBUG_ERROR, "%a: no room for APIC ID " FMT_APIC_ID "\n", + __FUNCTION__, NewApicId)); + return EFI_OUT_OF_RESOURCES; + } + + // + // Store the APIC ID of the new processor to the slot. + // + mCpuHotPlugData->ApicId[NewSlot] = NewApicId; + + // + // Relocate the SMBASE of the new CPU. + // + Status = SmbaseRelocate (NewApicId, mCpuHotPlugData->SmBase[NewSlot], + mPostSmmPenAddress); + if (EFI_ERROR (Status)) { + goto RevokeNewSlot; + } + + // + // Add the new CPU with EFI_SMM_CPU_SERVICE_PROTOCOL. + // + Status = mMmCpuService->AddProcessor (mMmCpuService, NewApicId, + &NewProcessorNumberByProtocol); + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_ERROR, "%a: AddProcessor(" FMT_APIC_ID "): %r\n", + __FUNCTION__, NewApicId, Status)); + goto RevokeNewSlot; + } + + DEBUG ((DEBUG_INFO, "%a: hot-added APIC ID " FMT_APIC_ID ", SMBASE 0x%Lx, " + "EFI_SMM_CPU_SERVICE_PROTOCOL assigned number %Lu\n", __FUNCTION__, + NewApicId, (UINT64)mCpuHotPlugData->SmBase[NewSlot], + (UINT64)NewProcessorNumberByProtocol)); + + NewSlot++; + PluggedIdx++; + } + + // + // We've processed this batch of hot-added CPUs. + // + return EFI_SUCCESS; + +RevokeNewSlot: + mCpuHotPlugData->ApicId[NewSlot] = MAX_UINT64; + + return Status; +} /** CPU Hotplug MMI handler function. @@ -122,8 +245,6 @@ CpuHotplugMmi ( UINT8 ApmControl; UINT32 PluggedCount; UINT32 ToUnplugCount; - UINT32 PluggedIdx; - UINT32 NewSlot; // // Assert that we are entering this function due to our root MMI handler @@ -179,87 +300,11 @@ CpuHotplugMmi ( goto Fatal; } - // - // Process hot-added CPUs. - // - // The Post-SMM Pen need not be reinstalled multiple times within a single - // root MMI handling. Even reinstalling once per root MMI is only prudence; - // in theory installing the pen in the driver's entry point function should - // suffice. - // - SmbaseReinstallPostSmmPen (mPostSmmPenAddress); - - PluggedIdx = 0; - NewSlot = 0; - while (PluggedIdx < PluggedCount) { - APIC_ID NewApicId; - UINT32 CheckSlot; - UINTN NewProcessorNumberByProtocol; - - NewApicId = mPluggedApicIds[PluggedIdx]; - - // - // Check if the supposedly hot-added CPU is already known to us. - // - for (CheckSlot = 0; - CheckSlot < mCpuHotPlugData->ArrayLength; - CheckSlot++) { - if (mCpuHotPlugData->ApicId[CheckSlot] == NewApicId) { - break; - } - } - if (CheckSlot < mCpuHotPlugData->ArrayLength) { - DEBUG ((DEBUG_VERBOSE, "%a: APIC ID " FMT_APIC_ID " was hot-plugged " - "before; ignoring it\n", __FUNCTION__, NewApicId)); - PluggedIdx++; - continue; - } - - // - // Find the first empty slot in CPU_HOT_PLUG_DATA. - // - while (NewSlot < mCpuHotPlugData->ArrayLength && - mCpuHotPlugData->ApicId[NewSlot] != MAX_UINT64) { - NewSlot++; - } - if (NewSlot == mCpuHotPlugData->ArrayLength) { - DEBUG ((DEBUG_ERROR, "%a: no room for APIC ID " FMT_APIC_ID "\n", - __FUNCTION__, NewApicId)); + if (PluggedCount > 0) { + Status = ProcessHotAddedCpus (mPluggedApicIds, PluggedCount); + if (EFI_ERROR (Status)) { goto Fatal; } - - // - // Store the APIC ID of the new processor to the slot. - // - mCpuHotPlugData->ApicId[NewSlot] = NewApicId; - - // - // Relocate the SMBASE of the new CPU. - // - Status = SmbaseRelocate (NewApicId, mCpuHotPlugData->SmBase[NewSlot], - mPostSmmPenAddress); - if (EFI_ERROR (Status)) { - goto RevokeNewSlot; - } - - // - // Add the new CPU with EFI_SMM_CPU_SERVICE_PROTOCOL. - // - Status = mMmCpuService->AddProcessor (mMmCpuService, NewApicId, - &NewProcessorNumberByProtocol); - if (EFI_ERROR (Status)) { - DEBUG ((DEBUG_ERROR, "%a: AddProcessor(" FMT_APIC_ID "): %r\n", - __FUNCTION__, NewApicId, Status)); - goto RevokeNewSlot; - } - - DEBUG ((DEBUG_INFO, "%a: hot-added APIC ID " FMT_APIC_ID ", SMBASE 0x%Lx, " - "EFI_SMM_CPU_SERVICE_PROTOCOL assigned number %Lu\n", __FUNCTION__, - NewApicId, (UINT64)mCpuHotPlugData->SmBase[NewSlot], - (UINT64)NewProcessorNumberByProtocol)); - - NewSlot++; - PluggedIdx++; } // @@ -267,9 +312,6 @@ CpuHotplugMmi ( // return EFI_SUCCESS; -RevokeNewSlot: - mCpuHotPlugData->ApicId[NewSlot] = MAX_UINT64; - Fatal: ASSERT (FALSE); CpuDeadLoop (); -- 2.9.3