libata-sff: remainder of separate-out-SFF-and-BMDMA-take2
PATCH 1/1 libata-sff: remainder of separate-out-SFF-and-BMDMA-take2
Hello, Jeff.
The followings are the refreshed left over patches from separate-out-SFF-and-BMDMA-take2.
0001-sata_mv-drop-unncessary-EH-callback-resetting.patch 0002-libata-sff-ata_sff_irq_clear-is-BMDMA-specific.patch 0003-libata-sff-separate-out-BMDMA-irq-handler.patch 0004-libata-sff-separate-out-BMDMA-init.patch 0005-libata-sff-kill-dummy-BMDMA-ops-from-sata_qstor-and-.patch 0006-libata-sff-make-BMDMA-optional.patch
0001 is the sata_mv part lost during merge. 0002-0006 are 0019-0023 refreshed against the current #upstream.
Thanks.
--
tejun
PATCH 1/6 sata_mv: drop unncessary EH callback resetting
Now that BMDMA EH ops are separated out from SFF ops, mv5_ops doesn't have to explicitly reset ->error_handler() and ->post_internal_cmd(). Drop them.
--- drivers/ata/sata_mv.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-)
drivers/ata/sata_mv.c +0 -2
@@ -675,8 +675,6 @@ static struct ata_port_operations mv5_ops = { .freeze = mv_eh_freeze, .thaw = mv_eh_thaw, .hardreset = mv_hardreset, - .error_handler = ata_std_error_handler, /* avoid SFF EH */ - .post_internal_cmd = ATA_OP_NULL, .scr_read = mv5_scr_read, .scr_write = mv5_scr_write,
Signature · 1 line
1.6.4.2
Re: [PATCH 1/6] sata_mv: drop unncessary EH callback resetting
Quoted 14 lines · Tejun Heo
Now that BMDMA EH ops are separated out from SFF ops,
mv5_opsdoesn't have to explicitly reset ->error_handler() and ->post_internal_cmd(). Drop them.Signed-off-by Tejun Heo<[email protected]>--- drivers/ata/sata_mv.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-)drivers/ata/sata_mv.c +0
-0
drivers/ata/sata_mv.c static struct ata_port_operations mv5_ops = { · line 679
Quoted 5 lines
drivers/ata/sata_mv.c +0
-2@@ -675,8 +675,6 @@ static struct ata_port_operations mv5_ops = { .freeze = mv_eh_freeze, .thaw = mv_eh_thaw, .hardreset = mv_hardreset, - .error_handler = ata_std_error_handler, /* avoid SFF EH */ - .post_internal_cmd = ATA_OP_NULL,
applied 1-6
PATCH 2/6 libata-sff: ata_sff_irq_clear() is BMDMA specific
In reply to Tejun Heoata_sff_irq_clear() is BMDMA specific. Rename it to ata_bmdma_irq_clear(), move it to ata_bmdma_port_ops and make ->sff_irq_clear() optional.
Note: ata_bmdma_irq_clear() is actually only needed by ata_piix and
possibly by sata_sil. This should be moved to respective low level drivers later.
--- drivers/ata/libata-sff.c | 67 +++++++++++++++++++++++++-------------------- drivers/ata/pata_bf54x.c | 2 +- drivers/ata/pata_scc.c | 2 +- drivers/ata/sata_nv.c | 2 +- drivers/ata/sata_sil.c | 4 +- drivers/ata/sata_via.c | 2 +- include/linux/libata.h | 1 + 7 files changed, 44 insertions(+), 36 deletions(-)
drivers/ata/libata-sff.c +37 -30
@@ -63,7 +63,6 @@ const struct ata_port_operations ata_sff_port_ops = { .sff_tf_read = ata_sff_tf_read, .sff_exec_command = ata_sff_exec_command, .sff_data_xfer = ata_sff_data_xfer, - .sff_irq_clear = ata_sff_irq_clear, .sff_drain_fifo = ata_sff_drain_fifo, .lost_interrupt = ata_sff_lost_interrupt,
@@ -395,33 +394,12 @@ void ata_sff_irq_on(struct ata_port *ap)ata_sff_set_devctl (ap, ap->ctl);ata_wait_idle (ap); - ap->ops->sff_irq_clear (ap); +if (ap->ops->sff_irq_clear) + ap->ops->sff_irq_clear (ap); }EXPORT_SYMBOL_GPL (ata_sff_irq_on);/** -* ata_sff_irq_clear - Clear PCI IDE BMDMA interrupt. -* @ap: Port associated with this ATA transaction. -* -* Clear interrupt and error flags in DMA status register. -* -* May be used as the irq_clear() entry in ata_port_operations. -* -* LOCKING: -* spin_lock_irqsave(host lock) -*/ -void ata_sff_irq_clear (struct ata_port *ap) -{ -void __iomem *mmio = ap->ioaddr.bmdma_addr; - -if (!mmio) -return ; - -iowrite8 (ioread8 (mmio +ATA_DMA_STATUS ), mmio +ATA_DMA_STATUS ); -} -EXPORT_SYMBOL_GPL (ata_sff_irq_clear); - -/** * ata_sff_tf_load - send taskfile registers to host controller * @ap: Port to which output is sent * @tf: ATA taskfile register set
@@ -1572,7 +1550,8 @@ unsigned int ata_sff_host_intr(struct ata_port *ap, }/* clear irq events */ - ap->ops->sff_irq_clear (ap); +if (ap->ops->sff_irq_clear) + ap->ops->sff_irq_clear (ap);ata_sff_hsm_move (ap, qc, status,0 );
@@ -1588,7 +1567,8 @@ idle_irq:#ifdef ATA_IRQ_TRAP if ((ap->stats.idle_irq %1000 ) ==0 ) { ap->ops->sff_check_status (ap); - ap->ops->sff_irq_clear (ap); +if (ap->ops->sff_irq_clear) + ap->ops->sff_irq_clear (ap);ata_port_printk (ap,KERN_WARNING ,"irq trap\n" );return 1 ; }
@@ -1658,7 +1638,8 @@ retry:if (idle & (1 << i)) { ap->ops->sff_check_status (ap); - ap->ops->sff_irq_clear (ap); +if (ap->ops->sff_irq_clear) + ap->ops->sff_irq_clear (ap); }else {/* clear INTRQ and check if BUSY cleared */ if (!(ap->ops->sff_check_status (ap) &ATA_BUSY ))
@@ -1744,7 +1725,8 @@ void ata_sff_freeze(struct ata_port *ap)*/ ap->ops->sff_check_status (ap); - ap->ops->sff_irq_clear (ap); +if (ap->ops->sff_irq_clear) + ap->ops->sff_irq_clear (ap); }EXPORT_SYMBOL_GPL (ata_sff_freeze);
@@ -1761,7 +1743,8 @@ void ata_sff_thaw(struct ata_port *ap) {/* clear & re-enable interrupts */ ap->ops->sff_check_status (ap); - ap->ops->sff_irq_clear (ap); +if (ap->ops->sff_irq_clear) + ap->ops->sff_irq_clear (ap);ata_sff_irq_on (ap); }EXPORT_SYMBOL_GPL (ata_sff_thaw);
@@ -2580,6 +2563,7 @@ const struct ata_port_operations ata_bmdma_port_ops = { .qc_prep = ata_bmdma_qc_prep, .qc_issue = ata_bmdma_qc_issue, + .sff_irq_clear = ata_bmdma_irq_clear, .bmdma_setup = ata_bmdma_setup, .bmdma_start = ata_bmdma_start, .bmdma_stop = ata_bmdma_stop,
@@ -2848,7 +2832,8 @@ void ata_bmdma_error_handler(struct ata_port *ap)/* if we're gonna thaw, make sure IRQ is clear */ if (thaw) { ap->ops->sff_check_status (ap); - ap->ops->sff_irq_clear (ap); +if (ap->ops->sff_irq_clear) + ap->ops->sff_irq_clear (ap); } }
@@ -2882,6 +2867,28 @@ void ata_bmdma_post_internal_cmd(struct ata_queued_cmd *qc)EXPORT_SYMBOL_GPL (ata_bmdma_post_internal_cmd);/** +* ata_bmdma_irq_clear - Clear PCI IDE BMDMA interrupt. +* @ap: Port associated with this ATA transaction. +* +* Clear interrupt and error flags in DMA status register. +* +* May be used as the irq_clear() entry in ata_port_operations. +* +* LOCKING: +* spin_lock_irqsave(host lock) +*/ +void ata_bmdma_irq_clear (struct ata_port *ap) +{ +void __iomem *mmio = ap->ioaddr.bmdma_addr; + +if (!mmio) +return ; + +iowrite8 (ioread8 (mmio +ATA_DMA_STATUS ), mmio +ATA_DMA_STATUS ); +} +EXPORT_SYMBOL_GPL (ata_bmdma_irq_clear); + +/** * ata_bmdma_setup - Set up PCI IDE BMDMA transaction * @qc: Info associated with this ATA transaction. *
drivers/ata/pata_bf54x.c +1 -1
@@ -1214,7 +1214,7 @@ static unsigned int bfin_data_xfer(struct ata_device *dev, unsigned char *buf,* bfin_irq_clear - Clear ATAPI interrupt. * @ap: Port associated with this ATA transaction. * -* Note: Original code is ata_sff_irq_clear(). +* Note: Original code is ata_bmdma_irq_clear(). */ static void bfin_irq_clear (struct ata_port *ap)
drivers/ata/pata_scc.c +1 -1
@@ -875,7 +875,7 @@ static void scc_postreset(struct ata_link *link, unsigned int *classes)* scc_irq_clear - Clear PCI IDE BMDMA interrupt. * @ap: Port associated with this ATA transaction. * -* Note: Original code is ata_sff_irq_clear(). +* Note: Original code is ata_bmdma_irq_clear(). */ static void scc_irq_clear (struct ata_port *ap)
drivers/ata/sata_nv.c +1 -1
@@ -1100,7 +1100,7 @@ static void nv_adma_irq_clear(struct ata_port *ap)u32 notifier_clears[2 ];if (pp->flags &NV_ADMA_ATAPI_SETUP_COMPLETE ) { -ata_sff_irq_clear (ap); +ata_bmdma_irq_clear (ap);return ; }
drivers/ata/sata_sil.c +2 -2
@@ -503,7 +503,7 @@ static void sil_host_intr(struct ata_port *ap, u32 bmdma2) goto err_hsm;/* ack bmdma irq events */ -ata_sff_irq_clear (ap); +ata_bmdma_irq_clear (ap);/* kick HSM in the ass */ ata_sff_hsm_move (ap, qc, status,0 );
@@ -584,7 +584,7 @@ static void sil_thaw(struct ata_port *ap)/* clear IRQ */ ap->ops->sff_check_status (ap); -ata_sff_irq_clear (ap); +ata_bmdma_irq_clear (ap);/* turn on SATA IRQ if supported */ if (!(ap->flags &SIL_FLAG_NO_SATA_IRQ ))
drivers/ata/sata_via.c +1 -1
@@ -308,7 +308,7 @@ static void svia_noop_freeze(struct ata_port *ap)* certain way. Leave it alone and just clear pending IRQ. */ ap->ops->sff_check_status (ap); -ata_sff_irq_clear (ap); +ata_bmdma_irq_clear (ap); }/**
include/linux/libata.h +1 -0
@@ -1630,6 +1630,7 @@ extern unsigned int ata_bmdma_qc_issue(struct ata_queued_cmd *qc);extern void ata_bmdma_dumb_qc_prep (struct ata_queued_cmd *qc);extern void ata_bmdma_error_handler (struct ata_port *ap);extern void ata_bmdma_post_internal_cmd (struct ata_queued_cmd *qc); +extern void ata_bmdma_irq_clear (struct ata_port *ap);extern void ata_bmdma_setup (struct ata_queued_cmd *qc);extern void ata_bmdma_start (struct ata_queued_cmd *qc);extern void ata_bmdma_stop (struct ata_queued_cmd *qc);
Signature · 1 line
1.6.4.2
PATCH 3/6 libata-sff: separate out BMDMA irq handler
In reply to Tejun HeoSeparate out BMDMA irq handler from SFF irq handler. The misnamed host_intr() functions are renamed to ata_sff_port_intr() and ata_bmdma_port_intr(). Common parts are factored into __ata_sff_port_intr() and __ata_sff_interrupt() and used by sff and bmdma interrupt routines.
All BMDMA drivers now use ata_bmdma_interrupt() or ata_bmdma_port_intr() while all non-BMDMA SFF ones use ata_sff_interrupt() or ata_sff_port_intr().
For now, ata_pci_sff_init_one() uses ata_bmdma_interrupt() as it's used by both SFF and BMDMA drivers.
--- drivers/ata/ata_piix.c | 2 +- drivers/ata/libata-sff.c | 208 +++++++++++++++++++++++++++---------------- drivers/ata/pata_atp867x.c | 2 +- drivers/ata/pata_cs5520.c | 2 +- drivers/ata/pata_hpt3x3.c | 2 +- drivers/ata/pata_icside.c | 2 +- drivers/ata/pata_macio.c | 2 +- drivers/ata/pata_mpc52xx.c | 2 +- drivers/ata/pata_ninja32.c | 2 +- drivers/ata/pata_pdc2027x.c | 2 +- drivers/ata/pata_rdc.c | 2 +- drivers/ata/pata_scc.c | 2 +- drivers/ata/pata_sil680.c | 2 +- drivers/ata/sata_mv.c | 2 +- drivers/ata/sata_nv.c | 4 +- drivers/ata/sata_qstor.c | 2 +- drivers/ata/sata_sis.c | 2 +- drivers/ata/sata_svw.c | 2 +- drivers/ata/sata_uli.c | 2 +- drivers/ata/sata_via.c | 2 +- drivers/ata/sata_vsc.c | 2 +- include/linux/libata.h | 5 +- 22 files changed, 155 insertions(+), 100 deletions(-)
drivers/ata/ata_piix.c +1 -1
@@ -1626,7 +1626,7 @@ static int __devinit piix_init_one(struct pci_dev *pdev, host->flags |=ATA_HOST_PARALLEL_SCAN ;pci_set_master (pdev); -return ata_pci_sff_activate_host (host, ata_sff_interrupt, &piix_sht); +return ata_pci_sff_activate_host (host, ata_bmdma_interrupt, &piix_sht); }static void piix_remove_one (struct pci_dev *pdev)
drivers/ata/libata-sff.c +130 -78
280 lines not on this page · raw message
drivers/ata/pata_atp867x.c +1 -1
@@ -525,7 +525,7 @@ static int atp867x_init_one(struct pci_dev *pdev,pci_set_master (pdev); - rc =ata_host_activate (host, pdev->irq, ata_sff_interrupt, + rc =ata_host_activate (host, pdev->irq, ata_bmdma_interrupt,IRQF_SHARED , &atp867x_sht);if (rc)dev_printk (KERN_ERR , &pdev->dev,"failed to activate host\n" );
drivers/ata/pata_cs5520.c +1 -1
@@ -221,7 +221,7 @@ static int __devinit cs5520_init_one(struct pci_dev *pdev, const struct pci_devicontinue ; rc =devm_request_irq (&pdev->dev, irq[ap->port_no], - ata_sff_interrupt,0 ,DRV_NAME , host); + ata_bmdma_interrupt,0 ,DRV_NAME , host);if (rc)return rc;
drivers/ata/pata_hpt3x3.c +1 -1
@@ -248,7 +248,7 @@ static int hpt3x3_init_one(struct pci_dev *pdev, const struct pci_device_id *id)ata_port_pbar_desc (ap,4 , offset_cmd[i],"cmd" ); }pci_set_master (pdev); -return ata_host_activate (host, pdev->irq, ata_sff_interrupt, +return ata_host_activate (host, pdev->irq, ata_bmdma_interrupt,IRQF_SHARED , &hpt3x3_sht); }
drivers/ata/pata_icside.c +1 -1
@@ -470,7 +470,7 @@ static int __devinit pata_icside_add_ports(struct pata_icside_info *info)pata_icside_setup_ioaddr (ap, info->base, info, info->port[i]); } -return ata_host_activate (host, ec->irq, ata_sff_interrupt,0 , +return ata_host_activate (host, ec->irq, ata_bmdma_interrupt,0 , &pata_icside_sht); }
drivers/ata/pata_macio.c +1 -1
@@ -1110,7 +1110,7 @@ static int __devinit pata_macio_common_init(struct pata_macio_priv *priv,/* Start it up */ priv->irq = irq; -return ata_host_activate (priv->host, irq, ata_sff_interrupt,0 , +return ata_host_activate (priv->host, irq, ata_bmdma_interrupt,0 , &pata_macio_sht); }
drivers/ata/pata_mpc52xx.c +1 -1
@@ -659,7 +659,7 @@ mpc52xx_ata_init_one(struct device *dev, struct mpc52xx_ata_priv *priv,ata_port_desc (ap,"ata_regs 0x%lx" , raw_ata_regs);/* activate host */ -return ata_host_activate (host, priv->ata_irq, ata_sff_interrupt,0 , +return ata_host_activate (host, priv->ata_irq, ata_bmdma_interrupt,0 , &mpc52xx_ata_sht); }
drivers/ata/pata_ninja32.c +1 -1
@@ -149,7 +149,7 @@ static int ninja32_init_one(struct pci_dev *dev, const struct pci_device_id *id)ninja32_program (base);/* FIXME: Should we disable them at remove ? */ -return ata_host_activate (host, dev->irq, ata_sff_interrupt, +return ata_host_activate (host, dev->irq, ata_bmdma_interrupt,IRQF_SHARED , &ninja32_sht); }
drivers/ata/pata_pdc2027x.c +1 -1
@@ -754,7 +754,7 @@ static int __devinit pdc2027x_init_one(struct pci_dev *pdev, const struct pci_dereturn -EIO ;pci_set_master (pdev); -return ata_host_activate (host, pdev->irq, ata_sff_interrupt, +return ata_host_activate (host, pdev->irq, ata_bmdma_interrupt,IRQF_SHARED , &pdc2027x_sht); }
drivers/ata/pata_rdc.c +1 -1
@@ -354,7 +354,7 @@ static int __devinit rdc_init_one(struct pci_dev *pdev, host->flags |=ATA_HOST_PARALLEL_SCAN ;pci_set_master (pdev); -return ata_pci_sff_activate_host (host, ata_sff_interrupt, &rdc_sht); +return ata_pci_sff_activate_host (host, ata_bmdma_interrupt, &rdc_sht); }static void rdc_remove_one (struct pci_dev *pdev)
drivers/ata/pata_scc.c +1 -1
@@ -1105,7 +1105,7 @@ static int scc_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)if (rc)return rc; -return ata_host_activate (host, pdev->irq, ata_sff_interrupt, +return ata_host_activate (host, pdev->irq, ata_bmdma_interrupt,IRQF_SHARED , &scc_sht); }
drivers/ata/pata_sil680.c +1 -1
@@ -374,7 +374,7 @@ static int __devinit sil680_init_one(struct pci_dev *pdev,ata_sff_std_ports (&host->ports[1 ]->ioaddr);/* Register & activate */ -return ata_host_activate (host, pdev->irq, ata_sff_interrupt, +return ata_host_activate (host, pdev->irq, ata_bmdma_interrupt,IRQF_SHARED , &sil680_sht); use_ioports:
drivers/ata/sata_mv.c +1 -1
@@ -2811,7 +2811,7 @@ static void mv_port_intr(struct ata_port *ap, u32 port_cause) }else if (!edma_was_enabled) {struct ata_queued_cmd *qc =mv_get_active_qc (ap);if (qc) -ata_sff_host_intr (ap, qc); +ata_bmdma_port_intr (ap, qc);else mv_unexpected_intr (ap, edma_was_enabled); }
drivers/ata/sata_nv.c +2 -2
@@ -920,7 +920,7 @@ static int nv_host_intr(struct ata_port *ap, u8 irq_stat) }/* handle interrupt */ -return ata_sff_host_intr (ap, qc); +return ata_bmdma_port_intr (ap, qc); }static irqreturn_t nv_adma_interrupt (int irq,void *dev_instance)
@@ -1505,7 +1505,7 @@ static irqreturn_t nv_generic_interrupt(int irq, void *dev_instance) qc =ata_qc_from_tag (ap, ap->link.active_tag);if (qc && (!(qc->tf.flags &ATA_TFLAG_POLLING ))) { - handled +=ata_sff_host_intr (ap, qc); + handled +=ata_bmdma_port_intr (ap, qc); }else {/* * No request pending? Clear interrupt status
drivers/ata/sata_qstor.c +1 -1
@@ -454,7 +454,7 @@ static inline unsigned int qs_intr_mmio(struct ata_host *host)if (!pp || pp->state != qs_state_mmio)continue ;if (!(qc->tf.flags &ATA_TFLAG_POLLING )) - handled |=ata_sff_host_intr (ap, qc); + handled |=ata_sff_port_intr (ap, qc); }return handled; }
drivers/ata/sata_sis.c +1 -1
@@ -308,7 +308,7 @@ static int sis_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)pci_set_master (pdev);pci_intx (pdev,1 ); -return ata_host_activate (host, pdev->irq, ata_sff_interrupt, +return ata_host_activate (host, pdev->irq, ata_bmdma_interrupt,IRQF_SHARED , &sis_sht); }
drivers/ata/sata_svw.c +1 -1
@@ -502,7 +502,7 @@ static int k2_sata_init_one(struct pci_dev *pdev, const struct pci_device_id *enwritel (0x0 , mmio_base +K2_SATA_SIM_OFFSET );pci_set_master (pdev); -return ata_host_activate (host, pdev->irq, ata_sff_interrupt, +return ata_host_activate (host, pdev->irq, ata_bmdma_interrupt,IRQF_SHARED , &k2_sata_sht); }
drivers/ata/sata_uli.c +1 -1
@@ -242,7 +242,7 @@ static int uli_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)pci_set_master (pdev);pci_intx (pdev,1 ); -return ata_host_activate (host, pdev->irq, ata_sff_interrupt, +return ata_host_activate (host, pdev->irq, ata_bmdma_interrupt,IRQF_SHARED , &uli_sht); }
drivers/ata/sata_via.c +1 -1
@@ -628,7 +628,7 @@ static int svia_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)svia_configure (pdev);pci_set_master (pdev); -return ata_host_activate (host, pdev->irq, ata_sff_interrupt, +return ata_host_activate (host, pdev->irq, ata_bmdma_interrupt,IRQF_SHARED , &svia_sht); }
drivers/ata/sata_vsc.c +1 -1
@@ -245,7 +245,7 @@ static void vsc_port_intr(u8 port_status, struct ata_port *ap) qc =ata_qc_from_tag (ap, ap->link.active_tag);if (qc &&likely (!(qc->tf.flags &ATA_TFLAG_POLLING ))) - handled =ata_sff_host_intr (ap, qc); + handled =ata_bmdma_port_intr (ap, qc);/* We received an interrupt during a polled command, * or some other spurious condition. Interrupt reporting
include/linux/libata.h +4 -1
@@ -1593,7 +1593,7 @@ extern int ata_sff_hsm_move(struct ata_port *ap, struct ata_queued_cmd *qc,extern void ata_sff_queue_pio_task (struct ata_port *ap,unsigned long delay);extern unsigned int ata_sff_qc_issue (struct ata_queued_cmd *qc);extern bool ata_sff_qc_fill_rtf (struct ata_queued_cmd *qc); -extern unsigned int ata_sff_host_intr (struct ata_port *ap, +extern unsigned int ata_sff_port_intr (struct ata_port *ap,struct ata_queued_cmd *qc);extern irqreturn_t ata_sff_interrupt (int irq,void *dev_instance);extern void ata_sff_lost_interrupt (struct ata_port *ap);
@@ -1628,6 +1628,9 @@ extern int ata_pci_sff_init_one(struct pci_dev *pdev,extern void ata_bmdma_qc_prep (struct ata_queued_cmd *qc);extern unsigned int ata_bmdma_qc_issue (struct ata_queued_cmd *qc);extern void ata_bmdma_dumb_qc_prep (struct ata_queued_cmd *qc); +extern unsigned int ata_bmdma_port_intr (struct ata_port *ap, +struct ata_queued_cmd *qc); +extern irqreturn_t ata_bmdma_interrupt (int irq,void *dev_instance);extern void ata_bmdma_error_handler (struct ata_port *ap);extern void ata_bmdma_post_internal_cmd (struct ata_queued_cmd *qc);extern void ata_bmdma_irq_clear (struct ata_port *ap);
Signature · 1 line
1.6.4.2
PATCH 4/6 libata-sff: separate out BMDMA init
In reply to Tejun HeoSeparate out ata_pci_bmdma_prepare_host() and ata_pci_bmdma_init_one() from their SFF counterparts. SFF ones no longer try to initialize BMDMA or set PCI master.
--- drivers/ata/ata_generic.c | 2 +- drivers/ata/ata_piix.c | 2 +- drivers/ata/libata-sff.c | 138 ++++++++++++++++++++++++++++++++------- drivers/ata/pata_acpi.c | 2 +- drivers/ata/pata_ali.c | 5 +- drivers/ata/pata_amd.c | 2 +- drivers/ata/pata_artop.c | 2 +- drivers/ata/pata_atiixp.c | 4 +- drivers/ata/pata_cmd64x.c | 2 +- drivers/ata/pata_cs5530.c | 2 +- drivers/ata/pata_cs5535.c | 2 +- drivers/ata/pata_cs5536.c | 2 +- drivers/ata/pata_cypress.c | 2 +- drivers/ata/pata_efar.c | 4 +- drivers/ata/pata_hpt366.c | 2 +- drivers/ata/pata_hpt37x.c | 2 +- drivers/ata/pata_hpt3x2n.c | 2 +- drivers/ata/pata_it8213.c | 2 +- drivers/ata/pata_it821x.c | 2 +- drivers/ata/pata_jmicron.c | 2 +- drivers/ata/pata_marvell.c | 2 +- drivers/ata/pata_netcell.c | 2 +- drivers/ata/pata_ns87415.c | 2 +- drivers/ata/pata_oldpiix.c | 2 +- drivers/ata/pata_optidma.c | 2 +- drivers/ata/pata_pdc202xx_old.c | 2 +- drivers/ata/pata_piccolo.c | 2 +- drivers/ata/pata_radisys.c | 2 +- drivers/ata/pata_rdc.c | 2 +- drivers/ata/pata_sc1200.c | 2 +- drivers/ata/pata_sch.c | 2 +- drivers/ata/pata_serverworks.c | 2 +- drivers/ata/pata_sil680.c | 2 +- drivers/ata/pata_sis.c | 2 +- drivers/ata/pata_sl82c105.c | 2 +- drivers/ata/pata_triflex.c | 2 +- drivers/ata/pata_via.c | 2 +- drivers/ata/sata_nv.c | 2 +- drivers/ata/sata_sis.c | 2 +- drivers/ata/sata_via.c | 4 +- include/linux/libata.h | 7 ++ 41 files changed, 166 insertions(+), 66 deletions(-)
drivers/ata/ata_generic.c +1 -1
@@ -155,7 +155,7 @@ static int ata_generic_init_one(struct pci_dev *dev, const struct pci_device_idreturn rc;pcim_pin_device (dev); } -return ata_pci_sff_init_one (dev, ppi, &generic_sht,NULL ,0 ); +return ata_pci_bmdma_init_one (dev, ppi, &generic_sht,NULL ,0 ); }static struct pci_device_id ata_generic[] = {
drivers/ata/ata_piix.c +1 -1
@@ -1589,7 +1589,7 @@ static int __devinit piix_init_one(struct pci_dev *pdev, hpriv->map =piix_init_sata_map (pdev, port_info, piix_map_db_table[ent->driver_data]); - rc =ata_pci_sff_prepare_host (pdev, ppi, &host); + rc =ata_pci_bmdma_prepare_host (pdev, ppi, &host);if (rc)return rc; host->private_data = hpriv;
drivers/ata/libata-sff.c +114 -24
189 lines not on this page · raw message
drivers/ata/pata_acpi.c +1 -1
@@ -260,7 +260,7 @@ static int pacpi_init_one (struct pci_dev *pdev, const struct pci_device_id *id)return rc;pcim_pin_device (pdev); } -return ata_pci_sff_init_one (pdev, ppi, &pacpi_sht,NULL ,0 ); +return ata_pci_bmdma_init_one (pdev, ppi, &pacpi_sht,NULL ,0 ); }static const struct pci_device_id pacpi_pci_tbl[] = {
drivers/ata/pata_ali.c +4 -1
@@ -583,7 +583,10 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id) ppi[0 ] = &info_20_udma; } -return ata_pci_sff_init_one (pdev, ppi, &ali_sht,NULL ,0 ); +if (!ppi[0 ]->mwdma_mask && !ppi[0 ]->udma_mask) +return ata_pci_sff_init_one (pdev, ppi, &ali_sht,NULL ,0 ); +else +return ata_pci_bmdma_init_one (pdev, ppi, &ali_sht,NULL ,0 ); }#ifdef CONFIG_PM
drivers/ata/pata_amd.c +1 -1
@@ -574,7 +574,7 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) }/* And fire it up */ -return ata_pci_sff_init_one (pdev, ppi, &amd_sht, hpriv,0 ); +return ata_pci_bmdma_init_one (pdev, ppi, &amd_sht, hpriv,0 ); }#ifdef CONFIG_PM
drivers/ata/pata_artop.c +1 -1
@@ -421,7 +421,7 @@ static int artop_init_one (struct pci_dev *pdev, const struct pci_device_id *id)BUG_ON (ppi[0 ] ==NULL ); -return ata_pci_sff_init_one (pdev, ppi, &artop_sht,NULL ,0 ); +return ata_pci_bmdma_init_one (pdev, ppi, &artop_sht,NULL ,0 ); }static const struct pci_device_id artop_pci_tbl[] = {
drivers/ata/pata_atiixp.c +2 -2
@@ -246,8 +246,8 @@ static int atiixp_init_one(struct pci_dev *pdev, const struct pci_device_id *id)if (!pci_test_config_bits (pdev, &atiixp_enable_bits[i])) ppi[i] = &ata_dummy_port_info; -return ata_pci_sff_init_one (pdev, ppi, &atiixp_sht,NULL , -ATA_HOST_PARALLEL_SCAN ); +return ata_pci_bmdma_init_one (pdev, ppi, &atiixp_sht,NULL , +ATA_HOST_PARALLEL_SCAN ); }static const struct pci_device_id atiixp[] = {
drivers/ata/pata_cmd64x.c +1 -1
@@ -367,7 +367,7 @@ static int cmd64x_init_one(struct pci_dev *pdev, const struct pci_device_id *id)pci_write_config_byte (pdev,UDIDETCR0 ,0xF0 );#endif -return ata_pci_sff_init_one (pdev, ppi, &cmd64x_sht,NULL ,0 ); +return ata_pci_bmdma_init_one (pdev, ppi, &cmd64x_sht,NULL ,0 ); }#ifdef CONFIG_PM
drivers/ata/pata_cs5530.c +1 -1
@@ -324,7 +324,7 @@ static int cs5530_init_one(struct pci_dev *pdev, const struct pci_device_id *id) ppi[1 ] = &info_palmax_secondary;/* Now kick off ATA set up */ -return ata_pci_sff_init_one (pdev, ppi, &cs5530_sht,NULL ,0 ); +return ata_pci_bmdma_init_one (pdev, ppi, &cs5530_sht,NULL ,0 ); }#ifdef CONFIG_PM
drivers/ata/pata_cs5535.c +1 -1
@@ -198,7 +198,7 @@ static int cs5535_init_one(struct pci_dev *dev, const struct pci_device_id *id)rdmsr (ATAC_CH0D1_PIO , timings, dummy);if (CS5535_BAD_PIO (timings))wrmsr (ATAC_CH0D1_PIO ,0xF7F4F7F4UL ,0 ); -return ata_pci_sff_init_one (dev, ppi, &cs5535_sht,NULL ,0 ); +return ata_pci_bmdma_init_one (dev, ppi, &cs5535_sht,NULL ,0 ); }static const struct pci_device_id cs5535[] = {
drivers/ata/pata_cs5536.c +1 -1
@@ -260,7 +260,7 @@ static int cs5536_init_one(struct pci_dev *dev, const struct pci_device_id *id)return -ENODEV ; } -return ata_pci_sff_init_one (dev, ppi, &cs5536_sht,NULL ,0 ); +return ata_pci_bmdma_init_one (dev, ppi, &cs5536_sht,NULL ,0 ); }static const struct pci_device_id cs5536[] = {
drivers/ata/pata_cypress.c +1 -1
@@ -138,7 +138,7 @@ static int cy82c693_init_one(struct pci_dev *pdev, const struct pci_device_id *iif (PCI_FUNC (pdev->devfn) !=1 )return -ENODEV ; -return ata_pci_sff_init_one (pdev, ppi, &cy82c693_sht,NULL ,0 ); +return ata_pci_bmdma_init_one (pdev, ppi, &cy82c693_sht,NULL ,0 ); }static const struct pci_device_id cy82c693[] = {
drivers/ata/pata_efar.c +2 -2
@@ -277,8 +277,8 @@ static int efar_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)dev_printk (KERN_DEBUG , &pdev->dev,"version " DRV_VERSION "\n" ); -return ata_pci_sff_init_one (pdev, ppi, &efar_sht,NULL , -ATA_HOST_PARALLEL_SCAN ); +return ata_pci_bmdma_init_one (pdev, ppi, &efar_sht,NULL , +ATA_HOST_PARALLEL_SCAN ); }static const struct pci_device_id efar_pci_tbl[] = {
drivers/ata/pata_hpt366.c +1 -1
@@ -361,7 +361,7 @@ static int hpt36x_init_one(struct pci_dev *dev, const struct pci_device_id *id)break ; }/* Now kick off ATA set up */ -return ata_pci_sff_init_one (dev, ppi, &hpt36x_sht, hpriv,0 ); +return ata_pci_bmdma_init_one (dev, ppi, &hpt36x_sht, hpriv,0 ); }#ifdef CONFIG_PM
drivers/ata/pata_hpt37x.c +1 -1
@@ -987,7 +987,7 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id) }/* Now kick off ATA set up */ -return ata_pci_sff_init_one (dev, ppi, &hpt37x_sht, private_data,0 ); +return ata_pci_bmdma_init_one (dev, ppi, &hpt37x_sht, private_data,0 ); }static const struct pci_device_id hpt37x[] = {
drivers/ata/pata_hpt3x2n.c +1 -1
@@ -548,7 +548,7 @@ static int hpt3x2n_init_one(struct pci_dev *dev, const struct pci_device_id *id)outb (inb (iobase +0x9c ) |0x04 , iobase +0x9c );/* Now kick off ATA set up */ -return ata_pci_sff_init_one (dev, ppi, &hpt3x2n_sht, hpriv,0 ); +return ata_pci_bmdma_init_one (dev, ppi, &hpt3x2n_sht, hpriv,0 ); }static const struct pci_device_id hpt3x2n[] = {
drivers/ata/pata_it8213.c +1 -1
@@ -273,7 +273,7 @@ static int it8213_init_one (struct pci_dev *pdev, const struct pci_device_id *endev_printk (KERN_DEBUG , &pdev->dev,"version " DRV_VERSION "\n" ); -return ata_pci_sff_init_one (pdev, ppi, &it8213_sht,NULL ,0 ); +return ata_pci_bmdma_init_one (pdev, ppi, &it8213_sht,NULL ,0 ); }static const struct pci_device_id it8213_pci_tbl[] = {
drivers/ata/pata_it821x.c +1 -1
@@ -933,7 +933,7 @@ static int it821x_init_one(struct pci_dev *pdev, const struct pci_device_id *id)else ppi[0 ] = &info_smart; } -return ata_pci_sff_init_one (pdev, ppi, &it821x_sht,NULL ,0 ); +return ata_pci_bmdma_init_one (pdev, ppi, &it821x_sht,NULL ,0 ); }#ifdef CONFIG_PM
drivers/ata/pata_jmicron.c +1 -1
@@ -144,7 +144,7 @@ static int jmicron_init_one (struct pci_dev *pdev, const struct pci_device_id *i };const struct ata_port_info *ppi[] = { &info,NULL }; -return ata_pci_sff_init_one (pdev, ppi, &jmicron_sht,NULL ,0 ); +return ata_pci_bmdma_init_one (pdev, ppi, &jmicron_sht,NULL ,0 ); }static const struct pci_device_id jmicron_pci_tbl[] = {
drivers/ata/pata_marvell.c +1 -1
@@ -153,7 +153,7 @@ static int marvell_init_one (struct pci_dev *pdev, const struct pci_device_id *ireturn -ENODEV ; }#endif -return ata_pci_sff_init_one (pdev, ppi, &marvell_sht,NULL ,0 ); +return ata_pci_bmdma_init_one (pdev, ppi, &marvell_sht,NULL ,0 ); } static const struct pci_device_id marvell_pci_tbl[] = {
drivers/ata/pata_netcell.c +1 -1
@@ -82,7 +82,7 @@ static int netcell_init_one (struct pci_dev *pdev, const struct pci_device_id *eata_pci_bmdma_clear_simplex (pdev);/* And let the library code do the work */ -return ata_pci_sff_init_one (pdev, port_info, &netcell_sht,NULL ,0 ); +return ata_pci_bmdma_init_one (pdev, port_info, &netcell_sht,NULL ,0 ); }static const struct pci_device_id netcell_pci_tbl[] = {
drivers/ata/pata_ns87415.c +1 -1
@@ -380,7 +380,7 @@ static int ns87415_init_one (struct pci_dev *pdev, const struct pci_device_id *ens87415_fixup (pdev); -return ata_pci_sff_init_one (pdev, ppi, &ns87415_sht,NULL ,0 ); +return ata_pci_bmdma_init_one (pdev, ppi, &ns87415_sht,NULL ,0 ); }static const struct pci_device_id ns87415_pci_tbl[] = {
drivers/ata/pata_oldpiix.c +1 -1
@@ -248,7 +248,7 @@ static int oldpiix_init_one (struct pci_dev *pdev, const struct pci_device_id *edev_printk (KERN_DEBUG , &pdev->dev,"version " DRV_VERSION "\n" ); -return ata_pci_sff_init_one (pdev, ppi, &oldpiix_sht,NULL ,0 ); +return ata_pci_bmdma_init_one (pdev, ppi, &oldpiix_sht,NULL ,0 ); }static const struct pci_device_id oldpiix_pci_tbl[] = {
drivers/ata/pata_optidma.c +1 -1
@@ -429,7 +429,7 @@ static int optidma_init_one(struct pci_dev *dev, const struct pci_device_id *id)if (optiplus_with_udma (dev)) ppi[0 ] = &info_82c700_udma; -return ata_pci_sff_init_one (dev, ppi, &optidma_sht,NULL ,0 ); +return ata_pci_bmdma_init_one (dev, ppi, &optidma_sht,NULL ,0 ); }static const struct pci_device_id optidma[] = {
drivers/ata/pata_pdc202xx_old.c +1 -1
@@ -337,7 +337,7 @@ static int pdc202xx_init_one(struct pci_dev *dev, const struct pci_device_id *idreturn -ENODEV ; } } -return ata_pci_sff_init_one (dev, ppi, &pdc202xx_sht,NULL ,0 ); +return ata_pci_bmdma_init_one (dev, ppi, &pdc202xx_sht,NULL ,0 ); }static const struct pci_device_id pdc202xx[] = {
drivers/ata/pata_piccolo.c +1 -1
@@ -95,7 +95,7 @@ static int ata_tosh_init_one(struct pci_dev *dev, const struct pci_device_id *id };const struct ata_port_info *ppi[] = { &info, &ata_dummy_port_info };/* Just one port for the moment */ -return ata_pci_sff_init_one (dev, ppi, &tosh_sht,NULL ,0 ); +return ata_pci_bmdma_init_one (dev, ppi, &tosh_sht,NULL ,0 ); }static struct pci_device_id ata_tosh[] = {
drivers/ata/pata_radisys.c +1 -1
@@ -227,7 +227,7 @@ static int radisys_init_one (struct pci_dev *pdev, const struct pci_device_id *edev_printk (KERN_DEBUG , &pdev->dev,"version " DRV_VERSION "\n" ); -return ata_pci_sff_init_one (pdev, ppi, &radisys_sht,NULL ,0 ); +return ata_pci_bmdma_init_one (pdev, ppi, &radisys_sht,NULL ,0 ); }static const struct pci_device_id radisys_pci_tbl[] = {
drivers/ata/pata_rdc.c +1 -1
@@ -344,7 +344,7 @@ static int __devinit rdc_init_one(struct pci_dev *pdev,*/ pci_read_config_dword (pdev,0x54 , &hpriv->saved_iocfg); - rc =ata_pci_sff_prepare_host (pdev, ppi, &host); + rc =ata_pci_bmdma_prepare_host (pdev, ppi, &host);if (rc)return rc; host->private_data = hpriv;
drivers/ata/pata_sc1200.c +1 -1
@@ -237,7 +237,7 @@ static int sc1200_init_one(struct pci_dev *dev, const struct pci_device_id *id) };const struct ata_port_info *ppi[] = { &info,NULL }; -return ata_pci_sff_init_one (dev, ppi, &sc1200_sht,NULL ,0 ); +return ata_pci_bmdma_init_one (dev, ppi, &sc1200_sht,NULL ,0 ); }static const struct pci_device_id sc1200[] = {
drivers/ata/pata_sch.c +1 -1
@@ -179,7 +179,7 @@ static int __devinit sch_init_one(struct pci_dev *pdev,dev_printk (KERN_DEBUG , &pdev->dev,"version " DRV_VERSION "\n" ); -return ata_pci_sff_init_one (pdev, ppi, &sch_sht,NULL ,0 ); +return ata_pci_bmdma_init_one (pdev, ppi, &sch_sht,NULL ,0 ); }static int __init sch_init (void )
drivers/ata/pata_serverworks.c +1 -1
@@ -460,7 +460,7 @@ static int serverworks_init_one(struct pci_dev *pdev, const struct pci_device_idif (pdev->device ==PCI_DEVICE_ID_SERVERWORKS_CSB5IDE )ata_pci_bmdma_clear_simplex (pdev); -return ata_pci_sff_init_one (pdev, ppi, &serverworks_sht,NULL ,0 ); +return ata_pci_bmdma_init_one (pdev, ppi, &serverworks_sht,NULL ,0 ); }#ifdef CONFIG_PM
drivers/ata/pata_sil680.c +1 -1
@@ -378,7 +378,7 @@ static int __devinit sil680_init_one(struct pci_dev *pdev, IRQF_SHARED, &sil680_sht); use_ioports: -return ata_pci_sff_init_one (pdev, ppi, &sil680_sht,NULL ,0 ); +return ata_pci_bmdma_init_one (pdev, ppi, &sil680_sht,NULL ,0 ); }#ifdef CONFIG_PM
drivers/ata/pata_sis.c +1 -1
@@ -826,7 +826,7 @@ static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)sis_fixup (pdev, chipset); -return ata_pci_sff_init_one (pdev, ppi, &sis_sht, chipset,0 ); +return ata_pci_bmdma_init_one (pdev, ppi, &sis_sht, chipset,0 ); }#ifdef CONFIG_PM
drivers/ata/pata_sl82c105.c +1 -1
@@ -316,7 +316,7 @@ static int sl82c105_init_one(struct pci_dev *dev, const struct pci_device_id *id val |=CTRL_P0EN |CTRL_P0F16 |CTRL_P1F16 ;pci_write_config_dword (dev,0x40 , val); -return ata_pci_sff_init_one (dev, ppi, &sl82c105_sht,NULL ,0 ); +return ata_pci_bmdma_init_one (dev, ppi, &sl82c105_sht,NULL ,0 ); }static const struct pci_device_id sl82c105[] = {
drivers/ata/pata_triflex.c +1 -1
@@ -201,7 +201,7 @@ static int triflex_init_one(struct pci_dev *dev, const struct pci_device_id *id)if (!printed_version++)dev_printk (KERN_DEBUG , &dev->dev,"version " DRV_VERSION "\n" ); -return ata_pci_sff_init_one (dev, ppi, &triflex_sht,NULL ,0 ); +return ata_pci_bmdma_init_one (dev, ppi, &triflex_sht,NULL ,0 ); }static const struct pci_device_id triflex[] = {
drivers/ata/pata_via.c +1 -1
@@ -627,7 +627,7 @@ static int via_init_one(struct pci_dev *pdev, const struct pci_device_id *id) }/* We have established the device type, now fire it up */ -return ata_pci_sff_init_one (pdev, ppi, &via_sht, (void *)config,0 ); +return ata_pci_bmdma_init_one (pdev, ppi, &via_sht, (void *)config,0 ); }#ifdef CONFIG_PM
drivers/ata/sata_nv.c +1 -1
@@ -2430,7 +2430,7 @@ static int nv_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) ppi[0 ] = &nv_port_info[type]; ipriv = ppi[0 ]->private_data; - rc =ata_pci_sff_prepare_host (pdev, ppi, &host); + rc =ata_pci_bmdma_prepare_host (pdev, ppi, &host);if (rc)return rc;
drivers/ata/sata_sis.c +1 -1
@@ -279,7 +279,7 @@ static int sis_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)break ; } - rc =ata_pci_sff_prepare_host (pdev, ppi, &host); + rc =ata_pci_bmdma_prepare_host (pdev, ppi, &host);if (rc)return rc;
drivers/ata/sata_via.c +2 -2
@@ -463,7 +463,7 @@ static int vt6420_prepare_host(struct pci_dev *pdev, struct ata_host **r_host)struct ata_host *host;int rc; - rc =ata_pci_sff_prepare_host (pdev, ppi, &host); + rc =ata_pci_bmdma_prepare_host (pdev, ppi, &host);if (rc)return rc; *r_host = host;
@@ -520,7 +520,7 @@ static int vt8251_prepare_host(struct pci_dev *pdev, struct ata_host **r_host)struct ata_host *host;int i, rc; - rc =ata_pci_sff_prepare_host (pdev, ppi, &host); + rc =ata_pci_bmdma_prepare_host (pdev, ppi, &host);if (rc)return rc; *r_host = host;
include/linux/libata.h +7 -0
@@ -1644,6 +1644,13 @@ extern int ata_bmdma_port_start32(struct ata_port *ap);#ifdef CONFIG_PCI extern int ata_pci_bmdma_clear_simplex (struct pci_dev *pdev);extern void ata_pci_bmdma_init (struct ata_host *host); +extern int ata_pci_bmdma_prepare_host (struct pci_dev *pdev, +const struct ata_port_info *const * ppi, +struct ata_host **r_host); +extern int ata_pci_bmdma_init_one (struct pci_dev *pdev, +const struct ata_port_info *const * ppi, +struct scsi_host_template *sht, +void *host_priv,int hflags);#endif /* CONFIG_PCI */ /**
Signature · 1 line
1.6.4.2
PATCH 5/6 libata-sff: kill dummy BMDMA ops from sata_qstor and pata_octeon_cf
In reply to Tejun HeoNow that SFF and BMDMA are completely separate, sata_qstor and pata_octeon_cf which inherit from ata_sff_port_ops don't need to worry about BMDMA ops being called. Kill the dummy BMDMA ops.
--- drivers/ata/pata_octeon_cf.c | 18 ------------------ drivers/ata/sata_qstor.c | 14 -------------- 2 files changed, 0 insertions(+), 32 deletions(-)
drivers/ata/pata_octeon_cf.c +0 -18
@@ -750,20 +750,6 @@ static void octeon_cf_dev_config(struct ata_device *dev) }/* -* Trap if driver tries to do standard bmdma commands. They are not -* supported. -*/ -static void unreachable_qc (struct ata_queued_cmd *qc) -{ -BUG (); -} - -static u8 unreachable_port (struct ata_port *ap) -{ -BUG (); -} - -/* * We don't do ATAPI DMA so return 0. */ static int octeon_cf_check_atapi_dma (struct ata_queued_cmd *qc)
@@ -804,10 +790,6 @@ static struct ata_port_operations octeon_cf_ops = { .sff_dev_select = octeon_cf_dev_select, .sff_irq_on = octeon_cf_irq_on, .sff_irq_clear = octeon_cf_irq_clear, - .bmdma_setup = unreachable_qc, - .bmdma_start = unreachable_qc, - .bmdma_stop = unreachable_qc, - .bmdma_status = unreachable_port, .cable_detect = ata_cable_40wire, .set_piomode = octeon_cf_set_piomode, .set_dmamode = octeon_cf_set_dmamode,
drivers/ata/sata_qstor.c +0 -14
@@ -120,8 +120,6 @@ static void qs_host_stop(struct ata_host *host);static void qs_qc_prep (struct ata_queued_cmd *qc);static unsigned int qs_qc_issue (struct ata_queued_cmd *qc);static int qs_check_atapi_dma (struct ata_queued_cmd *qc); -static void qs_bmdma_stop (struct ata_queued_cmd *qc); -static u8 qs_bmdma_status (struct ata_port *ap);static void qs_freeze (struct ata_port *ap);static void qs_thaw (struct ata_port *ap);static int qs_prereset (struct ata_link *link,unsigned long deadline);
@@ -137,8 +135,6 @@ static struct ata_port_operations qs_ata_ops = { .inherits = &ata_sff_port_ops, .check_atapi_dma = qs_check_atapi_dma, - .bmdma_stop = qs_bmdma_stop, - .bmdma_status = qs_bmdma_status, .qc_prep = qs_qc_prep, .qc_issue = qs_qc_issue,
@@ -190,16 +186,6 @@ static int qs_check_atapi_dma(struct ata_queued_cmd *qc)return 1 ;/* ATAPI DMA not supported */ } -static void qs_bmdma_stop (struct ata_queued_cmd *qc) -{ -/* nothing */ -} - -static u8 qs_bmdma_status (struct ata_port *ap) -{ -return 0 ; -} -static inline void qs_enter_reg_mode (struct ata_port *ap) {u8 __iomem *chan =qs_mmio_base (ap->host) + (ap->port_no *0x4000 );
Signature · 1 line
1.6.4.2
PATCH 6/6 libata-sff: make BMDMA optional
In reply to Tejun HeoMake BMDMA optional depending on new config variable CONFIG_ATA_BMDMA. In Kconfig, drivers are grouped into five groups - non-SFF native, SFF w/ custom DMA interface, SFF w/ BMDMA, PIO-only SFF, and generic fallback / legacy ones. Kconfig and Makefile are reorganized according to the groups and ordered alphabetically inside each group.
ata_ioports.bmdma_addr and ata_port.bmdma_prd[_dma] are put into CONFIG_ATA_BMDMA, as are all bmdma related ops, variables and functions.
This increase the binary size slightly when BMDMA is enabled but on both native-only and PIO-only configurations the size is slightly reduced. Either way, the size difference is insignificant. This change is more meaningful to signify the separation between SFF and BMDMA and as a tool to verify the separation.
--- drivers/ata/Kconfig | 511 ++++++++++++++++++++++++---------------------- drivers/ata/Makefile | 83 ++++---- drivers/ata/libata-sff.c | 11 + include/linux/libata.h | 22 ++- 4 files changed, 341 insertions(+), 286 deletions(-)
drivers/ata/Kconfig +268 -243
@@ -57,6 +57,8 @@ config SATA_PMP This option adds support for SATA Port Multipliers (the SATA version of an ethernet hub, or SAS expander). +comment "Controllers with non-SFF native interface" + config SATA_AHCI tristate "AHCI SATA support" depends on PCI
@@ -73,11 +75,12 @@ config SATA_AHCI_PLATFORM If unsure, say N. -config SATA_SIL24 - tristate "Silicon Image 3124/3132 SATA support" - depends on PCI +config SATA_FSL + tristate "Freescale 3.0Gbps SATA support" + depends on FSL_SOC help - This option enables support for Silicon Image 3124/3132 Serial ATA. + This option enables support for Freescale 3.0Gbps SATA controller. + It can be found on MPC837x and MPC8315. If unsure, say N.
@@ -87,12 +90,11 @@ config SATA_INIC162X help This option enables support for Initio 162x Serial ATA. -config SATA_FSL - tristate "Freescale 3.0Gbps SATA support" - depends on FSL_SOC +config SATA_SIL24 + tristate "Silicon Image 3124/3132 SATA support" + depends on PCI help - This option enables support for Freescale 3.0Gbps SATA controller. - It can be found on MPC837x and MPC8315. + This option enables support for Silicon Image 3124/3132 Serial ATA. If unsure, say N.
@@ -116,15 +118,65 @@ config ATA_SFF if ATA_SFF -config SATA_SVW - tristate "ServerWorks Frodo / Apple K2 SATA support" +comment "SFF controllers with custom DMA interface" + +config PDC_ADMA + tristate "Pacific Digital ADMA support" depends on PCI help - This option enables support for Broadcom/Serverworks/Apple K2 - SATA support. + This option enables support for Pacific Digital ADMA controllers + + If unsure, say N. + +config PATA_MPC52xx + tristate "Freescale MPC52xx SoC internal IDE" + depends on PPC_MPC52xx && PPC_BESTCOMM + select PPC_BESTCOMM_ATA + help + This option enables support for integrated IDE controller + of the Freescale MPC52xx SoC. + + If unsure, say N. + +config PATA_OCTEON_CF + tristate "OCTEON Boot Bus Compact Flash support" + depends on CPU_CAVIUM_OCTEON + help + This option enables a polled compact flash driver for use with + compact flash cards attached to the OCTEON boot bus. + + If unsure, say N. + +config SATA_QSTOR + tristate "Pacific Digital SATA QStor support" + depends on PCI + help + This option enables support for Pacific Digital Serial ATA QStor. + + If unsure, say N. + +config SATA_SX4 + tristate "Promise SATA SX4 support (Experimental)" + depends on PCI && EXPERIMENTAL + help + This option enables support for Promise Serial ATA SX4. If unsure, say N. +config ATA_BMDMA + bool "ATA BMDMA support" + default y + help + This option adds support for SFF ATA controllers with BMDMA + capability. BMDMA stands for bus-master DMA and the + de-facto DMA interface for SFF controllers. + + If unuser, say Y. + +if ATA_BMDMA + +comment "SATA SFF controllers with BMDMA" + config ATA_PIIX tristate "Intel ESB, ICH, PIIX3, PIIX4 PATA/SATA support" depends on PCI
@@ -152,22 +204,6 @@ config SATA_NV If unsure, say N. -config PDC_ADMA - tristate "Pacific Digital ADMA support" - depends on PCI - help - This option enables support for Pacific Digital ADMA controllers - - If unsure, say N. - -config SATA_QSTOR - tristate "Pacific Digital SATA QStor support" - depends on PCI - help - This option enables support for Pacific Digital Serial ATA QStor. - - If unsure, say N. - config SATA_PROMISE tristate "Promise SATA TX2/TX4 support" depends on PCI
@@ -176,14 +212,6 @@ config SATA_PROMISE If unsure, say N. -config SATA_SX4 - tristate "Promise SATA SX4 support (Experimental)" - depends on PCI && EXPERIMENTAL - help - This option enables support for Promise Serial ATA SX4. - - If unsure, say N. - config SATA_SIL tristate "Silicon Image SATA support" depends on PCI
@@ -203,6 +231,15 @@ config SATA_SIS enable the PATA_SIS driver in the config. If unsure, say N. +config SATA_SVW + tristate "ServerWorks Frodo / Apple K2 SATA support" + depends on PCI + help + This option enables support for Broadcom/Serverworks/Apple K2 + SATA support. + + If unsure, say N. + config SATA_ULI tristate "ULi Electronics SATA support" depends on PCI
@@ -227,14 +264,7 @@ config SATA_VITESSE If unsure, say N. -config PATA_ACPI - tristate "ACPI firmware driver for PATA" - depends on ATA_ACPI - help - This option enables an ACPI method driver which drives - motherboard PATA controller interfaces through the ACPI - firmware in the BIOS. This driver can sometimes handle - otherwise unsupported hardware. +comment "PATA SFF controllers with BMDMA" config PATA_ALI tristate "ALi PATA support"
@@ -262,40 +292,30 @@ config PATA_ARTOP If unsure, say N. -config PATA_ATP867X - tristate "ARTOP/Acard ATP867X PATA support" +config PATA_ATIIXP + tristate "ATI PATA support" depends on PCI help - This option enables support for ARTOP/Acard ATP867X PATA - controllers. - - If unsure, say N. - -config PATA_AT32 - tristate "Atmel AVR32 PATA support (Experimental)" - depends on AVR32 && PLATFORM_AT32AP && EXPERIMENTAL - help - This option enables support for the IDE devices on the - Atmel AT32AP platform. + This option enables support for the ATI ATA interfaces + found on the many ATI chipsets. If unsure, say N. -config PATA_ATIIXP - tristate "ATI PATA support" +config PATA_ATP867X + tristate "ARTOP/Acard ATP867X PATA support" depends on PCI help - This option enables support for the ATI ATA interfaces - found on the many ATI chipsets. + This option enables support for ARTOP/Acard ATP867X PATA + controllers. If unsure, say N. -config PATA_CMD640_PCI - tristate "CMD640 PCI PATA support (Experimental)" - depends on PCI && EXPERIMENTAL +config PATA_BF54X + tristate "Blackfin 54x ATAPI support" + depends on BF542 || BF548 || BF549 help - This option enables support for the CMD640 PCI IDE - interface chip. Only the primary channel is currently - supported. + This option enables support for the built-in ATAPI controller on + Blackfin 54x family chips. If unsure, say N.
@@ -362,15 +382,6 @@ config PATA_EFAR If unsure, say N. -config ATA_GENERIC - tristate "Generic ATA support" - depends on PCI - help - This option enables support for generic BIOS configured - ATA controllers via the new ATA layer - - If unsure, say N. - config PATA_HPT366 tristate "HPT 366/368 PATA support" depends on PCI
@@ -415,12 +426,20 @@ config PATA_HPT3X3_DMA controllers. Enable with care as there are still some problems with DMA on this chipset. -config PATA_ISAPNP - tristate "ISA Plug and Play PATA support" - depends on ISAPNP +config PATA_ICSIDE + tristate "Acorn ICS PATA support" + depends on ARM && ARCH_ACORN help - This option enables support for ISA plug & play ATA - controllers such as those found on old soundcards. + On Acorn systems, say Y here if you wish to use the ICS PATA + interface card. This is not required for ICS partition support. + If you are unsure, say N to this. + +config PATA_IT8213 + tristate "IT8213 PATA support (Experimental)" + depends on PCI && EXPERIMENTAL + help + This option enables support for the ITE 821 PATA + controllers via the new ATA layer. If unsure, say N.
@@ -434,15 +453,6 @@ config PATA_IT821X If unsure, say N. -config PATA_IT8213 - tristate "IT8213 PATA support (Experimental)" - depends on PCI && EXPERIMENTAL - help - This option enables support for the ITE 821 PATA - controllers via the new ATA layer. - - If unsure, say N. - config PATA_JMICRON tristate "JMicron PATA support" depends on PCI
@@ -452,23 +462,14 @@ config PATA_JMICRON If unsure, say N. -config PATA_LEGACY - tristate "Legacy ISA PATA support (Experimental)" - depends on (ISA || PCI) && EXPERIMENTAL - help - This option enables support for ISA/VLB/PCI bus legacy PATA - ports and allows them to be accessed via the new ATA layer. - - If unsure, say N. - -config PATA_TRIFLEX - tristate "Compaq Triflex PATA support" - depends on PCI +config PATA_MACIO + tristate "Apple PowerMac/PowerBook internal 'MacIO' IDE" + depends on PPC_PMAC help - Enable support for the Compaq 'Triflex' IDE controller as found - on many Compaq Pentium-Pro systems, via the new ATA layer. - - If unsure, say N. + Most IDE capable PowerMacs have IDE busses driven by a variant + of this controller which is part of the Apple chipset used on + most PowerMac models. Some models have multiple busses using + different chipsets, though generally, MacIO is one of them. config PATA_MARVELL tristate "Marvell PATA support via legacy mode"
@@ -481,32 +482,6 @@ config PATA_MARVELL If unsure, say N. -config PATA_MPC52xx - tristate "Freescale MPC52xx SoC internal IDE" - depends on PPC_MPC52xx && PPC_BESTCOMM - select PPC_BESTCOMM_ATA - help - This option enables support for integrated IDE controller - of the Freescale MPC52xx SoC. - - If unsure, say N. - -config PATA_MPIIX - tristate "Intel PATA MPIIX support" - depends on PCI - help - This option enables support for MPIIX PATA support. - - If unsure, say N. - -config PATA_OLDPIIX - tristate "Intel PATA old PIIX support" - depends on PCI - help - This option enables support for early PIIX PATA support. - - If unsure, say N. - config PATA_NETCELL tristate "NETCELL Revolution RAID support" depends on PCI
@@ -525,15 +500,6 @@ config PATA_NINJA32 If unsure, say N. -config PATA_NS87410 - tristate "Nat Semi NS87410 PATA support" - depends on PCI - help - This option enables support for the National Semiconductor - NS87410 PCI-IDE controller. - - If unsure, say N. - config PATA_NS87415 tristate "Nat Semi NS87415 PATA support" depends on PCI
@@ -543,12 +509,11 @@ config PATA_NS87415 If unsure, say N. -config PATA_OPTI - tristate "OPTI621/6215 PATA support (Very Experimental)" - depends on PCI && EXPERIMENTAL +config PATA_OLDPIIX + tristate "Intel PATA old PIIX support" + depends on PCI help - This option enables full PIO support for the early Opti ATA - controllers found on some old motherboards. + This option enables support for early PIIX PATA support. If unsure, say N.
@@ -562,24 +527,6 @@ config PATA_OPTIDMA If unsure, say N. -config PATA_PALMLD - tristate "Palm LifeDrive PATA support" - depends on MACH_PALMLD - help - This option enables support for Palm LifeDrive's internal ATA - port via the new ATA layer. - - If unsure, say N. - -config PATA_PCMCIA - tristate "PCMCIA PATA support" - depends on PCMCIA - help - This option enables support for PCMCIA ATA interfaces, including - compact flash card adapters via the new ATA layer. - - If unsure, say N. - config PATA_PDC2027X tristate "Promise PATA 2027x support" depends on PCI
@@ -597,12 +544,6 @@ config PATA_PDC_OLD If unsure, say N. -config PATA_QDI - tristate "QDI VLB PATA support" - depends on ISA - help - Support for QDI 6500 and 6580 PATA controllers on VESA local bus. - config PATA_RADISYS tristate "RADISYS 82600 PATA support (Experimental)" depends on PCI && EXPERIMENTAL
@@ -612,15 +553,6 @@ config PATA_RADISYS If unsure, say N. -config PATA_RB532 - tristate "RouterBoard 532 PATA CompactFlash support" - depends on MIKROTIK_RB532 - help - This option enables support for the RouterBoard 532 - PATA CompactFlash controller. - - If unsure, say N. - config PATA_RDC tristate "RDC PATA support" depends on PCI
@@ -631,21 +563,30 @@ config PATA_RDC If unsure, say N. -config PATA_RZ1000 - tristate "PC Tech RZ1000 PATA support" +config PATA_SC1200 + tristate "SC1200 PATA support" depends on PCI help - This option enables basic support for the PC Tech RZ1000/1 - PATA controllers via the new ATA layer + This option enables support for the NatSemi/AMD SC1200 SoC + companion chip used with the Geode processor family. If unsure, say N. -config PATA_SC1200 - tristate "SC1200 PATA support" +config PATA_SCC + tristate "Toshiba's Cell Reference Set IDE support" + depends on PCI && PPC_CELLEB + help + This option enables support for the built-in IDE controller on + Toshiba Cell Reference Board. + + If unsure, say N. + +config PATA_SCH + tristate "Intel SCH PATA support" depends on PCI help - This option enables support for the NatSemi/AMD SC1200 SoC - companion chip used with the Geode processor family. + This option enables support for Intel SCH PATA on the Intel + SCH (US15W, US15L, UL11L) series host controllers. If unsure, say N.
@@ -683,6 +624,15 @@ config PATA_TOSHIBA If unsure, say N. +config PATA_TRIFLEX + tristate "Compaq Triflex PATA support" + depends on PCI + help + Enable support for the Compaq 'Triflex' IDE controller as found + on many Compaq Pentium-Pro systems, via the new ATA layer. + + If unsure, say N. + config PATA_VIA tristate "VIA PATA support" depends on PCI
@@ -701,12 +651,99 @@ config PATA_WINBOND If unsure, say N. -config PATA_WINBOND_VLB - tristate "Winbond W83759A VLB PATA support (Experimental)" - depends on ISA && EXPERIMENTAL +endif # ATA_BMDMA + +comment "PIO-only SFF controllers" + +config PATA_AT32 + tristate "Atmel AVR32 PATA support (Experimental)" + depends on AVR32 && PLATFORM_AT32AP && EXPERIMENTAL help - Support for the Winbond W83759A controller on Vesa Local Bus - systems. + This option enables support for the IDE devices on the + Atmel AT32AP platform. + + If unsure, say N. + +config PATA_AT91 + tristate "PATA support for AT91SAM9260" + depends on ARM && ARCH_AT91 + help + This option enables support for IDE devices on the Atmel AT91SAM9260 SoC. + + If unsure, say N. + +config PATA_CMD640_PCI + tristate "CMD640 PCI PATA support (Experimental)" + depends on PCI && EXPERIMENTAL + help + This option enables support for the CMD640 PCI IDE + interface chip. Only the primary channel is currently + supported. + + If unsure, say N. + +config PATA_ISAPNP + tristate "ISA Plug and Play PATA support" + depends on ISAPNP + help + This option enables support for ISA plug & play ATA + controllers such as those found on old soundcards. + + If unsure, say N. + +config PATA_IXP4XX_CF + tristate "IXP4XX Compact Flash support" + depends on ARCH_IXP4XX + help + This option enables support for a Compact Flash connected on + the ixp4xx expansion bus. This driver had been written for + Loft/Avila boards in mind but can work with others. + + If unsure, say N. + +config PATA_MPIIX + tristate "Intel PATA MPIIX support" + depends on PCI + help + This option enables support for MPIIX PATA support. + + If unsure, say N. + +config PATA_NS87410 + tristate "Nat Semi NS87410 PATA support" + depends on PCI + help + This option enables support for the National Semiconductor + NS87410 PCI-IDE controller. + + If unsure, say N. + +config PATA_OPTI + tristate "OPTI621/6215 PATA support (Very Experimental)" + depends on PCI && EXPERIMENTAL + help + This option enables full PIO support for the early Opti ATA + controllers found on some old motherboards. + + If unsure, say N. + +config PATA_PALMLD + tristate "Palm LifeDrive PATA support" + depends on MACH_PALMLD + help + This option enables support for Palm LifeDrive's internal ATA + port via the new ATA layer. + + If unsure, say N. + +config PATA_PCMCIA + tristate "PCMCIA PATA support" + depends on PCMCIA + help + This option enables support for PCMCIA ATA interfaces, including + compact flash card adapters via the new ATA layer. + + If unsure, say N. config HAVE_PATA_PLATFORM bool
@@ -725,14 +762,6 @@ config PATA_PLATFORM If unsure, say N. -config PATA_AT91 - tristate "PATA support for AT91SAM9260" - depends on ARM && ARCH_AT91 - help - This option enables support for IDE devices on the Atmel AT91SAM9260 SoC. - - If unsure, say N. - config PATA_OF_PLATFORM tristate "OpenFirmware platform device PATA support" depends on PATA_PLATFORM && PPC_OF
@@ -743,69 +772,65 @@ config PATA_OF_PLATFORM If unsure, say N. -config PATA_ICSIDE - tristate "Acorn ICS PATA support" - depends on ARM && ARCH_ACORN +config PATA_QDI + tristate "QDI VLB PATA support" + depends on ISA help - On Acorn systems, say Y here if you wish to use the ICS PATA - interface card. This is not required for ICS partition support. - If you are unsure, say N to this. + Support for QDI 6500 and 6580 PATA controllers on VESA local bus. -config PATA_IXP4XX_CF - tristate "IXP4XX Compact Flash support" - depends on ARCH_IXP4XX +config PATA_RB532 + tristate "RouterBoard 532 PATA CompactFlash support" + depends on MIKROTIK_RB532 help - This option enables support for a Compact Flash connected on - the ixp4xx expansion bus. This driver had been written for - Loft/Avila boards in mind but can work with others. + This option enables support for the RouterBoard 532 + PATA CompactFlash controller. If unsure, say N. -config PATA_OCTEON_CF - tristate "OCTEON Boot Bus Compact Flash support" - depends on CPU_CAVIUM_OCTEON +config PATA_RZ1000 + tristate "PC Tech RZ1000 PATA support" + depends on PCI help - This option enables a polled compact flash driver for use with - compact flash cards attached to the OCTEON boot bus. + This option enables basic support for the PC Tech RZ1000/1 + PATA controllers via the new ATA layer If unsure, say N. -config PATA_SCC - tristate "Toshiba's Cell Reference Set IDE support" - depends on PCI && PPC_CELLEB +config PATA_WINBOND_VLB + tristate "Winbond W83759A VLB PATA support (Experimental)" + depends on ISA && EXPERIMENTAL help - This option enables support for the built-in IDE controller on - Toshiba Cell Reference Board. + Support for the Winbond W83759A controller on Vesa Local Bus + systems. - If unsure, say N. +comment "Generic fallback / legacy drivers" -config PATA_SCH - tristate "Intel SCH PATA support" - depends on PCI +config PATA_ACPI + tristate "ACPI firmware driver for PATA" + depends on ATA_ACPI && ATA_BMDMA help - This option enables support for Intel SCH PATA on the Intel - SCH (US15W, US15L, UL11L) series host controllers. - - If unsure, say N. + This option enables an ACPI method driver which drives + motherboard PATA controller interfaces through the ACPI + firmware in the BIOS. This driver can sometimes handle + otherwise unsupported hardware. -config PATA_BF54X - tristate "Blackfin 54x ATAPI support" - depends on BF542 || BF548 || BF549 +config ATA_GENERIC + tristate "Generic ATA support" + depends on PCI && ATA_BMDMA help - This option enables support for the built-in ATAPI controller on - Blackfin 54x family chips. + This option enables support for generic BIOS configured + ATA controllers via the new ATA layer If unsure, say N. -config PATA_MACIO - tristate "Apple PowerMac/PowerBook internal 'MacIO' IDE" - depends on PPC_PMAC +config PATA_LEGACY + tristate "Legacy ISA PATA support (Experimental)" + depends on (ISA || PCI) && EXPERIMENTAL help - Most IDE capable PowerMacs have IDE busses driven by a variant - of this controller which is part of the Apple chipset used on - most PowerMac models. Some models have multiple busses using - different chipsets, though generally, MacIO is one of them. + This option enables support for ISA/VLB/PCI bus legacy PATA + ports and allows them to be accessed via the new ATA layer. + If unsure, say N. endif # ATA_SFF endif # ATA
drivers/ata/Makefile +46 -37
126 lines not on this page · raw message
drivers/ata/libata-sff.c +11 -0
@@ -798,11 +798,15 @@ static void atapi_send_cdb(struct ata_port *ap, struct ata_queued_cmd *qc)case ATAPI_PROT_NODATA : ap->hsm_task_state =HSM_ST_LAST ;break ; +#ifdef CONFIG_ATA_BMDMA case ATAPI_PROT_DMA : ap->hsm_task_state =HSM_ST_LAST ;/* initiate bmdma */ ap->ops->bmdma_start (qc);break ; +#endif /* CONFIG_ATA_BMDMA */ +default : +BUG (); } }
@@ -2535,6 +2539,12 @@ EXPORT_SYMBOL_GPL(ata_pci_sff_init_one);#endif /* CONFIG_PCI */ +/* +* BMDMA support +*/ + +#ifdef CONFIG_ATA_BMDMA +const struct ata_port_operations ata_bmdma_port_ops = { .inherits = &ata_sff_port_ops,
@@ -3287,6 +3297,7 @@ int ata_pci_bmdma_init_one(struct pci_dev *pdev,EXPORT_SYMBOL_GPL (ata_pci_bmdma_init_one);#endif /* CONFIG_PCI */ +#endif /* CONFIG_ATA_BMDMA */ /** * ata_sff_port_init - Initialize SFF/BMDMA ATA port
include/linux/libata.h +16 -6
@@ -513,7 +513,9 @@ struct ata_ioports {void __iomem *command_addr;void __iomem *altstatus_addr;void __iomem *ctl_addr; +#ifdef CONFIG_ATA_BMDMA void __iomem *bmdma_addr; +#endif /* CONFIG_ATA_BMDMA */ void __iomem *scr_addr; };#endif /* CONFIG_ATA_SFF */
@@ -721,8 +723,10 @@ struct ata_port {u8 ctl;/* cache of ATA control register */ u8 last_ctl;/* Cache last written value */ struct delayed_work sff_pio_task; +#ifdef CONFIG_ATA_BMDMA struct ata_bmdma_prd *bmdma_prd;/* BMDMA SG list */ dma_addr_t bmdma_prd_dma;/* and its DMA mapping */ +#endif /* CONFIG_ATA_BMDMA */ #endif /* CONFIG_ATA_SFF */ unsigned int pio_mask;
@@ -856,10 +860,12 @@ struct ata_port_operations {void (*sff_irq_clear)(struct ata_port *);void (*sff_drain_fifo)(struct ata_queued_cmd *qc); +#ifdef CONFIG_ATA_BMDMA void (*bmdma_setup)(struct ata_queued_cmd *qc);void (*bmdma_start)(struct ata_queued_cmd *qc);void (*bmdma_stop)(struct ata_queued_cmd *qc);u8 (*bmdma_status)(struct ata_port *ap); +#endif /* CONFIG_ATA_BMDMA */ #endif /* CONFIG_ATA_SFF */ ssize_t (*em_show)(struct ata_port *ap,char *buf);
@@ -1555,7 +1561,6 @@ extern void sata_pmp_error_handler(struct ata_port *ap);#ifdef CONFIG_ATA_SFF extern const struct ata_port_operations ata_sff_port_ops; -extern const struct ata_port_operations ata_bmdma_port_ops;extern const struct ata_port_operations ata_bmdma32_port_ops;/* PIO only, sg_tablesize and dma_boundary limits can be removed */
@@ -1564,11 +1569,6 @@ extern const struct ata_port_operations ata_bmdma32_port_ops; .sg_tablesize = LIBATA_MAX_PRD, \ .dma_boundary = ATA_DMA_BOUNDARY -#define ATA_BMDMA_SHT (drv_name) \ - ATA_BASE_SHT(drv_name), \ - .sg_tablesize = LIBATA_MAX_PRD, \ - .dma_boundary = ATA_DMA_BOUNDARY - extern void ata_sff_dev_select(struct ata_port *ap, unsigned int device);extern u8 ata_sff_check_status (struct ata_port *ap);extern void ata_sff_pause (struct ata_port *ap);
@@ -1625,6 +1625,15 @@ extern int ata_pci_sff_init_one(struct pci_dev *pdev, struct scsi_host_template *sht, void *host_priv, int hflags);#endif /* CONFIG_PCI */ +#ifdef CONFIG_ATA_BMDMA + +extern const struct ata_port_operations ata_bmdma_port_ops; + +#define ATA_BMDMA_SHT (drv_name) \ + ATA_BASE_SHT(drv_name), \ + .sg_tablesize = LIBATA_MAX_PRD, \ + .dma_boundary = ATA_DMA_BOUNDARY +extern void ata_bmdma_qc_prep (struct ata_queued_cmd *qc);extern unsigned int ata_bmdma_qc_issue (struct ata_queued_cmd *qc);extern void ata_bmdma_dumb_qc_prep (struct ata_queued_cmd *qc);
@@ -1652,6 +1661,7 @@ extern int ata_pci_bmdma_init_one(struct pci_dev *pdev,struct scsi_host_template *sht, void *host_priv, int hflags);#endif /* CONFIG_PCI */ +#endif /* CONFIG_ATA_BMDMA */ /** * ata_sff_busy_wait - Wait for a port status register
Signature · 1 line
1.6.4.2