From 4faa50287ee70f2140ab81efbacfb0bb0ac891b8 Mon Sep 17 00:00:00 2001 From: vanjeff Date: Fri, 2 Feb 2007 05:36:42 +0000 Subject: [PATCH] 1. removed BaseTimerLibLocalApic from MdePkg and Nt32TimerLib from EdkNt32Pkg. 2. added BaseTimerlibNullTemplate in MdePkg and SecPeiDxeTimerLibCpu in MdePkg. 3. modified the related spd and fpd files git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2347 6f19259b-4bc3-4df7-8a09-765794883524 --- EdkModulePkg/EdkModulePkg.fpd | 85 +++--------- EdkNt32Pkg/EdkNt32Pkg.spd | 1 - EdkNt32Pkg/Nt32.fpd | 55 +++----- .../BaseTimerLibLocalApic/Ebc/EbcTimerLib.c | 123 ------------------ .../BaseTimerLibNullTemplate.msa | 34 +++-- .../BaseTimerLibNullTemplate/TimerLibNull.c | 8 +- .../IpfTimerLib.c | 8 +- .../SecPeiDxeTimerLibCpu.msa} | 24 ++-- .../x86TimerLib.c | 2 +- MdePkg/MdePkg.fpd | 24 ++-- MdePkg/MdePkg.spd | 3 +- 11 files changed, 83 insertions(+), 284 deletions(-) delete mode 100644 MdePkg/Library/BaseTimerLibLocalApic/Ebc/EbcTimerLib.c rename EdkNt32Pkg/Library/Nt32TimerLibNull/Nt32TimerLib.msa => MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.msa (60%) rename EdkNt32Pkg/Library/Nt32TimerLibNull/Nt32TimerLib.c => MdePkg/Library/BaseTimerLibNullTemplate/TimerLibNull.c (90%) rename MdePkg/Library/{BaseTimerLibLocalApic/Ipf => SecPeiDxeTimerLibCpu}/IpfTimerLib.c (90%) rename MdePkg/Library/{BaseTimerLibLocalApic/BaseTimerLibLocalApic.msa => SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.msa} (70%) rename MdePkg/Library/{BaseTimerLibLocalApic => SecPeiDxeTimerLibCpu}/x86TimerLib.c (95%) diff --git a/EdkModulePkg/EdkModulePkg.fpd b/EdkModulePkg/EdkModulePkg.fpd index 4e1e99ef10..a95774d35f 100644 --- a/EdkModulePkg/EdkModulePkg.fpd +++ b/EdkModulePkg/EdkModulePkg.fpd @@ -6,7 +6,7 @@ 0.3 EFI/Framework Reference Module Package for All Architectures This FPD file is used for Package Level build. - Copyright (c) 2006, Intel Corporation + Copyright (c) 2006 - 2007, Intel Corporation All rights reserved. This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -814,8 +814,9 @@ - + + @@ -5347,10 +5348,13 @@ - + + + + @@ -5497,14 +5501,6 @@ 1 0x06 - - PcdFSBClock - 0x0000000c - gEfiMdePkgTokenSpaceGuid - UINT32 - 4 - 200000000 - NULL @@ -5523,11 +5519,14 @@ - + + + + @@ -5674,22 +5673,6 @@ 1 0x06 - - PcdFSBClock - 0x0000000c - gEfiMdePkgTokenSpaceGuid - UINT32 - 4 - 200000000 - - - PcdIoBlockBaseAddressForIpf - 0x0000000c - gEfiMdePkgTokenSpaceGuid - UINT64 - 8 - 0x0ffffc000000 - NULL @@ -5708,11 +5691,14 @@ - + + + + @@ -5859,14 +5845,6 @@ 1 0x06 - - PcdFSBClock - 0x0000000c - gEfiMdePkgTokenSpaceGuid - UINT32 - 4 - 200000000 - NULL @@ -6658,8 +6636,9 @@ - + + @@ -11121,8 +11100,9 @@ - + + @@ -15400,8 +15380,9 @@ - + + @@ -15476,14 +15457,6 @@ 1 0 - - PcdFSBClock - 0x0000000c - gEfiMdePkgTokenSpaceGuid - UINT32 - 4 - 200000000 - NULL @@ -18666,14 +18639,6 @@ 4 10000000 - - PcdIoBlockBaseAddressForIpf - 0x0000000c - gEfiMdePkgTokenSpaceGuid - UINT64 - 8 - 0x0ffffc000000 - NULL @@ -18805,14 +18770,6 @@ 4 10000000 - - PcdIoBlockBaseAddressForIpf - 0x0000000c - gEfiMdePkgTokenSpaceGuid - UINT64 - 8 - 0x0ffffc000000 - NULL diff --git a/EdkNt32Pkg/EdkNt32Pkg.spd b/EdkNt32Pkg/EdkNt32Pkg.spd index 3dd38f8506..4c7837a14d 100644 --- a/EdkNt32Pkg/EdkNt32Pkg.spd +++ b/EdkNt32Pkg/EdkNt32Pkg.spd @@ -106,7 +106,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. Dxe/WinNtThunk/Cpu/Cpu.msa Dxe/WinNtThunk/WinNtThunk/WinNtThunk.msa Library/DxeWinNtLib/DxeWinNtLib.msa - Library/Nt32TimerLibNull/Nt32TimerLib.msa Library/EdkGenericBdsLib/EdkGenericBdsLib.msa Library/EdkNt32PeiPeCoffGetEntryPointLib/EdkNt32PeiPeCoffGetEntryPointLib.msa Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoaderLib.msa diff --git a/EdkNt32Pkg/Nt32.fpd b/EdkNt32Pkg/Nt32.fpd index 5c81986e85..df63b7538d 100644 --- a/EdkNt32Pkg/Nt32.fpd +++ b/EdkNt32Pkg/Nt32.fpd @@ -7,7 +7,7 @@ EFI/Framework Emulation Platform The Emulation Platform can be used to debug individual modules, prior to creating a real platform. This also provides an example for how an FPD is created. - Copyright (c) 2006, Intel Corporation + Copyright (c) 2006 - 2007, Intel Corporation All rights reserved. This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -235,8 +235,8 @@ - - + + @@ -586,14 +586,6 @@ 4 200000000 - - PcdIoBlockBaseAddressForIpf - 0x0000000c - gEfiMdePkgTokenSpaceGuid - UINT64 - 8 - 0x0ffffc000000 - FV_RECOVERY @@ -1651,6 +1643,8 @@ + + @@ -2424,13 +2418,18 @@ - + + + + + + @@ -2585,22 +2584,6 @@ 1 FALSE - - PcdFSBClock - 0x0000000c - gEfiMdePkgTokenSpaceGuid - UINT32 - 4 - 200000000 - - - PcdIoBlockBaseAddressForIpf - 0x0000000c - gEfiMdePkgTokenSpaceGuid - UINT64 - 8 - 0x0ffffc000000 - FV_RECOVERY @@ -3777,6 +3760,8 @@ + + @@ -7319,8 +7304,6 @@ - - @@ -7925,20 +7908,20 @@ @REM are licensed and made available under the terms and conditions of the BSD License @REM which accompanies this distribution. The full text of the license may be found at @REM http://opensource.org/licenses/bsd-license.php - @REM + @REM @REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, @REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - @REM - - @echo off - pushd . + @REM + + @echo off + pushd . cd ${SecMainPath} SecMain.exe popd @echo on - + \ No newline at end of file diff --git a/MdePkg/Library/BaseTimerLibLocalApic/Ebc/EbcTimerLib.c b/MdePkg/Library/BaseTimerLibLocalApic/Ebc/EbcTimerLib.c deleted file mode 100644 index 416a44f4ea..0000000000 --- a/MdePkg/Library/BaseTimerLibLocalApic/Ebc/EbcTimerLib.c +++ /dev/null @@ -1,123 +0,0 @@ -/** @file - Timer Library functions for EBC. - - Copyright (c) 2006, Intel Corporation
- All rights reserved. This program and the accompanying materials - are licensed and made available under the terms and conditions of the BSD License - which accompanies this distribution. The full text of the license may be found at - http://opensource.org/licenses/bsd-license.php - - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - - Module Name: EbcTimerLib.c - -**/ - -/** - Stalls the CPU for at least the given number of microseconds. - - Stalls the CPU for the number of microseconds specified by MicroSeconds. - - @param MicroSeconds The minimum number of microseconds to delay. - - @return MicroSeconds - -**/ -UINTN -EFIAPI -MicroSecondDelay ( - IN UINTN MicroSeconds - ) -{ - // - // EBC architecture does not support local APIC timer. - // - ASSERT (FALSE); - return MicroSeconds; -} - -/** - Stalls the CPU for at least the given number of nanoseconds. - - Stalls the CPU for the number of nanoseconds specified by NanoSeconds. - - @param NanoSeconds The minimum number of nanoseconds to delay. - - @return NanoSeconds - -**/ -UINTN -EFIAPI -NanoSecondDelay ( - IN UINTN NanoSeconds - ) -{ - // - // EBC architecture does not support local APIC timer. - // - ASSERT (FALSE); - return NanoSeconds; -} - -/** - Retrieves the current value of a 64-bit free running performance counter. - - Retrieves the current value of a 64-bit free running performance counter. The - counter can either count up by 1 or count down by 1. If the physical - performance counter counts by a larger increment, then the counter values - must be translated. The properties of the counter can be retrieved from - GetPerformanceCounterProperties(). - - @return The current value of the free running performance counter. - -**/ -UINT64 -EFIAPI -GetPerformanceCounter ( - VOID - ) -{ - // - // EBC architecture does not support local APIC timer. - // - ASSERT (FALSE); - return 0; -} - -/** - Retrieves the 64-bit frequency in Hz and the range of performance counter - values. - - If StartValue is not NULL, then the value that the performance counter starts - with immediately after is it rolls over is returned in StartValue. If - EndValue is not NULL, then the value that the performance counter end with - immediately before it rolls over is returned in EndValue. The 64-bit - frequency of the performance counter in Hz is always returned. If StartValue - is less than EndValue, then the performance counter counts up. If StartValue - is greater than EndValue, then the performance counter counts down. For - example, a 64-bit free running counter that counts up would have a StartValue - of 0 and an EndValue of 0xFFFFFFFFFFFFFFFF. A 24-bit free running counter - that counts down would have a StartValue of 0xFFFFFF and an EndValue of 0. - - @param StartValue The value the performance counter starts with when it - rolls over. - @param EndValue The value that the performance counter ends with before - it rolls over. - - @return The frequency in Hz. - -**/ -UINT64 -EFIAPI -GetPerformanceCounterProperties ( - OUT UINT64 *StartValue, OPTIONAL - OUT UINT64 *EndValue OPTIONAL - ) -{ - // - // EBC architecture does not support local APIC timer. - // - ASSERT (FALSE); - return 0; -} diff --git a/EdkNt32Pkg/Library/Nt32TimerLibNull/Nt32TimerLib.msa b/MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.msa similarity index 60% rename from EdkNt32Pkg/Library/Nt32TimerLibNull/Nt32TimerLib.msa rename to MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.msa index 00898585e4..65ea51dfcf 100644 --- a/EdkNt32Pkg/Library/Nt32TimerLibNull/Nt32TimerLib.msa +++ b/MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.msa @@ -1,44 +1,40 @@ - + - Nt32TimerLib + BaseTimerLibNullTemplate BASE - 3813bb9b-808b-4dcb-b9a3-ea47bd9324c0 + f4731d79-537e-4505-bd52-c03f9b1f6b89 1.0 - Component description file for Nt32Timer Library - Timer Library provide API of TimerLib library class for Nt32 platform, - Now this library do not impletement functionality completely. - Copyright (c) 2006, Intel Corporation. - All rights reserved. This program and the accompanying materials - are licensed and made available under the terms and conditions of the BSD License - which accompanies this distribution. The full text of the license may be found at - http://opensource.org/licenses/bsd-license.php - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + Timer library NULL template implementaton + This NULL Timer library provides one template API of TimerLib library, + this library do not impletement functionality completely. + Copyright (c) 2007, Intel Corporation. + All rights reserved. This program and the accompanying materials + are licensed and made available under the terms and conditions of the BSD License + which accompanies this distribution. The full text of the license may be found at + http://opensource.org/licenses/bsd-license.php + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. FRAMEWORK_BUILD_PACKAGING_SPECIFICATION 0x00000052 - IA32 + IA32 X64 IPF EBC false - Nt32TimerLib + BaseTimerLibNullTemplate TimerLib - - BaseLib - DebugLib - Nt32TimerLib.c + TimerLibNull.c - EFI_SPECIFICATION_VERSION 0x00020000 diff --git a/EdkNt32Pkg/Library/Nt32TimerLibNull/Nt32TimerLib.c b/MdePkg/Library/BaseTimerLibNullTemplate/TimerLibNull.c similarity index 90% rename from EdkNt32Pkg/Library/Nt32TimerLibNull/Nt32TimerLib.c rename to MdePkg/Library/BaseTimerLibNullTemplate/TimerLibNull.c index 40a1a41eb8..33a9736a24 100644 --- a/EdkNt32Pkg/Library/Nt32TimerLibNull/Nt32TimerLib.c +++ b/MdePkg/Library/BaseTimerLibNullTemplate/TimerLibNull.c @@ -1,9 +1,7 @@ /** @file - Timer Library functions for Nt32 platform. + Timer Library functions for runtime drivers. - @bug Still no complete implementation for time library function for Nt32 platform. - - Copyright (c) 2006, Intel Corporation
+ Copyright (c) 2007, Intel Corporation
All rights reserved. This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -12,7 +10,7 @@ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - Module Name: x86TimerLib.c + Module Name: RuntimeTimerLib.c **/ diff --git a/MdePkg/Library/BaseTimerLibLocalApic/Ipf/IpfTimerLib.c b/MdePkg/Library/SecPeiDxeTimerLibCpu/IpfTimerLib.c similarity index 90% rename from MdePkg/Library/BaseTimerLibLocalApic/Ipf/IpfTimerLib.c rename to MdePkg/Library/SecPeiDxeTimerLibCpu/IpfTimerLib.c index 65b58bc549..9049fef997 100644 --- a/MdePkg/Library/BaseTimerLibLocalApic/Ipf/IpfTimerLib.c +++ b/MdePkg/Library/SecPeiDxeTimerLibCpu/IpfTimerLib.c @@ -1,11 +1,7 @@ /** @file - Timer Library functions built upon local APIC on IA32/x64. + Timer Library functions built upon ITC on IA32/x64. - @bug Should use PCD to retrieve all the constants including index of - the IA32_APIC_BASE MSR, the offsets of InitialCount, CorrentCount - and DivideConfiguration. - - Copyright (c) 2006, Intel Corporation
+ Copyright (c) 2006 - 2007, Intel Corporation
All rights reserved. This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at diff --git a/MdePkg/Library/BaseTimerLibLocalApic/BaseTimerLibLocalApic.msa b/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.msa similarity index 70% rename from MdePkg/Library/BaseTimerLibLocalApic/BaseTimerLibLocalApic.msa rename to MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.msa index 539021dd93..4c152caae6 100644 --- a/MdePkg/Library/BaseTimerLibLocalApic/BaseTimerLibLocalApic.msa +++ b/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.msa @@ -1,16 +1,17 @@ - BaseTimerLibLocalApic + SecPeiDxeTimerLibCpu BASE b5a05743-9b71-489b-a0ed-a0eb3950d23b 1.0 - Component description file for Baser Timer Library - Timer Library that only uses CPU resources to provide calibrated - delays on IA-32 and x64. Note: Because CpuLocalApci timer could be programmed - by OS, it cannot be used by SMM drivers and runtime drivers, ACPI timer is - recommended for SMM drivers and runtime drivers. - Copyright (c) 2006, Intel Corporation. + Timer Library implementation for boot time drivers. + Timer Library that uses CPU resources to provide calibrated + delays on IA-32 and x64, and uses ITC on IPF. Note: Because CpuLocalApci + and ITC could be programmed by OS, it cannot be used by SMM drivers + and runtime drivers, ACPI timer is recommended for SMM drivers and RUNTIME + drivers. + Copyright (c) 2006 - 2007, Intel Corporation. All rights reserved. This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -20,12 +21,12 @@ FRAMEWORK_BUILD_PACKAGING_SPECIFICATION 0x00000052 - IA32 X64 IPF EBC + IA32 X64 IPF false - BaseTimerLibLocalApic + SecPeiDxeTimerLibCpu - + TimerLib @@ -44,8 +45,7 @@ x86TimerLib.c x86TimerLib.c - Ipf/IpfTimerLib.c - Ebc/EbcTimerLib.c + IpfTimerLib.c diff --git a/MdePkg/Library/BaseTimerLibLocalApic/x86TimerLib.c b/MdePkg/Library/SecPeiDxeTimerLibCpu/x86TimerLib.c similarity index 95% rename from MdePkg/Library/BaseTimerLibLocalApic/x86TimerLib.c rename to MdePkg/Library/SecPeiDxeTimerLibCpu/x86TimerLib.c index 235fe7be6d..7467bc5e4d 100644 --- a/MdePkg/Library/BaseTimerLibLocalApic/x86TimerLib.c +++ b/MdePkg/Library/SecPeiDxeTimerLibCpu/x86TimerLib.c @@ -5,7 +5,7 @@ the IA32_APIC_BASE MSR, the offsets of InitialCount, CorrentCount and DivideConfiguration. - Copyright (c) 2006, Intel Corporation
+ Copyright (c) 2006 - 2007, Intel Corporation
All rights reserved. This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at diff --git a/MdePkg/MdePkg.fpd b/MdePkg/MdePkg.fpd index 76c6630c1c..cf1083955b 100644 --- a/MdePkg/MdePkg.fpd +++ b/MdePkg/MdePkg.fpd @@ -1779,22 +1779,6 @@ LIBRARY - - - - PcdFSBClock - 0x0000000c - gEfiMdePkgTokenSpaceGuid - UINT32 - 4 - 200000000 - - - - NULL - LIBRARY - - NULL @@ -2284,6 +2268,14 @@ + + + + + + + + diff --git a/MdePkg/MdePkg.spd b/MdePkg/MdePkg.spd index 6bfbdb3b2d..a70622b1b4 100644 --- a/MdePkg/MdePkg.spd +++ b/MdePkg/MdePkg.spd @@ -1150,7 +1150,6 @@ Library/BasePciExpressLib/BasePciExpressLib.msa Library/BasePciLibCf8/BasePciLibCf8.msa Library/BasePciLibPciExpress/BasePciLibPciExpress.msa - Library/BaseTimerLibLocalApic/BaseTimerLibLocalApic.msa Library/DxeCoreEntryPoint/DxeCoreEntryPoint.msa Library/DxeCoreHobLib/DxeCoreHobLib.msa Library/DxeHobLib/DxeHobLib.msa @@ -1185,6 +1184,8 @@ Library/DxeMemoryLib/DxeMemoryLib.msa Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.msa Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.msa + Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.msa + Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.msa Include/Base.h -- 2.39.2