MdePkg/BaseLib: Support IA32 processors without CLFLUSH

[mirror_edk2.git] / MdePkg / Library / BaseIoLibIntrinsic / IoLib.c

diff --git a/MdePkg/Library/BaseIoLibIntrinsic/IoLib.c b/MdePkg/Library/BaseIoLibIntrinsic/IoLib.c
index 126457a7e59be4dd013db32abf86b361b7837233..f6bd81911481fa39033392b16f5843661512cd5b 100644 (file)
--- a/MdePkg/Library/BaseIoLibIntrinsic/IoLib.c
+++ b/MdePkg/Library/BaseIoLibIntrinsic/IoLib.c
@@ -1,19 +1,19 @@
 /** @file\r
   Common I/O Library routines.\r
 \r
-  Copyright (c) 2006, Intel Corporation<BR>\r
-  All rights reserved. This program and the accompanying materials\r
+  Copyright (c) 2006 - 2008, 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
-  http://opensource.org/licenses/bsd-license.php\r
+  http://opensource.org/licenses/bsd-license.php.\r
 \r
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
-  Module Name:  IoLib.c\r
-\r
 **/\r
 \r
+#include "BaseIoLibIntrinsicInternal.h"\r
+\r
 /**\r
   Reads a 64-bit I/O port.\r
 \r
@@ -22,6 +22,7 @@
   serialized.\r
 \r
   If 64-bit I/O port operations are not supported, then ASSERT().\r
+  If Port is not aligned on a 64-bit boundary, then ASSERT().\r
 \r
   @param  Port  The I/O port to read.\r
 \r
@@ -46,6 +47,7 @@ IoRead64 (
   operations are serialized.\r
 \r
   If 64-bit I/O port operations are not supported, then ASSERT().\r
+  If Port is not aligned on a 64-bit boundary, then ASSERT().\r
 \r
   @param  Port  The I/O port to write.\r
   @param  Value The value to write to the I/O port.\r
@@ -64,6 +66,7 @@ IoWrite64 (
   return 0;\r
 }\r
 \r
+\r
 /**\r
   Reads an 8-bit MMIO register.\r
 \r
@@ -84,7 +87,13 @@ MmioRead8 (
   IN      UINTN                     Address\r
   )\r
 {\r
-  return *(volatile UINT8*)Address;\r
+  UINT8                             Value;\r
+\r
+  MemoryFence ();\r
+  Value = *(volatile UINT8*)Address;\r
+  MemoryFence ();\r
+\r
+  return Value;\r
 }\r
 \r
 /**\r
@@ -98,6 +107,8 @@ MmioRead8 (
 \r
   @param  Address The MMIO register to write.\r
   @param  Value   The value to write to the MMIO register.\r
+  \r
+  @return Value.\r
 \r
 **/\r
 UINT8\r
@@ -107,7 +118,11 @@ MmioWrite8 (
   IN      UINT8                     Value\r
   )\r
 {\r
-  return *(volatile UINT8*)Address = Value;\r
+  MemoryFence ();\r
+  *(volatile UINT8*)Address = Value;\r
+  MemoryFence ();\r
+\r
+  return Value;\r
 }\r
 \r
 /**\r
@@ -118,6 +133,7 @@ MmioWrite8 (
   operations are serialized.\r
 \r
   If 16-bit MMIO register operations are not supported, then ASSERT().\r
+  If Address is not aligned on a 16-bit boundary, then ASSERT().\r
 \r
   @param  Address The MMIO register to read.\r
 \r
@@ -130,8 +146,15 @@ MmioRead16 (
   IN      UINTN                     Address\r
   )\r
 {\r
+  UINT16                            Value;\r
+\r
   ASSERT ((Address & 1) == 0);\r
-  return *(volatile UINT16*)Address;\r
+\r
+  MemoryFence ();\r
+  Value = *(volatile UINT16*)Address;\r
+  MemoryFence ();\r
+\r
+  return Value;\r
 }\r
 \r
 /**\r
@@ -142,9 +165,12 @@ MmioRead16 (
   and write operations are serialized.\r
 \r
   If 16-bit MMIO register operations are not supported, then ASSERT().\r
+  If Address is not aligned on a 16-bit boundary, then ASSERT().\r
 \r
   @param  Address The MMIO register to write.\r
   @param  Value   The value to write to the MMIO register.\r
+  \r
+  @return Value.\r
 \r
 **/\r
 UINT16\r
