From nobody Sat Apr 27 15:23:40 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+77728+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+77728+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1626155894; cv=none; d=zohomail.com; s=zohoarc; b=fe2WTQFFQgKl3B7qduyrtMiZoklwWaIqdfRQ1FVXIwiI2j7nZhBU8xe8WQwL+85zIh4hHEniqINAhlc+aGFOWUwEWqwReNKxZvgerruAulsuLYvyqMHAyZq2NhugnyKKu8FrsAABTW0p1HIQFCJagDNFLVhIa8pyT23LHFqoKkc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626155894; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=Wds/QXjIyzfdKMqPwrS6kH7PzM/pHwt3QvjsteDNbCQ=; b=QtyR3vMEtHG6X0MynGT3kGCIu3uevJkLod1nniLAO43LZcg/bnRXKmQD4lm1kTrXdxN8VoXLOKqYBn9WQN1lsCeESBG7rULzXCjj6enFwIfd6o4T5i24B5FCCeOt/1gkcz9NBm8Rw+by5fjcBxCTUvtrWP2pBF4DeroBoioVlvE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+77728+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1626155894164329.8043959922147; Mon, 12 Jul 2021 22:58:14 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id ycKrYY1788612xsxH2q0wCNq; Mon, 12 Jul 2021 22:58:13 -0700 X-Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web09.875.1626155892614452246 for ; Mon, 12 Jul 2021 22:58:13 -0700 X-IronPort-AV: E=McAfee;i="6200,9189,10043"; a="231900962" X-IronPort-AV: E=Sophos;i="5.84,235,1620716400"; d="scan'208";a="231900962" X-Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jul 2021 22:58:11 -0700 X-IronPort-AV: E=Sophos;i="5.84,235,1620716400"; d="scan'208";a="487115922" X-Received: from yatingcx-mobl.gar.corp.intel.com ([10.252.188.73]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jul 2021 22:58:09 -0700 From: "TinaX Y Chen" To: devel@edk2.groups.io Cc: JackX , Chasel Chiu , Jenny Huang , Jiewen Yao , Ray Ni , Rangasai V Chaganty , Tinax Chen Subject: [edk2-devel] [edk2-platforms: PATCH] Platform/Intel: Correct CPU APIC IDs. Date: Tue, 13 Jul 2021 13:57:56 +0800 Message-Id: <20210713055756.1858-1-tinax.y.chen@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,tinax.y.chen@intel.com X-Gm-Message-State: n9byvQrh60YydtiRrUGLhyNsx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1626155893; bh=vYg5fclKApFyVEC2QTkJaazFOjiqFt+p5+zH5WSco/0=; h=Cc:Date:From:Reply-To:Subject:To; b=L5Ld7QYsOXmbcyRbfP2OADRcKZD40THOf/SBlQYnpf2mPx2+hflTy0qx8FWmZV6qGqv gvqxdrpGolqDCvkg2ZOOxWSPlPtOwsjVO8bdndNBaBrVdKXeKvFmmY/Dmo3GuNYbExNY+ iL+lIJcXSh8z3d+vLU7+O4czcic3JFzU6uI= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1626155894876100002 Content-Type: text/plain; charset="utf-8" From: JackX REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3365 BIOS cannot find correct AcpiProcId in mApicIdMap because of there is no suitable map, that causes ACPI_BIOS_ERROR. Remove mApicIdMap for determing AcpiProcId, uses normal countings instead. Signed-off-by: JackX Lin Cc: Chasel Chiu Cc: Jenny Huang Cc: Jiewen Yao Cc: Ray Ni Cc: Rangasai V Chaganty Cc: Tinax Chen Cc: JackX Lin --- Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c | 230 +++++++= +++++++++++++++++++++++++++++++++++++++++----------------------------------= ---------------------------------------------------------------------------= ------------------------------------------------------------------------- 1 file changed, 48 insertions(+), 182 deletions(-) diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c b= /Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c index 2b51c34ef2..5a717295e0 100644 --- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c +++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c @@ -1,14 +1,13 @@ /** @file ACPI Platform Driver =20 -Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.
+Copyright (c) 2017 - 2021, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ =20 #include "AcpiPlatform.h" =20 -#define MAX_CPU_NUM (FixedPcdGet32(PcdMaxCpuThreadCount) * FixedPcdGet32(P= cdMaxCpuCoreCount) * FixedPcdGet32(PcdMaxCpuSocketCount)) =20 #pragma pack(1) =20 @@ -16,7 +15,6 @@ typedef struct { UINT32 AcpiProcessorId; UINT32 ApicId; UINT32 Flags; - UINT32 SwProcApicId; UINT32 SocketNum; } EFI_CPU_ID_ORDER_MAP; =20 @@ -58,138 +56,17 @@ BOOLEAN mX2ApicEnabled; =20 EFI_MP_SERVICES_PROTOCOL *mMpService; BOOLEAN mCpuOrderSorted; -EFI_CPU_ID_ORDER_MAP mCpuApicIdOrderTable[MAX_CPU_NUM]; -UINTN mNumberOfCPUs =3D 0; +EFI_CPU_ID_ORDER_MAP *mCpuApicIdOrderTable =3D NULL; +UINTN mNumberOfCpus =3D 0; UINTN mNumberOfEnabledCPUs =3D 0; =20 -// following are possible APICID Map for SKX -static const UINT32 ApicIdMapA[] =3D { //for SKUs have number of core > 16 - //it is 14 + 14 + 14 + 14 format - 0x00000000, 0x00000001, 0x00000002, 0x00000003, 0x00000004, 0x00000005, = 0x00000006, 0x00000007, - 0x00000008, 0x00000009, 0x0000000A, 0x0000000B, 0x0000000C, 0x0000000D, = 0x00000010, 0x00000011, - 0x00000012, 0x00000013, 0x00000014, 0x00000015, 0x00000016, 0x00000017, = 0x00000018, 0x00000019, - 0x0000001A, 0x0000001B, 0x0000001C, 0x0000001D, 0x00000020, 0x00000021, = 0x00000022, 0x00000023, - 0x00000024, 0x00000025, 0x00000026, 0x00000027, 0x00000028, 0x00000029, = 0x0000002A, 0x0000002B, - 0x0000002C, 0x0000002D, 0x00000030, 0x00000031, 0x00000032, 0x00000033, = 0x00000034, 0x00000035, - 0x00000036, 0x00000037, 0x00000038, 0x00000039, 0x0000003A, 0x0000003B, = 0x0000003C, 0x0000003D -}; - -static const UINT32 ApicIdMapB[] =3D { //for SKUs have number of cores <= =3D 16 use 32 ID space - //it is 16+16 format - 0x00000000, 0x00000001, 0x00000002, 0x00000003, 0x00000004, 0x00000005, = 0x00000006, 0x00000007, - 0x00000008, 0x00000009, 0x0000000A, 0x0000000B, 0x0000000C, 0x0000000D, = 0x0000000E, 0x0000000F, - 0x00000010, 0x00000011, 0x00000012, 0x00000013, 0x00000014, 0x00000015, = 0x00000016, 0x00000017, - 0x00000018, 0x00000019, 0x0000001A, 0x0000001B, 0x0000001C, 0x0000001D, = 0x0000001E, 0x0000001F, - 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, = 0xFFFFFFFF, 0xFFFFFFFF, - 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, = 0xFFFFFFFF, 0xFFFFFFFF, - 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, = 0xFFFFFFFF, 0xFFFFFFFF -}; - - -static const UINT32 ApicIdMapC[] =3D { //for SKUs have number of cores <= =3D 16 use 64 ID space - //it is 16+0+16+0 format - 0x00000000, 0x00000001, 0x00000002, 0x00000003, 0x00000004, 0x00000005, = 0x00000006, 0x00000007, - 0x00000008, 0x00000009, 0x0000000A, 0x0000000B, 0x0000000C, 0x0000000D, = 0x0000000E, 0x0000000F, - 0x00000020, 0x00000021, 0x00000022, 0x00000023, 0x00000024, 0x00000025, = 0x00000026, 0x00000027, - 0x00000028, 0x00000029, 0x0000002A, 0x0000002B, 0x0000002C, 0x0000002D, = 0x0000002E, 0x0000002F, - 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, = 0xFFFFFFFF, 0xFFFFFFFF, - 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, = 0xFFFFFFFF, 0xFFFFFFFF, - 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, = 0xFFFFFFFF, 0xFFFFFFFF -}; - -static const UINT32 ApicIdMapD[] =3D { //for SKUs have number of cores <= =3D 8 use 16 ID space - //it is 16 format - 0x00000000, 0x00000001, 0x00000002, 0x00000003, 0x00000004, 0x00000005, = 0x00000006, 0x00000007, - 0x00000008, 0x00000009, 0x0000000A, 0x0000000B, 0x0000000C, 0x0000000D, = 0x0000000E, 0x0000000F, - 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, = 0xFFFFFFFF, 0xFFFFFFFF, - 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, = 0xFFFFFFFF, 0xFFFFFFFF, - 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, = 0xFFFFFFFF, 0xFFFFFFFF, - 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, = 0xFFFFFFFF, 0xFFFFFFFF, - 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, = 0xFFFFFFFF, 0xFFFFFFFF -}; - -const UINT32 *mApicIdMap =3D NULL; - /** - This function detect the APICID map and update ApicID Map pointer - - @param None - - @retval VOID - -**/ -VOID DetectApicIdMap(VOID) -{ - UINTN CoreCount; - - CoreCount =3D 0; - - if(mApicIdMap !=3D NULL) { - return; //aleady initialized - } - - mApicIdMap =3D ApicIdMapA; // default to > 16C SKUs - - CoreCount =3D mNumberOfEnabledCPUs / 2; - DEBUG ((DEBUG_INFO, "CoreCount - %d\n", CoreCount)); - - //DEBUG((EFI_D_ERROR, ":: Default to use Map A @ %08X FusedCoreCount: %0= 2d, sktlevel: %d\n",mApicIdMap, FusedCoreCount, mNumOfBitShift)); - // Dont assert for single core, single thread system. - //ASSERT (CoreCount !=3D 0); - - if(CoreCount <=3D 16) { - - if(mNumOfBitShift =3D=3D 4) { - mApicIdMap =3D ApicIdMapD; - //DEBUG((EFI_D_ERROR, ":: Use Map B @ %08X\n",mApicIdMap)); - } - - if(mNumOfBitShift =3D=3D 5) { - mApicIdMap =3D ApicIdMapB; - //DEBUG((EFI_D_ERROR, ":: Use Map B @ %08X\n",mApicIdMap)); - } - - if(mNumOfBitShift =3D=3D 6) { - mApicIdMap =3D ApicIdMapC; - //DEBUG((EFI_D_ERROR, ":: Use Map C @ %08X\n",mApicIdMap)); - } - - } - - return; -} - -/** - This function return the CoreThreadId of ApicId from ACPI ApicId Map arr= ay + This function searches mCpuApicIdOrderTable to find the BSP ApicId, and = returns a number where the BSP is. =20 @param ApicId =20 - @retval Index of ACPI ApicId Map array - + @return Where the BSP is. **/ -UINT32 -GetIndexFromApicId ( - UINT32 ApicId - ) -{ - UINT32 CoreThreadId; - UINT32 i; - - ASSERT (mApicIdMap !=3D NULL); - - CoreThreadId =3D ApicId & ((1 << mNumOfBitShift) - 1); - - for(i =3D 0; i < (FixedPcdGet32(PcdMaxCpuCoreCount) * FixedPcdGet32(PcdM= axCpuThreadCount)); i++) { - if(mApicIdMap[i] =3D=3D CoreThreadId) { - break; - } - } - - ASSERT (i <=3D (FixedPcdGet32(PcdMaxCpuCoreCount) * FixedPcdGet32(PcdMax= CpuThreadCount))); - - return i; -} - UINT32 ApicId2SwProcApicId ( UINT32 ApicId @@ -197,7 +74,7 @@ ApicId2SwProcApicId ( { UINT32 Index; =20 - for (Index =3D 0; Index < MAX_CPU_NUM; Index++) { + for (Index =3D 0; Index < mNumberOfCpus; Index++) { if ((mCpuApicIdOrderTable[Index].Flags =3D=3D 1) && (mCpuApicIdOrderTa= ble[Index].ApicId =3D=3D ApicId)) { return Index; } @@ -214,13 +91,12 @@ DebugDisplayReOrderTable( { UINT32 Index; =20 - DEBUG ((EFI_D_ERROR, "Index AcpiProcId ApicId Flags SwApicId Skt\n"= )); - for (Index=3D0; Index> 24; } - DEBUG ((EFI_D_INFO, "BspApicId - 0x%x\n", BspApicId)); + DEBUG ((DEBUG_INFO, "BspApicId - 0x%x\n", BspApicId)); =20 if(mCpuApicIdOrderTable[0].ApicId !=3D BspApicId) { //check to see if 1st entry is BSP, if not swap it Index =3D ApicId2SwProcApicId(BspApicId); =20 - if(MAX_CPU_NUM <=3D Index) { - DEBUG ((EFI_D_ERROR, "Asserting the SortCpuLocalApicInTable Index = Bufferflow\n")); + if(mNumberOfCpus <=3D Index) { + DEBUG ((DEBUG_ERROR, "Asserting the SortCpuLocalApicInTable Index = Bufferflow\n")); return EFI_INVALID_PARAMETER; } =20 @@ -362,9 +227,6 @@ SortCpuLocalApicInTable ( mCpuApicIdOrderTable[0].ApicId =3D TempVal; mCpuApicIdOrderTable[Index].Flags =3D mCpuApicIdOrderTable[0].Flags; mCpuApicIdOrderTable[0].Flags =3D 1; - TempVal =3D mCpuApicIdOrderTable[Index].SwProcApicId; - mCpuApicIdOrderTable[Index].SwProcApicId =3D mCpuApicIdOrderTable[0]= .SwProcApicId; - mCpuApicIdOrderTable[0].SwProcApicId =3D TempVal; //swap AcpiProcId TempVal =3D mCpuApicIdOrderTable[Index].AcpiProcessorId; mCpuApicIdOrderTable[Index].AcpiProcessorId =3D mCpuApicIdOrderTable= [0].AcpiProcessorId; @@ -373,27 +235,24 @@ SortCpuLocalApicInTable ( } =20 //Make sure no holes between enabled threads - for(CurrProcessor =3D 0; CurrProcessor < MAX_CPU_NUM; CurrProcessor++)= { + for (CurrProcessor =3D 0; CurrProcessor < mNumberOfCpus; CurrProcessor= ++) { =20 if(mCpuApicIdOrderTable[CurrProcessor].Flags =3D=3D 0) { //make sure disabled entry has ProcId set to FFs mCpuApicIdOrderTable[CurrProcessor].ApicId =3D (UINT32)-1; mCpuApicIdOrderTable[CurrProcessor].AcpiProcessorId =3D (UINT32)-1; - mCpuApicIdOrderTable[CurrProcessor].SwProcApicId =3D (UINT32)-1; =20 - for(Index =3D CurrProcessor+1; Index < MAX_CPU_NUM; Index++) { + for (Index =3D CurrProcessor+1; Index < mNumberOfCpus; Index++) { if(mCpuApicIdOrderTable[Index].Flags =3D=3D 1) { //move enabled entry up mCpuApicIdOrderTable[CurrProcessor].Flags =3D 1; mCpuApicIdOrderTable[CurrProcessor].ApicId =3D mCpuApicIdOrder= Table[Index].ApicId; mCpuApicIdOrderTable[CurrProcessor].AcpiProcessorId =3D mCpuAp= icIdOrderTable[Index].AcpiProcessorId; - mCpuApicIdOrderTable[CurrProcessor].SwProcApicId =3D mCpuApicI= dOrderTable[Index].SwProcApicId; mCpuApicIdOrderTable[CurrProcessor].SocketNum =3D mCpuApicIdOr= derTable[Index].SocketNum; //disable moved entry mCpuApicIdOrderTable[Index].Flags =3D 0; mCpuApicIdOrderTable[Index].ApicId =3D (UINT32)-1; mCpuApicIdOrderTable[Index].AcpiProcessorId =3D (UINT32)-1; - mCpuApicIdOrderTable[Index].SwProcApicId =3D (UINT32)-1; break; } } @@ -401,7 +260,7 @@ SortCpuLocalApicInTable ( } =20 //keep for debug purpose - DEBUG ((EFI_D_ERROR, "APIC ID Order Table ReOrdered\n")); + DEBUG ((DEBUG_ERROR, "APIC ID Order Table ReOrdered\n")); DebugDisplayReOrderTable(); =20 mCpuOrderSorted =3D TRUE; @@ -871,18 +730,22 @@ InstallMadtFromScratch ( NewMadtTable =3D NULL; MaxMadtStructCount =3D 0; =20 - DetectApicIdMap(); + mCpuApicIdOrderTable =3D AllocateZeroPool (mNumberOfCpus * sizeof (EFI_C= PU_ID_ORDER_MAP)); + if (mCpuApicIdOrderTable =3D=3D NULL) { + DEBUG ((DEBUG_ERROR, "Could not allocate mCpuApicIdOrderTable structur= e pointer array\n")); + return EFI_OUT_OF_RESOURCES; + } =20 // Call for Local APIC ID Reorder Status =3D SortCpuLocalApicInTable (); if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, "SortCpuLocalApicInTable failed: %r\n", Status)); + DEBUG ((DEBUG_ERROR, "SortCpuLocalApicInTable failed: %r\n", Status)); goto Done; } =20 MaxMadtStructCount =3D (UINT32) ( - MAX_CPU_NUM + // processor local APIC structures - MAX_CPU_NUM + // processor local x2APIC structures + mNumberOfCpus + // processor local APIC structures + mNumberOfCpus + // processor local x2APIC structures 1 + PcdGet8(PcdPcIoApicCount) + // I/O APIC structures 2 + // interrupt source override structures 1 + // local APIC NMI structures @@ -906,11 +769,11 @@ InstallMadtFromScratch ( // Status =3D InitializeMadtHeader (&MadtTableHeader); if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, "InitializeMadtHeader failed: %r\n", Status)); + DEBUG ((DEBUG_ERROR, "InitializeMadtHeader failed: %r\n", Status)); goto Done; } =20 - DEBUG ((EFI_D_INFO, "Number of CPUs detected =3D %d \n", mNumberOfCPUs)); + DEBUG ((DEBUG_INFO, "Number of CPUs detected =3D %d \n", mNumberOfCpus)); =20 // // Build Processor Local APIC Structures and Processor Local X2APIC Stru= ctures @@ -923,7 +786,7 @@ InstallMadtFromScratch ( ProcLocalX2ApicStruct.Reserved[0] =3D 0; ProcLocalX2ApicStruct.Reserved[1] =3D 0; =20 - for (Index =3D 0; Index < MAX_CPU_NUM; Index++) { + for (Index =3D 0; Index < mNumberOfCpus; Index++) { // // If x2APIC mode is not enabled, and if it is possible to express the // APIC ID as a UINT8, use a processor local APIC structure. Otherwise, @@ -953,7 +816,7 @@ InstallMadtFromScratch ( ); } if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, "CopyMadtStructure (local APIC/x2APIC) failed: = %r\n", Status)); + DEBUG ((DEBUG_ERROR, "CopyMadtStructure (local APIC/x2APIC) failed: = %r\n", Status)); goto Done; } } @@ -978,7 +841,7 @@ InstallMadtFromScratch ( &MadtStructs[MadtStructsIndex++] ); if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, "CopyMadtStructure (I/O APIC) failed: %r\n", St= atus)); + DEBUG ((DEBUG_ERROR, "CopyMadtStructure (I/O APIC) failed: %r\n", St= atus)); goto Done; } } @@ -1000,7 +863,7 @@ InstallMadtFromScratch ( &MadtStructs[MadtStructsIndex++] ); if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, "CopyMadtStructure (I/O APIC) failed: %r\n", = Status)); + DEBUG ((DEBUG_ERROR, "CopyMadtStructure (I/O APIC) failed: %r\n", St= atus)); goto Done; } } @@ -1026,7 +889,7 @@ InstallMadtFromScratch ( &MadtStructs[MadtStructsIndex++] ); if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, "CopyMadtStructure (IRQ2 source override) failed:= %r\n", Status)); + DEBUG ((DEBUG_ERROR, "CopyMadtStructure (IRQ2 source override) failed:= %r\n", Status)); goto Done; } =20 @@ -1045,7 +908,7 @@ InstallMadtFromScratch ( &MadtStructs[MadtStructsIndex++] ); if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, "CopyMadtStructure (IRQ9 source override) failed:= %r\n", Status)); + DEBUG ((DEBUG_ERROR, "CopyMadtStructure (IRQ9 source override) failed:= %r\n", Status)); goto Done; } =20 @@ -1065,7 +928,7 @@ InstallMadtFromScratch ( &MadtStructs[MadtStructsIndex++] ); if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, "CopyMadtStructure (APIC NMI) failed: %r\n", Stat= us)); + DEBUG ((DEBUG_ERROR, "CopyMadtStructure (APIC NMI) failed: %r\n", Stat= us)); goto Done; } =20 @@ -1105,7 +968,7 @@ InstallMadtFromScratch ( (UINT8 **)&NewMadtTable ); if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, "BuildAcpiTable failed: %r\n", Status)); + DEBUG ((DEBUG_ERROR, "BuildAcpiTable failed: %r\n", Status)); goto Done; } =20 @@ -1136,6 +999,10 @@ Done: FreePool (NewMadtTable); } =20 + if (mCpuApicIdOrderTable !=3D NULL) { + FreePool (mCpuApicIdOrderTable); + } + return Status; } =20 @@ -1324,9 +1191,9 @@ PlatformUpdateTables ( FadtHeader->XGpe1Blk.AccessSize =3D 0; } =20 - DEBUG(( EFI_D_ERROR, "ACPI FADT table @ address 0x%x\n", Table )); - DEBUG(( EFI_D_ERROR, " IaPcBootArch 0x%x\n", FadtHeader->IaPcBootArch= )); - DEBUG(( EFI_D_ERROR, " Flags 0x%x\n", FadtHeader->Flags )); + DEBUG ((DEBUG_ERROR, "ACPI FADT table @ address 0x%x\n", Table)); + DEBUG ((DEBUG_ERROR, " IaPcBootArch 0x%x\n", FadtHeader->IaPcBootArch= )); + DEBUG ((DEBUG_ERROR, " Flags 0x%x\n", FadtHeader->Flags)); break; =20 case EFI_ACPI_3_0_HIGH_PRECISION_EVENT_TIMER_TABLE_SIGNATURE: @@ -1346,8 +1213,8 @@ PlatformUpdateTables ( HpetBlockId.Bits.VendorId =3D HpetCapabilities.Bits.VendorId; HpetTable->EventTimerBlockId =3D HpetBlockId.Uint32; HpetTable->MainCounterMinimumClockTickInPeriodicMode =3D (UINT16)HpetC= apabilities.Bits.CounterClockPeriod; - DEBUG(( EFI_D_ERROR, "ACPI HPET table @ address 0x%x\n", Table )); - DEBUG(( EFI_D_ERROR, " HPET base 0x%x\n", PcdGet32 (PcdHpetBaseAddres= s) )); + DEBUG ((DEBUG_ERROR, "ACPI HPET table @ address 0x%x\n", Table)); + DEBUG ((DEBUG_ERROR, " HPET base 0x%x\n", PcdGet32 (PcdHpetBaseAddres= s))); break; =20 case EFI_ACPI_3_0_PCI_EXPRESS_MEMORY_MAPPED_CONFIGURATION_SPACE_BASE_ADD= RESS_DESCRIPTION_TABLE_SIGNATURE: @@ -1526,7 +1393,6 @@ InstallAcpiPlatform ( EFI_STATUS Status; EFI_EVENT EndOfDxeEvent; =20 - Status =3D gBS->LocateProtocol (&gEfiMpServiceProtocolGuid, NULL, (VOID = **)&mMpService); ASSERT_EFI_ERROR (Status); =20 @@ -1551,11 +1417,11 @@ InstallAcpiPlatform ( // mMpService->GetNumberOfProcessors ( mMpService, - &mNumberOfCPUs, + &mNumberOfCpus, &mNumberOfEnabledCPUs ); - ASSERT (mNumberOfCPUs <=3D MAX_CPU_NUM && mNumberOfEnabledCPUs >=3D 1); - DEBUG ((DEBUG_INFO, "mNumberOfCPUs - %d\n", mNumberOfCPUs)); + + DEBUG ((DEBUG_INFO, "mNumberOfCpus - %d\n", mNumberOfCpus)); DEBUG ((DEBUG_INFO, "mNumberOfEnabledCPUs - %d\n", mNumberOfEnabledCPUs)= ); =20 DEBUG ((DEBUG_INFO, "mX2ApicEnabled - 0x%x\n", mX2ApicEnabled)); --=20 2.26.2.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#77728): https://edk2.groups.io/g/devel/message/77728 Mute This Topic: https://groups.io/mt/84172873/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-