X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=EdkModulePkg%2FBus%2FPci%2FIdeBus%2FDxe%2Fidebus.c;h=c1c14052f1826621e14af9a88fb1d9c8f6fb0879;hp=42d71b5c228fd544bcd33cfcf249de8413320fbd;hb=c094abe5852057ef47941d8de3af20b2286cd822;hpb=90a98f29c5db0a9e008c6779866ba6f1ada45cae

diff --git a/EdkModulePkg/Bus/Pci/IdeBus/Dxe/idebus.c b/EdkModulePkg/Bus/Pci/IdeBus/Dxe/idebus.c
index 42d71b5c22..c1c14052f1 100644
--- a/EdkModulePkg/Bus/Pci/IdeBus/Dxe/idebus.c
+++ b/EdkModulePkg/Bus/Pci/IdeBus/Dxe/idebus.c
@@ -1035,6 +1035,9 @@ IDEBlkIoReset (
 {
   IDE_BLK_IO_DEV  *IdeBlkIoDevice;
   EFI_STATUS      Status;
+  EFI_TPL         OldTpl;
+
+  OldTpl = gBS->RaiseTPL (EFI_TPL_CALLBACK);
 
   IdeBlkIoDevice = IDE_BLOCK_IO_DEV_FROM_THIS (This);
   //
@@ -1047,11 +1050,13 @@ IDEBlkIoReset (
   //
   if (IdeBlkIoDevice->Type == IdeHardDisk ||
       IdeBlkIoDevice->Type == Ide48bitAddressingHardDisk) {
-    return AtaSoftReset (IdeBlkIoDevice);
+    Status = AtaSoftReset (IdeBlkIoDevice);
+    goto Done;
   }
 
   if (IdeBlkIoDevice->Type == IdeUnknown) {
-    return EFI_DEVICE_ERROR;
+    Status = EFI_DEVICE_ERROR;
+    goto Done;
   }
   
   //
@@ -1062,6 +1067,8 @@ IDEBlkIoReset (
     Status = AtaSoftReset (IdeBlkIoDevice);
   }
 
+Done:
+  gBS->RestoreTPL (OldTpl);
   return Status;
 }
 
@@ -1089,6 +1096,10 @@ IDEBlkIoReadBlocks (
 // TODO:    EFI_DEVICE_ERROR - add return value to function comment
 {
   IDE_BLK_IO_DEV  *IdeBlkIoDevice;
+  EFI_STATUS      Status;
+  EFI_TPL         OldTpl;
+
+  OldTpl = gBS->RaiseTPL (EFI_TPL_CALLBACK);
 
   IdeBlkIoDevice = IDE_BLOCK_IO_DEV_FROM_THIS (This);
 
@@ -1102,23 +1113,25 @@ IDEBlkIoReadBlocks (
   //
   if (IdeBlkIoDevice->Type == IdeHardDisk ||
       IdeBlkIoDevice->Type == Ide48bitAddressingHardDisk) {
-    return AtaBlkIoReadBlocks (
+    Status = AtaBlkIoReadBlocks (
             IdeBlkIoDevice,
             MediaId,
             LBA,
             BufferSize,
             Buffer
             );
+    goto Done;
   }
 
   if (IdeBlkIoDevice->Type == IdeUnknown) {
-    return EFI_DEVICE_ERROR;
+    Status = EFI_DEVICE_ERROR;
+    goto Done;
   }
   
   //
   // for ATAPI device, using ATAPI read block's mechanism
   //
-  return AtapiBlkIoReadBlocks (
+  Status = AtapiBlkIoReadBlocks (
           IdeBlkIoDevice,
           MediaId,
           LBA,
@@ -1126,6 +1139,10 @@ IDEBlkIoReadBlocks (
           Buffer
           );
 
+Done:
+  gBS->RestoreTPL (OldTpl);
+
+  return Status;
 }
 
 /**
@@ -1152,7 +1169,11 @@ IDEBlkIoWriteBlocks (
 // TODO:    EFI_DEVICE_ERROR - add return value to function comment
 {
   IDE_BLK_IO_DEV  *IdeBlkIoDevice;
+  EFI_STATUS      Status;
+  EFI_TPL         OldTpl;
 
+  OldTpl = gBS->RaiseTPL (EFI_TPL_CALLBACK);
+  
   IdeBlkIoDevice = IDE_BLOCK_IO_DEV_FROM_THIS (This);
   //
   // Requery IDE IO resources in case of the switch of native and legacy modes
@@ -1165,29 +1186,35 @@ IDEBlkIoWriteBlocks (
   if (IdeBlkIoDevice->Type == IdeHardDisk ||
       IdeBlkIoDevice->Type == Ide48bitAddressingHardDisk) {        
 
-    return AtaBlkIoWriteBlocks (
+    Status = AtaBlkIoWriteBlocks (
             IdeBlkIoDevice,
             MediaId,
             LBA,
             BufferSize,
             Buffer
             );
+    goto Done;
   }
 
   if (IdeBlkIoDevice->Type == IdeUnknown) {
-    return EFI_DEVICE_ERROR;
+    Status = EFI_DEVICE_ERROR;
+    goto Done;
   }
   
   //
   // for ATAPI device, using ATAPI write block's mechanism
   //
-  return AtapiBlkIoWriteBlocks (
+  Status = AtapiBlkIoWriteBlocks (
           IdeBlkIoDevice,
           MediaId,
           LBA,
           BufferSize,
           Buffer
           );
+  
+Done:
+  gBS->RestoreTPL (OldTpl);
+  return Status;
 }
 
 //