From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.2209.1662925798155163066 for ; Sun, 11 Sep 2022 12:49:58 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: thomas.abraham@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 70BE4113E; Sun, 11 Sep 2022 12:50:03 -0700 (PDT) Received: from [10.57.78.41] (unknown [10.57.78.41]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 67BF13F73D; Sun, 11 Sep 2022 12:49:56 -0700 (PDT) Message-ID: <40a8842e-76a8-f5e2-dc42-1c28c70be83f@arm.com> Date: Sun, 11 Sep 2022 20:49:55 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.13.0 Subject: Re: [PATCH edk2-platforms 1/1] Platform/ARM: Update Morello and SgiPkg for ARM_CORE_INFO Mpidr change To: Rebecca Cran , devel@edk2.groups.io, Ard Biesheuvel , Sami Mujawar References: <20220911191522.366209-1-rebecca@bsdio.com> From: "Thomas Abraham" In-Reply-To: <20220911191522.366209-1-rebecca@bsdio.com> Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 11/09/2022 20:15, Rebecca Cran wrote: > 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, > }, > }; > Reviewed-by: Thomas Abraham