From nobody Sun Apr 28 09:26:46 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+79947+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+79947+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1630317361; cv=none; d=zohomail.com; s=zohoarc; b=WwFtureAQpBOdb2rxgch0LNgQv3BwwpVE91KW2te7+S7bisEdwE/x0HTXuCgzGddEXB26F3UvgcUtTiB16bWvDFo/2sYDYmqbnp3A2vddgwTzqj3i1K6qnT1G2n9prdCogX+PewawxQ5GkjhfusIffDpdH9iKYs98IJkqDwSYIY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1630317361; 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=tTfhoqnJGGvoVb+Se/ZcF+OqoBlK0BUpNKpn9ThAXG4=; b=eEQ3FGS2bHO3mQ2tEoCTwt2XpSA0NEzn8NOae71v4Fw1DXXzcEiOzQkgxVl0ernQQQ4bOUapHpIZxqaT0XhxSVMq6M5rTVhef/OvQ2L+OAdlfqQ0dBCNpGaUBu5u0Vw37jbZGwaT+7EovDINH9s4ScyPIPknEpzr7rWctL3HhAg= 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+79947+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 1630317361591794.0312321842746; Mon, 30 Aug 2021 02:56:01 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id Ilb4YY1788612xFSUaNapiis; Mon, 30 Aug 2021 02:56:01 -0700 X-Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mx.groups.io with SMTP id smtpd.web12.14856.1630317359714310170 for ; Mon, 30 Aug 2021 02:56:00 -0700 X-IronPort-AV: E=McAfee;i="6200,9189,10091"; a="198482682" X-IronPort-AV: E=Sophos;i="5.84,363,1620716400"; d="scan'208";a="198482682" X-Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Aug 2021 02:55:58 -0700 X-IronPort-AV: E=Sophos;i="5.84,363,1620716400"; d="scan'208";a="427785691" X-Received: from lins2x-mobl1.gar.corp.intel.com ([10.213.37.126]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Aug 2021 02:55:55 -0700 From: "JackX Lin" To: devel@edk2.groups.io Cc: Chasel Chiu , Dong Eric , Jiewen Yao , Ray Ni , Rangasai V Chaganty , Donald Kuo , Chandana C Kumar Subject: [edk2-devel] [edk2-platforms:PATCH V1] Platform/Intel: Fix macro re-defined Date: Mon, 30 Aug 2021 17:55:46 +0800 Message-Id: <20210830095546.795-1-JackX.Lin@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,JackX.Lin@intel.com X-Gm-Message-State: km7mJhpKEQDRbiVmE2VXXbGMx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1630317361; bh=zDdJTodhZSmVYWpH/dNNPK1x9TbEUTYxHGBXlMwkJB8=; h=Cc:Date:From:Reply-To:Subject:To; b=ohnSaVcI1vFZl3N1H7LWDhg8kJ0yL20k1UfeXhRFEWDyQ2ALZ+rJPlh4U3quT5ksw9w S0SLSa/h1xeJ5Ws1P+CIZg/k+kk1pFG8p7Fh/XENgVYhZ3OtM5m4SmciTy9Ql/H1pjCfI pDE0LvrLGxpRhgAiO47S3ncaEeFOr90lH8k= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1630317363293100002 Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3365 Check MAX_SOCKET exists before its creation. Signed-off-by: JackX Lin Cc: Chasel Chiu Cc: Dong Eric Cc: Jiewen Yao Cc: Ray Ni Cc: Rangasai V Chaganty Cc: Donald Kuo Cc: Chandana C Kumar Cc: JackX Lin --- 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 **/ =20 #include "AcpiPlatform.h" +#ifndef MAX_SOCKET #define MAX_SOCKET (FixedPcdGet32 (PcdMaxCpuSocketCount)) +#endif =20 #pragma pack(1) =20 @@ -213,7 +215,7 @@ SortCpuLocalApicInTable ( CpuIdMapPtr->SocketNum =3D (UINT32)-1; } //end if PROC ENABLE } //end for CurrentProcessor - =20 + //keep for debug purpose DEBUG ((DEBUG_INFO, "::ACPI:: APIC ID Order Table Init. CoreThreadMas= k =3D %x, mNumOfBitShift =3D %x\n", CoreThreadMask, mNumOfBitShift)); DebugDisplayReOrderTable (TempCpuApicIdOrderTable); @@ -244,7 +246,7 @@ SortCpuLocalApicInTable ( } =20 // - // 1. Sort TempCpuApicIdOrderTable,=20 + // 1. Sort TempCpuApicIdOrderTable, // sort it by using ApicId from minimum to maximum (Socket0 to Socket= N), and the BSP must in the fist location of the table. // So, start sorting the table from the second element and total elem= ents are mNumberOfCpus-1. // --=20 2.32.0.windows.2 -=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 (#79947): https://edk2.groups.io/g/devel/message/79947 Mute This Topic: https://groups.io/mt/85247231/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-