diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-28 23:44:41 +0200 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-28 23:44:41 +0200 |
| commit | 22cdd6cedc93653a95965191e65a30619234a640 (patch) | |
| tree | 0335b5d38d13b45a029b3fcda9d1cf6915766bbc /drivers | |
| parent | 9f87abe892f899f19df8d472f937ee955cd6264b (diff) | |
| download | linux-22cdd6cedc93653a95965191e65a30619234a640.tar.gz | |
ide: skip "VLB sync" if host uses MMIO
* Skip "VLB sync" in ata_{in,out}put_data() if host uses MMIO.
* Use I/O ops directly in ata_vlb_sync() an drop no longer needed
'ide_drive_t *drive' argument.
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/ide/ide-iops.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c index daa23b19440e..60e3048a25f1 100644 --- a/drivers/ide/ide-iops.c +++ b/drivers/ide/ide-iops.c @@ -227,11 +227,11 @@ static void ide_tf_read(ide_drive_t *drive, ide_task_t *task) * of the sector count register location, with interrupts disabled * to ensure that the reads all happen together. */ -static void ata_vlb_sync(ide_drive_t *drive, unsigned long port) +static void ata_vlb_sync(unsigned long port) { - (void) HWIF(drive)->INB(port); - (void) HWIF(drive)->INB(port); - (void) HWIF(drive)->INB(port); + (void)inb(port); + (void)inb(port); + (void)inb(port); } /* @@ -255,9 +255,9 @@ static void ata_input_data(ide_drive_t *drive, struct request *rq, if (io_32bit) { unsigned long uninitialized_var(flags); - if (io_32bit & 2) { + if ((io_32bit & 2) && !mmio) { local_irq_save(flags); - ata_vlb_sync(drive, io_ports->nsect_addr); + ata_vlb_sync(io_ports->nsect_addr); } if (mmio) @@ -265,7 +265,7 @@ static void ata_input_data(ide_drive_t *drive, struct request *rq, else insl(data_addr, buf, len / 4); - if (io_32bit & 2) + if ((io_32bit & 2) && !mmio) local_irq_restore(flags); if ((len & 3) >= 2) { @@ -298,9 +298,9 @@ static void ata_output_data(ide_drive_t *drive, struct request *rq, if (io_32bit) { unsigned long uninitialized_var(flags); - if (io_32bit & 2) { + if ((io_32bit & 2) && !mmio) { local_irq_save(flags); - ata_vlb_sync(drive, io_ports->nsect_addr); + ata_vlb_sync(io_ports->nsect_addr); } if (mmio) @@ -308,7 +308,7 @@ static void ata_output_data(ide_drive_t *drive, struct request *rq, else outsl(data_addr, buf, len / 4); - if (io_32bit & 2) + if ((io_32bit & 2) && !mmio) local_irq_restore(flags); if ((len & 3) >= 2) { |