From nobody Thu May 2 22:00:25 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+53263+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+53263+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1579068419; cv=none; d=zohomail.com; s=zohoarc; b=HqmWAtxhUMInZmb69RZmNoUEJN0M7+xfc51bjJ3MSLE1jWnh3HZDfJfRcUQW+ceMBx9qV4xNPr4NxTzcaATaAnnqmBKCqixdkEECVTKUbtd0MJZfITI4dWFzpAWuReLtoUYnQ9UsRQM/tbyedVUNnX/ARFOoShvPEaLzlMjpLKk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579068419; h=Content-Transfer-Encoding:Cc:Date:From:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=KLZPWR3eGmZ0LLat49+eJYaF21mbodvEp891N7R+F8E=; b=e25dGPYP7pc3LQu5/1e9x7JGGLXGFZBOm8xmqQXdBMyb6EAlqjbR4tAowZrSNZhl9VgGmpL5gT0s8dggYkBpPpY5yfQEj+hFSguvPN4PIjlFxmYeNK6DQwAmGT9dV5mlvqjMB7YmaXmwDvP9kUTR9Yblv37rKZ+T70iVOaFwmoE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+53263+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 1579068419949794.9755403033319; Tue, 14 Jan 2020 22:06:59 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id nTu7YY1788612xetcnj76mLS; Tue, 14 Jan 2020 22:06:59 -0800 X-Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mx.groups.io with SMTP id smtpd.web10.3193.1579068418674265486 for ; Tue, 14 Jan 2020 22:06:58 -0800 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Jan 2020 22:06:58 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,321,1574150400"; d="scan'208";a="256626350" X-Received: from unknown (HELO ydong10-desktop.ccr.corp.intel.com) ([10.239.158.133]) by fmsmga002.fm.intel.com with ESMTP; 14 Jan 2020 22:06:57 -0800 From: "Dong, Eric" To: devel@edk2.groups.io Cc: Ray Ni , Laszlo Ersek Subject: [edk2-devel] [PATCH] UefiCpuPkg/Library/MpInitLib: Remove BSP index == 0 Assumption. Date: Wed, 15 Jan 2020 14:06:42 +0800 Message-Id: <20200115060642.1707-1-eric.dong@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,eric.dong@intel.com X-Gm-Message-State: atKSfpvvCLJzf1g7QXCIUUehx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1579068419; bh=ewXk0OQB2fYW98xSU3loPGSxMwlLFA5dD7erfjWpg58=; h=Cc:Date:From:Reply-To:Subject:To; b=X4RYLMXOBQCXMW1iIGNm7CM4ofVbQ5br64ZYi8089jbcFlEkPz3fTPi0mQ/PZ6LaDrz qgAAKTnfJWM/3djjxgnS7WRyZVMqipYh1vkoKreWmZeliazBDZOzjYkMDRTXm8A10pvBy Z7ZCrbtHXWjmCr33XTgzn1cFOO6wE+kZGJk= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2392 Current code implementation assumes BSP index is 0 at the begin. This code change removes this assumption. It get BSP index from the saved data structure if it existed. Cc: Ray Ni Cc: Laszlo Ersek Signed-off-by: Eric Dong --- UefiCpuPkg/Library/MpInitLib/MpLib.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.c b/UefiCpuPkg/Library/MpIn= itLib/MpLib.c index 6ec9b172b8..922c87b766 100644 --- a/UefiCpuPkg/Library/MpInitLib/MpLib.c +++ b/UefiCpuPkg/Library/MpInitLib/MpLib.c @@ -636,7 +636,7 @@ ApWakeupFunction ( // to initialize AP in InitConfig path. // NOTE: IDTR.BASE stored in CpuMpData->CpuData[0].VolatileRegisters= points to a different IDT shared by all APs. // - RestoreVolatileRegisters (&CpuMpData->CpuData[0].VolatileRegisters, = FALSE); + RestoreVolatileRegisters (&CpuMpData->CpuData[CpuMpData->BspNumber].= VolatileRegisters, FALSE); InitializeApData (CpuMpData, ProcessorNumber, BistData, ApTopOfStack= ); ApStartupSignalBuffer =3D CpuMpData->CpuData[ProcessorNumber].Startu= pApSignal; =20 @@ -1615,6 +1615,7 @@ MpInitLibInitialize ( UINTN ApResetVectorSize; UINTN BackupBufferAddr; UINTN ApIdtBase; + UINT64 BspTopOfStack; =20 OldCpuMpData =3D GetCpuMpDataFromGuidedHob (); if (OldCpuMpData =3D=3D NULL) { @@ -1677,7 +1678,7 @@ MpInitLibInitialize ( CpuMpData->BackupBufferSize =3D ApResetVectorSize; CpuMpData->WakeupBuffer =3D (UINTN) -1; CpuMpData->CpuCount =3D 1; - CpuMpData->BspNumber =3D 0; + CpuMpData->BspNumber =3D OldCpuMpData !=3D NULL ? OldCpuMpData->B= spNumber : 0; CpuMpData->WaitEvent =3D NULL; CpuMpData->SwitchBspFlag =3D FALSE; CpuMpData->CpuData =3D (CPU_AP_DATA *) (CpuMpData + 1); @@ -1704,11 +1705,12 @@ MpInitLibInitialize ( // Don't pass BSP's TR to APs to avoid AP init failure. // VolatileRegisters.Tr =3D 0; - CopyMem (&CpuMpData->CpuData[0].VolatileRegisters, &VolatileRegisters, s= izeof (VolatileRegisters)); + CopyMem (&CpuMpData->CpuData[CpuMpData->BspNumber].VolatileRegisters, &V= olatileRegisters, sizeof (VolatileRegisters)); // // Set BSP basic information // - InitializeApData (CpuMpData, 0, 0, CpuMpData->Buffer + ApStackSize); + BspTopOfStack =3D CpuMpData->Buffer + (CpuMpData->BspNumber + 1) * CpuMp= Data->CpuApStackSize; + InitializeApData (CpuMpData, CpuMpData->BspNumber, 0, BspTopOfStack); // // Save assembly code information // --=20 2.23.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 (#53263): https://edk2.groups.io/g/devel/message/53263 Mute This Topic: https://groups.io/mt/69712223/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-