tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-04-08 17:05:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

PcAtChipsetPkg: Fix AcpiTimerLib incompatibility with XhciDxe

Browse Source 
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 and renamed it to
mAcpiTimerLibTscFrequency. Since this variable is not used outside
of the DxeStandaloneMmAcpiTimerLib.c compilation unit, there is no
reason to have it exported as a global.

Reviewed-by: Ray Ni <ray.ni@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
This commit is contained in:
Nate DeSimone 2023-11-30 17:33:14 -08:00 committed by mergify[bot]
parent b59ab98049
commit df2ec2aab0
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
PcAtChipsetPkg/Library/AcpiTimerLib/DxeStandaloneMmAcpiTimerLib.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
ACPI Timer implements one instance of Timer Library. ACPI Timer implements one instance of Timer Library.
Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR> Copyright (c) 2013 - 2023, Intel Corporation. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent SPDX-License-Identifier: BSD-2-Clause-Patent
**/ **/
@ -11,6 +11,11 @@
#include <Library/BaseLib.h> #include <Library/BaseLib.h>
#include <Library/HobLib.h> #include <Library/HobLib.h>
//
// Cached performance counter frequency
//
static UINT64 mAcpiTimerLibTscFrequency = 0;
extern GUID mFrequencyHobGuid; extern GUID mFrequencyHobGuid;
/** /**
@ -48,11 +53,6 @@ InternalCalculateTscFrequency (
VOID VOID
); );
//
// Cached performance counter frequency
//
UINT64 mPerformanceCounterFrequency = 0;
/** /**
Internal function to retrieves the 64-bit frequency in Hz. Internal function to retrieves the 64-bit frequency in Hz.
@ -66,7 +66,7 @@ InternalGetPerformanceCounterFrequency (
VOID VOID
) )
{ {
return mPerformanceCounterFrequency; return mAcpiTimerLibTscFrequency;
} }
/** /**
@ -92,9 +92,9 @@ CommonAcpiTimerLibConstructor (
// //
GuidHob = GetFirstGuidHob (&mFrequencyHobGuid); GuidHob = GetFirstGuidHob (&mFrequencyHobGuid);
if (GuidHob != NULL) { if (GuidHob != NULL) {
mPerformanceCounterFrequency = *(UINT64 *)GET_GUID_HOB_DATA (GuidHob); mAcpiTimerLibTscFrequency = *(UINT64 *)GET_GUID_HOB_DATA (GuidHob);
} else { } else {
mPerformanceCounterFrequency = InternalCalculateTscFrequency (); mAcpiTimerLibTscFrequency = InternalCalculateTscFrequency ();
} }
return EFI_SUCCESS; return EFI_SUCCESS;