From nobody Fri May 17 07:47:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+111962+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+111962+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1701395797; cv=none; d=zohomail.com; s=zohoarc; b=ZQXC++s5ogXu7wr/nM+On5WGp73I8JyAEtq/jJs6guKB6TsoJzIAfxEkvpwkkoIgiE5PdCz8XtGIcusddE3Tkdm7vqi95efHU0uW55PwZVpxkO1jA01UX9WS/LYkO/Ba4SUtURLZF4NQRToFuIsSnDv+rSV2uSYAN2vGWO5hHLA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1701395797; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=8M3Co8WxqDSTEKGh5tGd2lmtkFxsGjQOR3EL4JK9VTY=; b=jHo3uKIBsD91ADdM1xeUT3Dr6hNFsiVCUQYrEN9jK55n6ugOu7t/g5aY7cXPJRZYUfw/80gWk2JHDFrduyIbMhlBlfJDnbRTFKtl8qoVEGibnW4raBpcOx5EnvVSE1e+/vt3UbOOQoMtsPxCrYgaOcvBQUUbTc/gQw7EvpV+ah8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+111962+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 17013957978869.60008269850266; Thu, 30 Nov 2023 17:56:37 -0800 (PST) Return-Path: DKIM-Signature: a=rsa-sha256; bh=OwpJkl/phxqavjCVmJGkq1bZ/wCCcKBQvW+r2bUrNrc=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding; s=20140610; t=1701395797; v=1; b=cXyRQdZl5u+QUhGjI8w2dRn6/EJ/O//AaINeuqYwBiCmJ8qFoU68c274fDaWq3RgvrMqFA5E yCvzQMOEkw4BFkvKu4aJEmWGu1q+RRGoyHQ0pGTFAYJqowCRxx24VnBgxgKcSgWhxwnqFjOWcIi NakxadHhvi1DEYs4lQKpGkxU= X-Received: by 127.0.0.2 with SMTP id EBfPYY1788612xl9W8SPuYBo; Thu, 30 Nov 2023 17:56:37 -0800 X-Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.151]) by mx.groups.io with SMTP id smtpd.web11.13222.1701395795770041683 for ; Thu, 30 Nov 2023 17:56:36 -0800 X-IronPort-AV: E=McAfee;i="6600,9927,10910"; a="373604452" X-IronPort-AV: E=Sophos;i="6.04,240,1695711600"; d="scan'208";a="373604452" X-Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Nov 2023 17:56:35 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10910"; a="913416536" X-IronPort-AV: E=Sophos;i="6.04,240,1695711600"; d="scan'208";a="913416536" X-Received: from nldesimo-desk.amr.corp.intel.com ([10.241.240.67]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Nov 2023 17:56:35 -0800 From: "Nate DeSimone" To: devel@edk2.groups.io Cc: Ray Ni , Michael D Kinney Subject: [edk2-devel] [PATCH v1] PcAtChipsetPkg: Fix AcpiTimerLib incompatibility with XhciDxe Date: Thu, 30 Nov 2023 17:56:18 -0800 Message-Id: <20231201015618.3920-3-nathaniel.l.desimone@intel.com> In-Reply-To: <20231201015618.3920-1-nathaniel.l.desimone@intel.com> References: <20231201015618.3920-1-nathaniel.l.desimone@intel.com> MIME-Version: 1.0 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: lVSc5l3yOrzkbeyIJJw5QfUsx1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1701395799297000009 Content-Type: text/plain; charset="utf-8" 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/DxeStandaloneMmAcpiTimerLi= b.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. --=20 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 (#111962): https://edk2.groups.io/g/devel/message/111962 Mute This Topic: https://groups.io/mt/102907651/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-