Pushed: https://github.com/tianocore/edk2-platforms/commit/98e8ab0
-----Original Message----- From: [email protected] <[email protected]> On Behalf Of Nate DeSimone Sent: Tuesday, August 31, 2021 3:29 PM To: [email protected] Cc: Chiu, Chasel <[email protected]>; Oram, Isaac W <[email protected]>; Liming Gao <[email protected]>; Dong, Eric <[email protected]>; Ni, Ray <[email protected]>; Lin, JackX <[email protected]> Subject: [edk2-devel] [edk2-platforms] [PATCH V1] MinPlatformPkg: Fix Purley and Whitley builds Commit f4e12 causes a re-definition warning for the MAX_SOCKETS macro on PurleyOpenBoardPkg and WhitleyOpenBoardPkg. Cc: Chasel Chiu <[email protected]> Cc: Isaac Oram <[email protected]> Cc: Liming Gao <[email protected]> Cc: Eric Dong <[email protected]> Cc: Ray Ni <[email protected]> Cc: Jack Lin <[email protected]> Signed-off-by: Nate DeSimone <[email protected]> --- .../Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c index c03d899163..9a3a6437eb 100644 --- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c +++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c @@ -7,7 +7,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ #include "AcpiPlatform.h" -#define MAX_SOCKET (FixedPcdGet32 (PcdMaxCpuSocketCount)) #pragma pack(1) @@ -213,7 +212,7 @@ SortCpuLocalApicInTable ( CpuIdMapPtr->SocketNum = (UINT32)-1; } //end if PROC ENABLE } //end for CurrentProcessor - + //keep for debug purpose DEBUG ((DEBUG_INFO, "::ACPI:: APIC ID Order Table Init. CoreThreadMask = %x, mNumOfBitShift = %x\n", CoreThreadMask, mNumOfBitShift)); DebugDisplayReOrderTable (TempCpuApicIdOrderTable); @@ -244,7 +243,7 @@ SortCpuLocalApicInTable ( } // - // 1. Sort TempCpuApicIdOrderTable, + // 1. Sort TempCpuApicIdOrderTable, // sort it by using ApicId from minimum to maximum (Socket0 to SocketN), and the BSP must in the fist location of the table. // So, start sorting the table from the second element and total elements are mNumberOfCpus-1. // @@ -283,7 +282,7 @@ SortCpuLocalApicInTable ( // // 5. Re-assigen AcpiProcessorId for AcpiProcessorUId uses purpose. // - for (Socket = 0; Socket < MAX_SOCKET; Socket++) { + for (Socket = 0; Socket < FixedPcdGet32 (PcdMaxCpuSocketCount); + Socket++) { for (CurrProcessor = 0, Index = 0; CurrProcessor < mNumberOfCpus; CurrProcessor++) { if (mCpuApicIdOrderTable[CurrProcessor].Flags && (mCpuApicIdOrderTable[CurrProcessor].SocketNum == Socket)) { mCpuApicIdOrderTable[CurrProcessor].AcpiProcessorId = (ProcessorInfoBuffer.Location.Package << mNumOfBitShift) + Index; -- 2.27.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#80039): https://edk2.groups.io/g/devel/message/80039 Mute This Topic: https://groups.io/mt/85288718/21656 Group Owner: [email protected] Unsubscribe: https://edk2.groups.io/g/devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
