From nobody Fri Apr 26 20:24:33 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+43476+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+43476+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1562758961; cv=none; d=zoho.com; s=zohoarc; b=JiE+bW9FANyorezJP8p76zsFjC2r5/c8lvK8KTTzXvq+3Y892zTvzGXuWpSmtEAcDrsNDS0QHYjbOMLqFZ7FRzlq+aOIWM/5CNkL26etdw7PNOmaIWtEMjGSp58mloVbf8NKOI91jGqGYJJR9U+NW5uy6eESEUpttBVZIPn8RUw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562758961; h=Content-Transfer-Encoding:Cc:Date:From:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To:ARC-Authentication-Results; bh=+VyYrgCrBTrwHaUxv6GfkpoNuhRXLSf56yR9DCdP5BY=; b=USXjE4fj76YmGJrMvWjza9E5ZDyo5O+NaQT9ip2SZU3ceqnGBypDWTcdcuHtuxqK3+JAKQ+3sOE+dkrfdyPnRvpHQbCYhObG1JC4L3Ejm98ZkyMzQ5egnh79sQ3ATsaKVE4Y8Fz5WQtHVVoxkq2kHUxBd7REBig2pqQd835UFA0= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+43476+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1562758961027773.2074781218686; Wed, 10 Jul 2019 04:42:41 -0700 (PDT) Return-Path: X-Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by groups.io with SMTP; Wed, 10 Jul 2019 04:42:40 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Jul 2019 04:42:39 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,474,1557212400"; d="scan'208";a="166050223" X-Received: from shwdeopenpsi068.ccr.corp.intel.com ([10.239.158.38]) by fmsmga008.fm.intel.com with ESMTP; 10 Jul 2019 04:42:36 -0700 From: "Zeng, Star" To: devel@edk2.groups.io Cc: Star Zeng , Laszlo Ersek , Eric Dong , Ray Ni , Chandana Kumar , Kevin Li Subject: [edk2-devel] [PATCH] UefiCpuPkg RegisterCpuFeaturesLib: Fix an ASSERTION issue Date: Wed, 10 Jul 2019 19:42:36 +0800 Message-Id: <20190710114236.14800-1-star.zeng@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,star.zeng@intel.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1562758960; bh=F5z7QCDPTjQ08oUj2a2gGL7KZJsA6eKhy/N388EeYDs=; h=Cc:Date:From:Reply-To:Subject:To; b=hovfV9ichU88lgU58h5b7r0IKYm/m/Ux21tmE6ovr+gbIJYIORWwZO8NIqjiX2RB+4n Q/yDLoiDUAT089nHj8JErLY6LNGIx49A3tqh0EFAKZpLd9RZBXIfCZ3DbJOgVuPFYJsvJ D1V0cn2IYcihX7fAgw7gd0sxSMnSXtYJtug= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1968 We met assertion like below, it happens when there is only one processor. ASSERT_EFI_ERROR (Status =3D Not started) ASSERT [CpuFeaturesDxe] X:\XXX\XXX\RegisterCpuFeaturesLib\ DxeRegisterCpuFeaturesLib.c(149): !EFI_ERROR (Status) The code should not call StartupAllAPs when there is only one processor. Cc: Laszlo Ersek Cc: Eric Dong Cc: Ray Ni Cc: Chandana Kumar Cc: Kevin Li Signed-off-by: Star Zeng Reviewed-by: Eric Dong --- .../CpuFeaturesInitialize.c | 10 +++-- .../DxeRegisterCpuFeaturesLib.c | 43 +++++++++++-------- .../PeiRegisterCpuFeaturesLib.c | 11 +++-- 3 files changed, 37 insertions(+), 27 deletions(-) diff --git a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitializ= e.c b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c index aff7ad600cad..1746f4f07f7b 100644 --- a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c +++ b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c @@ -1071,10 +1071,12 @@ CpuFeaturesDetect ( =20 CpuInitDataInitialize (); =20 - // - // Wakeup all APs for data collection. - // - StartupAPsWorker (CollectProcessorData, NULL); + if (CpuFeaturesData->NumberOfCpus > 1) { + // + // Wakeup all APs for data collection. + // + StartupAPsWorker (CollectProcessorData, NULL); + } =20 // // Collect data on BSP diff --git a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/DxeRegisterCpuFeatur= esLib.c b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/DxeRegisterCpuFeaturesL= ib.c index 9c78a2d993c4..ffd99046a6cd 100644 --- a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/DxeRegisterCpuFeaturesLib.c +++ b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/DxeRegisterCpuFeaturesLib.c @@ -229,31 +229,36 @@ CpuFeaturesInitialize ( OldBspNumber =3D GetProcessorIndex (CpuFeaturesData); CpuFeaturesData->BspNumber =3D OldBspNumber; =20 - Status =3D gBS->CreateEvent ( - EVT_NOTIFY_WAIT, - TPL_CALLBACK, - EfiEventEmptyFunction, - NULL, - &MpEvent - ); - ASSERT_EFI_ERROR (Status); + if (CpuFeaturesData->NumberOfCpus > 1) { + Status =3D gBS->CreateEvent ( + EVT_NOTIFY_WAIT, + TPL_CALLBACK, + EfiEventEmptyFunction, + NULL, + &MpEvent + ); + ASSERT_EFI_ERROR (Status); + + // + // Wakeup all APs for programming. + // + StartupAPsWorker (SetProcessorRegister, MpEvent); + } =20 - // - // Wakeup all APs for programming. - // - StartupAPsWorker (SetProcessorRegister, MpEvent); // // Programming BSP // SetProcessorRegister (CpuFeaturesData); =20 - // - // Wait all processors to finish the task. - // - do { - Status =3D gBS->CheckEvent (MpEvent); - } while (Status =3D=3D EFI_NOT_READY); - ASSERT_EFI_ERROR (Status); + if (CpuFeaturesData->NumberOfCpus > 1) { + // + // Wait all processors to finish the task. + // + do { + Status =3D gBS->CheckEvent (MpEvent); + } while (Status =3D=3D EFI_NOT_READY); + ASSERT_EFI_ERROR (Status); + } =20 // // Switch to new BSP if required diff --git a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/PeiRegisterCpuFeatur= esLib.c b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/PeiRegisterCpuFeaturesL= ib.c index 2b1553f9b84b..8ad5a40e5a44 100644 --- a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/PeiRegisterCpuFeaturesLib.c +++ b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/PeiRegisterCpuFeaturesLib.c @@ -273,10 +273,13 @@ CpuFeaturesInitialize ( // DXE type instance. // =20 - // - // Wakeup all APs for programming. - // - StartupAPsWorker (SetProcessorRegister, NULL); + if (CpuFeaturesData->NumberOfCpus > 1) { + // + // Wakeup all APs for programming. + // + StartupAPsWorker (SetProcessorRegister, NULL); + } + // // Programming BSP // --=20 2.21.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#43476): https://edk2.groups.io/g/devel/message/43476 Mute This Topic: https://groups.io/mt/32415229/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-