From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 7807D740048 for ; Thu, 15 Feb 2024 09:31:59 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=odgq1I1CyaOTCPrL0Q9k2FbAw/2kDdUz73l6twaZt6w=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding:Content-Type; s=20140610; t=1707989518; v=1; b=PVY5v4f7edSshpNJBvPewNoPiVJoz0LRr/wqSFaiMZ+s2CnGtuLpMGMMBtwYQI4QwmTUxDzX ry7Si1drwIiI9yyZhEYXVfVcv7nB20ogftAL+mUdQqlDa593X5LxpX7txHrLhvghtGvNTjFe2L6 Lm9zBVWkQasSvQ8/z7ysZROQ= X-Received: by 127.0.0.2 with SMTP id wRo7YY7687511xp4iRz9JnpX; Thu, 15 Feb 2024 01:31:58 -0800 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.groups.io with SMTP id smtpd.web10.10348.1707989516970697629 for ; Thu, 15 Feb 2024 01:31:57 -0800 X-Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-607-vwdywdcyMmqPGIGNXXaqwg-1; Thu, 15 Feb 2024 04:31:52 -0500 X-MC-Unique: vwdywdcyMmqPGIGNXXaqwg-1 X-Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1620D106D1A7; Thu, 15 Feb 2024 09:31:52 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.193.16]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A4AD7111F9; Thu, 15 Feb 2024 09:31:51 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 28F421800DE8; Thu, 15 Feb 2024 10:31:49 +0100 (CET) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Oliver Steffen , Ray Ni , Laszlo Ersek , Rahul Kumar , Gerd Hoffmann Subject: [edk2-devel] [PATCH 2/5] UefiCpuPkg/MpInitLib: Add support for multiple HOBs to GetBspNumber() Date: Thu, 15 Feb 2024 10:31:46 +0100 Message-ID: <20240215093149.251319-3-kraxel@redhat.com> In-Reply-To: <20240215093149.251319-1-kraxel@redhat.com> References: <20240215093149.251319-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Subscribe: List-Help: 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,kraxel@redhat.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: 9vphSyDbajbgo8rVuOA1xov1x7686176AA= Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=PVY5v4f7; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=redhat.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io Remove the MpHandOff parameter. This is not useful in case multiple HOBs are present in the system. The function will use GetMpHandOffHob() to loop over all HOBs instead. Signed-off-by: Gerd Hoffmann --- UefiCpuPkg/Library/MpInitLib/MpLib.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.c b/UefiCpuPkg/Library/MpInitLib/MpLib.c index e0a2366073a7..8e6cf50ed171 100644 --- a/UefiCpuPkg/Library/MpInitLib/MpLib.c +++ b/UefiCpuPkg/Library/MpInitLib/MpLib.c @@ -1894,26 +1894,32 @@ CheckAllAPs ( /** This function Get BspNumber. - @param[in] MpHandOff Pointer to MpHandOff @return BspNumber **/ UINT32 GetBspNumber ( - IN CONST MP_HAND_OFF *MpHandOff + VOID ) { - UINT32 ApicId; - UINT32 BspNumber; - UINT32 Index; + UINT32 ApicId; + UINT32 BspNumber; + UINT32 Index; + MP_HAND_OFF *MpHandOff; // // Get the processor number for the BSP // BspNumber = MAX_UINT32; ApicId = GetInitialApicId (); - for (Index = 0; Index < MpHandOff->CpuCount; Index++) { - if (MpHandOff->Info[Index].ApicId == ApicId) { - BspNumber = Index; + + for (MpHandOff = GetMpHandOffHob (0); + MpHandOff != NULL; + MpHandOff = GetMpHandOffHob (MpHandOff->ProcessorIndex + MpHandOff->CpuCount)) + { + for (Index = 0; Index < MpHandOff->CpuCount; Index++) { + if (MpHandOff->Info[Index].ApicId == ApicId) { + BspNumber = MpHandOff->ProcessorIndex + Index; + } } } @@ -1941,7 +1947,7 @@ SwitchApContext ( UINTN Index; UINT32 BspNumber; - BspNumber = GetBspNumber (MpHandOff); + BspNumber = GetBspNumber (); for (Index = 0; Index < MpHandOff->CpuCount; Index++) { if (Index != BspNumber) { @@ -2191,7 +2197,7 @@ MpInitLibInitialize ( } CpuMpData->CpuCount = MpHandOff->CpuCount; - CpuMpData->BspNumber = GetBspNumber (MpHandOff); + CpuMpData->BspNumber = GetBspNumber (); CpuInfoInHob = (CPU_INFO_IN_HOB *)(UINTN)CpuMpData->CpuInfoInHob; for (Index = 0; Index < CpuMpData->CpuCount; Index++) { InitializeSpinLock (&CpuMpData->CpuData[Index].ApLock); -- 2.43.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#115499): https://edk2.groups.io/g/devel/message/115499 Mute This Topic: https://groups.io/mt/104369845/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-