/** @file\r
- Copyright (c) 2006, Intel Corporation \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
- http://opensource.org/licenses/bsd-license.php \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
+ 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
+ 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
@par Revision Reference:\r
This module is modified from DXE\IDE module for Ide Contriller Init support\r
IDEBusDriverBindingSupported,\r
IDEBusDriverBindingStart,\r
IDEBusDriverBindingStop,\r
- 0x10,\r
+ 0xa,\r
NULL,\r
NULL\r
};\r
if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
- \r
+\r
//\r
- // Clsoe protocol, don't use device path protocol in the .Support() function\r
+ // Close protocol, don't use device path protocol in the .Support() function\r
//\r
gBS->CloseProtocol (\r
Controller,\r
// ***********************************************************************************\r
//\r
/**\r
- Start this driver on Controller by detecting all disks and installing \r
+ Start this driver on Controller by detecting all disks and installing\r
BlockIo protocol on them.\r
\r
@param This Protocol instance pointer.\r
UINT16 CommandBlockBaseAddr;\r
UINT16 ControlBlockBaseAddr;\r
UINTN DataSize;\r
- UINT32 Attributes;\r
IDE_BUS_DRIVER_PRIVATE_DATA *IdeBusDriverPrivateData;\r
- EFI_EVENT Event;\r
\r
//\r
// Local variables declaration for IdeControllerInit support\r
EFI_IDE_CONTROLLER_INIT_PROTOCOL *IdeInit;\r
BOOLEAN EnumAll;\r
BOOLEAN ChannelEnabled;\r
- UINT8 ChannelCount;\r
UINT8 MaxDevices;\r
EFI_IDENTIFY_DATA IdentifyData;\r
EFI_ATA_COLLECTIVE_MODE *SupportedModes;\r
if ((EFI_ERROR (Status)) && (Status != EFI_ALREADY_STARTED)) {\r
return Status;\r
}\r
- \r
+\r
//\r
// Now open the IDE_CONTROLLER_INIT protocol. Step7.1\r
//\r
}\r
\r
//\r
- // Save Enumall and ChannelCount. Step7.2\r
+ // Save Enumall. Step7.2\r
//\r
EnumAll = IdeInit->EnumAll;\r
- ChannelCount = IdeInit->ChannelCount;\r
\r
//\r
// Consume PCI I/O protocol. Note that the OpenProtocol with _GET_PROTOCOL\r
Status = gRT->GetVariable (\r
(CHAR16 *) L"Configuration",\r
&gEfiCallerIdGuid,\r
- &Attributes,\r
+ NULL,\r
&DataSize,\r
&ConfigurationOptions\r
);\r
EfiIdeBusBeforeDevicePresenceDetection,\r
IdeChannel\r
);\r
+\r
+ //\r
+ // Prepare to detect IDE device of this channel\r
+ //\r
+ InitializeIDEChannelData ();\r
+\r
//\r
// -- 1st inner loop --- Master/Slave ------------ Step14\r
//\r
if (!(ConfigurationOptions & (1 << (IdeChannel * 2 + IdeDevice)))) {\r
continue;\r
}\r
- \r
+\r
//\r
// The device has been scanned in another Start(), No need to scan it again\r
// for perf optimization.\r
if (IdeBusDriverPrivateData->HaveScannedDevice[IdeChannel * 2 + IdeDevice]) {\r
continue;\r
}\r
- \r
+\r
//\r
// create child handle for the detected device.\r
//\r
ZeroMem (IdeBlkIoDevicePtr, sizeof (IDE_BLK_IO_DEV));\r
\r
IdeBlkIoDevicePtr->Signature = IDE_BLK_IO_DEV_SIGNATURE;\r
- IdeBlkIoDevicePtr->Channel = IdeChannel;\r
- IdeBlkIoDevicePtr->Device = IdeDevice;\r
+ IdeBlkIoDevicePtr->Channel = (EFI_IDE_CHANNEL) IdeChannel;\r
+ IdeBlkIoDevicePtr->Device = (EFI_IDE_DEVICE) IdeDevice;\r
\r
//\r
// initialize Block IO interface's Media pointer\r
IdeBlkIoDevicePtr->IdeBusDriverPrivateData = IdeBusDriverPrivateData;\r
IdeBlkIoDevicePtr->IoPort->BusMasterBaseAddr = IdeRegsBaseAddr[IdeChannel].BusMasterBaseAddr;\r
\r
+ //\r
+ // Report Status code: is about to detect IDE drive\r
+ //\r
+ REPORT_STATUS_CODE_EX (\r
+ EFI_PROGRESS_CODE,\r
+ (EFI_IO_BUS_ATA_ATAPI | EFI_P_PC_PRESENCE_DETECT),\r
+ 0,\r
+ &gEfiCallerIdGuid,\r
+ NULL,\r
+ NULL,\r
+ 0\r
+ );\r
+\r
//\r
// Discover device, now!\r
//\r
// Submit identify data to IDE controller init driver\r
//\r
CopyMem (&IdentifyData, IdeBlkIoDevicePtr->pIdData, sizeof (IdentifyData));\r
- // IdentifyData = *IdeBlkIoDevicePtr->pIdData;\r
IdeBusDriverPrivateData->DeviceFound[IdeChannel * 2 + IdeDevice] = TRUE;\r
IdeInit->SubmitData (IdeInit, IdeChannel, IdeDevice, &IdentifyData);\r
} else {\r
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
if ((IdeBlkIoDevicePtr->Type == IdeHardDisk) || (IdeBlkIoDevicePtr->Type == Ide48bitAddressingHardDisk)) {\r
Status = SetDriveParameters (IdeBlkIoDevicePtr, &DriveParameters);\r
}\r
- \r
+\r
//\r
// Record PIO mode used in private data\r
//\r
- IdeBlkIoDevicePtr->PioMode = SupportedModes->PioMode.Mode;\r
+ IdeBlkIoDevicePtr->PioMode = (ATA_PIO_MODE) SupportedModes->PioMode.Mode;\r
\r
//\r
// Set IDE controller Timing Blocks in the PCI Configuration Space\r
(EFI_IO_BUS_ATA_ATAPI | EFI_P_PC_ENABLE),\r
IdeBlkIoDevicePtr->DevicePath\r
);\r
- \r
+\r
//\r
// Create event to clear pending IDE interrupt\r
//\r
Status = gBS->CreateEvent (\r
- EFI_EVENT_SIGNAL_EXIT_BOOT_SERVICES,\r
- EFI_TPL_NOTIFY,\r
+ EVT_SIGNAL_EXIT_BOOT_SERVICES,\r
+ TPL_NOTIFY,\r
ClearInterrupt,\r
IdeBlkIoDevicePtr,\r
- &Event\r
+ &IdeBlkIoDevicePtr->ExitBootServiceEvent\r
);\r
\r
- \r
//\r
// end of 2nd inner loop ----\r
//\r
// end of 2nd outer loop ==========\r
//\r
}\r
- \r
+\r
//\r
// All configurations done! Notify IdeController to do post initialization\r
// work such as saving IDE controller PCI settings for S3 resume\r
// ***********************************************************************************\r
//\r
/**\r
- Stop this driver on Controller Handle. \r
+ Stop this driver on Controller Handle.\r
\r
@param This Protocol instance pointer.\r
@param DeviceHandle Handle of device to stop driver on\r
);\r
return Status;\r
}\r
- \r
+\r
//\r
// Release allocated resources\r
//\r
{\r
IDE_BLK_IO_DEV *IdeBlkIoDevice;\r
EFI_STATUS Status;\r
+ EFI_TPL OldTpl;\r
+\r
+ OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
\r
IdeBlkIoDevice = IDE_BLOCK_IO_DEV_FROM_THIS (This);\r
//\r
//\r
// for ATA device, using ATA reset method\r
//\r
- if (IdeBlkIoDevice->Type == IdeHardDisk) {\r
- return AtaSoftReset (IdeBlkIoDevice);\r
+ if (IdeBlkIoDevice->Type == IdeHardDisk ||\r
+ IdeBlkIoDevice->Type == Ide48bitAddressingHardDisk) {\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
//\r
// for ATAPI device, using ATAPI reset method\r
//\r
Status = AtaSoftReset (IdeBlkIoDevice);\r
}\r
\r
+Done:\r
+ gBS->RestoreTPL (OldTpl);\r
return Status;\r
}\r
\r
// 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 (TPL_CALLBACK);\r
\r
IdeBlkIoDevice = IDE_BLOCK_IO_DEV_FROM_THIS (This);\r
\r
//\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
//\r
// for ATAPI device, using ATAPI read block's mechanism\r
//\r
- return AtapiBlkIoReadBlocks (\r
+ Status = AtapiBlkIoReadBlocks (\r
IdeBlkIoDevice,\r
MediaId,\r
LBA,\r
Buffer\r
);\r
\r
+Done:\r
+ gBS->RestoreTPL (OldTpl);\r
+\r
+ return Status;\r
}\r
\r
/**\r
// 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 (TPL_CALLBACK);\r
\r
IdeBlkIoDevice = IDE_BLOCK_IO_DEV_FROM_THIS (This);\r
//\r
// for ATA device, using ATA write block's mechanism\r
//\r
if (IdeBlkIoDevice->Type == IdeHardDisk ||\r
- IdeBlkIoDevice->Type == Ide48bitAddressingHardDisk) { \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
//\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
projects / mirror_edk2.git / blobdiff