From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mx.groups.io with SMTP id smtpd.web10.575.1630452303573889033 for ; Tue, 31 Aug 2021 16:25:03 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=bGUP+q9V; spf=pass (domain: intel.com, ip: 192.55.52.43, mailfrom: isaac.w.oram@intel.com) X-IronPort-AV: E=McAfee;i="6200,9189,10093"; a="304161803" X-IronPort-AV: E=Sophos;i="5.84,367,1620716400"; d="scan'208";a="304161803" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Aug 2021 16:25:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.84,367,1620716400"; d="scan'208";a="577302211" Received: from orsmsx606.amr.corp.intel.com ([10.22.229.19]) by orsmga004.jf.intel.com with ESMTP; 31 Aug 2021 16:25:02 -0700 Received: from orsmsx607.amr.corp.intel.com (10.22.229.20) by ORSMSX606.amr.corp.intel.com (10.22.229.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.10; Tue, 31 Aug 2021 16:25:01 -0700 Received: from orsmsx601.amr.corp.intel.com (10.22.229.14) by ORSMSX607.amr.corp.intel.com (10.22.229.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.10; Tue, 31 Aug 2021 16:25:01 -0700 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx601.amr.corp.intel.com (10.22.229.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.12 via Frontend Transport; Tue, 31 Aug 2021 16:25:01 -0700 Received: from NAM04-DM6-obe.outbound.protection.outlook.com (104.47.73.47) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2242.10; Tue, 31 Aug 2021 16:25:01 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EB4tt/uMXGcYZ+dsN/mYtdPOJmH3VBaIwdw+XRrGtcHk4vVgB34TO1uPtsR+O24o5YC5z0ciuQlyHRCsPUkFM+bAj3sG/D4ngsHL6TqyT1Rc2oIjUXoN4mRRqwhNZ9jEM6rPiY82umDZz6cNzCWiWHtyNhkeb8aRaZ98U1Bmj/IV+VSiDkayvBhghMp7emkkhx471h852DH8M6ye02DJoQmlc7++H54/vFKieBjKiFg+1nNbqqZflzJvwo+2hOdCs4YGQbrZtlmtLTLS/3TBie0yG1Qnz0IPXZcu9hdZgsm9ATVqUy3tB01uXbSv5XWOhJKaUrskkciSUHtCF3Cg9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=4GqvCq9LFKXEfdYMZsuDLi1FARG52NdDeUSw8uVfOUU=; b=NTzCxusXiqRXX3Czqa0FDkMPq6huNVZpUdUgbkqSC9HefXEy6Alg2mf0LeWGUQhGqACLSB9W4FLo0qqJ6+yG+0F3e7pzSrmfucmrmgMEeAN9+82P71LEl1cMLhGvYKXf7XtcrqwFq9N0hGC4sJJi+1VOKZJA09xlCLxZRB0xPajE9Gpv65mkaPKYVzv8aARewZ4nmGbxgMdTRqfw8z0gTAH3NHlIescWaK4c6fglw4cmAN5D+CzDm6TTzfxKf+E0aI8QIw4RDc61LQ5MJfDFo0gIg3wJLg8vu81SVnzhWIPRl4s2b3H/lSW9yJUPCL6E9zQ33dAcA2k5bOOsm+PUjw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4GqvCq9LFKXEfdYMZsuDLi1FARG52NdDeUSw8uVfOUU=; b=bGUP+q9VfSW9+e+/M08h4wykrptNUuigPHY4Dv566tjay57zYeIcXSl2UmAi52iUJOv8tD2S4GGStgYPCfa3BntO2pLNpqcw8L86EcbbiTLJTwwi8BpEqkQMxBCAWmQEi3JG58lsQraW2UDADlZkOd2RAf2anLhABqrKoYZw9ao= Received: from MW3PR11MB4747.namprd11.prod.outlook.com (2603:10b6:303:2f::11) by MW3PR11MB4649.namprd11.prod.outlook.com (2603:10b6:303:5b::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.17; Tue, 31 Aug 2021 23:25:00 +0000 Received: from MW3PR11MB4747.namprd11.prod.outlook.com ([fe80::6d8b:efd8:62d1:8743]) by MW3PR11MB4747.namprd11.prod.outlook.com ([fe80::6d8b:efd8:62d1:8743%8]) with mapi id 15.20.4457.024; Tue, 31 Aug 2021 23:25:00 +0000 From: "Oram, Isaac W" To: "Desimone, Nathaniel L" , "devel@edk2.groups.io" CC: "Chiu, Chasel" , Liming Gao , "Dong, Eric" , "Ni, Ray" , "Lin, JackX" Subject: Re: [edk2-platforms] [PATCH V1] MinPlatformPkg: Fix Purley and Whitley builds Thread-Topic: [edk2-platforms] [PATCH V1] MinPlatformPkg: Fix Purley and Whitley builds Thread-Index: AQHXnre5B84DhUpZdEm65Fe30DXu16uOQVMQ Date: Tue, 31 Aug 2021 23:25:00 +0000 Message-ID: References: <20210831222859.4342-1-nathaniel.l.desimone@intel.com> In-Reply-To: <20210831222859.4342-1-nathaniel.l.desimone@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.5.1.3 dlp-reaction: no-action authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 3072a143-bd20-4658-a761-08d96cd68d7c x-ms-traffictypediagnostic: MW3PR11MB4649: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:8882; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: Z3oqpW/+0EFzuN9dd6a76eWTFeO2L0uPeM9Sra0QbdRvUHwZeK30BuYiB0KSIxwCn/THzDgInx8XBhvNSZz4wtalMkbbUZoFq5E3NuxdpteRTm39VoXT7CUBFSWIZ5673az1TMVI1L7y+DzbFLuKb95vzq8qtKIRFd3vaOG2SB5KUNhcjedEunjcuqKczB5CAhGqvwUJ8tEXbKCZHVNqhwUcZ0DtsAal1GynCe2sqQtLKvuvwpgdEPOROKAybwTkhHuhBvpenklQZfYzGTEa8R2p7BFU0ikDkkLfz1O6Nx+BEY5JaeiWiE7U7AXIb54ABKgeYK9T0TA3JO8PM8eyvoPYZzxKyhDgHDk3UgkdrnsBz5UqsEvEcykFG9aRDgW+Vf6AcyLiCSHvzKVxfu4UwjOHaRV5WARxL9y082bowirOx1pg9dHLuIvVwEvt6TPpdvA2KqYyta3WADtV5WAFefj+YPHd4+L8rWSfnpYoPO1JrgrZGQrw8q2vGhVtcw8Gnbad5bYU4YCnrttJMiz6Y5EsiKshTAbhFI4B9h/Fwv7bFDbfF882MKsM5GYM01AO9oi5IO3NB85qwE0ACEL5XkDqByC3i6qcQ5DdeEhTjjKGN/+aom6ZO4cNbPmJp81/h9k0n1lyy2kutxTdg6kUGwjGt9EAASO9NrSBlQtPiJvjr3vN40TnhgbMxL1I7/RtPGxF7/OKc6Ok4pzTUrm9ww== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MW3PR11MB4747.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(376002)(136003)(396003)(346002)(39860400002)(86362001)(55016002)(26005)(83380400001)(5660300002)(52536014)(38070700005)(316002)(8936002)(2906002)(54906003)(7696005)(8676002)(122000001)(38100700002)(107886003)(110136005)(64756008)(66556008)(66476007)(6506007)(66946007)(4326008)(71200400001)(66446008)(9686003)(478600001)(186003)(76116006)(53546011)(33656002);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?bBdp5P5/2wupS5H9EH/Djor+lxpwW0+DBmv32ctNteAfO2hvsNeBr9Ao0XZN?= =?us-ascii?Q?iKrerweh25dAtl5vN1wA1FJ3ZyF0kNbNlMjBXncAMAbmQ3QvyLsoQdcVzu2t?= =?us-ascii?Q?wD2pKHUBI12xuYuscmck+ELq8OU0sce8bNh5AqTK2hcZKr5gDx9fwJzXJasY?= =?us-ascii?Q?zvpyAWNVwl+lJ8R3aDyIRUXVivZj0wZKAogiOqpFf/aJkTdmHyvQWiKnOfJl?= =?us-ascii?Q?RpHqAR30M+p/obO0u9d20sldJKOrmyKYmKWw8iWbDAK2DiNh4p5Ut0YF5Q/H?= =?us-ascii?Q?/GRyC4nY2qu7x5vph/wum4K8bUp2MCXYWxaNDDawxXuj/k7vaOdeW/ku+Kee?= =?us-ascii?Q?gK7zfymebo9ZpTzijLXyJJeHXr6TWohDLeG2zdChHed5AmNJdNDtPifk5Fk8?= =?us-ascii?Q?mxbDXB9lxgHGMNrLTJxYbpS6TZxqagGJB+XUg1yvNfInyxN6xNyM61Qof0kY?= =?us-ascii?Q?R+jlYgqYsMOEdHro+0e16JXhDOHpdHG3SVaCID0psCdU2G/UccWcbIuNwulx?= =?us-ascii?Q?L4aSuELSx0oIvnNtOmAfr7GyiY4fFETQrGdXTX+h7mpcSp0W8aCWfSONpPr7?= =?us-ascii?Q?mH4V+0SLPysbo3dPKm0iqr4ERhl9LWPZPNaIRoYeTHx4+5IFHkKdRwMcXDqp?= =?us-ascii?Q?yIhfhnBUlPKY3nJMp3mh0f0eqJC7t25K0NS979gvTQJqUkIhuXIInn+txH7L?= =?us-ascii?Q?LGAFRPU5d69vW4+p4fNJ+C+vzkF0bJuPQh//SA5bi4Avznp+E2uQ1W/t/MlN?= =?us-ascii?Q?YcJ8nM6/6okNQZu0zl94qyCzmMl2st+VI/YwGqTj19VJXprAwzmybwdvQttw?= =?us-ascii?Q?ayza7AYZnZ2hWp/q+GE0HcIckqVBLndI1nauPM/Qa1pUIr7Ut+LG3GnrC1v2?= =?us-ascii?Q?PymBaakFzUFsZtJkGhw5/DrcrlZlSeNhl6QsJyMkQ84igmdtpuraEIVL8CM3?= =?us-ascii?Q?9CHZ/eWwbqw8FTL4HAUU5i08FHf0qlUo4BOUkjxORLknDHAdl7yqlv+jC+B2?= =?us-ascii?Q?GWljz2PmKh51DroL34NUcO8NEDiQnYQJkv39IGMF1Jawu+KXwc82OuC7yROU?= =?us-ascii?Q?lo2r2eIWZ34UJDbOIERUgbbw2uRs9lm4b584HY0MjTLcP/Je23nKU3wDcYhz?= =?us-ascii?Q?HR9awiTvzZ02LfGlgHyjydMPwV2u5wyWW+hqSwIZ9gHUvwOep4WLcT+PW4+s?= =?us-ascii?Q?nJfC/M7VLSdsKul+mzZ0qgaT04ivyG33ThUIZEL/NsyVSP5ofk8k0rNPNDKo?= =?us-ascii?Q?blQ0h1ktmLvk+YH2LWScbuxXMNycqGMJ3TvoxYhoSJak95jfpsQlo00Ak6/s?= =?us-ascii?Q?4Xo6alvkwTGwgXzMx+dJF7eS?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MW3PR11MB4747.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3072a143-bd20-4658-a761-08d96cd68d7c X-MS-Exchange-CrossTenant-originalarrivaltime: 31 Aug 2021 23:25:00.1596 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 6QFOS/XF1zDxYTcHyfSZ+Cy9M7A/zFMUoGELKIcuO8Dr7CTa27Vzqs19W23eSLAvDqKfOyosxk6akj88/P7RxQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR11MB4649 Return-Path: isaac.w.oram@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Isaac Oram -----Original Message----- From: Desimone, Nathaniel L =20 Sent: Tuesday, August 31, 2021 3:29 PM To: devel@edk2.groups.io Cc: Chiu, Chasel ; Oram, Isaac W ; Liming Gao ; Dong, Eric ; Ni, Ray ; Lin, JackX Subject: [edk2-platforms] [PATCH V1] MinPlatformPkg: Fix Purley and Whitley= builds Commit f4e12 causes a re-definition warning for the MAX_SOCKETS macro on Pu= rleyOpenBoardPkg 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 --- .../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);=20 + 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; -- 2.27.0.windows.1