@@ -155,7 +181,12 @@ MmioWrite16 (
   )\r
 {\r
   ASSERT ((Address & 1) == 0);\r
-  return *(volatile UINT16*)Address = Value;\r
+\r
+  MemoryFence ();\r
+  *(volatile UINT16*)Address = Value;\r
+  MemoryFence ();\r
+  \r
+  return Value;\r
 }\r
 \r
 /**\r
@@ -166,6 +197,7 @@ MmioWrite16 (
   operations are serialized.\r
 \r
   If 32-bit MMIO register operations are not supported, then ASSERT().\r
+  If Address is not aligned on a 32-bit boundary, then ASSERT().\r
 \r
   @param  Address The MMIO register to read.\r
 \r
@@ -178,8 +210,15 @@ MmioRead32 (
   IN      UINTN                     Address\r
   )\r
 {\r
+  UINT32                            Value;\r
+\r
   ASSERT ((Address & 3) == 0);\r
-  return *(volatile UINT32*)Address;\r
+  \r
+  MemoryFence ();\r
+  Value = *(volatile UINT32*)Address;\r
+  MemoryFence ();\r
+  \r
+  return Value;\r
 }\r
 \r
 /**\r
@@ -190,9 +229,12 @@ MmioRead32 (
   and write operations are serialized.\r
 \r
   If 32-bit MMIO register operations are not supported, then ASSERT().\r
+  If Address is not aligned on a 32-bit boundary, then ASSERT().\r
 \r
   @param  Address The MMIO register to write.\r
   @param  Value   The value to write to the MMIO register.\r
+  \r
+  @return Value.\r
 \r
 **/\r
 UINT32\r
@@ -203,7 +245,12 @@ MmioWrite32 (
   )\r
 {\r
   ASSERT ((Address & 3) == 0);\r
-  return *(volatile UINT32*)Address = Value;\r
+  \r
+  MemoryFence ();\r
+  *(volatile UINT32*)Address = Value;\r
+  MemoryFence ();\r
+  \r
+  return Value;\r
 }\r
 \r
 /**\r
@@ -214,6 +261,7 @@ MmioWrite32 (
   operations are serialized.\r
 \r
   If 64-bit MMIO register operations are not supported, then ASSERT().\r
+  If Address is not aligned on a 64-bit boundary, then ASSERT().\r
 \r
   @param  Address The MMIO register to read.\r
 \r
@@ -226,8 +274,15 @@ MmioRead64 (
   IN      UINTN                     Address\r
   )\r
 {\r
+  UINT64                            Value;\r
+\r
   ASSERT ((Address & 7) == 0);\r
-  return *(volatile UINT64*)Address;\r
+  \r
+  MemoryFence ();\r
+  Value = *(volatile UINT64*)Address;\r
+  MemoryFence ();\r
+\r
+  return Value;\r
 }\r
 \r
 /**\r
@@ -238,6 +293,7 @@ MmioRead64 (
   and write operations are serialized.\r
 \r
   If 64-bit MMIO register operations are not supported, then ASSERT().\r
+  If Address is not aligned on a 64-bit boundary, then ASSERT().\r
 \r
   @param  Address The MMIO register to write.\r
   @param  Value   The value to write to the MMIO register.\r
@@ -251,5 +307,11 @@ MmioWrite64 (
   )\r
 {\r
   ASSERT ((Address & 7) == 0);\r
-  return *(volatile UINT64*)Address = Value;\r
+  \r
+  MemoryFence ();\r
+  *(volatile UINT64*)Address = Value;\r
+  MemoryFence ();\r
+  \r
+  return Value;\r
 }\r
+\r