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=45baa9ec8731fb1542f3b27f69ddafad3e932076;hb=c094abe5852057ef47941d8de3af20b2286cd822;hpb=905dd497d2d481c50ff4856f06322309956fb068

diff --git a/EdkModulePkg/Bus/Pci/IdeBus/Dxe/idebus.c b/EdkModulePkg/Bus/Pci/IdeBus/Dxe/idebus.c
index 45baa9ec87..c1c14052f1 100644
--- a/EdkModulePkg/Bus/Pci/IdeBus/Dxe/idebus.c
+++ b/EdkModulePkg/Bus/Pci/IdeBus/Dxe/idebus.c
@@ -1,5 +1,5 @@
 /** @file
-  Copyright (c) 2006, Intel Corporation                                                         
+  Copyright (c) 2006 - 2007 Intel Corporation. <BR>
   All rights reserved. This program and the accompanying materials                          
   are licensed and made available under the terms and conditions of the BSD License         
   which accompanies this distribution.  The full text of the license may be found at        
@@ -26,7 +26,7 @@ EFI_DRIVER_BINDING_PROTOCOL gIDEBusDriverBinding = {
   IDEBusDriverBindingSupported,
   IDEBusDriverBindingStart,
   IDEBusDriverBindingStop,
-  0x10,
+  0xa,
   NULL,
   NULL
 };
@@ -91,7 +91,7 @@ IDEBusDriverBindingSupported (
   }
  
   //
-  // Clsoe protocol, don't use device path protocol in the .Support() function
+  // Close protocol, don't use device path protocol in the .Support() function
   //
   gBS->CloseProtocol (
         Controller,
@@ -181,9 +181,7 @@ IDEBusDriverBindingStart (
   UINT16                            CommandBlockBaseAddr;
   UINT16                            ControlBlockBaseAddr;
   UINTN                             DataSize;
-  UINT32                            Attributes;
   IDE_BUS_DRIVER_PRIVATE_DATA       *IdeBusDriverPrivateData;
-  EFI_EVENT                         Event;
 
   //
   // Local variables declaration for IdeControllerInit support
@@ -191,7 +189,6 @@ IDEBusDriverBindingStart (
   EFI_IDE_CONTROLLER_INIT_PROTOCOL  *IdeInit;
   BOOLEAN                           EnumAll;
   BOOLEAN                           ChannelEnabled;
-  UINT8                             ChannelCount;
   UINT8                             MaxDevices;
   EFI_IDENTIFY_DATA                 IdentifyData;
   EFI_ATA_COLLECTIVE_MODE           *SupportedModes;
@@ -241,10 +238,9 @@ IDEBusDriverBindingStart (
   }
 
   //
-  // Save Enumall and ChannelCount. Step7.2
+  // Save Enumall. Step7.2
   //
   EnumAll       = IdeInit->EnumAll;
-  ChannelCount  = IdeInit->ChannelCount;
 
   //
   // Consume PCI I/O protocol. Note that the OpenProtocol with _GET_PROTOCOL
@@ -317,7 +313,7 @@ IDEBusDriverBindingStart (
   Status = gRT->GetVariable (
                   (CHAR16 *) L"Configuration",
                   &gEfiCallerIdGuid,
-                  &Attributes,
+                  NULL,
                   &DataSize,
                   &ConfigurationOptions
                   );
@@ -417,6 +413,12 @@ IDEBusDriverBindingStart (
               EfiIdeBusBeforeDevicePresenceDetection,
               IdeChannel
               );
+
+    //
+    // Prepare to detect IDE device of this channel
+    //
+    InitializeIDEChannelData ();
+
     //
     // -- 1st inner loop --- Master/Slave ------------  Step14
     //
@@ -449,8 +451,8 @@ IDEBusDriverBindingStart (
       ZeroMem (IdeBlkIoDevicePtr, sizeof (IDE_BLK_IO_DEV));
 
       IdeBlkIoDevicePtr->Signature  = IDE_BLK_IO_DEV_SIGNATURE;
-      IdeBlkIoDevicePtr->Channel    = IdeChannel;
-      IdeBlkIoDevicePtr->Device     = IdeDevice;
+      IdeBlkIoDevicePtr->Channel    = (EFI_IDE_CHANNEL) IdeChannel;
+      IdeBlkIoDevicePtr->Device     = (EFI_IDE_DEVICE) IdeDevice;
 
       //
       // initialize Block IO interface's Media pointer
@@ -488,6 +490,19 @@ IDEBusDriverBindingStart (
       IdeBlkIoDevicePtr->IdeBusDriverPrivateData = IdeBusDriverPrivateData;
       IdeBlkIoDevicePtr->IoPort->BusMasterBaseAddr = IdeRegsBaseAddr[IdeChannel].BusMasterBaseAddr;
 
+      //
+      // Report Status code: is about to detect IDE drive
+      //
+      REPORT_STATUS_CODE_EX (
+        EFI_PROGRESS_CODE,
+        (EFI_IO_BUS_ATA_ATAPI | EFI_P_PC_PRESENCE_DETECT),
+        0,
+        &gEfiCallerIdGuid,
+        NULL,
+        NULL,
+        0
+      );
+
       //
       // Discover device, now!
       //
@@ -523,7 +538,6 @@ IDEBusDriverBindingStart (
         // Submit identify data to IDE controller init driver
         //
         CopyMem (&IdentifyData, IdeBlkIoDevicePtr->pIdData, sizeof (IdentifyData));
-        // IdentifyData  = *IdeBlkIoDevicePtr->pIdData;
         IdeBusDriverPrivateData->DeviceFound[IdeChannel * 2 + IdeDevice] = TRUE;
         IdeInit->SubmitData (IdeInit, IdeChannel, IdeDevice, &IdentifyData);
       } else {
@@ -615,7 +629,11 @@ IDEBusDriverBindingStart (
           IdeBlkIoDevicePtr = NULL;
           continue;
         }
-
+        //
+        // Record Udma Mode
+        //
+        IdeBlkIoDevicePtr->UdmaMode.Valid = TRUE;
+        IdeBlkIoDevicePtr->UdmaMode.Mode  = SupportedModes->UdmaMode.Mode;
         EnableInterrupt (IdeBlkIoDevicePtr);
       } else if (SupportedModes->MultiWordDmaMode.Valid) {
 
@@ -650,7 +668,7 @@ IDEBusDriverBindingStart (
       //
       // Record PIO mode used in private data
       //
-      IdeBlkIoDevicePtr->PioMode = SupportedModes->PioMode.Mode;
+      IdeBlkIoDevicePtr->PioMode = (ATA_PIO_MODE) SupportedModes->PioMode.Mode;
 
       //
       // Set IDE controller Timing Blocks in the PCI Configuration Space
@@ -706,10 +724,9 @@ IDEBusDriverBindingStart (
                       EFI_TPL_NOTIFY,
                       ClearInterrupt,
                       IdeBlkIoDevicePtr,
-                      &Event
+                      &IdeBlkIoDevicePtr->ExitBootServiceEvent
                       );
 
-  
       //
       // end of 2nd inner loop ----
       //
@@ -1018,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);
   //
@@ -1028,12 +1048,15 @@ IDEBlkIoReset (
   //
   // for ATA device, using ATA reset method
   //
-  if (IdeBlkIoDevice->Type == IdeHardDisk) {
-    return AtaSoftReset (IdeBlkIoDevice);
+  if (IdeBlkIoDevice->Type == IdeHardDisk ||
+      IdeBlkIoDevice->Type == Ide48bitAddressingHardDisk) {
+    Status = AtaSoftReset (IdeBlkIoDevice);
+    goto Done;
   }
 
   if (IdeBlkIoDevice->Type == IdeUnknown) {
-    return EFI_DEVICE_ERROR;
+    Status = EFI_DEVICE_ERROR;
+    goto Done;
   }
   
   //
@@ -1044,6 +1067,8 @@ IDEBlkIoReset (
     Status = AtaSoftReset (IdeBlkIoDevice);
   }
 
+Done:
+  gBS->RestoreTPL (OldTpl);
   return Status;
 }
 
@@ -1071,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);
 
@@ -1084,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,
@@ -1108,6 +1139,10 @@ IDEBlkIoReadBlocks (
           Buffer
           );
 
+Done:
+  gBS->RestoreTPL (OldTpl);
+
+  return Status;
 }
 
 /**
@@ -1134,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
@@ -1147,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;
 }
 
 //