tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

In AtaAtapiPassThru driver 

1.	move the non-blocking task related setting ahead to store the MapTable and PageCount in case there is a IO operation error happened then the error handler code could use those information to release the resource.
2.	Enlarge the TPL protective area to make sure the simulative delay time is accurate when there is mixing usage of Non blocking and blocking I/O.

Signed-off-by: qianouyang
Reviewed-by: erictian


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12712 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
qianouyang 2011-11-15 13:44:06 +00:00
parent 5d9f5dc1a0
commit 1aff716ac7
2 changed files with 159 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.c
View File

@ -905,15 +905,15 @@ AhciDmaTransfer (
// BlockIO tasks. // BlockIO tasks.
// Delay 100us to simulate the blocking time out checking. // Delay 100us to simulate the blocking time out checking.
// //
while ((Task == NULL) && (!IsListEmpty (&Instance->NonBlockingTaskList))) {
OldTpl = gBS->RaiseTPL (TPL_NOTIFY); OldTpl = gBS->RaiseTPL (TPL_NOTIFY);
while ((Task == NULL) && (!IsListEmpty (&Instance->NonBlockingTaskList))) {
AsyncNonBlockingTransferRoutine (NULL, Instance); AsyncNonBlockingTransferRoutine (NULL, Instance);
gBS->RestoreTPL (OldTpl);
// //
// Stall for 100us. // Stall for 100us.
// //
MicroSecondDelay (100); MicroSecondDelay (100);
} }
gBS->RestoreTPL (OldTpl);
if ((Task == NULL) || ((Task != NULL) && (!Task->IsStart))) { if ((Task == NULL) || ((Task != NULL) && (!Task->IsStart))) {
// //

31
MdeModulePkg/Bus/Ata/AtaAtapiPassThru/IdeMode.c
View File

@ -1495,15 +1495,15 @@ AtaUdmaInOut (
// BlockIO tasks. // BlockIO tasks.
// Delay 1ms to simulate the blocking time out checking. // Delay 1ms to simulate the blocking time out checking.
// //
while ((Task == NULL) && (!IsListEmpty (&Instance->NonBlockingTaskList))) {
OldTpl = gBS->RaiseTPL (TPL_NOTIFY); OldTpl = gBS->RaiseTPL (TPL_NOTIFY);
while ((Task == NULL) && (!IsListEmpty (&Instance->NonBlockingTaskList))) {
AsyncNonBlockingTransferRoutine (NULL, Instance); AsyncNonBlockingTransferRoutine (NULL, Instance);
gBS->RestoreTPL (OldTpl);
// //
// Stall for 1 milliseconds. // Stall for 1 milliseconds.
// //
MicroSecondDelay (1000); MicroSecondDelay (1000);
} }
gBS->RestoreTPL (OldTpl);
// //
// The data buffer should be even alignment // The data buffer should be even alignment
@ -1663,6 +1663,20 @@ AtaUdmaInOut (
} }
IdeWritePortB (PciIo, IoPortForBmic, RegisterValue); IdeWritePortB (PciIo, IoPortForBmic, RegisterValue);
if (Task != NULL) {
//
// Max transfer number of sectors for one command is 65536(32Mbyte),
// it will cost 1 second to transfer these data in UDMA mode 2(33.3MBps).
// So set the variable Count to 2000, for about 2 second Timeout time.
//
Task->RetryTimes = 2000;
Task->Map = BufferMap;
Task->TableMap = PrdTableMap;
Task->MapBaseAddress = PrdBaseAddr;
Task->PageCount = PageCount;
Task->IsStart = TRUE;
}
// //
// Issue ATA command // Issue ATA command
// //
@ -1685,19 +1699,6 @@ AtaUdmaInOut (
RegisterValue |= BMIC_START; RegisterValue |= BMIC_START;
IdeWritePortB(PciIo, IoPortForBmic, RegisterValue); IdeWritePortB(PciIo, IoPortForBmic, RegisterValue);
if (Task != NULL) {
//
// Max transfer number of sectors for one command is 65536(32Mbyte),
// it will cost 1 second to transfer these data in UDMA mode 2(33.3MBps).
// So set the variable Count to 2000, for about 2 second Timeout time.
//
Task->RetryTimes = 2000;
Task->Map = BufferMap;
Task->TableMap = PrdTableMap;
Task->MapBaseAddress = PrdBaseAddr;
Task->PageCount = PageCount;
Task->IsStart = TRUE;
}
} }
// //