From nobody Wed May 8 01:08:20 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+80034+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+80034+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1630448966; cv=none; d=zohomail.com; s=zohoarc; b=gZTd6xNcNED4b0RJnret/WbZ/BEr5VOc4u9A4v/hFhs9UWcBJkE8hhPwHckijNvdbKsSPbYjFEbGsObw6wtKl03le0TCxS5HlI2LyWvEx+v2uiDtKiLpVuaEu6gSz9dgjfpiCNhBbdSAP5ZMwB6FuMwz6cJQ+5fytDQCjZcEuX0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1630448966; 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=HjvHaueZboB6xLpLII33/RggrrlNxvM4/iqp2ooPtCs=; b=gyj1Ij5YMWgB6w09kwMDgQnQh3SpLUrOa8LlyaEOXBdBKnUe6KF7/iCUXqRnBs+sn53kUhADbozIClQpU9eRq6G/LZMrYSJv0WLNCUaTUIcKXiXQw+XLkPOZy3rYSW11i15V5Ytv7SFJgMuWjX+NfjwsD6e1heUdW/U9hd+12KE= 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+80034+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 1630448966511141.72034161634315; Tue, 31 Aug 2021 15:29:26 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id QvXfYY1788612xCb9ptazzHk; Tue, 31 Aug 2021 15:29:26 -0700 X-Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mx.groups.io with SMTP id smtpd.web10.270.1630448965569863863 for ; Tue, 31 Aug 2021 15:29:25 -0700 X-IronPort-AV: E=McAfee;i="6200,9189,10093"; a="218628813" X-IronPort-AV: E=Sophos;i="5.84,367,1620716400"; d="scan'208";a="218628813" X-Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Aug 2021 15:29:24 -0700 X-IronPort-AV: E=Sophos;i="5.84,367,1620716400"; d="scan'208";a="466605709" X-Received: from nldesimo-desk1.amr.corp.intel.com ([10.212.163.217]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Aug 2021 15:29:24 -0700 From: "Nate DeSimone" To: devel@edk2.groups.io Cc: Chasel Chiu , Isaac Oram , Liming Gao , Eric Dong , Ray Ni , Jack Lin Subject: [edk2-devel] [edk2-platforms] [PATCH V1] MinPlatformPkg: Fix Purley and Whitley builds Date: Tue, 31 Aug 2021 15:28:59 -0700 Message-Id: <20210831222859.4342-1-nathaniel.l.desimone@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,nathaniel.l.desimone@intel.com X-Gm-Message-State: h3Bnd5kt4T26W48xai4Lpo6kx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1630448966; bh=UMSp4uws7K77SuyQarL8iFCZt+Sv7Qp2Hkqqi7UIfyA=; h=Cc:Date:From:Reply-To:Subject:To; b=m0hu8M782PCdhlY4kBcBXCXJDiXzWe3JZxqYq1ao5RHUCloTKmqI8Vs2tsWQcBq79jm 1Y1aQYwmc72WIlghqR9JZJk2UXEWX0mEOJIpkzDYeHyRxJDMllz5gLeYEDr07GLsoS/ID 0BZyR1I3PflVJ2lSPt990Q18YpZCyT6S4yc= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1630448968136100001 Content-Type: text/plain; charset="utf-8" Commit f4e12 causes a re-definition warning for the MAX_SOCKETS macro on PurleyOpenBoardPkg and WhitleyOpenBoardPkg. Cc: Chasel Chiu Cc: Isaac Oram Cc: Liming Gao Cc: Eric Dong Cc: Ray Ni Cc: Jack Lin Signed-off-by: Nate DeSimone Reviewed-by: Isaac Oram --- .../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 **/ =20 #include "AcpiPlatform.h" -#define MAX_SOCKET (FixedPcdGet32 (PcdMaxCpuSocketCount)) =20 #pragma pack(1) =20 @@ -213,7 +212,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 +243,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. // @@ -283,7 +282,7 @@ SortCpuLocalApicInTable ( // // 5. Re-assigen AcpiProcessorId for AcpiProcessorUId uses purpose. // - for (Socket =3D 0; Socket < MAX_SOCKET; Socket++) { + for (Socket =3D 0; Socket < FixedPcdGet32 (PcdMaxCpuSocketCount); Socket= ++) { for (CurrProcessor =3D 0, Index =3D 0; CurrProcessor < mNumberOfCpus; = CurrProcessor++) { if (mCpuApicIdOrderTable[CurrProcessor].Flags && (mCpuApicIdOrderTab= le[CurrProcessor].SocketNum =3D=3D Socket)) { mCpuApicIdOrderTable[CurrProcessor].AcpiProcessorId =3D (Processor= InfoBuffer.Location.Package << mNumOfBitShift) + Index; --=20 2.27.0.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 (#80034): https://edk2.groups.io/g/devel/message/80034 Mute This Topic: https://groups.io/mt/85288718/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-