From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (NAM02-SN1-obe.outbound.protection.outlook.com [40.92.5.41]) by mx.groups.io with SMTP id smtpd.web08.1556.1609873200183401813 for ; Tue, 05 Jan 2021 11:00:00 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@outlook.com header.s=selector1 header.b=buI3MHrS; spf=pass (domain: outlook.com, ip: 40.92.5.41, mailfrom: kun.q@outlook.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ieXG3YI31fZ5ICQRGoJDZ7t6Qb6b3T3fVnlxYTmoWRHA18L7dSeirfYOuCOOrcUdp0EsTIh2UcSbGm2TwNDs6Qjat8wzHncvSWNMObH99OU1i/b6Qvrrp5p5kEhjC8fFMuwcrX/kXl3zvE/yHsyOkFFSODblVEI0l1g+xlTTQA7MgX5mnIcKKPrbh7IRCEbPB7dWIg+BjcRuYRpPlQyrM0V2j1nmZhzkQF4b/wLSNSV0QECxuv72ZfP8i8k+0kbO32ZtPwlGGMHf0gqbmkvoXtEx3xjtMZWqSw+jVOgBZcb1FloxhXCL573OTd3021prnZXYAao1a0I4OpTwvpPedQ== 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-SenderADCheck; bh=hMeZuTpOTldnCxw5wEt/qmznsQwNn0mlR27gtbOo1cA=; b=RLynFGiyZqoXmR8Ceg0ALB44N8z/CIruUrCpw3GcSGRpypuvhKpaNParvII+4OrYUGdOqr7nUEhBpZ7CzhZWkPQ0mqNR6Z1Uycn4L7wYzBK4wIP4+c7/GMG6yQWViNf6j5TfjgNKemYy6OCSLUHFVNysVJXDx9CGOFjnGC2KUHz+esjBXLqR7AIZzUkpzc0e5ILlY+gkAz+NiATyYdozUpnTDG00e0DiRr1wuqKgNbqw+bBKuleDEbWui7RNOWXwxR3qyI3fVKbjd+/WXBicOQILbSqg/Lk/slHAHyAxFtpbfzdF38O6V5vvHQc+CPn/QTKdGig5D6evKR4CFzxyig== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=hMeZuTpOTldnCxw5wEt/qmznsQwNn0mlR27gtbOo1cA=; b=buI3MHrSDjja+1QPdVKak9SPLpze2T2Dp9HSLSgNpBX8vnG8eTdQYg7JM0TVZgNdK+vC0HrhX9VxOnB0rUUd1eosem6R6Maa+w1yE34Pa1JM/eRJOAgGGXfernqYKdkhsxQPkag34c4TxCqmk8zn60plvA/OJsks7hQTCFQnyNMmZCjCnu/+tnMgo6bdIp5HDHmaUSM+4LhayhZwc9mg8yxIFsbx6/ADV6C/30JkeLYN6hLOvGydJTbmVVOQPLnDwKDIRYRxFkm+EYq2pMYzNh6ogTPjWMJGoDfB3Kh1DtbEWoSb7GkqXT7ZBiVc7Ie/XtFRzHyyVR7BDYrrJiO7TA== Received: from CY1NAM02FT003.eop-nam02.prod.protection.outlook.com (10.152.74.58) by CY1NAM02HT165.eop-nam02.prod.protection.outlook.com (10.152.75.154) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3721.22; Tue, 5 Jan 2021 18:59:58 +0000 Received: from MWHPR06MB3102.namprd06.prod.outlook.com (2a01:111:e400:7e45::53) by CY1NAM02FT003.mail.protection.outlook.com (2a01:111:e400:7e45::151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3721.22 via Frontend Transport; Tue, 5 Jan 2021 18:59:58 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:1711EB16D3D619F72442E21CF35388F0DC8773926959F472C446DB1C2FC02057;UpperCasedChecksum:2A0CFBD86CDEDCFF15F2849A0C450F5EF044C34563478B068699AFB24D533738;SizeAsReceived:7377;Count:47 Received: from MWHPR06MB3102.namprd06.prod.outlook.com ([fe80::acb3:ab69:563d:b0d6]) by MWHPR06MB3102.namprd06.prod.outlook.com ([fe80::acb3:ab69:563d:b0d6%5]) with mapi id 15.20.3721.024; Tue, 5 Jan 2021 18:59:58 +0000 From: "Kun Qin" To: devel@edk2.groups.io CC: Ray Ni Subject: [PATCH v2 11/16] PcAtChipsetPkg: AcpiTimerLib: Added StandaloneMm instance of AcpiTimerLib Date: Tue, 5 Jan 2021 10:59:30 -0800 Message-ID: X-Mailer: git-send-email 2.30.0.windows.1 In-Reply-To: <20210105185935.3769-1-kun.q@outlook.com> References: <20210105185935.3769-1-kun.q@outlook.com> X-TMN: [PA2gRzc889WHlmhPvEIrgruJZqgqc/ZP] X-ClientProxiedBy: MWHPR22CA0045.namprd22.prod.outlook.com (2603:10b6:300:69::31) To MWHPR06MB3102.namprd06.prod.outlook.com (2603:10b6:301:3e::35) Return-Path: kun.q@outlook.com X-Microsoft-Original-Message-ID: <20210105185935.3769-12-kun.q@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (50.35.88.161) by MWHPR22CA0045.namprd22.prod.outlook.com (2603:10b6:300:69::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3742.6 via Frontend Transport; Tue, 5 Jan 2021 18:59:58 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 47 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: e55c05e7-adf2-4c49-5ba6-08d8b1ac18f9 X-MS-TrafficTypeDiagnostic: CY1NAM02HT165: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2fRr4kOj8exsXUZe2VHvf0G7Y2TJQHhdeA10ZSHQJtzAaiQ01N8kkoeIeZSJMANxhDMn/CZjX1Zc8EcQq5HVVC/lUQ7ruQJA+4yrTcaG6hfQVr/oqGxYwB9sJEZ91scojjQzJs7DbIlqyvKWU660Ydl1oGht/zrWSqH5bkcPPcRSX285o039g7q0usiOhxf4dH6Wzd3HePLc7Ov2uSrR+vlwgClKKpuhGpPzYWVw4NGcC5Q9eaUyZDDdksyb9g4b X-MS-Exchange-AntiSpam-MessageData: H/hOOFw3OJuja+WAR0kDbMjSF9y/sCL9CyZWJ5oOAP8dprLIk/lBE2TOKgcbZ2Ua2RkkOM2Z29IC4NoYtV81nnE7dX2AYElW7kCj/y1BcINPBNS/9NDod2lmBIbVHXye60Qj2uiu12Y/+HQbu1N8wg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jan 2021 18:59:58.3741 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-Network-Message-Id: e55c05e7-adf2-4c49-5ba6-08d8b1ac18f9 X-MS-Exchange-CrossTenant-AuthSource: CY1NAM02FT003.eop-nam02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1NAM02HT165 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain This change added a new instance of AcpiTimerLib for StandaloneMm core and drivers. It centralizes the common routines into shared files and abstract the library constructor into corresponding files to accommodate each constructor function prototypes. Cc: Ray Ni Signed-off-by: Kun Qin --- Notes: v2: - Removed "EFIAPI" for internal functions. PcAtChipsetPkg/Library/AcpiTimerLib/{DxeAcpiTimerLib.c =3D> CommonAcpiTime= rLib.c} | 9 +-- PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.c = | 81 +------------------- PcAtChipsetPkg/Library/AcpiTimerLib/StandaloneAcpiTimerLib.c = | 31 ++++++++ PcAtChipsetPkg/Library/AcpiTimerLib/CommonAcpiTimerLib.h = | 24 ++++++ PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf = | 2 + PcAtChipsetPkg/Library/AcpiTimerLib/{DxeAcpiTimerLib.inf =3D> StandaloneAc= piTimerLib.inf} | 19 +++-- PcAtChipsetPkg/PcAtChipsetPkg.dsc = | 1 + 7 files changed, 74 insertions(+), 93 deletions(-) diff --git a/PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.c b/PcAtCh= ipsetPkg/Library/AcpiTimerLib/CommonAcpiTimerLib.c similarity index 86% copy from PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.c copy to PcAtChipsetPkg/Library/AcpiTimerLib/CommonAcpiTimerLib.c index 3ad831b15e8a..0e401194d01d 100644 --- a/PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.c +++ b/PcAtChipsetPkg/Library/AcpiTimerLib/CommonAcpiTimerLib.c @@ -72,17 +72,12 @@ InternalGetPerformanceCounterFrequency ( /** The constructor function enables ACPI IO space, and caches PerformanceCo= unterFrequency. =20 - @param ImageHandle The firmware allocated handle for the EFI image. - @param SystemTable A pointer to the EFI System Table. - @retval EFI_SUCCESS The constructor always returns RETURN_SUCCESS. =20 **/ EFI_STATUS -EFIAPI -DxeAcpiTimerLibConstructor ( - IN EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE *SystemTable +CommonAcpiTimerLibConstructor ( + VOID ) { EFI_HOB_GUID_TYPE *GuidHob; diff --git a/PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.c b/PcAtCh= ipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.c index 3ad831b15e8a..e519ad8ed07e 100644 --- a/PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.c +++ b/PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.c @@ -2,72 +2,14 @@ ACPI Timer implements one instance of Timer Library. =20 Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.
+ Copyright (c) Microsoft Corporation. SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ =20 #include -#include -#include -#include =20 -extern GUID mFrequencyHobGuid; - -/** - The constructor function enables ACPI IO space. - - If ACPI I/O space not enabled, this function will enable it. - It will always return RETURN_SUCCESS. - - @retval EFI_SUCCESS The constructor always returns RETURN_SUCCESS. - -**/ -RETURN_STATUS -EFIAPI -AcpiTimerLibConstructor ( - VOID - ); - -/** - Calculate TSC frequency. - - The TSC counting frequency is determined by comparing how far it counts - during a 101.4 us period as determined by the ACPI timer. - The ACPI timer is used because it counts at a known frequency. - The TSC is sampled, followed by waiting 363 counts of the ACPI timer, - or 101.4 us. The TSC is then sampled again. The difference multiplied by - 9861 is the TSC frequency. There will be a small error because of the - overhead of reading the ACPI timer. An attempt is made to determine and - compensate for this error. - - @return The number of TSC counts per second. - -**/ -UINT64 -InternalCalculateTscFrequency ( - VOID - ); - -// -// Cached performance counter frequency -// -UINT64 mPerformanceCounterFrequency =3D 0; - -/** - Internal function to retrieves the 64-bit frequency in Hz. - - Internal function to retrieves the 64-bit frequency in Hz. - - @return The frequency in Hz. - -**/ -UINT64 -InternalGetPerformanceCounterFrequency ( - VOID - ) -{ - return mPerformanceCounterFrequency; -} +#include "CommonAcpiTimerLib.h" =20 /** The constructor function enables ACPI IO space, and caches PerformanceCo= unterFrequency. @@ -85,22 +27,5 @@ DxeAcpiTimerLibConstructor ( IN EFI_SYSTEM_TABLE *SystemTable ) { - EFI_HOB_GUID_TYPE *GuidHob; - - // - // Enable ACPI IO space. - // - AcpiTimerLibConstructor (); - - // - // Initialize PerformanceCounterFrequency - // - GuidHob =3D GetFirstGuidHob (&mFrequencyHobGuid); - if (GuidHob !=3D NULL) { - mPerformanceCounterFrequency =3D *(UINT64*)GET_GUID_HOB_DATA (GuidHob)= ; - } else { - mPerformanceCounterFrequency =3D InternalCalculateTscFrequency (); - } - - return EFI_SUCCESS; + return CommonAcpiTimerLibConstructor (); } diff --git a/PcAtChipsetPkg/Library/AcpiTimerLib/StandaloneAcpiTimerLib.c b= /PcAtChipsetPkg/Library/AcpiTimerLib/StandaloneAcpiTimerLib.c new file mode 100644 index 000000000000..8509f94ba7cb --- /dev/null +++ b/PcAtChipsetPkg/Library/AcpiTimerLib/StandaloneAcpiTimerLib.c @@ -0,0 +1,31 @@ +/** @file + ACPI Timer implements one instance of Timer Library. + + Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.
+ Copyright (c) Microsoft Corporation. + SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ + +#include + +#include "CommonAcpiTimerLib.h" + +/** + The constructor function enables ACPI IO space, and caches PerformanceCo= unterFrequency. + + @param ImageHandle The firmware allocated handle for the EFI image. + @param SystemTable A pointer to the EFI System Table. + + @retval EFI_SUCCESS The constructor always returns RETURN_SUCCESS. + +**/ +EFI_STATUS +EFIAPI +StandaloneMmAcpiTimerLibConstructor ( + IN EFI_HANDLE ImageHandle, + IN EFI_MM_SYSTEM_TABLE *SystemTable + ) +{ + return CommonAcpiTimerLibConstructor (); +} diff --git a/PcAtChipsetPkg/Library/AcpiTimerLib/CommonAcpiTimerLib.h b/PcA= tChipsetPkg/Library/AcpiTimerLib/CommonAcpiTimerLib.h new file mode 100644 index 000000000000..1bbdaef04cce --- /dev/null +++ b/PcAtChipsetPkg/Library/AcpiTimerLib/CommonAcpiTimerLib.h @@ -0,0 +1,24 @@ +/** @file + Header file internal to ACPI TimerLib. + +Copyright (c) Microsoft Corporation. +SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ + + +#ifndef _COMMON_ACPI_TIMER_LIB_H_ +#define _COMMON_ACPI_TIMER_LIB_H_ + +/** + The constructor function enables ACPI IO space, and caches PerformanceCo= unterFrequency. + + @retval EFI_SUCCESS The constructor always returns RETURN_SUCCESS. + +**/ +EFI_STATUS +CommonAcpiTimerLibConstructor ( + VOID + ); + +#endif diff --git a/PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf b/PcAt= ChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf index d86356f4ff17..bbf14b3b5b53 100644 --- a/PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf +++ b/PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf @@ -25,6 +25,8 @@ [Defines] [Sources] AcpiTimerLib.c DxeAcpiTimerLib.c + CommonAcpiTimerLib.c + CommonAcpiTimerLib.h =20 [Packages] MdePkg/MdePkg.dec diff --git a/PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf b/PcAt= ChipsetPkg/Library/AcpiTimerLib/StandaloneAcpiTimerLib.inf similarity index 70% copy from PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf copy to PcAtChipsetPkg/Library/AcpiTimerLib/StandaloneAcpiTimerLib.inf index d86356f4ff17..aa8f0012f744 100644 --- a/PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf +++ b/PcAtChipsetPkg/Library/AcpiTimerLib/StandaloneAcpiTimerLib.inf @@ -1,5 +1,5 @@ ## @file -# DXE ACPI Timer Library +# Standalone MM ACPI Timer Library # # Provides basic timer support using the ACPI timer hardware. The perfor= mance # counter features are provided by the processors time stamp counter. @@ -8,23 +8,26 @@ # is compatible with both 24-bit and 32-bit ACPI timers. # # Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.
+# Copyright (c) Microsoft Corporation. # SPDX-License-Identifier: BSD-2-Clause-Patent # ## =20 [Defines] INF_VERSION =3D 0x00010005 - BASE_NAME =3D DxeAcpiTimerLib - FILE_GUID =3D E624B98C-845A-4b94-9B50-B20475D552B9 - MODULE_TYPE =3D DXE_DRIVER + BASE_NAME =3D StandaloneAcpiTimerLib + FILE_GUID =3D C771858D-AF09-4D1A-B2F3-C7F081C3F076 + MODULE_TYPE =3D MM_STANDALONE VERSION_STRING =3D 1.0 - LIBRARY_CLASS =3D TimerLib|DXE_CORE DXE_DRIVER DXE_RUNT= IME_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER SMM_CORE - CONSTRUCTOR =3D DxeAcpiTimerLibConstructor - MODULE_UNI_FILE =3D DxeAcpiTimerLib.uni + PI_SPECIFICATION_VERSION =3D 0x00010032 + LIBRARY_CLASS =3D TimerLib|MM_CORE_STANDALONE MM_STANDA= LONE + CONSTRUCTOR =3D StandaloneMmAcpiTimerLibConstructor =20 [Sources] AcpiTimerLib.c - DxeAcpiTimerLib.c + StandaloneAcpiTimerLib.c + CommonAcpiTimerLib.c + CommonAcpiTimerLib.h =20 [Packages] MdePkg/MdePkg.dec diff --git a/PcAtChipsetPkg/PcAtChipsetPkg.dsc b/PcAtChipsetPkg/PcAtChipset= Pkg.dsc index b61b7d1f528e..8862ca7a0006 100644 --- a/PcAtChipsetPkg/PcAtChipsetPkg.dsc +++ b/PcAtChipsetPkg/PcAtChipsetPkg.dsc @@ -53,6 +53,7 @@ [Components] PcAtChipsetPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.inf PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf PcAtChipsetPkg/Library/AcpiTimerLib/PeiAcpiTimerLib.inf + PcAtChipsetPkg/Library/AcpiTimerLib/StandaloneAcpiTimerLib.inf PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.i= nf =20 [BuildOptions] --=20 2.30.0.windows.1