diff options
author | Tejun Heo <htejun@gmail.com> | 2007-06-08 16:46:55 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-08 20:23:33 -0400 |
commit | 51b94d2a5a90d4800e74d7348bcde098a28f4fb3 (patch) | |
tree | 0d72d28e03d0c0136965e143c942ae79db8b1bdb /drivers | |
parent | 7b4dc1fdb868089ab60c09531d476284b71373e3 (diff) |
sata_promise: use TF interface for polling NODATA commands
sata_promise uses two different command modes - packet and TF. Packet mode
is intelligent low-overhead mode while TF is the same old taskfile
interface. As with other advanced interface (ahci/sil24),
ATA_TFLAG_POLLING has no effect in packet mode. However, PIO commands are
issued using TF interface in polling mode, so pdc_interrupt() considers
interrupts spurious if ATA_TFLAG_POLLING is set.
This is broken for polling NODATA commands because command is issued using
packet mode but the interrupt handler ignores it due to ATA_TFLAG_POLLING.
Fix pdc_qc_issue_prot() such that ATA/ATAPI NODATA commands are issued
using TF interface if ATA_TFLAG_POLLING is set.
This patch fixes detection failure introduced by polling SETXFERMODE.
Signed-off-by: Tejun Heo <htejun@gmail.com>
Acked-by: Mikael Pettersson <mikpe@it.uu.se>
Acked-by: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/ata/sata_promise.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/ata/sata_promise.c b/drivers/ata/sata_promise.c index 2b924a69b365..6dc0b011a6b7 100644 --- a/drivers/ata/sata_promise.c +++ b/drivers/ata/sata_promise.c | |||
@@ -784,9 +784,12 @@ static unsigned int pdc_qc_issue_prot(struct ata_queued_cmd *qc) | |||
784 | if (qc->dev->flags & ATA_DFLAG_CDB_INTR) | 784 | if (qc->dev->flags & ATA_DFLAG_CDB_INTR) |
785 | break; | 785 | break; |
786 | /*FALLTHROUGH*/ | 786 | /*FALLTHROUGH*/ |
787 | case ATA_PROT_NODATA: | ||
788 | if (qc->tf.flags & ATA_TFLAG_POLLING) | ||
789 | break; | ||
790 | /*FALLTHROUGH*/ | ||
787 | case ATA_PROT_ATAPI_DMA: | 791 | case ATA_PROT_ATAPI_DMA: |
788 | case ATA_PROT_DMA: | 792 | case ATA_PROT_DMA: |
789 | case ATA_PROT_NODATA: | ||
790 | pdc_packet_start(qc); | 793 | pdc_packet_start(qc); |
791 | return 0; | 794 | return 0; |
792 | 795 | ||
@@ -800,7 +803,7 @@ static unsigned int pdc_qc_issue_prot(struct ata_queued_cmd *qc) | |||
800 | static void pdc_tf_load_mmio(struct ata_port *ap, const struct ata_taskfile *tf) | 803 | static void pdc_tf_load_mmio(struct ata_port *ap, const struct ata_taskfile *tf) |
801 | { | 804 | { |
802 | WARN_ON (tf->protocol == ATA_PROT_DMA || | 805 | WARN_ON (tf->protocol == ATA_PROT_DMA || |
803 | tf->protocol == ATA_PROT_NODATA); | 806 | tf->protocol == ATA_PROT_ATAPI_DMA); |
804 | ata_tf_load(ap, tf); | 807 | ata_tf_load(ap, tf); |
805 | } | 808 | } |
806 | 809 | ||
@@ -808,7 +811,7 @@ static void pdc_tf_load_mmio(struct ata_port *ap, const struct ata_taskfile *tf) | |||
808 | static void pdc_exec_command_mmio(struct ata_port *ap, const struct ata_taskfile *tf) | 811 | static void pdc_exec_command_mmio(struct ata_port *ap, const struct ata_taskfile *tf) |
809 | { | 812 | { |
810 | WARN_ON (tf->protocol == ATA_PROT_DMA || | 813 | WARN_ON (tf->protocol == ATA_PROT_DMA || |
811 | tf->protocol == ATA_PROT_NODATA); | 814 | tf->protocol == ATA_PROT_ATAPI_DMA); |
812 | ata_exec_command(ap, tf); | 815 | ata_exec_command(ap, tf); |
813 | } | 816 | } |
814 | 817 | ||