From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) by mx.groups.io with SMTP id smtpd.web11.1024.1639692518225373657 for ; Thu, 16 Dec 2021 14:08:38 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@nuviainc-com.20210112.gappssmtp.com header.s=20210112 header.b=VgF2Y/5e; spf=pass (domain: nuviainc.com, ip: 209.85.215.170, mailfrom: rebecca@nuviainc.com) Received: by mail-pg1-f170.google.com with SMTP id 133so269893pgc.12 for ; Thu, 16 Dec 2021 14:08:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nuviainc-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6mGBIA2tJpJ9j3uzIQMIqrp/0GdJjwAK8aYKaIdG3bg=; b=VgF2Y/5e9FJDQNQBnhvh5KThLaBKOVu21W4fPYNTwgICSclaLk0t1QwECixhw0+9/k om2lvnPZJk9KFYVnmDQKkMtW7aXPGNweixCxTG9npfPxps9THClnoj7yeo+wrlKEtcCj HIYZfTmjUJgnEvzxJO8JF2tZampUe9ql+vGgIGl7ZdLJsTdx4uC/ulyhVVRPhXIyN+Lv egxXVbANrWJkQNxenSG7b4H7rxunQDpumkqjuv0vduNrIXZmoy3Xrplbzs2MnDQ5HSoz 6OfX81+chpLs1cMTN+u36UvyKsa1Pp97Ipl69/98ww9VDaitJX+BGFbOA2D6BCIt+21m IiCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6mGBIA2tJpJ9j3uzIQMIqrp/0GdJjwAK8aYKaIdG3bg=; b=eESWYe551Y+GTyXMk6SxZaWfG78SiLLrZwA2X+qqe6nx59LzCjcw4hiRN7pmfDifa5 VI6IN3ceCZuxnGluuEhccVsyop5t5CF5bHkMyvlcAqUg/JVm9sU/m1fihTjwInvcOnhO Q6hIqglBTzsSxeGhkQns6AnfQp3/oKBA8ftJNbk2CSXUzkiIze0waEpOLXOU+mMkUudi JEaV+K4ZVNLUbY+RncsMDDT32vLdoG05jpHKW2LOgjOCkPggvvZclACBGTcFKELq6FhB HCzyoW0WU37Dzcwl8cBNQ38WJSl+j6lceBIBvw7XrFL/5x8bdIEL+pfRljV48utO/yvZ Ph0w== X-Gm-Message-State: AOAM531mQsAWEhNs2GjKRB9PG7OIJns8kfSbJmmTd95o0KW9v49bt/NK 0GtczMbL9B33Ob54PCgESNjlSpp4qV9voWHe5rHZR5yfmLWz47E0D5o//M6TArxAii6+VMZLxlC aKeBSFSW/hWb2I2mzAozl5Wwot3ywYNV8+gj3ekZIRF7VkMh+BoVeF1+XBGQUqmJspo1VKw== X-Google-Smtp-Source: ABdhPJwx/gpGynZDgWpRm+yVLOhirtrCBa/s1Dg4RP8X7p+s4cSIOkQ3gtJQLdmwTPWm8glwdD5FKw== X-Received: by 2002:a63:5c64:: with SMTP id n36mr172020pgm.61.1639692517489; Thu, 16 Dec 2021 14:08:37 -0800 (PST) Return-Path: Received: from linbox.ba.nuviainc.com ([2601:681:4300:69e:9e7b:efff:fe2b:884c]) by smtp.gmail.com with ESMTPSA id 32sm5982619pgs.48.2021.12.16.14.08.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Dec 2021 14:08:37 -0800 (PST) From: "Rebecca Cran" To: devel@edk2.groups.io, Ard Biesheuvel , Samer El-Haj-Mahmoud , Leif Lindholm , Sami Mujawar , Wenyi Xie , Peng Xie , Ling Jia , Yiqi Shu , Nhi Pham , Vu Nguyen , Thang Nguyen , Chuong Tran , Pete Batard , Masami Hiramatsu , Graeme Gregory , Radoslaw Biernacki , Marcin Wojtas Cc: Rebecca Cran Subject: [PATCH v2 14/17] Silicon/Ampere: Update ArmPlatformLib to work with changed ARM_CORE_INFO Date: Thu, 16 Dec 2021 15:07:57 -0700 Message-Id: <20211216220800.9628-15-rebecca@nuviainc.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211216220800.9628-1-rebecca@nuviainc.com> References: <20211216220800.9628-1-rebecca@nuviainc.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The ARM_CORE_INFO struct has been updated so the MPIDR is now a single field instead of separate cluster/core fields. Update ArmPlatformLib. Signed-off-by: Rebecca Cran --- Silicon/Ampere/AmpereAltraPkg/Library/ArmPlatformLib/ArmPlatformLib.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Silicon/Ampere/AmpereAltraPkg/Library/ArmPlatformLib/ArmPlatformLib.c b/Silicon/Ampere/AmpereAltraPkg/Library/ArmPlatformLib/ArmPlatformLib.c index 5b4be0e55516..f2ec923d6f8d 100644 --- a/Silicon/Ampere/AmpereAltraPkg/Library/ArmPlatformLib/ArmPlatformLib.c +++ b/Silicon/Ampere/AmpereAltraPkg/Library/ArmPlatformLib/ArmPlatformLib.c @@ -108,9 +108,8 @@ PrePeiCoreGetMpCoreInfo ( } SocketId = SOCKET_ID (Index); ClusterId = CLUSTER_ID (Index); - mArmPlatformMpCoreInfoTable[mArmPlatformCoreCount].ClusterId = SocketId; - mArmPlatformMpCoreInfoTable[mArmPlatformCoreCount].CoreId = - (ClusterId << 8) | (Index % PLATFORM_CPU_NUM_CORES_PER_CPM); + mArmPlatformMpCoreInfoTable[mArmPlatformCoreCount].Mpidr = GET_MPID ( + SocketId, (ClusterId << 8) | (Index % PLATFORM_CPU_NUM_CORES_PER_CPM)); mArmPlatformMpCoreInfoTable[mArmPlatformCoreCount].MailboxClearAddress = 0; mArmPlatformMpCoreInfoTable[mArmPlatformCoreCount].MailboxClearValue = 0; mArmPlatformMpCoreInfoTable[mArmPlatformCoreCount].MailboxGetAddress = 0; -- 2.31.1