Reviewed-by: Ray Ni <ray...@intel.com> > > -----Original Message----- > From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of JackX Lin > Sent: Monday, August 30, 2021 5:56 PM > To: devel@edk2.groups.io > Cc: Chiu, Chasel <chasel.c...@intel.com>; Dong, Eric <eric.d...@intel.com>; > Yao, Jiewen <jiewen....@intel.com>; Ni, Ray > <ray...@intel.com>; Chaganty, Rangasai V <rangasai.v.chaga...@intel.com>; > Kuo, Donald <donald....@intel.com>; Kumar, > Chandana C <chandana.c.ku...@intel.com> > Subject: [edk2-devel] [edk2-platforms:PATCH V1] Platform/Intel: Fix macro > re-defined > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3365 > > Check MAX_SOCKET exists before its creation. > > Signed-off-by: JackX Lin <jackx....@intel.com> > Cc: Chasel Chiu <chasel.c...@intel.com> > Cc: Dong Eric <eric.d...@intel.com> > Cc: Jiewen Yao <jiewen....@intel.com> > Cc: Ray Ni <ray...@intel.com> > Cc: Rangasai V Chaganty <rangasai.v.chaga...@intel.com> > Cc: Donald Kuo <donald....@intel.com> > Cc: Chandana C Kumar <chandana.c.ku...@intel.com> > Cc: JackX Lin <jackx....@intel.com> > --- > Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c > b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c > index c03d899163..5a11f426ec 100644 > --- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c > +++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c > @@ -7,7 +7,9 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ > > #include "AcpiPlatform.h" > +#ifndef MAX_SOCKET > #define MAX_SOCKET (FixedPcdGet32 (PcdMaxCpuSocketCount)) > +#endif > > #pragma pack(1) > > @@ -213,7 +215,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 +246,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. > // > -- > 2.32.0.windows.2 > > > > >
-=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#80288): https://edk2.groups.io/g/devel/message/80288 Mute This Topic: https://groups.io/mt/85247231/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
