From d50f6f8be8e2a738ac1422364963a6936e02d13d Mon Sep 17 00:00:00 2001
From: lzeng14 <lzeng14@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Tue, 15 Feb 2011 02:02:06 +0000
Subject: TscTimerLib in PerformancePkg is a BASE type library, which should be
 used by any module type. But its constructor uses the global variable
 mTscFrequency to store frequency, which doesn't work on XIP PEIM. Split it to
 two LIBs for PEI and DXE separately.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11312 6f19259b-4bc3-4df7-8a09-765794883524
---
 .../Include/Guid/PerformancePkgTokenSpace.h        | 25 ++++++++++++++++++++++
 PerformancePkg/Include/Guid/TscFrequency.h         | 25 ++++++++++++++++++++++
 PerformancePkg/Include/Ich/GenericIch.h            |  3 ++-
 3 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 PerformancePkg/Include/Guid/PerformancePkgTokenSpace.h
 create mode 100644 PerformancePkg/Include/Guid/TscFrequency.h

(limited to 'PerformancePkg/Include')

diff --git a/PerformancePkg/Include/Guid/PerformancePkgTokenSpace.h b/PerformancePkg/Include/Guid/PerformancePkgTokenSpace.h
new file mode 100644
index 0000000..86dfe87
--- /dev/null
+++ b/PerformancePkg/Include/Guid/PerformancePkgTokenSpace.h
@@ -0,0 +1,25 @@
+/** @file
+  GUID for PerformancePkg PCD Token Space 
+
+  Copyright (c) 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
+  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.
+
+**/
+
+#ifndef _PERFORMANCEPKG_TOKEN_SPACE_GUID_H_
+#define _PERFORMANCEPKG_TOKEN_SPACE_GUID_H_
+
+#define PERFORMANCEPKG_TOKEN_SPACE_GUID \
+  { \
+    0x669346ef, 0xFDad, 0x4aeb, { 0x08, 0xa6, 0x21, 0x46, 0x2d, 0x3f, 0xef, 0x7d } \
+  }
+
+extern EFI_GUID gPerformancePkgTokenSpaceGuid;
+
+#endif
diff --git a/PerformancePkg/Include/Guid/TscFrequency.h b/PerformancePkg/Include/Guid/TscFrequency.h
new file mode 100644
index 0000000..f7c4a1c
--- /dev/null
+++ b/PerformancePkg/Include/Guid/TscFrequency.h
@@ -0,0 +1,25 @@
+/** @file
+  GUID for TSC frequency
+
+  Copyright (c) 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
+  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.
+
+**/
+
+#ifndef _TSC_FREQUENCY_GUID_H_
+#define _TSC_FREQUENCY_GUID_H_
+
+#define EFI_TSC_FREQUENCY_GUID \
+  { \
+    0xdba6a7e3, 0xbb57, 0x4be7, { 0x8a, 0xf8, 0xd5, 0x78, 0xdb, 0x7e, 0x56, 0x87 } \
+  }
+
+extern EFI_GUID gEfiTscFrequencyGuid;
+
+#endif
diff --git a/PerformancePkg/Include/Ich/GenericIch.h b/PerformancePkg/Include/Ich/GenericIch.h
index 8df74e1..697ea04 100644
--- a/PerformancePkg/Include/Ich/GenericIch.h
+++ b/PerformancePkg/Include/Ich/GenericIch.h
@@ -3,7 +3,7 @@
 
   These definitions should work for any version of Ich.
 
-  Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2009 - 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
@@ -35,6 +35,7 @@ Definitions beginning with "V_" are meaningful values of bits within the registe
 /// IchAcpiCntr   Control for the ICH's ACPI Counter.
 ///@{
 #define R_ICH_LPC_ACPI_BASE                   0x40
+#define   B_ICH_LPC_ACPI_BASE_BAR                 0x0000FF80
 #define R_ICH_LPC_ACPI_CNT                    0x44
 #define   B_ICH_LPC_ACPI_CNT_ACPI_EN              0x80
 ///@}
-- 
cgit v1.1