diff options
| author | Tejun Heo <htejun@gmail.com> | 2008-03-25 21:34:39 +0900 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2008-04-17 15:44:20 -0400 |
| commit | ed82f96425e744dffe62115e46f08eb785c0b2f3 (patch) | |
| tree | a4c61c016c6bd340d941ad141c14a8f7d837ab7f | |
| parent | d8b81b8008a0f131e01bb6eb5c681c900c327e2b (diff) | |
| download | op-kernel-dev-ed82f96425e744dffe62115e46f08eb785c0b2f3.zip op-kernel-dev-ed82f96425e744dffe62115e46f08eb785c0b2f3.tar.gz | |
libata/pdc_adma: make SFF EH handle non-bmdma SFF drivers and standardize pdc_adma ops
pdc_adma has interface similar to SFF but has its own DMA interface.
It currently implements noop bmdma ops to avoid crashing
ata_bmdma_error_handler() which BTW actually is EH for SFF drivers.
This patch makes ata_bmdma_error_handler() dereference bmdma ops iff
bmdma_addr is initialized as done in ata_bmdma_post_internal_cmd.
This change allows pdc_adma to standardize ops and use SFF
error_handler and post_internal_cmd.
Signed-off-by: Tejun Heo <htejun@gmail.com>
Cc: Mark Lord <liml@rtr.ca>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
| -rw-r--r-- | drivers/ata/libata-sff.c | 3 | ||||
| -rw-r--r-- | drivers/ata/pdc_adma.c | 16 |
2 files changed, 4 insertions, 15 deletions
diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c index c601dce..5208ca2 100644 --- a/drivers/ata/libata-sff.c +++ b/drivers/ata/libata-sff.c @@ -2014,7 +2014,8 @@ void ata_bmdma_error_handler(struct ata_port *ap) ap->hsm_task_state = HSM_ST_IDLE; - if (qc && (qc->tf.protocol == ATA_PROT_DMA || + if (ap->ioaddr.bmdma_addr && + qc && (qc->tf.protocol == ATA_PROT_DMA || qc->tf.protocol == ATAPI_PROT_DMA)) { u8 host_stat; diff --git a/drivers/ata/pdc_adma.c b/drivers/ata/pdc_adma.c index 5ed065d..577a0e5 100644 --- a/drivers/ata/pdc_adma.c +++ b/drivers/ata/pdc_adma.c @@ -136,8 +136,6 @@ static void adma_port_stop(struct ata_port *ap); static void adma_qc_prep(struct ata_queued_cmd *qc); static unsigned int adma_qc_issue(struct ata_queued_cmd *qc); static int adma_check_atapi_dma(struct ata_queued_cmd *qc); -static void adma_bmdma_stop(struct ata_queued_cmd *qc); -static u8 adma_bmdma_status(struct ata_port *ap); static void adma_freeze(struct ata_port *ap); static void adma_thaw(struct ata_port *ap); static int adma_prereset(struct ata_link *link, unsigned long deadline); @@ -158,8 +156,6 @@ static struct ata_port_operations adma_ata_ops = { .exec_command = ata_exec_command, .data_xfer = ata_data_xfer, .check_atapi_dma = adma_check_atapi_dma, - .bmdma_stop = adma_bmdma_stop, - .bmdma_status = adma_bmdma_status, .qc_prep = adma_qc_prep, .qc_issue = adma_qc_issue, .irq_on = ata_irq_on, @@ -168,6 +164,8 @@ static struct ata_port_operations adma_ata_ops = { .thaw = adma_thaw, .prereset = adma_prereset, .softreset = ata_std_softreset, + .error_handler = ata_bmdma_error_handler, + .post_internal_cmd = ata_bmdma_post_internal_cmd, .port_start = adma_port_start, .port_stop = adma_port_stop, @@ -204,16 +202,6 @@ static int adma_check_atapi_dma(struct ata_queued_cmd *qc) return 1; /* ATAPI DMA not yet supported */ } -static void adma_bmdma_stop(struct ata_queued_cmd *qc) -{ - /* nothing */ -} - -static u8 adma_bmdma_status(struct ata_port *ap) -{ - return 0; -} - static void adma_reset_engine(struct ata_port *ap) { void __iomem *chan = ADMA_PORT_REGS(ap); |
