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 7AB7C7803D0 for ; Wed, 6 Dec 2023 22:50:18 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=aGmMkB37X1NlV6INeumzhZWoXBWVkc3jEcRu/YcIddU=; 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=1701903017; v=1; b=nVFxWReAhYwxWylxXfJtHi+gzGDspboq1wwDcnEqrbT3aps33daS3/GNdwUHxM1RkcDPDDgw 2N1TwX8h2iFaX8iSlv2BrTgkPIFnsLgVF2EvNna3vWqsKL1wxDx+/8esFnCnjf8ZkQ2zemllX3/ Pi88MCFsawpjdZrb5TbO6K/w= X-Received: by 127.0.0.2 with SMTP id rvaZYY7687511xCsvxikK9eg; Wed, 06 Dec 2023 14:50:17 -0800 X-Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) by mx.groups.io with SMTP id smtpd.web10.51757.1701903011396626740 for ; Wed, 06 Dec 2023 14:50:11 -0800 X-IronPort-AV: E=McAfee;i="6600,9927,10916"; a="7441304" X-IronPort-AV: E=Sophos;i="6.04,256,1695711600"; d="scan'208";a="7441304" X-Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Dec 2023 14:50:11 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10916"; a="837480011" X-IronPort-AV: E=Sophos;i="6.04,256,1695711600"; d="scan'208";a="837480011" X-Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by fmsmga008.fm.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 06 Dec 2023 14:50:10 -0800 X-Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Wed, 6 Dec 2023 14:50:10 -0800 X-Received: from fmsedg602.ED.cps.intel.com (10.1.192.136) 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.35 via Frontend Transport; Wed, 6 Dec 2023 14:50:10 -0800 X-Received: from NAM12-DM6-obe.outbound.protection.outlook.com (104.47.59.168) by edgegateway.intel.com (192.55.55.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Wed, 6 Dec 2023 14:50:09 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SuVibW1poDiOhOVC6F+MqS3bY/yj+UcOD47adqy108g93hp3BYdDuR1t9a1mMJxQ4Q7qXLHoGwpW9YbppJpk0s4nuBg/sz/CToGoAHodxgs6kQDoUd02ohQzdPECNO+dHlMuDh11dIkk0guEjmNyu3LxFRpRQXIEdDosF6mZOymohhMo+Jty8bknLpfY1h3j4VWuf08UHiVNECvd9I1jhDP1FOECIVjXEHa1NX7jui9f6e2qaFwARG4X5ah15prUwopmnLKQfi93bFjTpQCj3yQz4K1DBO5R/V7AHEAUKcfFsEJdjBxZhfKB5NsNUIvkxSBznwPePI/gCH9NoBqu6Q== 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=2Kg63OpJS3u0uQuLUl9cPJx34BLp2c7qte92X1ErHTs=; b=iOMODlThL32Kbg+n5omb7enVWuoQr5zCx2qXtM/wL/RM4EfqUQbFnchB/ZYGTuERwEfWnu0PXvOJJ6sWx6MnVcxummkj/HmABaNtX97lJ8m7UYn2yjozPtlUthcEhOXWlUUMjq/MjkkprfNzEP0f/pBilWLsrdnffLv/1f9zxx3hVGcFNf3ZDAjWdTShZVKwpJ0b+YgOUt3sHwLUmvDzP15wvo1N33r3vmVWf26LE6NjGquQ3IafNrQtZYR97zLXUQqtL+Cl1r9uoJ6CTGtgWYXvQlfmQYFVLOctrWMYtn3heJiKqLQElk8S8iv+N6c9cAsqV8HZrCc2rA5kkJm6Ww== 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 MW4PR11MB5821.namprd11.prod.outlook.com (2603:10b6:303:184::5) by MN2PR11MB4725.namprd11.prod.outlook.com (2603:10b6:208:263::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7046.34; Wed, 6 Dec 2023 22:50:07 +0000 X-Received: from MW4PR11MB5821.namprd11.prod.outlook.com ([fe80::ced7:2db7:4cae:ab0]) by MW4PR11MB5821.namprd11.prod.outlook.com ([fe80::ced7:2db7:4cae:ab0%7]) with mapi id 15.20.7068.025; Wed, 6 Dec 2023 22:50:07 +0000 From: "Nate DeSimone" To: "devel@edk2.groups.io" , "Desimone, Nathaniel L" CC: "Ni, Ray" , "Kinney, Michael D" Subject: Re: [edk2-devel] [PATCH v2] PcAtChipsetPkg: Fix AcpiTimerLib incompatibility with XhciDxe Thread-Topic: [edk2-devel] [PATCH v2] PcAtChipsetPkg: Fix AcpiTimerLib incompatibility with XhciDxe Thread-Index: AQHaJuKOX4tFhbLnqkKVcq+bzZRzgbCc30GQ Date: Wed, 6 Dec 2023 22:50:07 +0000 Message-ID: References: <20231204184751.348-1-nathaniel.l.desimone@intel.com> <179DB5683F38928F.24600@groups.io> In-Reply-To: <179DB5683F38928F.24600@groups.io> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: MW4PR11MB5821:EE_|MN2PR11MB4725:EE_ x-ms-office365-filtering-correlation-id: 7cd13057-8afd-4502-02ae-08dbf6adb19e x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam-message-info: rfkgtAbgBDI1W2zE5pFoBMEAXzCVxbQk+ceSe+8A+tvYp2+QEp0w/0+EldebqxetPTaKDFzPwRLofxXVCO1WcMlEtxgTKSsYZvKihbrFZr8mdIcn+D7xmtaCj5Q3Gup0uKXB5+p9boVK7cCKpAk4sgXdEZx45g/aH+0PA7WuvjjZFv35jnjnVg+aZsOmv8EOwRSjjR75hoAamVRMslkzVN2vGKfERJ+9QLBD1fqU9PdNLvKJVKrNnCjhh/1rI1gI/S+sp0WSzR9rEM30SqLE4RGm/stC7vwfbw1Yhhz2IY8ZjQl3DQmbxcU9AUQQT7DbypiQOqqD9GTZu3KrNp0SE9YrfOuuz6EDBAE2+JTCsZY564QCic1gV475ccN+yIyVR4xiPazylqtMPx04WQpiyI80aB/dIvtCvercoVe4ldHOJjTGx7gGhpjADtYO6IlZBF7b8UETVm+4dZCdrHBIQqiAY4G9iviB+0u+uDudsx+b3qMOM0WMbYXtSAwi8tCII6ytQO00mPLt8BjQ3kdgWySs91YRiAYszrV7Zc/8FgKDMPs8pGtDKUC/DOiuPNUEdqVMSm+MyiyDbeMy30aokGU/KXQzFlln3lyh9hrQkqZwhYAgOFoO51IloKDh+Ig8p+AiqZUTk1w+0Fm03X1NRA== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?ukpJz9EeZtgzDov3/Av3BhiCIQZH8l7sdtEoSGEt03uOup5aESgtZuG3Xppn?= =?us-ascii?Q?m33j6zvFJ2yAlMhNJ4LNbs/NoSAyF5W8RVuZS1jUmtM3MZtKtjymHncY5SCV?= =?us-ascii?Q?B5gHis/VMU5cDzrkWFhItZK/xRMAvWIw1GUjJ9qJkGw46jOf7BZc7HMkbxuN?= =?us-ascii?Q?D4BFlhJ09WEjyAYz6BDnzxT/gmLavEOXE8TR+W3dBzY9SoWYF0gcChtLbOSe?= =?us-ascii?Q?YyyMuVntkELTd6AuaWjGxTyocX6MwIfvQGSpRdy5QcfgitqCCRlSKQbELs/r?= =?us-ascii?Q?GGHYQdF4U18tOFJwuY7JpKF2IvhpWkYrTJNy2xXeAhs8H4DLvZX/vHQI5Ba9?= =?us-ascii?Q?jVVKND0eVNbYLXMJTz9JmmitONqD/iLIg31gt+MblqCgmMZiIi9cZn+MG3Yf?= =?us-ascii?Q?EPOEcD8BzYeYyIs3Hxp09NfcyY7dYunq1CT9EhZKoUsC6n1NLktdqaIwjlal?= =?us-ascii?Q?SgiO2TkVzHxkbyLN2cAuNixmIrQ2vHnEuIA0JhtWjX8LPpx8OkBgepqLNLx3?= =?us-ascii?Q?jjMCHaDhfcUiNcbRbwzaMxNHDF+dyhKzd/H6F1KMc2DSa3qvnePXsZx9Chrc?= =?us-ascii?Q?hZM4O5A/fyZ8FMYoB23MbZvHmyrkp710QS9oNMLd7vJuXVH3ZyOmZ/v//Zo5?= =?us-ascii?Q?vWuDYCHgliWEY2OoVpdJovi5zcaw/c9pbWhxr0Uxh2ma1eZRk1+eNFfBuu7U?= =?us-ascii?Q?VfAN04Y5Zpu3Fysyn9WZZLwdsJzMZPxoYmS26TYFbdICvNKxshr0SgvH09go?= =?us-ascii?Q?qDUa2BzcfucEcK+uhXly/fNPv/TmPfrwzhJxFKeVLUkMxWjrkePIKmQjG0ub?= =?us-ascii?Q?cCJMfp63i76Jid1O3+uAoqqln1XuL7jexbXFhCTYIW89ZCjYcdKLcvePOel7?= =?us-ascii?Q?M7ZxheoZV9sssO0EYyAxMjfxb5ryq222NEqWPElFRZzIxF8WekkAV+LFKqaV?= =?us-ascii?Q?Olp0COMPiSrqRm5qQe3WhJoaZviQx/M4RCCSlrDthhIg0Uo2N4V6LKnmH+bd?= =?us-ascii?Q?pfnWQ1nH7XEkf6hA1t8M+wsbgUV1cgb0l59nufDdgtpwHqRqjv8ytj1bIz8h?= =?us-ascii?Q?mJWCpYKJhjuOyl0wHsl1AtR9T5JZk6jW+szHj4DJgOX4u1oqarCyx/9gHT8H?= =?us-ascii?Q?6uNGylOGRXYyufqcAmhjsIzY/MB0ntmvP3Gxm4jsrlTzi7ZT6ZZQkaSzkIQm?= =?us-ascii?Q?RZGQOCabmN2iODUIVdc79wL8bsMhP87bpJi3yj6K61MQcP7gaR4bOZAfxSaM?= =?us-ascii?Q?N7GMy3cUY8TAqr1qb5kcXCG7Xe7LKEVc6YAL/XEdZVFMXir31HfaPuNeL67X?= =?us-ascii?Q?+RfxAs53JNC7ht8btnWRqM8mNfWBdn88hGvkvbIFCrs+bzkGbvbWvunyJS5P?= =?us-ascii?Q?Eu4piQk0V9IvTu8NcYjsx0e9NR32FARWYZ/mkEeCBw8wgmEofHNTJv8AO62s?= =?us-ascii?Q?U7Qcdo4cpo2CqdRiOL8gOtyZzEgz6s4pbYTX/CtrLMZ2OYOY6hJTLCQS2S/+?= =?us-ascii?Q?GUdw/KFduSv7W5ZO63THXTHKw0WfNac6jbvC8h5KCqHgGxx8Voa5gGoJRVZ/?= =?us-ascii?Q?gwMobATKz2a7tjuZxGxSDZOaGH3RaDzBy1jMHhs+670dMCTfKqKxSBSxiDXT?= =?us-ascii?Q?6g=3D=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MW4PR11MB5821.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7cd13057-8afd-4502-02ae-08dbf6adb19e X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Dec 2023 22:50:07.2486 (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: VpT8FlhTKWjVkpQjquxj/jx6J7pWCcjV1bWE0v8oXv1J+mXXF4/G7hGMIoydiyy6lhajPtyConMZAFJE1Uax/WVcrD0bb7ujBORR/kDTNWE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4725 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,nathaniel.l.desimone@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: wvpd2vBOUefMu4bLzC2mmYkFx7686176AA= 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=nVFxWReA; arc=reject ("signature check failed: fail, {[1] = sig:microsoft.com:reject}"); 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 Pushed as df2ec2a -----Original Message----- From: devel@edk2.groups.io On Behalf Of Nate DeSimon= e Sent: Monday, December 4, 2023 10:48 AM To: devel@edk2.groups.io Cc: Ni, Ray ; Kinney, Michael D Subject: [edk2-devel] [PATCH v2] PcAtChipsetPkg: Fix AcpiTimerLib incompati= bility with XhciDxe The DXE & MM standalone variant of AcpiTimerLib defines a global named mPer= formanceCounterFrequency. A global with an identical name is also present i= n 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 A= cpiTimerLib as the TimerLib implementation for any given platform. To resolve this, I have changed made the definition of mPerformanceCounterF= requency to static and renamed it to mAcpiTimerLibTscFrequency. Since this = variable is not used outside of the DxeStandaloneMmAcpiTimerLib.c compilati= on unit, there is no reason to have it exported as a global. Cc: Ray Ni Cc: Michael D Kinney Signed-off-by: Nate DeSimone --- .../AcpiTimerLib/DxeStandaloneMmAcpiTimerLib.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/PcAtChipsetPkg/Library/AcpiTimerLib/DxeStandaloneMmAcpiTimerLi= b.c b/PcAtChipsetPkg/Library/AcpiTimerLib/DxeStandaloneMmAcpiTimerLib.c index 16ac48938f..ccceb8a649 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=20 + reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ @@ -11,6 +11,11 @@ #include #include =20 +// +// Cached performance counter frequency // static UINT64=20 +mAcpiTimerLibTscFrequency =3D 0; + extern GUID mFrequencyHobGuid; =20 /** @@ -48,11 +53,6 @@ InternalCalculateTscFrequency ( VOID ); =20 -// -// Cached performance counter frequency -// -UINT64 mPerformanceCounterFrequency =3D 0; - /** Internal function to retrieves the 64-bit frequency in Hz. =20 @@ -66,7 +66,7 @@ InternalGetPerformanceCounterFrequency ( VOID ) { - return mPerformanceCounterFrequency; + return mAcpiTimerLibTscFrequency; } =20 /** @@ -92,9 +92,9 @@ CommonAcpiTimerLibConstructor ( // GuidHob =3D GetFirstGuidHob (&mFrequencyHobGuid); if (GuidHob !=3D NULL) { - mPerformanceCounterFrequency =3D *(UINT64 *)GET_GUID_HOB_DATA (GuidHob= ); + mAcpiTimerLibTscFrequency =3D *(UINT64 *)GET_GUID_HOB_DATA (GuidHob); } else { - mPerformanceCounterFrequency =3D InternalCalculateTscFrequency (); + mAcpiTimerLibTscFrequency =3D InternalCalculateTscFrequency (); } =20 return EFI_SUCCESS; -- 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 (#112141): https://edk2.groups.io/g/devel/message/112141 Mute This Topic: https://groups.io/mt/103024047/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-