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 211A7D80477 for ; Fri, 1 Dec 2023 03:13:42 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=BjlvoXmFw+u+SMYcJAFosub6yN7tT3SiAR1HtYkFhVI=; c=relaxed/simple; d=groups.io; h=ARC-Seal:ARC-Message-Signature:ARC-Authentication-Results:From:To:CC: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=1701400421; v=1; b=xPBe7rVtwCc5CbTCZVEUMaSfOIv8HJKhwfwW2bbxz24upAg1Y3tdEMmM75Xqss6tn9dWNACg 0rUp0IwgWSmlI06iKJbcKRtJCrYT6d2neh6omVH+6pJJMzCCyEYVeexY1YeYXJF5YhR0XIUmiTV Tn47F26J/kW0isENCuYB5IoY= X-Received: by 127.0.0.2 with SMTP id jYdLYY7687511xj8ydkyEnvE; Thu, 30 Nov 2023 19:13:41 -0800 X-Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.9]) by mx.groups.io with SMTP id smtpd.web11.14554.1701400420881992628 for ; Thu, 30 Nov 2023 19:13:41 -0800 X-IronPort-AV: E=McAfee;i="6600,9927,10910"; a="326401" X-IronPort-AV: E=Sophos;i="6.04,240,1695711600"; d="scan'208";a="326401" X-Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmvoesa103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Nov 2023 19:13:28 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10910"; a="803907142" X-IronPort-AV: E=Sophos;i="6.04,240,1695711600"; d="scan'208";a="803907142" X-Received: from fmsmsx603.amr.corp.intel.com ([10.18.126.83]) by orsmga001.jf.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 30 Nov 2023 19:13:27 -0800 X-Received: from fmsmsx612.amr.corp.intel.com (10.18.126.92) by fmsmsx603.amr.corp.intel.com (10.18.126.83) 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 19:13:27 -0800 X-Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) by fmsmsx612.amr.corp.intel.com (10.18.126.92) 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 19:13:26 -0800 X-Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) by fmsmsx610.amr.corp.intel.com (10.18.126.90) 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 19:13:26 -0800 X-Received: from NAM11-BN8-obe.outbound.protection.outlook.com (104.47.58.168) by edgegateway.intel.com (192.55.55.68) 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 19:13:09 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LmwjTLbiLeG+iu8pMUmll49IfdwbZB7ttH5vUnfKZgNrHwioVIzhaOgCAhelMhB4Mu0QgeSIeWuZcPRLSFx8TI+Hd5c/i5lOo03+SeXRnr97++sA4pZP/8PC4hz2mTez+tS5tutZMmyZgkHEj499u9pOQpz1WySmnbQEKKKBuF3yvnRu1+aWc+p7wXzEVjupLzxz8wF0B3DBGb0rpuNy2FzNdmncjfdXE2dHGdW6VEK5pqvMoUeIBzIkhgUxHa2SwLizWTcksWjkErfz1Xq6iaRqz8vO8ILNG7l2UXXbQJ1mrhvUI6nEy/0FmnkJM9ftwdl/M5r3hLX7l0k2hwpFXA== 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=f1Z4gq8UlHysOCjzC2F9w6y0H0d+vYbKDWNAINOIxSc=; b=hev+7HAFg1mjGssSr/vmoWQsTJKMq/jum1inbZNAiLrptKbpGRfQpOAtXurn0PW384Ng+IQHOfmCR4z3MVNNhAHiDiPcivFUqfq5IlI95MwJ9T6uTU8Lv1qBoVEE87BKZl9kPxd5yzoVDOEbZlP1FYrIsyB81NrucNE+nLNIpmwFS15tfGraUKQ4MGlHPU8qWirocbAkn4f9GgrCWc+UwOmEqxzleCuYRT5OSk7qN09Bpw7cB6AxcB+PuFEj5SVF+2lXXj4+votqJYstjKDyKlt+AxpWavHVT7XrwHAi8gc/1jZ94aUpQ7Lbhr6/xG6rp5piKZhEqkySi8Lfb9Dhtw== 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 CY8PR11MB6817.namprd11.prod.outlook.com (2603:10b6:930:63::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7046.24; Fri, 1 Dec 2023 03:13:01 +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 03:13:01 +0000 From: "Ni, Ray" To: "Desimone, Nathaniel L" , "devel@edk2.groups.io" CC: "Kinney, Michael D" 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/moftHY7d69q0icbnVRSreVb7CTv66g Date: Fri, 1 Dec 2023 03:13:00 +0000 Message-ID: References: <20231201015618.3920-1-nathaniel.l.desimone@intel.com> <20231201015618.3920-3-nathaniel.l.desimone@intel.com> In-Reply-To: <20231201015618.3920-3-nathaniel.l.desimone@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: MN6PR11MB8244:EE_|CY8PR11MB6817:EE_ x-ms-office365-filtering-correlation-id: a41cf22d-d751-4ae5-384d-08dbf21b6cfc x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam-message-info: kKIGxGAglt1iSi7iElkHVEgEYZJrOq49fm0Pm9ElXxGTAjgwH+mIqsbJepaxgcAXZMJNiJk3m4v8Hq9xGr3j7eW3w15LUzFwDfuGqtlOKrjVEphUVbCQR03vHdstAWWs5N/yRIRXLdimPzFBMxeAJogA40yIcGSeXFHGYbUZVxgzpQZBAwSDzlFEElZre90+DiMfqrld5imUXrRLp14+Q2ZgNGQ0ptCyrpO+VsnhxNhL3Htk7rpRSxwTvBijYYseVPA/HuLW04GiKRWlYDyWFy6BCPJT1o4WU9RPZMUU5tmPzD/utGtpYCGlziCylFc9l2zjj06kr5Eu0DLIYaz6LpiYp5K4huovu13qZwCGgzFmlCVCOJleJjecfTtDY61WWyhMhgK4ZdYW4vmpaxjqcxE/6pRELoqmL3eztBVG8cwjiQ4DZgbY7Kb+kBAxlDFNnBALwl7Kc7JExXcmmocxXS//S4u9p6eHWCliFzbYUfRlsegwHmmZDXLG6viwEaaDnvgLjJJ9wZMKJcjuwwNARmVhMuFSU6j/yTBnSuekGPiCUIikx5QoojP6Ma/8mMgnDbgtjxColX+4SFZouPaJtc8Y6/nee4O171uIFXVNPMrnxAycnVR7JMxI4GDx2vA/ x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?OIPg02e3ziVZQ/YuED8BjIttNhZFnIRlYUfCnyqhlRIbpqfSJI9VXoFRKyxR?= =?us-ascii?Q?aRfjjE+LPn0T/90jLRXOGzPPN1lW1BKh6u1gRyq+FGNky/J+jeKoftDfY4Vc?= =?us-ascii?Q?3K9yrSn2rghLIhajwIqjDQgash9mJxMskvZFwHChG68IxxVdMY3v+pmtHi7u?= =?us-ascii?Q?mPXNQY2HviNIebBlg7QsHFpILTQmcjDWdPMWcN/cO0qwaNJprCgSQCd/ldCy?= =?us-ascii?Q?TSLNzJQnbMzbM/VSs50635ei/dokNtnHbah0Z3GCmHS2XJ/tzGj6MUCXuSTs?= =?us-ascii?Q?XYivFz33fgVoeyrwbmaoML7Y/UOke2dNx0+hMcqgDwfJIcryahG6nbPJMryU?= =?us-ascii?Q?MlUTy725ll6vG8dH/xBFFhtkSSlu14NvUoGzRgzFu73zzIbgOT2gHOXCQmk2?= =?us-ascii?Q?VSG2xZlPK/WUywVYKtvunRok1AMS2Bqwfi9lrJEegoc/91gX9fh/DqFZk07V?= =?us-ascii?Q?PdkqnQSe3a0/gh9iJzGomSmuD/OWW4K2mEjnMenamy4cgzm5YqM2Jj+2T/Ve?= =?us-ascii?Q?8vZZjdT0X0t4aMaWsw44QpxAVARRU/aw0uFezM4R0rSxGjdrq+Gkz8hXoamS?= =?us-ascii?Q?o5iiqfVOo7znFBQWH35j1/Qj4MT+0l0logdGHB1913tcD/XZpoOrWL77sLIi?= =?us-ascii?Q?k9/sy5vzT8Xr99aQ6C4IZH7cSJQeKN0gi/X7ofYqNjRYYyMrmjSlu7haCOUJ?= =?us-ascii?Q?28lbS8ZLkjNhnk4bK0G7LEb95resn+UopQGumDLs0KSppMJQJRLKJ5JzhoRS?= =?us-ascii?Q?ixHgRGOl7tCygNzZ7BXasd0CO/cMJmdNVbTFCrqqWS3dza04onh4QlB8SjMF?= =?us-ascii?Q?TUCCtbbopeHIu09pfA5ZJxIk6IimffIB9e73hWJlZIuIabqWkcY3n/M0XkfM?= =?us-ascii?Q?8/tx8y99MsZUt3GZo7leB0wYedtQaMvDegDKB+dCmbFwwnpdgk9qVUAPvrob?= =?us-ascii?Q?rpiSaEyNBoUZRUynzXLz+di9AfikvOuYos3Te9Yd7goGxjQQEfaY0shOPWv2?= =?us-ascii?Q?3B3BUvOvsOjXjeY/pAjNF5yjM3VcGW9C2Aht2pj35afQaEnB0EUymRlofE5C?= =?us-ascii?Q?ocu5WCsXFxo1rOi11a5ODOd7KYzbUS3H29Uxxl6b4qh97CklGG9N0fA3H0yz?= =?us-ascii?Q?8ChzXJ/kbYnppFDn9pr53loeA+uQElQQibEz7B6m6Bl+iEqO7Xih8RoBUSvp?= =?us-ascii?Q?hpGNcxeOqSisSYbo2JfP52PZu0iUBx48yiEMHtGOi2JLi0JRi2GKllgQVxEw?= =?us-ascii?Q?nhzBxf6BOTUMuQz7XjdGRql6J0Qdr0k7pTwyu4F9l8sl/kVxXWaLUP2DID6C?= =?us-ascii?Q?q+p2/fn6gTKrGtendp0SXXxgU9iLc3qb/kIbeJMF1bjIOanMtg1dWfwDjErn?= =?us-ascii?Q?qdHFH3PI0ppSMTTQ7M4sfs4Fb9dQq0Spyco3/2XdCkt78spUWLn9J6vF8sac?= =?us-ascii?Q?aquYfivaO+RjH95N7P1GCERNwnE1hZpSLeZgFZR4Uuze9QGQx1FH9U7LBqQs?= =?us-ascii?Q?999NMUaEnJKuj9TkocLbQwr+W9SO+gPXHPDSljKlx2PxCx9WmIs0NNy7mxcC?= =?us-ascii?Q?/Dn5piZgbYaCK4ehcjM=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: a41cf22d-d751-4ae5-384d-08dbf21b6cfc X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Dec 2023 03:13:00.9141 (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: Vf0EI63izeMOpU6EQVMLxBtJT8oBulixeDEV1zbhh9Txe0P6Brv/DvIEzDN69RGUOOlWuDcqmL+BqJyOpPt2VQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR11MB6817 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: 3KKdf995mBcymHT6MW8D6pomx7686176AA= 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=xPBe7rVt; spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=intel.com (policy=none); arc=reject ("signature check failed: fail, {[1] = sig:microsoft.com:reject}") Mike, Does today's EDK2 C coding style spec allow using "STATIC" for global varia= bles? Or lower case "static"? Or changing the variable to a name with lib name prefix, e.g.: " mTimerLibP= erformanceCounterFrequency"? 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 >=20 > 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 >=20 > 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. >=20 > 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. >=20 > Cc: Ray Ni > Cc: Michael D Kinney > Signed-off-by: Nate DeSimone > --- > .../Library/AcpiTimerLib/DxeStandaloneMmAcpiTimerLib.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) >=20 > 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. >=20 > - 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 >=20 > **/ > @@ -51,7 +51,7 @@ InternalCalculateTscFrequency ( > // > // Cached performance counter frequency > // > -UINT64 mPerformanceCounterFrequency =3D 0; > +STATIC UINT64 mPerformanceCounterFrequency =3D 0; >=20 > /** > 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 (#111965): https://edk2.groups.io/g/devel/message/111965 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-