leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ide: use wait_drive_not_busy() in drive_cmd_intr() (take 2)

Browse Source 
Use wait_drive_not_busy() in drive_cmd_intr().

v2:
* Fix wait_drive_not_busy() comment (noticed by Sergei).

Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Bartlomiej Zolnierkiewicz 2008-01-26 20:13:11 +01:00
parent 4906f3b4cd
commit 2624565caa
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/ide/ide-io.c
View File

@ -640,7 +640,6 @@ static ide_startstop_t drive_cmd_intr (ide_drive_t *drive)
ide_hwif_t *hwif = HWIF(drive); ide_hwif_t *hwif = HWIF(drive);
u8 *args = (u8 *) rq->buffer; u8 *args = (u8 *) rq->buffer;
u8 stat = hwif->INB(IDE_STATUS_REG); u8 stat = hwif->INB(IDE_STATUS_REG);
int retries = 10;
local_irq_enable_in_hardirq(); local_irq_enable_in_hardirq();
if (rq->cmd_type == REQ_TYPE_ATA_CMD && if (rq->cmd_type == REQ_TYPE_ATA_CMD &&
@ -649,8 +648,7 @@ static ide_startstop_t drive_cmd_intr (ide_drive_t *drive)
drive->io_32bit = 0; drive->io_32bit = 0;
hwif->ata_input_data(drive, &args[4], args[3] * SECTOR_WORDS); hwif->ata_input_data(drive, &args[4], args[3] * SECTOR_WORDS);
drive->io_32bit = io_32bit; drive->io_32bit = io_32bit;
while (((stat = hwif->INB(IDE_STATUS_REG)) & BUSY_STAT) && retries--) stat = wait_drive_not_busy(drive);
udelay(100);
} }
if (!OK_STAT(stat, READY_STAT, BAD_STAT)) if (!OK_STAT(stat, READY_STAT, BAD_STAT))

5
drivers/ide/ide-taskfile.c
View File

@ -260,7 +260,7 @@ static ide_startstop_t task_no_data_intr(ide_drive_t *drive)
return ide_stopped; return ide_stopped;
} }
static u8 wait_drive_not_busy(ide_drive_t *drive) u8 wait_drive_not_busy(ide_drive_t *drive)
{ {
ide_hwif_t *hwif = HWIF(drive); ide_hwif_t *hwif = HWIF(drive);
int retries; int retries;
@ -268,8 +268,7 @@ static u8 wait_drive_not_busy(ide_drive_t *drive)
/* /*
* Last sector was transfered, wait until drive is ready. * Last sector was transfered, wait until drive is ready.
* This can take up to 10 usec, but we will wait max 1 ms * This can take up to 10 usec, but we will wait max 1 ms.
* (drive_cmd_intr() waits that long).
*/ */
for (retries = 0; retries < 100; retries++) { for (retries = 0; retries < 100; retries++) {
if ((stat = hwif->INB(IDE_STATUS_REG)) & BUSY_STAT) if ((stat = hwif->INB(IDE_STATUS_REG)) & BUSY_STAT)

2
include/linux/ide.h
View File

@ -994,6 +994,8 @@ ide_startstop_t do_rw_taskfile(ide_drive_t *, ide_task_t *);
void task_end_request(ide_drive_t *, struct request *, u8); void task_end_request(ide_drive_t *, struct request *, u8);
u8 wait_drive_not_busy(ide_drive_t *);
int ide_raw_taskfile(ide_drive_t *, ide_task_t *, u8 *, u16); int ide_raw_taskfile(ide_drive_t *, ide_task_t *, u8 *, u16);
int ide_no_data_taskfile(ide_drive_t *, ide_task_t *); int ide_no_data_taskfile(ide_drive_t *, ide_task_t *);