summaryrefslogtreecommitdiffstats
path: root/ArmPkg/Universal/Smbios
diff options
context:
space:
mode:
authorNhi Pham <nhi@os.amperecomputing.com>2021-09-15 20:55:32 +0700
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>2021-09-16 14:45:48 +0000
commitac6388add4ade3ae5c4036ea6c2ce9c8d301d057 (patch)
treef65394870c05e7fd67d65de2a51023ee4dd3b706 /ArmPkg/Universal/Smbios
parent60d8bb9f28f663e6ca58bc87c042fdd82f5607bd (diff)
downloadedk2-ac6388add4ade3ae5c4036ea6c2ce9c8d301d057.tar.gz
edk2-ac6388add4ade3ae5c4036ea6c2ce9c8d301d057.tar.bz2
edk2-ac6388add4ade3ae5c4036ea6c2ce9c8d301d057.zip
ArmPkg/ProcessorSubClassDxe: Fix the format of ProcessorId
According to SMBIOS 3.4, section 7.5.3.3 ARM64-class CPUs, if SMCCC_ARCH_SOC_ID is supported, the first DWORD is the JEP-106 code and the second DWORD is the SoC revision value. But in the current implementation, they are set in reverse. This patch is to correct it. Cc: Leif Lindholm <leif@nuviainc.com> Cc: Ard Biesheuvel <ardb+tianocore@kernel.org> Cc: Rebecca Cran <rebecca@nuviainc.com> Signed-off-by: Nhi Pham <nhi@os.amperecomputing.com> Reviewed-by: Rebecca Cran <rebecca@nuviainc.com> Acked-by: Leif Lindholm <leif@nuviainc.com>
Diffstat (limited to 'ArmPkg/Universal/Smbios')
-rw-r--r--ArmPkg/Universal/Smbios/ProcessorSubClassDxe/SmbiosProcessorArmCommon.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ArmPkg/Universal/Smbios/ProcessorSubClassDxe/SmbiosProcessorArmCommon.c b/ArmPkg/Universal/Smbios/ProcessorSubClassDxe/SmbiosProcessorArmCommon.c
index 292f10bf97..d644cd33d2 100644
--- a/ArmPkg/Universal/Smbios/ProcessorSubClassDxe/SmbiosProcessorArmCommon.c
+++ b/ArmPkg/Universal/Smbios/ProcessorSubClassDxe/SmbiosProcessorArmCommon.c
@@ -2,6 +2,7 @@
Functions for processor information common to ARM and AARCH64.
Copyright (c) 2021, NUVIA Inc. All rights reserved.<BR>
+ Copyright (c) 2021, Ampere Computing LLC. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -171,7 +172,7 @@ SmbiosGetProcessorId (
if (HasSmcArm64SocId ()) {
SmbiosGetSmcArm64SocId (&Jep106Code, &SocRevision);
- ProcessorId = ((UINT64)Jep106Code << 32) | SocRevision;
+ ProcessorId = ((UINT64)SocRevision << 32) | Jep106Code;
} else {
ProcessorId = ArmReadMidr ();
}