MdePkg/BaseCacheMaintenanceLib: Support IA32 processors without CLFLUSH

Use CPUID Leaf 01 to detect support for CLFLUSH instruction.
If CLFLUSH is supported, use CPUID to determine the cache line size to use with CLFLUSH.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Michael Kinney <michael.d.kinney@intel.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17211 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf b/MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf
index 298ba39fb4157d4ed0ce93c30b34757098090462..d659161f33bc54f42c7a3c732cf19344dde3ce77 100644 (file)
--- a/MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf
+++ b/MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf
@@ -4,7 +4,7 @@
 #  Cache Maintenance Library that uses Base Library services to maintain caches.\r
 #  This library assumes there are no chipset dependencies required to maintain caches.\r
 #\r
-#  Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2007 - 2015, Intel Corporation. All rights reserved.<BR>\r
 #  Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\r
 #\r
 #  This program and the accompanying materials\r
@@ -23,7 +23,7 @@
   MODULE_UNI_FILE                = BaseCacheMaintenanceLib.uni\r
   FILE_GUID                      = 123dd843-57c9-4158-8418-ce68b3944ce7\r
   MODULE_TYPE                    = BASE\r
-  VERSION_STRING                 = 1.0\r
+  VERSION_STRING                 = 1.1\r
   LIBRARY_CLASS                  = CacheMaintenanceLib \r
 \r
 \r

diff --git a/MdePkg/Library/BaseCacheMaintenanceLib/X86Cache.c b/MdePkg/Library/BaseCacheMaintenanceLib/X86Cache.c
index 5246893f94fef06aeebdbcc0f7cd406093563015..147a9a78e48dcaf47a73bc0025f2649f383bd348 100644 (file)
--- a/MdePkg/Library/BaseCacheMaintenanceLib/X86Cache.c
+++ b/MdePkg/Library/BaseCacheMaintenanceLib/X86Cache.c
@@ -1,7 +1,7 @@
 /** @file\r
   Cache Maintenance Functions.\r
 \r
-  Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 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
@@ -17,12 +17,6 @@
 #include <Library/BaseLib.h>\r
 #include <Library/DebugLib.h>\r
 \r
-//\r
-// This size must be at or below the smallest cache size possible among all\r
-// supported processors\r
-//\r
-#define CACHE_LINE_SIZE             0x20\r
-\r
 /**\r
   Invalidates the entire instruction cache in cache coherency domain of the\r
   calling CPU.\r
@@ -128,6 +122,9 @@ WriteBackInvalidateDataCacheRange (
   IN      UINTN                     Length\r
   )\r
 {\r
+  UINT32                            RegEbx;\r
+  UINT32                            RegEdx;\r
+  UINTN                             CacheLineSize;\r
   UINTN                             Start;\r
   UINTN                             End;\r
 \r
@@ -137,15 +134,30 @@ WriteBackInvalidateDataCacheRange (
 \r
   ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)Address));\r
 \r
+  //\r
+  // If the CPU does not support CLFLUSH instruction, \r
+  // then promote flush range to flush entire cache.\r
+  //\r
+  AsmCpuid (0x01, NULL, &RegEbx, NULL, &RegEdx);\r
+  if ((RegEdx & BIT19) == 0) {\r
+    AsmWbinvd ();\r
+    return Address;\r
+  }\r
+\r
+  //\r
+  // Cache line size is 8 * Bits 15-08 of EBX returned from CPUID 01H\r
+  //\r
+  CacheLineSize = (RegEbx & 0xff00) >> 5;\r
+\r
   Start = (UINTN)Address;\r
   //\r
   // Calculate the cache line alignment\r
-  // \r
-  End = (Start + Length + (CACHE_LINE_SIZE - 1)) & ~(CACHE_LINE_SIZE - 1);\r
-  Start &= ~((UINTN) CACHE_LINE_SIZE - 1);\r
+  //\r
+  End = (Start + Length + (CacheLineSize - 1)) & ~(CacheLineSize - 1);\r
+  Start &= ~((UINTN)CacheLineSize - 1);\r
 \r
   do {\r
-    Start = (UINTN)AsmFlushCacheLine ((VOID*)Start) + CACHE_LINE_SIZE;\r
+    Start = (UINTN)AsmFlushCacheLine ((VOID*)Start) + CacheLineSize;\r
   } while (Start != End);\r
   return Address;\r
 }\r