From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by mx.groups.io with SMTP id smtpd.web08.32220.1630995433768027196 for ; Mon, 06 Sep 2021 23:17:14 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=lfANUjzn; spf=pass (domain: intel.com, ip: 134.134.136.31, mailfrom: ray.ni@intel.com) X-IronPort-AV: E=McAfee;i="6200,9189,10099"; a="281123159" X-IronPort-AV: E=Sophos;i="5.85,274,1624345200"; d="scan'208";a="281123159" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Sep 2021 23:17:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.85,274,1624345200"; d="scan'208";a="523611770" Received: from orsmsx602.amr.corp.intel.com ([10.22.229.15]) by fmsmga004.fm.intel.com with ESMTP; 06 Sep 2021 23:17:11 -0700 Received: from orsmsx601.amr.corp.intel.com (10.22.229.14) by ORSMSX602.amr.corp.intel.com (10.22.229.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.12; Mon, 6 Sep 2021 23:17:11 -0700 Received: from ORSEDG602.ED.cps.intel.com (10.7.248.7) 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; Mon, 6 Sep 2021 23:17:11 -0700 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (104.47.59.169) by edgegateway.intel.com (134.134.137.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2242.10; Mon, 6 Sep 2021 23:17:10 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WGTJgeAfXrfify2+PQgyJ7spyzUE7G2CYUcDnnjqZbJDpa99CZ7V6N1PAMf8j+sJeV21niUDMdpHG4XoMiRezATAsl3hOzN9iT+lSr7Omce+6EHkuCzSy0SQTSx30TZL32aUyZ7YjPPxOb/eYFm4E7uGLEEpEBfm1RigF1nhOB1QPI3E6Qzk/7ieExkUPXLIA6PQ4gB+nyOe55FLWgxKEwjCvNDlaxsoUYq9A7/oBozUoFDRQwRYW47zf289jbmk1ZXvxKnzAlqbO4xMWUlh5BpLKwXUQu2Dcli65liTofKdubYjuOpEXDFmgSHZMPL5L6+zZdGPEhuqHfDfWcVLcQ== 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=WSo6Mh4QUL+MTZO4Vru+xf/FFlUByDuO7cYH1ZlEsHI=; b=NHPfNOs9X1xHZKdAjfjNugrC9MViYwI5MGAvhqrgvaDoY6JQHPFDt2WSjmbe9ArFOVCxUIYF2Ullq3/17CNmaLvJqzHZyeqGNZWS09mWHIa5p/hdEfs7sWL5cuQ6cI3JKovM/yNsnyhpxSqlz5gXq4/VB5F7xJT+jmQe0Y5CGuiz5cV3goeoHC4LB0cnxLyV/t1zCJmCMQ6A4cK6+zMAY6vPr5v7xKOI2QtSBR6pKa/uIEzkvVqlSElDslBPpPsV01Nimtqmy4K3NPIp2zRrPRw0O42+cp96PFq7S8tPUJD5y9UBnnwLr0CEOKf+XiL4Y3cGiLCcw0RYxY5UDvEGNw== 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=WSo6Mh4QUL+MTZO4Vru+xf/FFlUByDuO7cYH1ZlEsHI=; b=lfANUjzn8XEXgbyPI6Fc31b6k2NseYeigPVg2zf7xon9wosyptdbhgvWf0oat/0s6mrNddrFwgkWH2nrafuk2f8QTPjmSHCs2u0dAIMdkKiam/NdqyFVUOcT8Dqs+aB1sgENamzmy13ySnC5DaAFnD0Dbfc3i57/PBKtsXvP1jY= Received: from CO1PR11MB4930.namprd11.prod.outlook.com (2603:10b6:303:9b::11) by MWHPR1101MB2080.namprd11.prod.outlook.com (2603:10b6:301:56::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.21; Tue, 7 Sep 2021 06:17:09 +0000 Received: from CO1PR11MB4930.namprd11.prod.outlook.com ([fe80::50ce:c9a3:ab37:9fac]) by CO1PR11MB4930.namprd11.prod.outlook.com ([fe80::50ce:c9a3:ab37:9fac%9]) with mapi id 15.20.4478.025; Tue, 7 Sep 2021 06:17:09 +0000 From: "Ni, Ray" To: "Lin, JackX" CC: "devel@edk2.groups.io" Subject: Re: [edk2-devel] [edk2-platforms:PATCH V1] Platform/Intel: Fix macro re-defined Thread-Topic: [edk2-devel] [edk2-platforms:PATCH V1] Platform/Intel: Fix macro re-defined Thread-Index: AQHXnYVEwP3/Iw3eCk2rzxvJJ0ibcKuYIndQgAACYZA= Date: Tue, 7 Sep 2021 06:17:09 +0000 Message-ID: References: <16A00D005C3F6085.14873@groups.io> In-Reply-To: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: 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: 0c4a3c38-e123-4b27-6f44-08d971c71fd4 x-ms-traffictypediagnostic: MWHPR1101MB2080: 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: oWg3dw94xTQCkoIDeXgEEpijLCJqa3/8POnu/O6PNfDj9qBe00IiXfhPEU9PNhxFWHsUkMTh9VKhsN04RwvjozDWXTYtDa0CKiE8z2ziWt13pyaqpge5cMQ/EVrKYpdkixBk3peGnJ16PLn45NtQSaib/eE2QJR4RW1XMSEsOy8EdP27xUoiwfuYvYLKCbYRKOq+SL3lDDd07IR4Mc6uND1kT+ABjX0SXgb9Dhr9B4fCjeQO1sINDqwP4ouo5ao+v/bhH6VHB6Of8isWBCB07PyvWxmsAJmr03NQfcy/fQP2hovcM24/gcTCY0T5xufFh6uCO8HksrXZbaBSgC/kkCW0V1eZk4plgV/OxVK9CW1d9YMFB9zrhINQblxx6xasByMuCZKBcEih1FZz6eN9HOdzrA0J80ejJWOwWPlBbNQ1QnrzwDBGYz1XyZkxgCgWPB0M3qcospFr7ev3Vons5iZT02T2CBqSsBx+tOsWrzdVu14KphXGdW1vK4tMRE/7c1r+noijRuWtHGa1qNwBK8Ug6n11mu6Ky21BSOzKlLIW0gxtrXHFIyLk7dDOAnvQZ1pBcUaOOX37D5rbeHPsnduznlPrXfSivixB1KyQ4cWq6JuYs9dwG5YhN7OV1SP1XkXOzSpxp5sgbaJSphM5YzW0YzK3KgHmKcp7C+qFCx0O4+n16OaCMnQroHf6h9Pm8jTFnWZH6++WaX97qsraY3so/BTwqvVDRSEwukDBEyUBWSS0DSyge102Z1zEBueA45oHp6KqQrAzlV7Q8a3T0Bdatfuy6whTKC6Qa7tZsBBGylPin9f0BN04RlBI4kNSY4YZdm5MpZyRvSR4q/G9IQ== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO1PR11MB4930.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(39860400002)(136003)(396003)(346002)(376002)(366004)(53546011)(6506007)(966005)(26005)(186003)(2906002)(7696005)(316002)(4326008)(478600001)(86362001)(8936002)(8676002)(83380400001)(5660300002)(33656002)(6636002)(52536014)(122000001)(38100700002)(38070700005)(9686003)(6862004)(71200400001)(55016002)(66556008)(66946007)(64756008)(66446008)(66476007)(76116006);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?iAoSUICVRtG743G354KqCINqOFXOwjunt35pAvQiJemQdktK2yoijBUrAror?= =?us-ascii?Q?Qsy/ulXtd8sgzIT+i2QwoXryL1kfWBhGhKlfAR4QN/IUs0hzjw3osfOm2i2N?= =?us-ascii?Q?6A2wyArdmxBsF9+p8OPHrOAnB1Ba6sIU29Q06/PEH3RvHD6eWkqfsd/s1JdM?= =?us-ascii?Q?I+TZpr8YasJRsIK6qgZKek/YlVP8CgYZHZD8HlihJwWQURRKJ6k2jI/CJAwk?= =?us-ascii?Q?qqEoZW2hJie2tjvf+tyuBS2czwh937EcOvNQ/Bq5XmmqTKK7FyDmdI3WMDL/?= =?us-ascii?Q?9iev37DniJGK8MUtGlC2KZT4xUYIwYpLCPXe4sonb+KUIb0HOUotKwhfLyWO?= =?us-ascii?Q?YB7SKnA318S0GtKAFrH/cfAailiNLdEez5mCe1G3Zpjc1Cb2sgChwB+O1MiO?= =?us-ascii?Q?wUJhaNg3Q12jlfUpefEQIfnnyymM+VcPvuaNBhG1BIl6XYtxBmLQbno7Sw6p?= =?us-ascii?Q?5ShouJJFwVaZr37oc7rxg2E6cbyRzvutTopHjIXdzoS2IitDSaX/kg9+kaW3?= =?us-ascii?Q?d2fEkivlJ6PUG2HRrZPb6beFB1flRWVU7Y1mrZjuHGGs9tQnSUDxF/roPC2i?= =?us-ascii?Q?zJNGqVNKc+soWo1wL9/kGOxe3MAhvrhPrgR6X0a2RmERmV2M2sZAxHovqpzb?= =?us-ascii?Q?vcTl+BAaDdsat7TrXViB4kF07PZKO1xflGxcapUVWKqXEYR5I4qW+p7+Uq6I?= =?us-ascii?Q?KBfXQgNsS0ZzwwMNPNu3xrPoMORwLuW2dpIw4o7eAQ1MftfaehirENo9Hqy5?= =?us-ascii?Q?yVN8oChmcNeG2Lg/9HZYJ4x+MgfwZyGFJ39pqnUWyIe2A1E/tpx1zdTb4tvF?= =?us-ascii?Q?mN1ncMPD5FIEtJHuzv2/0XsdAyIti76gQhmxLsqsl9ergu87baErFUIqW8eD?= =?us-ascii?Q?lBfmLM+LQ5AHfqiQLvtefiqWKN3296VSwg1gu+boNh56b7oGSQGMRAyeFc6K?= =?us-ascii?Q?jvs9mkPpbhlDoo++LYl9hJ0AUmvAa5KkSJbjTuy+z3WJJDd0FKyYDvIQHoVn?= =?us-ascii?Q?wUxD3+0a/0W2pqmFfFuuVLUF6ICuQSnSHfYOaMrnfHkn/PLd++KjlW66j3x8?= =?us-ascii?Q?C/GrtrZIhqE9T3VdiWrO5HssfvXLOM1268BuCUbCDOWabsBWviypOosG+iRR?= =?us-ascii?Q?32iEpjIJa2xI6Rdcy6miegJH8roLH7RWM6PmLq5qtGCp7e+ZNSMNrfS55TFI?= =?us-ascii?Q?r7bZ7qE598ZzhDMaG2+rhrVu9hbHaW8bwHcxkCdtaB6nbv/gyXCWz1iDLmwX?= =?us-ascii?Q?bcTWlhKbXYi0eK/G2GWBJg0LKWkTDzaGvMQRTVB8OAXJcevpY1uoKvcZVoJJ?= =?us-ascii?Q?tyEylN59/So3pcUFeQx4ESmz?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: CO1PR11MB4930.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0c4a3c38-e123-4b27-6f44-08d971c71fd4 X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Sep 2021 06:17:09.4708 (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: AwuGcy6Ig+IanAqLO+pzurIDVSApFTTGGrrIQZXK00kWPSftqfRjPIVPbJdlUX2PUkuD+kSs2TXaZA6Idnbh6Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR1101MB2080 Return-Path: ray.ni@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Ray Ni >=20 > -----Original Message----- > From: 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 ; Dong, Eric ; Yao, Jiewen ; Ni, Ray > ; Chaganty, Rangasai V ;= Kuo, Donald ; Kumar, > Chandana C > Subject: [edk2-devel] [edk2-platforms:PATCH V1] Platform/Intel: Fix macro= re-defined >=20 > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3365 >=20 > Check MAX_SOCKET exists before its creation. >=20 > 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(-) >=20 > 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 > - > + > //keep for debug purpose > DEBUG ((DEBUG_INFO, "::ACPI:: APIC ID Order Table Init. CoreThreadM= ask =3D %x, mNumOfBitShift =3D %x\n", CoreThreadMask, > mNumOfBitShift)); > DebugDisplayReOrderTable (TempCpuApicIdOrderTable); @@ -244,7 +246,7 @= @ SortCpuLocalApicInTable ( > } >=20 > // > - // 1. Sort TempCpuApicIdOrderTable, > + // 1. Sort TempCpuApicIdOrderTable, > // sort it by using ApicId from minimum to maximum (Socket0 to Sock= etN), and the BSP must in the fist location of the table. > // So, start sorting the table from the second element and total el= ements are mNumberOfCpus-1. > // > -- > 2.32.0.windows.2 >=20 >=20 >=20 >=20 >=20