PcAtChipsetPkg: Update BaseAcpiTimerLib

Introduce new PcdAcpiIoPortBaseAddressMask to mask BITS ACPI IO Port Base Address.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16952 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/PcAtChipsetPkg/Library/AcpiTimerLib/AcpiTimerLib.c b/PcAtChipsetPkg/Library/AcpiTimerLib/AcpiTimerLib.c
index b184c49ee7d0e75556b876ca7a7d4b7b5b0e7e9f..ad855fe4f517f6e0c4a814239d63152f3ae4781e 100644 (file)
--- a/PcAtChipsetPkg/Library/AcpiTimerLib/AcpiTimerLib.c
+++ b/PcAtChipsetPkg/Library/AcpiTimerLib/AcpiTimerLib.c
@@ -1,7 +1,7 @@
 /** @file\r
   ACPI Timer implements one instance of Timer Library.\r
 \r
-  Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.<BR>\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
@@ -118,11 +118,11 @@ InternalAcpiGetAcpiTimerIoPort (
 {\r
   UINT16  Port;\r
   \r
-  Port = PcdGet16 (PcdAcpiIoPciBarRegisterOffset);\r
+  Port = PcdGet16 (PcdAcpiIoPortBaseAddress);\r
   \r
   //\r
   // If the register offset to the BAR for the ACPI I/O Port Base Address is not 0x0000, then \r
-  // read the PCI register for the APCI BAR value in case the BAR has been programmed to a \r
+  // read the PCI register for the ACPI BAR value in case the BAR has been programmed to a \r
   // value other than PcdAcpiIoPortBaseAddress\r
   //\r
   if (PcdGet16 (PcdAcpiIoPciBarRegisterOffset) != 0x0000) {\r
@@ -134,7 +134,7 @@ InternalAcpiGetAcpiTimerIoPort (
                         ));\r
   }\r
   \r
-  return (Port & ~BIT0) + PcdGet16 (PcdAcpiPm1TmrOffset);\r
+  return (Port & PcdGet16 (PcdAcpiIoPortBaseAddressMask)) + PcdGet16 (PcdAcpiPm1TmrOffset);\r
 }\r
 \r
 /**\r

diff --git a/PcAtChipsetPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.inf b/PcAtChipsetPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.inf
index fcd7814a570e701728a2ce7db5191c2d67850814..48caebff13543aa5522aea2abf8928ac3124a096 100644 (file)
--- a/PcAtChipsetPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.inf
+++ b/PcAtChipsetPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.inf
@@ -4,7 +4,7 @@
 #  Provides basic timer support using the ACPI timer hardware.  The performance\r
 #  counter features are provided by the processors time stamp counter. \r
 #\r
-#  Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.<BR>\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
@@ -49,3 +49,4 @@
   gPcAtChipsetPkgTokenSpaceGuid.PcdAcpiIoPciBarRegisterOffset     ## CONSUMES\r
   gPcAtChipsetPkgTokenSpaceGuid.PcdAcpiIoPortBaseAddress          ## CONSUMES\r
   gPcAtChipsetPkgTokenSpaceGuid.PcdAcpiPm1TmrOffset               ## CONSUMES\r
+  gPcAtChipsetPkgTokenSpaceGuid.PcdAcpiIoPortBaseAddressMask      ## CONSUMES
\ No newline at end of file

diff --git a/PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf b/PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf
index 5c8a8e6852d7c84677014d9278d1daf8efdfb075..3446c03eda21ec0dc8eecf24bc5a246e6469e0a5 100644 (file)
--- a/PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf
+++ b/PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf
@@ -4,7 +4,7 @@
 #  Provides basic timer support using the ACPI timer hardware.  The performance\r
 #  counter features are provided by the processors time stamp counter. \r
 #\r
-#  Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.<BR>\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
@@ -49,3 +49,4 @@
   gPcAtChipsetPkgTokenSpaceGuid.PcdAcpiIoPciBarRegisterOffset     ## CONSUMES\r
   gPcAtChipsetPkgTokenSpaceGuid.PcdAcpiIoPortBaseAddress          ## CONSUMES\r
   gPcAtChipsetPkgTokenSpaceGuid.PcdAcpiPm1TmrOffset               ## CONSUMES\r
+  gPcAtChipsetPkgTokenSpaceGuid.PcdAcpiIoPortBaseAddressMask      ## CONSUMES
\ No newline at end of file

diff --git a/PcAtChipsetPkg/PcAtChipsetPkg.dec b/PcAtChipsetPkg/PcAtChipsetPkg.dec
index 11c31e1d5ae07557c23d0eb8610a86fe3496be09..fb6fb8b9f74be8c540520a426ec193b131a82377 100644 (file)
--- a/PcAtChipsetPkg/PcAtChipsetPkg.dec
+++ b/PcAtChipsetPkg/PcAtChipsetPkg.dec
@@ -163,5 +163,9 @@
   # @Prompt Offset to 32-bit Timer register in ACPI BAR\r
   gPcAtChipsetPkgTokenSpaceGuid.PcdAcpiPm1TmrOffset              |0x0008|UINT16|0x00000017\r
 \r
+  ## Defines the bit mask to retrieve ACPI IO Port Base Address\r
+  # @Prompt ACPI IO Port Base Address Mask\r
+  gPcAtChipsetPkgTokenSpaceGuid.PcdAcpiIoPortBaseAddressMask     |0xFFFE|UINT16|0x00000018\r
+\r
 [UserExtensions.TianoCore."ExtraFiles"]\r
   PcAtChipsetPkgExtra.uni
\ No newline at end of file

diff --git a/PcAtChipsetPkg/PcAtChipsetPkg.uni b/PcAtChipsetPkg/PcAtChipsetPkg.uni
index 080f302ea791c990b5a1658d265766a13b994070..e6d91632933bd3c481927a63a54835838afe35a7 100644 (file)
Binary files a/PcAtChipsetPkg/PcAtChipsetPkg.uni and b/PcAtChipsetPkg/PcAtChipsetPkg.uni differ