From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 1473D9410B2 for ; Fri, 1 Dec 2023 05:25:01 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=AbB2BJRQc7Zbj++cJ60Bm2HNVXs0Mr1nkP1epb4MBN8=; c=relaxed/simple; d=groups.io; h=ARC-Seal:ARC-Message-Signature:ARC-Authentication-Results:From:To:Subject:Thread-Topic:Thread-Index:Date:Message-ID:References:In-Reply-To:Accept-Language:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Language:Content-Type:Content-Transfer-Encoding; s=20140610; t=1701408300; v=1; b=F7CcDndmzgYRISQcjmCWJnbGqELp0mBY/A5elED8Uf4jHHJ3k2tur8quCkogWAd9InoG+kqO bQC7xveNNAfvdO8SM4NTxkAuaDnfZi/V2v2o8yjCIjYzO1VWfc97frWM2mA083mOWPkhHrJK+W7 foJUEUJBBpu/OZwBxi0z5Bww= X-Received: by 127.0.0.2 with SMTP id 8fFLYY7687511x0WQL6eKRBn; Thu, 30 Nov 2023 21:25:00 -0800 X-Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.10]) by mx.groups.io with SMTP id smtpd.web11.16365.1701408299522613724 for ; Thu, 30 Nov 2023 21:24:59 -0800 X-IronPort-AV: E=McAfee;i="6600,9927,10910"; a="6716438" X-IronPort-AV: E=Sophos;i="6.04,241,1695711600"; d="scan'208";a="6716438" X-Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Nov 2023 21:24:58 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10910"; a="769551090" X-IronPort-AV: E=Sophos;i="6.04,241,1695711600"; d="scan'208";a="769551090" X-Received: from orsmsx603.amr.corp.intel.com ([10.22.229.16]) by orsmga002.jf.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 30 Nov 2023 21:24:58 -0800 X-Received: from orsmsx602.amr.corp.intel.com (10.22.229.15) by ORSMSX603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.34; Thu, 30 Nov 2023 21:24:58 -0800 X-Received: from ORSEDG602.ED.cps.intel.com (10.7.248.7) 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.2507.34 via Frontend Transport; Thu, 30 Nov 2023 21:24:58 -0800 X-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.2507.34; Thu, 30 Nov 2023 21:24:57 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cjfIs0/hEuqLuF94KQd4u5MgbPK6Pf8iwaZKYd+doVz6kAGHFP34ONOWI10TnrNLj1+38YPd01EQpwm6Ii69w8MerxKBwWtsHpCD5An8oPIuKD/evB1w/3lNDMMf/V5aKNuCA0usiVwheZvR3rD6Z+Bc5Di5Zclcq953A1p33sOULKMh2cgmBEbXlBs3UnhJJvrr0+fh6/emUtU/qh7T7J3pFMA/UCgjebLZaFhAp6HMwdCW8zlCaZRtzkrucpc68DWA3ODD4EZsOrWuNtcPtV6h5VnLinn6j79+I1hTX5ktKvp23HJjyBUN4kr0dzzSNeYu2OHjOxz8u4BPxw7DGw== 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:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=BsSYsI/QZzbvWgRMdyC0v3FICy/pOtJxJqn12+ERUeg=; b=eCZN+OWMR4VhP3sH2P3xmoyRUJLIxd25Ae/iu3mtPZhnmj41q7Fot0N+lZLDab10dE0X0ICj38OQbhGwLY62+OZpc0dktoupTtX6m4KSlnGn3LrP3TtG3oAdM1wr4J/mZBfl0umdauAR031eJAmb0gtEdAwtvFe2S6jnjdOd0I58vYtxD+bYUQSzH7AJLFQoeIz4UgKq9x/2tik3QyUaV0PUZjcmiHDhmavZx1A11zLjGGuHsktDknh/iInJ4hn0kwKKc+wcov+J6DX+lj0KhxfEtPCgSp0K96M+Hpin5mlFs7T7wam+0/B9hIdknabV2LsiOG20eVv7lMeC1zodZA== 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 X-Received: from MN6PR11MB8244.namprd11.prod.outlook.com (2603:10b6:208:470::14) by CH3PR11MB8561.namprd11.prod.outlook.com (2603:10b6:610:1ad::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7046.23; Fri, 1 Dec 2023 05:24:56 +0000 X-Received: from MN6PR11MB8244.namprd11.prod.outlook.com ([fe80::b614:1f5e:8b0c:9858]) by MN6PR11MB8244.namprd11.prod.outlook.com ([fe80::b614:1f5e:8b0c:9858%4]) with mapi id 15.20.7046.027; Fri, 1 Dec 2023 05:24:56 +0000 From: "Ni, Ray" To: "Kinney, Michael D" , "Desimone, Nathaniel L" , "devel@edk2.groups.io" Subject: Re: [edk2-devel] [PATCH v1] PcAtChipsetPkg: Fix AcpiTimerLib incompatibility with XhciDxe Thread-Topic: [PATCH v1] PcAtChipsetPkg: Fix AcpiTimerLib incompatibility with XhciDxe Thread-Index: AQHaI/moftHY7d69q0icbnVRSreVb7CTv66ggAAY/gCAAAyewA== Date: Fri, 1 Dec 2023 05:24:55 +0000 Message-ID: References: <20231201015618.3920-1-nathaniel.l.desimone@intel.com> <20231201015618.3920-3-nathaniel.l.desimone@intel.com> In-Reply-To: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: MN6PR11MB8244:EE_|CH3PR11MB8561:EE_ x-ms-office365-filtering-correlation-id: a199be0d-4ff1-449d-db12-08dbf22ddab5 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam-message-info: Wwa1xH8yC+i+EZAWHwASPq+9v4a7FUQ5yk+a+5EHfwWyaQAGUWR4+Ef18TK9h2VkcxItYMlRZsRbEg4LmQzQP2XZZkvCpKzR+fQ+lBHZWlaudgXJWTtkzBfwmt0WRuYX2tWu9nHQP0na0KgK01zbhQLesLXxE4Tp4eJmsLm+fAKx2BCTCnvYp9BVnfR0nLaRvtC0O75OdGfrlZ6Gj7jx7l6rnwtiwTfHqyQ473Xf5fggFENlIHm+oYOt94l9OrwMVMfylOwmnC7JnJY68bWTRFhWLegtQku4qkPEdzCATJKbRwLPfBiSQQ0wAbNqv4FtzDBi6jgTIoW3jmH3egiAUfsJxGiMu7fMYHXW0NhsHWFtqgUt0d2IB7oIR92V/oA004cJSq6NVQvBvRMgJUHKQrFhuu0Y7wVS0D3H/yXPfC25Hc2UGuzQqXjBubxim50WbNNx1d5jrwKoBNwRmr1RMFrR0cc372BdAsDiNikvJjrqZHJZah99O4CC0EGX4DqLMuwC63WFv4ZIf1R6cpnGAmGEOP+yXA8aSNdDvdlQIUwtbGfHP50QmWWgSZ5/siQvYOHTeQ9C7p6ha91c6EOPaJt/jxAFlG2hwBLyGdr0P805uzdXzVCLkCJ6+5vbOXNe x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?I3U/QR7tUf7kmJF8Hez/ft5Kq8c0dhykQMQPZGgtjm0x7WBv9vIi9RyJpsA/?= =?us-ascii?Q?pQl0HMi+HDEcUDZzshO3lQ4RB56jIHMwJG1wQ3aBa6wj7FxIylkta5pVIxMT?= =?us-ascii?Q?MC9isu3O0JX+1eMBPQRHb3rn+5YjzvwfPGnRUE0B+xAiYGzMTYBrOmMOs7qe?= =?us-ascii?Q?TzybXwDO7rDz6soeo8KekcVB+TG8A5mAlWmBKWw4jg+/4gAzwRz2dzN80ic6?= =?us-ascii?Q?7aZuSWAKyQXQCSk50dtctHsHkWtncGGO3xEGSjnXIpZB4fhpelgq1MqQmLzp?= =?us-ascii?Q?4ypBbIwc6inaQlYNhQHGVg9VvgjBhSKOIzwnlh1oWwglgMRFe+1T5Vd4a4de?= =?us-ascii?Q?08bSIhZmF46tLeyGeEgy2jX9DKIcrYhivRr4QpDWcG4UWsw5VivwBVH+D0Qn?= =?us-ascii?Q?mwt3lhLa6yyXD49RUsLa6eCU6UTzEAQQYy4HLLhOKOjWMYzG/RXKkGQ0FLYE?= =?us-ascii?Q?XpLDKPGdgOQsxcfceQenTYy0uRDLEljDULTH4oa2DBxUGTfAfhJZNe9YyVi1?= =?us-ascii?Q?74DCEi8ALRevm3+WfAzrlgWfe8joiRVyL7VuHHDVFlIeGHIya4rdAaFPDgaS?= =?us-ascii?Q?RsGXW7jfEadvkh/Cghj6nzQq5pkpPlq2w1LjfEYqibe9VzZdIjknwaUFjlgI?= =?us-ascii?Q?i3El42sFPhhorXfgfHWtRiUUa9HOjmMjhgxitt6YVFt7hEDwuLF1Bnz00zT8?= =?us-ascii?Q?jMpfBL3ddv/7qcq1U22QuMv4Q7FMAJena7tIqJWZ/78w+ic93Lmy593xJuGo?= =?us-ascii?Q?8IkhmgWJuU/R4xdq8EkedYD4blM7xdI6fIPUd1r0vvhak6vNEQg0/55x8ApB?= =?us-ascii?Q?wWIVvUNXrCZ2hyQ+2kaHEpVDYNeDI1w5emv1R+3nNz19wzJyvxTbwO6ZqEH6?= =?us-ascii?Q?Fb1VPJzCAvSA6Y5xwvRz/H8J0xJOc3zyfpvKmftkpHkcOfAuOVdGw5iwxRog?= =?us-ascii?Q?bczPtzgZ5qQr8Wpc/SCFZw1yj88NNTklRvV97IZF62ELm0PIMB/irE5oHRGI?= =?us-ascii?Q?+diKy4JEgOuv3NLnXAYA5No6wkiCRedLUC+yhWHgK4AvsAMG/2+M+BflDTkL?= =?us-ascii?Q?/OOE8n1q/KLXiiiloyCWYdvwXjIdoZMW+aKdCyvmNzuGyKnM/XHASvzmJOfg?= =?us-ascii?Q?AeYeT9UE4exV9rmXPEJ3wqSTeoYYefhLWPW7Ya3/j8ITtEsa8FaGFubaTawT?= =?us-ascii?Q?Jltm/yWCtjSf8q0JXVI+dd9+MU2m37i5TfTzHWCjKJuBe8WPmzPHPZwAa7Ad?= =?us-ascii?Q?Y33ZBe++GkMTkPVDLh9AN387t+mB95hpJRBSItrM0DIj5o0wI2OHifOc7Dy8?= =?us-ascii?Q?rtG3oOmh2kcKEzKo2Y9MXYVhCVs76tfjgc1j9XD1R1swC1OadqyDoX1JCXN/?= =?us-ascii?Q?YDJvbp6u/Nbzm3EvgSADxAH+DcPAJMXhgFn72w5hhRuXqoFANq7mAHXHUGvy?= =?us-ascii?Q?MJH9JQGH0kgPpEQErpW7UMWshe4cx1+o42WhpzbkWG5hENo05SujlsaWnBxS?= =?us-ascii?Q?2rEen8xG9gmCbq7iLTL25m/Ia9q7pJs2TeqERZ1Vl1uNf1AyJy9qIzsGMuj1?= =?us-ascii?Q?Z1HjYX/gtAA+1aDGtmg=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN6PR11MB8244.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a199be0d-4ff1-449d-db12-08dbf22ddab5 X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Dec 2023 05:24:55.9827 (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: SUT6AGpPp8E06I6zWaA2zqCSd7RUUt+pJ3zRnm10zFnYj8xWQJEaDb8D5i6ZEMkybaLQO3b/MVSXV8B5CL30Yw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR11MB8561 X-OriginatorOrg: intel.com Precedence: Bulk 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,ray.ni@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: tp3C937Pw4wVC2pK8H5zg9ZKx7686176AA= Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=F7CcDndm; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=intel.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io Mike, Thanks! Thanks, Ray > -----Original Message----- > From: Kinney, Michael D > Sent: Friday, December 1, 2023 12:39 PM > To: Ni, Ray ; Desimone, Nathaniel L > ; devel@edk2.groups.io > Cc: Kinney, Michael D > Subject: RE: [PATCH v1] PcAtChipsetPkg: Fix AcpiTimerLib incompatibility = with > XhciDxe >=20 > Hi Ray, >=20 > 'static' is allowed and actually preferred for module globals > that start with 'm' that are scoped to a single C file. >=20 > Globals that start with 'g' that need to be access by multiple > C files can not be static. >=20 > Since 'm' globals could be changed to 'g' globals due to > maintenance, we want to avoid symbol collisions between > 'g' globals. Prefixing all globals with a module name helps > prevent symbol collisions. >=20 > Summary > =3D=3D=3D=3D=3D=3D=3D=3D > * Use lower case 'static' > * Use 'static' for 'm' globals > * Do not use 'static' for 'g' globals > * Add module/lib specific prefix to 'm' and 'g' global >=20 > Mike >=20 > > -----Original Message----- > > From: Ni, Ray > > Sent: Thursday, November 30, 2023 7:13 PM > > To: Desimone, Nathaniel L ; > > devel@edk2.groups.io > > Cc: Kinney, Michael D > > Subject: RE: [PATCH v1] PcAtChipsetPkg: Fix AcpiTimerLib incompatibilit= y > > with XhciDxe > > > > Mike, > > Does today's EDK2 C coding style spec allow using "STATIC" for global > > variables? > > Or lower case "static"? > > Or changing the variable to a name with lib name prefix, e.g.: " > > mTimerLibPerformanceCounterFrequency"? > > > > > > Thanks, > > Ray > > > -----Original Message----- > > > From: Desimone, Nathaniel L > > > Sent: Friday, December 1, 2023 9:56 AM > > > To: devel@edk2.groups.io > > > Cc: Ni, Ray ; Kinney, Michael D > > > > > > Subject: [PATCH v1] PcAtChipsetPkg: Fix AcpiTimerLib incompatibility = with > > > XhciDxe > > > > > > The DXE & MM standalone variant of AcpiTimerLib defines a global > > > named mPerformanceCounterFrequency. A global with an identical > > > name is also present in MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c > > > > > > Since XhciDxe has a dependency on TimerLib, this can cause link > > > errors due to the same symbol being defined twice if the platform > > > DSC chooses to use AcpiTimerLib as the TimerLib implementation for > > > any given platform. > > > > > > To resolve this, I have changed made the definition of > > > mPerformanceCounterFrequency to STATIC. Since this variable is not > > > used outside of the DxeStandaloneMmAcpiTimerLib.c compilation unit, > > > there is no reason to have it exported as a global. > > > > > > Cc: Ray Ni > > > Cc: Michael D Kinney > > > Signed-off-by: Nate DeSimone > > > --- > > > .../Library/AcpiTimerLib/DxeStandaloneMmAcpiTimerLib.c | 4 ++= -- > > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > > > diff --git > > > a/PcAtChipsetPkg/Library/AcpiTimerLib/DxeStandaloneMmAcpiTimerLib.c > > > b/PcAtChipsetPkg/Library/AcpiTimerLib/DxeStandaloneMmAcpiTimerLib.c > > > index 16ac48938f..41d2af7d55 100644 > > > --- > a/PcAtChipsetPkg/Library/AcpiTimerLib/DxeStandaloneMmAcpiTimerLib.c > > > +++ > > > b/PcAtChipsetPkg/Library/AcpiTimerLib/DxeStandaloneMmAcpiTimerLib.c > > > @@ -1,7 +1,7 @@ > > > /** @file > > > ACPI Timer implements one instance of Timer Library. > > > > > > - Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.=
> > > + Copyright (c) 2013 - 2023, Intel Corporation. All rights reserved.=
> > > SPDX-License-Identifier: BSD-2-Clause-Patent > > > > > > **/ > > > @@ -51,7 +51,7 @@ InternalCalculateTscFrequency ( > > > // > > > // Cached performance counter frequency > > > // > > > -UINT64 mPerformanceCounterFrequency =3D 0; > > > +STATIC UINT64 mPerformanceCounterFrequency =3D 0; > > > > > > /** > > > Internal function to retrieves the 64-bit frequency in Hz. > > > -- > > > 2.39.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 (#111967): https://edk2.groups.io/g/devel/message/111967 Mute This Topic: https://groups.io/mt/102907651/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/12367111/7686176/19134562= 12/xyzzy [rebecca@openfw.io] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-