From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by mx.groups.io with SMTP id smtpd.web11.1864.1662923728624508115 for ; Sun, 11 Sep 2022 12:15:28 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@bsdio.com header.s=fm3 header.b=I2R9jxbU; spf=pass (domain: bsdio.com, ip: 66.111.4.28, mailfrom: rebecca@bsdio.com) Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id C67335C0150; Sun, 11 Sep 2022 15:15:27 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Sun, 11 Sep 2022 15:15:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdio.com; h=cc :cc:content-transfer-encoding:date:date:from:from:in-reply-to :message-id:mime-version:reply-to:sender:subject:subject:to:to; s=fm3; t=1662923727; x=1663010127; bh=3fhNxFb6a2OWIvjujH7do+1b2 7/POi0tdsmHwFpH1qI=; b=I2R9jxbUywfIqU3Q6EN6umRe3DkgmwRjWcJrpqfns dKb3dXbWsqzFRBj6UCkQ0T2bzzYBMkKPLuzQov80uOvK3OQKhlVTUKrMybtoJLkH OwPanJR0NKjIArC9i0cs7W1KnXj74MkUNa5aZxeddyiIHIXCQlZ0BLdikLC38CZw 2V59hmpbaxnoxHN/eGZO3roFlZwU94ivNzZ5w69W5F01XkRKNL3BtyPT+VNhFtxo Z/aHBIbJKyNdkHeR7NNz7NGtHvFHPauIqnsc/lY7R4EffhYA5pj8ODPg/4iBGhSn ZRSfVsxa3yQRyoy/uju1zpM4QrDyjptgKe2on83qOJDog== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:message-id :mime-version:reply-to:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t= 1662923727; x=1663010127; bh=3fhNxFb6a2OWIvjujH7do+1b27/POi0tdsm HwFpH1qI=; b=Bj4TIXuAN7LQF7mnwLnQmGiOSNXfjRdeuQYAU0IUN5D8lTELFzF Nwnd66VgsQ60wq/3W61gHgEZZUvxgiTVpnfIBAWrAwhkxXnaRM2lNjZI8cl1iLaY 3G8wiwRke03j3FYKtxwBt/N9rolA2SDfqxY6QkmKHlaf1k6hMmo9RWotLtiNFVm4 9CoEEEcuMLU4JHpV6WIGnjcTvyIe5UsRcjHOKNCIUo/vuSE2B8O4ZyrsABYtui4M GvN0HNTTEuyhtXzI2TTGQGLvii9/wdgMkKXp+X47OyBzYDxWrjJGg8T8LQvb5D8Z WbGnm29r+d/LtsweFmXx6ZuAk1b6/quwhQQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrfedutddgudeflecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvfevufffkffoggfgsedtkeertdertddtnecuhfhrohhmpeftvggsvggt tggrucevrhgrnhcuoehrvggsvggttggrsegsshguihhordgtohhmqeenucggtffrrghtth gvrhhnpeeuvdektdelkeeukefgjeejteetffdtudeiffefheevfefgveeulefghfellefg vdenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehrvg gsvggttggrsegsshguihhordgtohhm X-ME-Proxy: Feedback-ID: i5b994698:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 11 Sep 2022 15:15:26 -0400 (EDT) From: "Rebecca Cran" To: devel@edk2.groups.io, Ard Biesheuvel , Thomas Abraham , Sami Mujawar Cc: Rebecca Cran Subject: [PATCH edk2-platforms 1/1] Platform/ARM: Update Morello and SgiPkg for ARM_CORE_INFO Mpidr change Date: Sun, 11 Sep 2022 13:15:22 -0600 Message-Id: <20220911191522.366209-1-rebecca@bsdio.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The ARM_CORE_INFO struct now has a single Mpidr field instead of separate ClusterId and CoreId fields. Update mCoreInfoTable in PlatformLib.c in Morello and SgiPkg to match. Signed-off-by: Rebecca Cran --- Platform/ARM/Morello/Library/PlatformLib/PlatformLib.c | 8 ++++---- Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Platform/ARM/Morello/Library/PlatformLib/PlatformLib.c b/Platform/ARM/Morello/Library/PlatformLib/PlatformLib.c index 52318a62911a..894a53c9ca01 100644 --- a/Platform/ARM/Morello/Library/PlatformLib/PlatformLib.c +++ b/Platform/ARM/Morello/Library/PlatformLib/PlatformLib.c @@ -10,10 +10,10 @@ #include STATIC ARM_CORE_INFO mCoreInfoTable[] = { - { 0x0, 0x0 }, // Cluster 0, Core 0 - { 0x0, 0x1 }, // Cluster 0, Core 1 - { 0x1, 0x0 }, // Cluster 1, Core 0 - { 0x1, 0x1 } // Cluster 1, Core 1 + { 0x000 }, // Cluster 0, Core 0 + { 0x001 }, // Cluster 0, Core 1 + { 0x100 }, // Cluster 1, Core 0 + { 0x101 } // Cluster 1, Core 1 }; /** diff --git a/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.c b/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.c index fa006320025b..b9ec998d8ef4 100644 --- a/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.c +++ b/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.c @@ -20,7 +20,7 @@ STATIC SGI_NT_FW_CONFIG_INFO_PPI mNtFwConfigDtInfoPpi; STATIC ARM_CORE_INFO mCoreInfoTable[] = { { // Cluster 0, Core 0 - 0x0, 0x0, + 0x000, }, }; -- 2.34.1