SecurityPkg: TcgPei: Sync TCG PP lifetime lock state

[mirror_edk2.git] / UefiCpuPkg / CpuIo2Dxe / CpuIo2Dxe.c

diff --git a/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.c b/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.c
index fd4b2e8524d0db8dcb9cb80e6c9710888f7a9cbd..6ccfc40e10f8fb8b9ea2625ce79ea9af4487799e 100644 (file)
--- a/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.c
+++ b/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.c
@@ -1,7 +1,7 @@
 /** @file\r
   Produces the CPU I/O 2 Protocol.\r
 \r
-Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2009 - 2012, 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
@@ -13,6 +13,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 **/\r
 \r
 #include "CpuIo2Dxe.h"\r
+#include "IoFifo.h"\r
 \r
 //\r
 // Handle for the CPU I/O 2 Protocol\r
@@ -116,7 +117,7 @@ CpuIoCheckParameter (
   //\r
   // Check to see if Width is in the valid range\r
   //\r
-  if (Width < 0 || Width >= EfiCpuIoWidthMaximum) {\r
+  if ((UINT32)Width >= EfiCpuIoWidthMaximum) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -175,8 +176,9 @@ CpuIoCheckParameter (
 \r
   //\r
   // Check to see if Buffer is aligned\r
+  // (IA-32 allows UINT64 and INT64 data types to be 32-bit aligned.)\r
   //\r
-  if (((UINTN)Buffer & (mInStride[Width] - 1)) != 0) {\r
+  if (((UINTN)Buffer & ((MIN (sizeof (UINTN), mInStride[Width])  - 1))) != 0) {\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r
@@ -409,6 +411,30 @@ CpuIoServiceRead (
   InStride = mInStride[Width];\r
   OutStride = mOutStride[Width];\r
   OperationWidth = (EFI_CPU_IO_PROTOCOL_WIDTH) (Width & 0x03);\r
+\r
+#if defined (MDE_CPU_IA32) || defined (MDE_CPU_X64)\r
+  if (InStride == 0) {\r
+    switch (OperationWidth) {\r
+    case EfiCpuIoWidthUint8:\r
+      IoReadFifo8 ((UINTN)Address, Count, Buffer);\r
+      return EFI_SUCCESS;\r
+    case EfiCpuIoWidthUint16:\r
+      IoReadFifo16 ((UINTN)Address, Count, Buffer);\r
+      return EFI_SUCCESS;\r
+    case EfiCpuIoWidthUint32:\r
+      IoReadFifo32 ((UINTN)Address, Count, Buffer);\r
+      return EFI_SUCCESS;\r
+    default:\r
+      //\r
+      // The CpuIoCheckParameter call above will ensure that this\r
+      // path is not taken.\r
+      //\r
+      ASSERT (FALSE);\r
+      break;\r
+    }\r
+  }\r
+#endif\r
+\r
   for (Uint8Buffer = Buffer; Count > 0; Address += InStride, Uint8Buffer += OutStride, Count--) {\r
     if (OperationWidth == EfiCpuIoWidthUint8) {\r
       *Uint8Buffer = IoRead8 ((UINTN)Address);\r
@@ -491,6 +517,30 @@ CpuIoServiceWrite (
   InStride = mInStride[Width];\r
   OutStride = mOutStride[Width];\r
   OperationWidth = (EFI_CPU_IO_PROTOCOL_WIDTH) (Width & 0x03);\r
+\r
+#if defined (MDE_CPU_IA32) || defined (MDE_CPU_X64)\r
+  if (InStride == 0) {\r
+    switch (OperationWidth) {\r
+    case EfiCpuIoWidthUint8:\r
+      IoWriteFifo8 ((UINTN)Address, Count, Buffer);\r
+      return EFI_SUCCESS;\r
+    case EfiCpuIoWidthUint16:\r
+      IoWriteFifo16 ((UINTN)Address, Count, Buffer);\r
+      return EFI_SUCCESS;\r
+    case EfiCpuIoWidthUint32:\r
+      IoWriteFifo32 ((UINTN)Address, Count, Buffer);\r
+      return EFI_SUCCESS;\r
+    default:\r
+      //\r
+      // The CpuIoCheckParameter call above will ensure that this\r
+      // path is not taken.\r
+      //\r
+      ASSERT (FALSE);\r
+      break;\r
+    }\r
+  }\r
+#endif\r
+\r
   for (Uint8Buffer = (UINT8 *)Buffer; Count > 0; Address += InStride, Uint8Buffer += OutStride, Count--) {\r
     if (OperationWidth == EfiCpuIoWidthUint8) {\r
       IoWrite8 ((UINTN)Address, *Uint8Buffer);\r