Add support for the GetTimerValue() to the CPU AP for NT32. This also requires some performance counter APIs to be added to the WinNtThunk Protocol.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11403 6f19259b-4bc3-4df7-8a09-765794883524

5 files changed, 53 insertions, 14 deletions

diff --git a/Nt32Pkg/CpuRuntimeDxe/Cpu.c b/Nt32Pkg/CpuRuntimeDxe/Cpu.c
index c2646e8808..bcce412a33 100644
--- a/Nt32Pkg/CpuRuntimeDxe/Cpu.c
+++ b/Nt32Pkg/CpuRuntimeDxe/Cpu.c
@@ -1,6 +1,6 @@
 /**@file

 

-Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>

 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

@@ -25,6 +25,7 @@ Abstract:
 

 #include "CpuDriver.h"

 

+UINT64  mTimerPeriod;

 

 CPU_ARCH_PROTOCOL_PRIVATE mCpuTemplate = {

   CPU_ARCH_PROT_PRIVATE_SIGNATURE,

@@ -38,7 +39,7 @@ CPU_ARCH_PROTOCOL_PRIVATE mCpuTemplate = {
     WinNtRegisterInterruptHandler,

     WinNtGetTimerValue,

     WinNtSetMemoryAttributes,

-    0,

+    1,

     4

   },

   {

@@ -321,11 +322,18 @@ Returns:
   if (TimerValue == NULL) {

     return EFI_INVALID_PARAMETER;

   }

-

-  //

-  // No timer supported

-  //

-  return EFI_UNSUPPORTED;

+  

+  if (TimerIndex != 0) {

+    return EFI_INVALID_PARAMETER;

+  }

+  

+  gWinNt->QueryPerformanceCounter (TimerValue);

+  

+  if (TimerPeriod != NULL) {

+    *TimerPeriod = mTimerPeriod;

+  }

+  

+  return EFI_SUCCESS;

 }

 

 

@@ -518,8 +526,19 @@ Returns:
 

 --*/

 {

-  EFI_STATUS                Status;

+  EFI_STATUS  Status;

+  UINT64      Frequency;

 

+  //

+  // Retrieve the frequency of the performance counter in Hz.

+  //  

+  gWinNt->QueryPerformanceFrequency (&Frequency);

+  

+  //

+  // Convert frequency in Hz to a clock period in femtoseconds.

+  //

+  mTimerPeriod = DivU64x64Remainder (1000000000000000, Frequency, NULL);

+  

   CpuUpdateSmbios ();

 

   Status = gBS->InstallMultipleProtocolInterfaces (

diff --git a/Nt32Pkg/CpuRuntimeDxe/CpuDriver.h b/Nt32Pkg/CpuRuntimeDxe/CpuDriver.h
index b98497d13e..5c0eaeb520 100644
--- a/Nt32Pkg/CpuRuntimeDxe/CpuDriver.h
+++ b/Nt32Pkg/CpuRuntimeDxe/CpuDriver.h
@@ -1,6 +1,6 @@
 /**@file

 

-Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>

 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        

@@ -39,6 +39,7 @@ Abstract:
 #include <Library/MemoryAllocationLib.h>

 #include <Library/UefiBootServicesTableLib.h>

 #include <Library/PcdLib.h>

+#include <Library/WinNtLib.h>

 

 

 extern UINT8  CpuStrings[];

diff --git a/Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf b/Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf
index 41d2b23b03..851002077a 100644
--- a/Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf
+++ b/Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf
@@ -2,7 +2,7 @@
 # Component description file for Cpu module.

 #

 # This CPU module abstracts the interrupt subsystem of a platform and the CPU-specific setjump-long pair.

-# Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>

+# Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>

 #

 #  This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -48,6 +48,7 @@
   UefiDriverEntryPoint

   DebugLib

   HiiLib

+  WinNtLib

 

 [Protocols]

   gEfiWinNtIoProtocolGuid                       # PROTOCOL_NOTIFY SOMETIMES_CONSUMED

diff --git a/Nt32Pkg/Include/Protocol/WinNtThunk.h b/Nt32Pkg/Include/Protocol/WinNtThunk.h
index 5a5d8290d2..fd7defd2fd 100644
--- a/Nt32Pkg/Include/Protocol/WinNtThunk.h
+++ b/Nt32Pkg/Include/Protocol/WinNtThunk.h
@@ -1,6 +1,6 @@
 /**@file

 

-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>

 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        

@@ -1104,6 +1104,19 @@ BOOL
 (WINAPI *WinNtFreeLibrary) (

   HANDLE  ModHandle

   );

+typedef  

+WINBASEAPI

+BOOL

+(WINAPI *WinNtQueryPerformanceCounter) (

+  LARGE_INTEGER  *PerformanceCount

+  );

+  

+typedef  

+WINBASEAPI

+BOOL

+(WINAPI *WinNtQueryPerformanceFrequency) (

+  LARGE_INTEGER  *Frequency

+  );

 //

 //

 //

@@ -1269,7 +1282,10 @@ typedef struct {
   WinNtGetProcessHeap                 GetProcessHeap;

   WinNtHeapAlloc                      HeapAlloc;

   WinNtHeapFree                       HeapFree;

-

+  

+  WinNtQueryPerformanceCounter        QueryPerformanceCounter;

+  WinNtQueryPerformanceFrequency      QueryPerformanceFrequency;

+  

 } EFI_WIN_NT_THUNK_PROTOCOL;

 

 extern EFI_GUID gEfiWinNtThunkProtocolGuid;

diff --git a/Nt32Pkg/Sec/WinNtThunk.c b/Nt32Pkg/Sec/WinNtThunk.c
index e4589cbfc7..9ab380c205 100644
--- a/Nt32Pkg/Sec/WinNtThunk.c
+++ b/Nt32Pkg/Sec/WinNtThunk.c
@@ -1,6 +1,6 @@
 /**@file

 

-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>

 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        

@@ -176,7 +176,9 @@ EFI_WIN_NT_THUNK_PROTOCOL mWinNtThunkTable = {
   DispatchMessage,

   GetProcessHeap,

   HeapAlloc,

-  HeapFree

+  HeapFree,

+  QueryPerformanceCounter,

+  QueryPerformanceFrequency

 };

 

 #pragma warning(default : 4996)