Add a lock to protect the critical region in Service APIs for gEfiBlockIoProtocolGuid...

[mirror_edk2.git] / EdkModulePkg / Bus / Pci / IdeBus / Dxe / idebus.c

diff --git a/EdkModulePkg/Bus/Pci/IdeBus/Dxe/idebus.c b/EdkModulePkg/Bus/Pci/IdeBus/Dxe/idebus.c
index 0e7d43eeb9a0475e0b2d3e603a3bb96809895217..c1c14052f1826621e14af9a88fb1d9c8f6fb0879 100644 (file)
--- a/EdkModulePkg/Bus/Pci/IdeBus/Dxe/idebus.c
+++ b/EdkModulePkg/Bus/Pci/IdeBus/Dxe/idebus.c
@@ -1,5 +1,5 @@
 /** @file\r
-  Copyright (c) 2006, Intel Corporation                                                         \r
+  Copyright (c) 2006 - 2007 Intel Corporation. <BR>\r
   All rights reserved. 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
@@ -629,7 +629,11 @@ IDEBusDriverBindingStart (
           IdeBlkIoDevicePtr = NULL;\r
           continue;\r
         }\r
-\r
+        //\r
+        // Record Udma Mode\r
+        //\r
+        IdeBlkIoDevicePtr->UdmaMode.Valid = TRUE;\r
+        IdeBlkIoDevicePtr->UdmaMode.Mode  = SupportedModes->UdmaMode.Mode;\r
         EnableInterrupt (IdeBlkIoDevicePtr);\r
       } else if (SupportedModes->MultiWordDmaMode.Valid) {\r
 \r
@@ -1031,6 +1035,9 @@ IDEBlkIoReset (
 {\r
   IDE_BLK_IO_DEV  *IdeBlkIoDevice;\r
   EFI_STATUS      Status;\r
+  EFI_TPL         OldTpl;\r
+\r
+  OldTpl = gBS->RaiseTPL (EFI_TPL_CALLBACK);\r
 \r
   IdeBlkIoDevice = IDE_BLOCK_IO_DEV_FROM_THIS (This);\r
   //\r
@@ -1043,11 +1050,13 @@ IDEBlkIoReset (
   //\r
   if (IdeBlkIoDevice->Type == IdeHardDisk ||\r
       IdeBlkIoDevice->Type == Ide48bitAddressingHardDisk) {\r
-    return AtaSoftReset (IdeBlkIoDevice);\r
+    Status = AtaSoftReset (IdeBlkIoDevice);\r
+    goto Done;\r
   }\r
 \r
   if (IdeBlkIoDevice->Type == IdeUnknown) {\r
-    return EFI_DEVICE_ERROR;\r
+    Status = EFI_DEVICE_ERROR;\r
+    goto Done;\r
   }\r
   \r
   //\r
@@ -1058,6 +1067,8 @@ IDEBlkIoReset (
     Status = AtaSoftReset (IdeBlkIoDevice);\r
   }\r
 \r
+Done:\r
+  gBS->RestoreTPL (OldTpl);\r
   return Status;\r
 }\r
 \r
@@ -1085,6 +1096,10 @@ IDEBlkIoReadBlocks (
 // TODO:    EFI_DEVICE_ERROR - add return value to function comment\r
 {\r
   IDE_BLK_IO_DEV  *IdeBlkIoDevice;\r
+  EFI_STATUS      Status;\r
+  EFI_TPL         OldTpl;\r
+\r
+  OldTpl = gBS->RaiseTPL (EFI_TPL_CALLBACK);\r
 \r
   IdeBlkIoDevice = IDE_BLOCK_IO_DEV_FROM_THIS (This);\r
 \r
@@ -1098,23 +1113,25 @@ IDEBlkIoReadBlocks (
   //\r
   if (IdeBlkIoDevice->Type == IdeHardDisk ||\r
       IdeBlkIoDevice->Type == Ide48bitAddressingHardDisk) {\r
-    return AtaBlkIoReadBlocks (\r
+    Status = AtaBlkIoReadBlocks (\r
             IdeBlkIoDevice,\r
             MediaId,\r
             LBA,\r
             BufferSize,\r
             Buffer\r
             );\r
+    goto Done;\r
   }\r
 \r
   if (IdeBlkIoDevice->Type == IdeUnknown) {\r
-    return EFI_DEVICE_ERROR;\r
+    Status = EFI_DEVICE_ERROR;\r
+    goto Done;\r
   }\r
   \r
   //\r
   // for ATAPI device, using ATAPI read block's mechanism\r
   //\r
-  return AtapiBlkIoReadBlocks (\r
+  Status = AtapiBlkIoReadBlocks (\r
           IdeBlkIoDevice,\r
           MediaId,\r
           LBA,\r
@@ -1122,6 +1139,10 @@ IDEBlkIoReadBlocks (
           Buffer\r
           );\r
 \r
+Done:\r
+  gBS->RestoreTPL (OldTpl);\r
+\r
+  return Status;\r
 }\r
 \r
 /**\r
@@ -1148,7 +1169,11 @@ IDEBlkIoWriteBlocks (
 // TODO:    EFI_DEVICE_ERROR - add return value to function comment\r
 {\r
   IDE_BLK_IO_DEV  *IdeBlkIoDevice;\r
+  EFI_STATUS      Status;\r
+  EFI_TPL         OldTpl;\r
 \r
+  OldTpl = gBS->RaiseTPL (EFI_TPL_CALLBACK);\r
+  \r
   IdeBlkIoDevice = IDE_BLOCK_IO_DEV_FROM_THIS (This);\r
   //\r
   // Requery IDE IO resources in case of the switch of native and legacy modes\r
@@ -1161,29 +1186,35 @@ IDEBlkIoWriteBlocks (
   if (IdeBlkIoDevice->Type == IdeHardDisk ||\r
       IdeBlkIoDevice->Type == Ide48bitAddressingHardDisk) {        \r
 \r
-    return AtaBlkIoWriteBlocks (\r
+    Status = AtaBlkIoWriteBlocks (\r
             IdeBlkIoDevice,\r
             MediaId,\r
             LBA,\r
             BufferSize,\r
             Buffer\r
             );\r
+    goto Done;\r
   }\r
 \r
   if (IdeBlkIoDevice->Type == IdeUnknown) {\r
-    return EFI_DEVICE_ERROR;\r
+    Status = EFI_DEVICE_ERROR;\r
+    goto Done;\r
   }\r
   \r
   //\r
   // for ATAPI device, using ATAPI write block's mechanism\r
   //\r
-  return AtapiBlkIoWriteBlocks (\r
+  Status = AtapiBlkIoWriteBlocks (\r
           IdeBlkIoDevice,\r
           MediaId,\r
           LBA,\r
           BufferSize,\r
           Buffer\r
           );\r
+  \r
+Done:\r
+  gBS->RestoreTPL (OldTpl);\r
+  return Status;\r
 }\r
 \r
 //\r