From nobody Sat May 4 02:13:34 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail(p=none dis=none) header.from=intel.com Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1532491074890181.74255229149946; Tue, 24 Jul 2018 20:57:54 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id A1194210C1EC3; Tue, 24 Jul 2018 20:57:51 -0700 (PDT) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 79DB1210C1B93 for ; Tue, 24 Jul 2018 20:57:49 -0700 (PDT) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 24 Jul 2018 20:57:49 -0700 Received: from ydong10-win10.ccr.corp.intel.com ([10.239.9.125]) by orsmga003.jf.intel.com with ESMTP; 24 Jul 2018 20:57:15 -0700 X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.31; helo=mga06.intel.com; envelope-from=eric.dong@intel.com; receiver=edk2-devel@lists.01.org X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,400,1526367600"; d="scan'208";a="69681337" From: Eric Dong To: edk2-devel@lists.01.org Date: Wed, 25 Jul 2018 11:57:10 +0800 Message-Id: <20180725035712.8944-2-eric.dong@intel.com> X-Mailer: git-send-email 2.15.0.windows.1 In-Reply-To: <20180725035712.8944-1-eric.dong@intel.com> References: <20180725035712.8944-1-eric.dong@intel.com> Subject: [edk2] [Patch 1/3] UefiCpuPkg/MpInitLib: Remove redundant CpuStateFinished State. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ruiyu Ni , Laszlo Ersek MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Current CPU state definition include CpuStateIdle and CpuStateFinished. After investigation, current code can use CpuStateIdle to replace the CpuStateFinished. It will reduce the state number and easy for maintenance. Cc: Laszlo Ersek Cc: Ruiyu Ni Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Eric Dong --- UefiCpuPkg/Library/MpInitLib/MpLib.c | 18 ++++++++---------- UefiCpuPkg/Library/MpInitLib/MpLib.h | 1 - 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.c b/UefiCpuPkg/Library/MpIn= itLib/MpLib.c index c82b985943..ff09a0e9e7 100644 --- a/UefiCpuPkg/Library/MpInitLib/MpLib.c +++ b/UefiCpuPkg/Library/MpInitLib/MpLib.c @@ -696,7 +696,7 @@ ApWakeupFunction ( } } } - SetApState (&CpuMpData->CpuData[ProcessorNumber], CpuStateFinished= ); + SetApState (&CpuMpData->CpuData[ProcessorNumber], CpuStateIdle); } } =20 @@ -1352,18 +1352,17 @@ CheckThisAP ( CpuData =3D &CpuMpData->CpuData[ProcessorNumber]; =20 // - // Check the CPU state of AP. If it is CpuStateFinished, then the AP ha= s finished its task. + // Check the CPU state of AP. If it is CpuStateIdle, then the AP has fi= nished its task. // Only BSP and corresponding AP access this unit of CPU Data. This mea= ns the AP will not modify the - // value of state after setting the it to CpuStateFinished, so BSP can = safely make use of its value. + // value of state after setting the it to CpuStateIdle, so BSP can safe= ly make use of its value. // // // If the AP finishes for StartupThisAP(), return EFI_SUCCESS. // - if (GetApState(CpuData) =3D=3D CpuStateFinished) { + if (GetApState(CpuData) =3D=3D CpuStateIdle) { if (CpuData->Finished !=3D NULL) { *(CpuData->Finished) =3D TRUE; } - SetApState (CpuData, CpuStateIdle); return EFI_SUCCESS; } else { // @@ -1420,14 +1419,13 @@ CheckAllAPs ( =20 CpuData =3D &CpuMpData->CpuData[ProcessorNumber]; // - // Check the CPU state of AP. If it is CpuStateFinished, then the AP h= as finished its task. + // Check the CPU state of AP. If it is CpuStateIdle, then the AP has f= inished its task. // Only BSP and corresponding AP access this unit of CPU Data. This me= ans the AP will not modify the - // value of state after setting the it to CpuStateFinished, so BSP can= safely make use of its value. + // value of state after setting the it to CpuStateIdle, so BSP can saf= ely make use of its value. // - if (GetApState(CpuData) =3D=3D CpuStateFinished) { + if (GetApState(CpuData) =3D=3D CpuStateIdle) { CpuMpData->RunningCount ++; CpuMpData->CpuData[ProcessorNumber].Waiting =3D FALSE; - SetApState(CpuData, CpuStateIdle); =20 // // If in Single Thread mode, then search for the next waiting AP for= execution. @@ -1923,7 +1921,7 @@ SwitchBSPWorker ( // // Wait for old BSP finished AP task // - while (GetApState (&CpuMpData->CpuData[CallerNumber]) !=3D CpuStateFinis= hed) { + while (GetApState (&CpuMpData->CpuData[CallerNumber]) !=3D CpuStateIdle)= { CpuPause (); } =20 diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.h b/UefiCpuPkg/Library/MpIn= itLib/MpLib.h index 9d0b866d09..962bce685d 100644 --- a/UefiCpuPkg/Library/MpInitLib/MpLib.h +++ b/UefiCpuPkg/Library/MpInitLib/MpLib.h @@ -85,7 +85,6 @@ typedef enum { CpuStateIdle, CpuStateReady, CpuStateBusy, - CpuStateFinished, CpuStateDisabled } CPU_STATE; =20 --=20 2.15.0.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Sat May 4 02:13:34 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail(p=none dis=none) header.from=intel.com Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1532491071996612.7002309501923; Tue, 24 Jul 2018 20:57:51 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 6904D210C1B9D; Tue, 24 Jul 2018 20:57:50 -0700 (PDT) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 6E00C210C1B8D for ; Tue, 24 Jul 2018 20:57:49 -0700 (PDT) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 24 Jul 2018 20:57:49 -0700 Received: from ydong10-win10.ccr.corp.intel.com ([10.239.9.125]) by orsmga003.jf.intel.com with ESMTP; 24 Jul 2018 20:57:16 -0700 X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.31; helo=mga06.intel.com; envelope-from=eric.dong@intel.com; receiver=edk2-devel@lists.01.org X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,400,1526367600"; d="scan'208";a="69681339" From: Eric Dong To: edk2-devel@lists.01.org Date: Wed, 25 Jul 2018 11:57:11 +0800 Message-Id: <20180725035712.8944-3-eric.dong@intel.com> X-Mailer: git-send-email 2.15.0.windows.1 In-Reply-To: <20180725035712.8944-1-eric.dong@intel.com> References: <20180725035712.8944-1-eric.dong@intel.com> Subject: [edk2] [Patch 2/3] UefiCpuPkg/MpInitLib: Remove StartCount and volatile definition. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ruiyu Ni , Laszlo Ersek MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The StartCount is duplicated with RunningCount, replace it with RunningCount. Also the volatile for RunningCount is not needed. Cc: Laszlo Ersek Cc: Ruiyu Ni Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Eric Dong --- UefiCpuPkg/Library/MpInitLib/MpLib.c | 11 +++++------ UefiCpuPkg/Library/MpInitLib/MpLib.h | 3 +-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.c b/UefiCpuPkg/Library/MpIn= itLib/MpLib.c index ff09a0e9e7..0e57cc86bf 100644 --- a/UefiCpuPkg/Library/MpInitLib/MpLib.c +++ b/UefiCpuPkg/Library/MpInitLib/MpLib.c @@ -1424,7 +1424,7 @@ CheckAllAPs ( // value of state after setting the it to CpuStateIdle, so BSP can saf= ely make use of its value. // if (GetApState(CpuData) =3D=3D CpuStateIdle) { - CpuMpData->RunningCount ++; + CpuMpData->RunningCount --; CpuMpData->CpuData[ProcessorNumber].Waiting =3D FALSE; =20 // @@ -1449,7 +1449,7 @@ CheckAllAPs ( // // If all APs finish, return EFI_SUCCESS. // - if (CpuMpData->RunningCount =3D=3D CpuMpData->StartCount) { + if (CpuMpData->RunningCount =3D=3D 0) { return EFI_SUCCESS; } =20 @@ -1466,7 +1466,7 @@ CheckAllAPs ( // if (CpuMpData->FailedCpuList !=3D NULL) { *CpuMpData->FailedCpuList =3D - AllocatePool ((CpuMpData->StartCount - CpuMpData->FinishedCount += 1) * sizeof (UINTN)); + AllocatePool ((CpuMpData->RunningCount + 1) * sizeof (UINTN)); ASSERT (*CpuMpData->FailedCpuList !=3D NULL); } ListIndex =3D 0; @@ -2212,7 +2212,7 @@ StartupAllAPsWorker ( return EFI_NOT_STARTED; } =20 - CpuMpData->StartCount =3D 0; + CpuMpData->RunningCount =3D 0; for (ProcessorNumber =3D 0; ProcessorNumber < ProcessorCount; ProcessorN= umber++) { CpuData =3D &CpuMpData->CpuData[ProcessorNumber]; CpuData->Waiting =3D FALSE; @@ -2222,7 +2222,7 @@ StartupAllAPsWorker ( // Mark this processor as responsible for current calling. // CpuData->Waiting =3D TRUE; - CpuMpData->StartCount++; + CpuMpData->RunningCount++; } } } @@ -2231,7 +2231,6 @@ StartupAllAPsWorker ( CpuMpData->ProcArguments =3D ProcedureArgument; CpuMpData->SingleThread =3D SingleThread; CpuMpData->FinishedCount =3D 0; - CpuMpData->RunningCount =3D 0; CpuMpData->FailedCpuList =3D FailedCpuList; CpuMpData->ExpectedTime =3D CalculateTimeout ( TimeoutInMicroseconds, diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.h b/UefiCpuPkg/Library/MpIn= itLib/MpLib.h index 962bce685d..5002b7e9c0 100644 --- a/UefiCpuPkg/Library/MpInitLib/MpLib.h +++ b/UefiCpuPkg/Library/MpInitLib/MpLib.h @@ -211,9 +211,8 @@ struct _CPU_MP_DATA { UINTN BackupBuffer; UINTN BackupBufferSize; =20 - volatile UINT32 StartCount; volatile UINT32 FinishedCount; - volatile UINT32 RunningCount; + UINT32 RunningCount; BOOLEAN SingleThread; EFI_AP_PROCEDURE Procedure; VOID *ProcArguments; --=20 2.15.0.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Sat May 4 02:13:34 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail(p=none dis=none) header.from=intel.com Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 153249107779094.98105200191844; Tue, 24 Jul 2018 20:57:57 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id D0548210C1EC9; Tue, 24 Jul 2018 20:57:51 -0700 (PDT) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 8599F21B02845 for ; Tue, 24 Jul 2018 20:57:49 -0700 (PDT) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 24 Jul 2018 20:57:49 -0700 Received: from ydong10-win10.ccr.corp.intel.com ([10.239.9.125]) by orsmga003.jf.intel.com with ESMTP; 24 Jul 2018 20:57:18 -0700 X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.31; helo=mga06.intel.com; envelope-from=eric.dong@intel.com; receiver=edk2-devel@lists.01.org X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,400,1526367600"; d="scan'208";a="69681341" From: Eric Dong To: edk2-devel@lists.01.org Date: Wed, 25 Jul 2018 11:57:12 +0800 Message-Id: <20180725035712.8944-4-eric.dong@intel.com> X-Mailer: git-send-email 2.15.0.windows.1 In-Reply-To: <20180725035712.8944-1-eric.dong@intel.com> References: <20180725035712.8944-1-eric.dong@intel.com> Subject: [edk2] [Patch 3/3] UefiCpuPkg/MpInitLib: Not use disabled AP when call StartAllAPs. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ruiyu Ni , Laszlo Ersek MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Base on UEFI spec requirement, StartAllAPs function should not use the APs which has been disabled before. This patch just change current code to follow this rule. Cc: Laszlo Ersek Cc: Ruiyu Ni Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Eric Dong --- UefiCpuPkg/Library/MpInitLib/MpLib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.c b/UefiCpuPkg/Library/MpIn= itLib/MpLib.c index 0e57cc86bf..69f69f2b79 100644 --- a/UefiCpuPkg/Library/MpInitLib/MpLib.c +++ b/UefiCpuPkg/Library/MpInitLib/MpLib.c @@ -1008,8 +1008,8 @@ WakeUpAP ( =20 if (Broadcast) { for (Index =3D 0; Index < CpuMpData->CpuCount; Index++) { - if (Index !=3D CpuMpData->BspNumber) { - CpuData =3D &CpuMpData->CpuData[Index]; + CpuData =3D &CpuMpData->CpuData[Index]; + if (Index !=3D CpuMpData->BspNumber && (GetApState (CpuData) !=3D Cp= uStateDisabled)) { CpuData->ApFunction =3D (UINTN) Procedure; CpuData->ApFunctionArgument =3D (UINTN) ProcedureArgument; SetApState (CpuData, CpuStateReady); --=20 2.15.0.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel