Skip to content

L
linux
Commit 5682ed33 authored by Tejun Heo's avatar Tejun Heo Committed by Jeff Garzik
Browse files
Options

libata: rename SFF port ops 

Add sff_ prefix to SFF specific port ops.

This rename is in preparation of separating SFF support out of libata
core layer.  This patch strictly renames ops and doesn't introduce any
behavior difference.
Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
parent 9363c382
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 192 additions and 188 deletions
drivers/ata/ahci.c
View file @ 5682ed33
......@@ -292,10 +292,10 @@ static struct scsi_host_template ahci_sht = {
static struct ata_port_operations ahci_ops = {
.inherits = &sata_pmp_port_ops,
.check_status = ahci_check_status,
.check_altstatus = ahci_check_status,
.sff_check_status = ahci_check_status,
.sff_check_altstatus = ahci_check_status,
.tf_read = ahci_tf_read,
.sff_tf_read = ahci_tf_read,
.qc_defer = sata_pmp_qc_defer_cmd_switch,
.qc_prep = ahci_qc_prep,
.qc_issue = ahci_qc_issue,
......
drivers/ata/libata-core.c
View file @ 5682ed33
......@@ -74,7 +74,7 @@ const unsigned long sata_deb_timing_hotplug[] = { 25, 500, 2000 };
const unsigned long sata_deb_timing_long[] = { 100, 2000, 5000 };
const struct ata_port_operations ata_base_port_ops = {
.irq_clear = ata_noop_irq_clear,
.sff_irq_clear = ata_noop_irq_clear,
.prereset = ata_sff_prereset,
.hardreset = sata_sff_hardreset,
.postreset = ata_sff_postreset,
......@@ -85,7 +85,7 @@ const struct ata_port_operations sata_port_ops = {
.inherits = &ata_base_port_ops,
.qc_defer = ata_std_qc_defer,
.dev_select = ata_noop_dev_select,
.sff_dev_select = ata_noop_dev_select,
};
const struct ata_port_operations sata_pmp_port_ops = {
......@@ -3563,9 +3563,9 @@ void ata_sff_postreset(struct ata_link *link, unsigned int *classes)
/* is double-select really necessary? */
if (classes[0] != ATA_DEV_NONE)
ap->ops->dev_select(ap, 1);
ap->ops->sff_dev_select(ap, 1);
if (classes[1] != ATA_DEV_NONE)
ap->ops->dev_select(ap, 0);
ap->ops->sff_dev_select(ap, 0);
/* bail out if no device is present */
if (classes[0] == ATA_DEV_NONE && classes[1] == ATA_DEV_NONE) {
......@@ -4416,7 +4416,7 @@ static void fill_result_tf(struct ata_queued_cmd *qc)
struct ata_port *ap = qc->ap;
qc->result_tf.flags = qc->tf.flags;
ap->ops->tf_read(ap, &qc->result_tf);
ap->ops->sff_tf_read(ap, &qc->result_tf);
}
static void ata_verify_xfer(struct ata_queued_cmd *qc)
......@@ -6049,16 +6049,16 @@ static unsigned int ata_dummy_qc_issue(struct ata_queued_cmd *qc)
}
struct ata_port_operations ata_dummy_port_ops = {
.check_status = ata_dummy_check_status,
.check_altstatus = ata_dummy_check_status,
.dev_select = ata_noop_dev_select,
.sff_check_status = ata_dummy_check_status,
.sff_check_altstatus = ata_dummy_check_status,
.sff_dev_select = ata_noop_dev_select,
.qc_prep = ata_noop_qc_prep,
.qc_issue = ata_dummy_qc_issue,
.freeze = ata_dummy_noret,
.thaw = ata_dummy_noret,
.error_handler = ata_dummy_noret,
.post_internal_cmd = ata_dummy_qc_noret,
.irq_clear = ata_dummy_noret,
.sff_irq_clear = ata_dummy_noret,
.port_start = ata_dummy_ret0,
.port_stop = ata_dummy_noret,
};
......
drivers/ata/libata-scsi.c
View file @ 5682ed33
......@@ -2393,7 +2393,7 @@ static void atapi_request_sense(struct ata_queued_cmd *qc)
/* FIXME: is this needed? */
memset(cmd->sense_buffer, 0, SCSI_SENSE_BUFFERSIZE);
ap->ops->tf_read(ap, &qc->tf);
ap->ops->sff_tf_read(ap, &qc->tf);
/* fill these in, for the case where they are -not- overwritten */
cmd->sense_buffer[0] = 0x70;
......
drivers/ata/libata-sff.c
View file @ 5682ed33
This diff is collapsed.
drivers/ata/pata_bf54x.c
View file @ 5682ed33
......@@ -1264,7 +1264,7 @@ static void bfin_freeze(struct ata_port *ap)
* ATA_NIEN manipulation. Also, many controllers fail to mask
* previously pending IRQ on ATA_NIEN assertion. Clear it.
*/
ap->ops->check_status(ap);
ap->ops->sff_check_status(ap);
bfin_irq_clear(ap);
}
......@@ -1357,18 +1357,18 @@ static const struct ata_port_operations bfin_pata_ops = {
.set_piomode = bfin_set_piomode,
.set_dmamode = bfin_set_dmamode,
.tf_load = bfin_tf_load,
.tf_read = bfin_tf_read,
.exec_command = bfin_exec_command,
.check_status = bfin_check_status,
.check_altstatus = bfin_check_altstatus,
.dev_select = bfin_dev_select,
.sff_tf_load = bfin_tf_load,
.sff_tf_read = bfin_tf_read,
.sff_exec_command = bfin_exec_command,
.sff_check_status = bfin_check_status,
.sff_check_altstatus = bfin_check_altstatus,
.sff_dev_select = bfin_dev_select,
.bmdma_setup = bfin_bmdma_setup,
.bmdma_start = bfin_bmdma_start,
.bmdma_stop = bfin_bmdma_stop,
.bmdma_status = bfin_bmdma_status,
.data_xfer = bfin_data_xfer,
.sff_data_xfer = bfin_data_xfer,
.qc_prep = ata_noop_qc_prep,
......@@ -1378,8 +1378,8 @@ static const struct ata_port_operations bfin_pata_ops = {
.postreset = bfin_postreset,
.post_internal_cmd = bfin_bmdma_stop,
.irq_clear = bfin_irq_clear,
.irq_on = bfin_irq_on,
.sff_irq_clear = bfin_irq_clear,
.sff_irq_on = bfin_irq_on,
.port_start = bfin_port_start,
.port_stop = bfin_port_stop,
......
drivers/ata/pata_cmd640.c
View file @ 5682ed33
......@@ -172,7 +172,7 @@ static struct scsi_host_template cmd640_sht = {
static struct ata_port_operations cmd640_port_ops = {
.inherits = &ata_bmdma_port_ops,
/* In theory xfer_noirq is not needed once we kill the prefetcher */
.data_xfer = ata_sff_data_xfer_noirq,
.sff_data_xfer = ata_sff_data_xfer_noirq,
.qc_issue = cmd640_qc_issue,
.cable_detect = ata_cable_40wire,
.set_piomode = cmd640_set_piomode,
......
drivers/ata/pata_icside.c
View file @ 5682ed33
......@@ -250,7 +250,7 @@ static void pata_icside_bmdma_setup(struct ata_queued_cmd *qc)
set_dma_mode(state->dma, write ? DMA_MODE_WRITE : DMA_MODE_READ);
/* issue r/w command */
ap->ops->exec_command(ap, &qc->tf);
ap->ops->sff_exec_command(ap, &qc->tf);
}
static void pata_icside_bmdma_start(struct ata_queued_cmd *qc)
......@@ -336,7 +336,7 @@ static struct ata_port_operations pata_icside_port_ops = {
.inherits = &ata_sff_port_ops,
/* no need to build any PRD tables for DMA */
.qc_prep = ata_noop_qc_prep,
.data_xfer = ata_sff_data_xfer_noirq,
.sff_data_xfer = ata_sff_data_xfer_noirq,
.bmdma_setup = pata_icside_bmdma_setup,
.bmdma_start = pata_icside_bmdma_start,
.bmdma_stop = pata_icside_bmdma_stop,
......
drivers/ata/pata_it821x.c
View file @ 5682ed33
......@@ -652,7 +652,7 @@ static struct ata_port_operations it821x_passthru_port_ops = {
.inherits = &ata_bmdma_port_ops,
.check_atapi_dma= it821x_check_atapi_dma,
.dev_select = it821x_passthru_dev_select,
.sff_dev_select = it821x_passthru_dev_select,
.bmdma_start = it821x_passthru_bmdma_start,
.bmdma_stop = it821x_passthru_bmdma_stop,
.qc_issue = it821x_passthru_qc_issue,
......
drivers/ata/pata_ixp4xx_cf.c
View file @ 5682ed33
......@@ -93,7 +93,7 @@ static struct scsi_host_template ixp4xx_sht = {
static struct ata_port_operations ixp4xx_port_ops = {
.inherits = &ata_sff_port_ops,
.data_xfer = ixp4xx_mmio_data_xfer,
.sff_data_xfer = ixp4xx_mmio_data_xfer,
.cable_detect = ata_cable_40wire,
.set_mode = ixp4xx_set_mode,
};
......
drivers/ata/pata_legacy.c
View file @ 5682ed33
......@@ -226,12 +226,12 @@ static const struct ata_port_operations legacy_base_port_ops = {
static struct ata_port_operations simple_port_ops = {
.inherits = &legacy_base_port_ops,
.data_xfer = ata_sff_data_xfer_noirq,
.sff_data_xfer = ata_sff_data_xfer_noirq,
};
static struct ata_port_operations legacy_port_ops = {
.inherits = &legacy_base_port_ops,
.data_xfer = ata_sff_data_xfer_noirq,
.sff_data_xfer = ata_sff_data_xfer_noirq,
.set_mode = legacy_set_mode,
};
......@@ -325,7 +325,7 @@ static unsigned int pdc_data_xfer_vlb(struct ata_device *dev,
static struct ata_port_operations pdc20230_port_ops = {
.inherits = &legacy_base_port_ops,
.set_piomode = pdc20230_set_piomode,
.data_xfer = pdc_data_xfer_vlb,
.sff_data_xfer = pdc_data_xfer_vlb,
};
/*
......@@ -775,19 +775,19 @@ static struct ata_port_operations qdi6500_port_ops = {
.inherits = &legacy_base_port_ops,
.set_piomode = qdi6500_set_piomode,
.qc_issue = qdi_qc_issue,
.data_xfer = vlb32_data_xfer,
.sff_data_xfer = vlb32_data_xfer,
};
static struct ata_port_operations qdi6580_port_ops = {
.inherits = &legacy_base_port_ops,
.set_piomode = qdi6580_set_piomode,
.data_xfer = vlb32_data_xfer,
.sff_data_xfer = vlb32_data_xfer,
};
static struct ata_port_operations qdi6580dp_port_ops = {
.inherits = &legacy_base_port_ops,
.set_piomode = qdi6580dp_set_piomode,
.data_xfer = vlb32_data_xfer,
.sff_data_xfer = vlb32_data_xfer,
};
static DEFINE_SPINLOCK(winbond_lock);
......@@ -858,7 +858,7 @@ static int winbond_port(struct platform_device *dev,
static struct ata_port_operations winbond_port_ops = {
.inherits = &legacy_base_port_ops,
.set_piomode = winbond_set_piomode,
.data_xfer = vlb32_data_xfer,
.sff_data_xfer = vlb32_data_xfer,
};
static struct legacy_controller controllers[] = {
......
drivers/ata/pata_mpc52xx.c
View file @ 5682ed33
......@@ -261,7 +261,7 @@ static struct scsi_host_template mpc52xx_ata_sht = {
static struct ata_port_operations mpc52xx_ata_port_ops = {
.inherits = &ata_sff_port_ops,
.dev_select = mpc52xx_ata_dev_select,
.sff_dev_select = mpc52xx_ata_dev_select,
.cable_detect = ata_cable_40wire,
.set_piomode = mpc52xx_ata_set_piomode,
.post_internal_cmd = ATA_OP_NULL,
......
drivers/ata/pata_ninja32.c
View file @ 5682ed33
......@@ -84,7 +84,7 @@ static struct scsi_host_template ninja32_sht = {
static struct ata_port_operations ninja32_port_ops = {
.inherits = &ata_bmdma_port_ops,
.dev_select = ninja32_dev_select,
.sff_dev_select = ninja32_dev_select,
.cable_detect = ata_cable_40wire,
.set_piomode = ninja32_set_piomode,
};
......
drivers/ata/pata_ns87415.c
View file @ 5682ed33
......@@ -138,7 +138,7 @@ static void ns87415_bmdma_setup(struct ata_queued_cmd *qc)
dmactl |= ATA_DMA_WR;
iowrite8(dmactl, ap->ioaddr.bmdma_addr + ATA_DMA_CMD);
/* issue r/w command */
ap->ops->exec_command(ap, &qc->tf);
ap->ops->sff_exec_command(ap, &qc->tf);
}
/**
......@@ -306,7 +306,7 @@ static struct ata_port_operations ns87415_pata_ops = {
.bmdma_setup = ns87415_bmdma_setup,
.bmdma_start = ns87415_bmdma_start,
.bmdma_stop = ns87415_bmdma_stop,
.irq_clear = ns87415_irq_clear,
.sff_irq_clear = ns87415_irq_clear,
.cable_detect = ata_cable_40wire,
.set_piomode = ns87415_set_piomode,
......@@ -315,8 +315,8 @@ static struct ata_port_operations ns87415_pata_ops = {
#if defined(CONFIG_SUPERIO)
static struct ata_port_operations ns87560_pata_ops = {
.inherits = &ns87415_pata_ops,
.tf_read = ns87560_tf_read,
.check_status = ns87560_check_status,
.sff_tf_read = ns87560_tf_read,
.sff_check_status = ns87560_check_status,
.bmdma_status = ns87560_bmdma_status,
};
#endif
......
drivers/ata/pata_pcmcia.c
View file @ 5682ed33
......@@ -133,14 +133,14 @@ static struct scsi_host_template pcmcia_sht = {
static struct ata_port_operations pcmcia_port_ops = {
.inherits = &ata_sff_port_ops,
.data_xfer = ata_sff_data_xfer_noirq,
.sff_data_xfer = ata_sff_data_xfer_noirq,
.cable_detect = ata_cable_40wire,
.set_mode = pcmcia_set_mode,
};
static struct ata_port_operations pcmcia_8bit_port_ops = {
.inherits = &ata_sff_port_ops,
.data_xfer = ata_data_xfer_8bit,
.sff_data_xfer = ata_data_xfer_8bit,
.cable_detect = ata_cable_40wire,
.set_mode = pcmcia_set_mode_8bit,
};
......
drivers/ata/pata_platform.c
View file @ 5682ed33
......@@ -52,7 +52,7 @@ static struct scsi_host_template pata_platform_sht = {
static struct ata_port_operations pata_platform_port_ops = {
.inherits = &ata_sff_port_ops,
.data_xfer = ata_sff_data_xfer_noirq,
.sff_data_xfer = ata_sff_data_xfer_noirq,
.cable_detect = ata_cable_unknown,
.set_mode = pata_platform_set_mode,
.port_start = ATA_OP_NULL,
......
drivers/ata/pata_qdi.c
View file @ 5682ed33
......@@ -160,7 +160,7 @@ static struct scsi_host_template qdi_sht = {
static struct ata_port_operations qdi6500_port_ops = {
.inherits = &ata_sff_port_ops,
.qc_issue = qdi_qc_issue,
.data_xfer = qdi_data_xfer,
.sff_data_xfer = qdi_data_xfer,
.cable_detect = ata_cable_40wire,
.set_piomode = qdi6500_set_piomode,
};
......
drivers/ata/pata_rb500_cf.c
View file @ 5682ed33
......@@ -119,8 +119,8 @@ static irqreturn_t rb500_pata_irq_handler(int irq, void *dev_instance)
static struct ata_port_operations rb500_pata_port_ops = {
.inherits = &ata_sff_port_ops,
.exec_command = rb500_pata_exec_command,
.data_xfer = rb500_pata_data_xfer,
.sff_exec_command = rb500_pata_exec_command,
.sff_data_xfer = rb500_pata_data_xfer,
.freeze = rb500_pata_freeze,
.thaw = rb500_pata_thaw,
};
......
drivers/ata/pata_scc.c
View file @ 5682ed33
......@@ -441,7 +441,7 @@ static void scc_bmdma_setup (struct ata_queued_cmd *qc)
out_be32(mmio + SCC_DMA_CMD, dmactl);
/* issue r/w command */
ap->ops->exec_command(ap, &qc->tf);
ap->ops->sff_exec_command(ap, &qc->tf);
}
/**
......@@ -476,7 +476,7 @@ static unsigned int scc_devchk (struct ata_port *ap,
struct ata_ioports *ioaddr = &ap->ioaddr;
u8 nsect, lbal;
ap->ops->dev_select(ap, device);
ap->ops->sff_dev_select(ap, device);
out_be32(ioaddr->nsect_addr, 0x55);
out_be32(ioaddr->lbal_addr, 0xaa);
......@@ -525,7 +525,7 @@ static int scc_bus_post_reset(struct ata_port *ap, unsigned int devmask,
while (dev1) {
u8 nsect, lbal;
ap->ops->dev_select(ap, 1);
ap->ops->sff_dev_select(ap, 1);
nsect = in_be32(ioaddr->nsect_addr);
lbal = in_be32(ioaddr->lbal_addr);
if ((nsect == 1) && (lbal == 1))
......@@ -541,11 +541,11 @@ static int scc_bus_post_reset(struct ata_port *ap, unsigned int devmask,
}
/* is all this really necessary? */
ap->ops->dev_select(ap, 0);
ap->ops->sff_dev_select(ap, 0);
if (dev1)
ap->ops->dev_select(ap, 1);
ap->ops->sff_dev_select(ap, 1);
if (dev0)
ap->ops->dev_select(ap, 0);
ap->ops->sff_dev_select(ap, 0);
return 0;
}
......@@ -616,7 +616,7 @@ static int scc_softreset(struct ata_link *link, unsigned int *classes,
devmask |= (1 << 1);
/* select device 0 again */
ap->ops->dev_select(ap, 0);
ap->ops->sff_dev_select(ap, 0);
/* issue bus reset */
DPRINTK("about to softreset, devmask=%x\n", devmask);
......@@ -829,7 +829,7 @@ static u8 scc_irq_on (struct ata_port *ap)
out_be32(ioaddr->ctl_addr, ap->ctl);
tmp = ata_wait_idle(ap);
ap->ops->irq_clear(ap);
ap->ops->sff_irq_clear(ap);
return tmp;
}
......@@ -854,9 +854,9 @@ static void scc_freeze (struct ata_port *ap)
* ATA_NIEN manipulation. Also, many controllers fail to mask
* previously pending IRQ on ATA_NIEN assertion. Clear it.
*/
ap->ops->check_status(ap);
ap->ops->sff_check_status(ap);
ap->ops->irq_clear(ap);
ap->ops->sff_irq_clear(ap);
}
/**
......@@ -887,9 +887,9 @@ static void scc_postreset(struct ata_link *link, unsigned int *classes)
/* is double-select really necessary? */
if (classes[0] != ATA_DEV_NONE)
ap->ops->dev_select(ap, 1);
ap->ops->sff_dev_select(ap, 1);
if (classes[1] != ATA_DEV_NONE)
ap->ops->dev_select(ap, 0);
ap->ops->sff_dev_select(ap, 0);
/* bail out if no device is present */
if (classes[0] == ATA_DEV_NONE && classes[1] == ATA_DEV_NONE) {
......@@ -967,18 +967,18 @@ static struct ata_port_operations scc_pata_ops = {
.set_dmamode = scc_set_dmamode,
.mode_filter = scc_mode_filter,
.tf_load = scc_tf_load,
.tf_read = scc_tf_read,
.exec_command = scc_exec_command,
.check_status = scc_check_status,
.check_altstatus = scc_check_altstatus,
.dev_select = scc_dev_select,
.sff_tf_load = scc_tf_load,
.sff_tf_read = scc_tf_read,
.sff_exec_command = scc_exec_command,
.sff_check_status = scc_check_status,
.sff_check_altstatus = scc_check_altstatus,
.sff_dev_select = scc_dev_select,
.bmdma_setup = scc_bmdma_setup,
.bmdma_start = scc_bmdma_start,
.bmdma_stop = scc_bmdma_stop,
.bmdma_status = scc_bmdma_status,
.data_xfer = scc_data_xfer,
.sff_data_xfer = scc_data_xfer,
.freeze = scc_freeze,
.prereset = scc_pata_prereset,
......@@ -986,8 +986,8 @@ static struct ata_port_operations scc_pata_ops = {
.postreset = scc_postreset,
.post_internal_cmd = scc_bmdma_stop,
.irq_clear = scc_irq_clear,
.irq_on = scc_irq_on,
.sff_irq_clear = scc_irq_clear,
.sff_irq_on = scc_irq_on,
.port_start = scc_port_start,
.port_stop = scc_port_stop,
......
drivers/ata/pata_via.c
View file @ 5682ed33
......@@ -336,7 +336,7 @@ static struct ata_port_operations via_port_ops = {
static struct ata_port_operations via_port_ops_noirq = {
.inherits = &via_port_ops,
.data_xfer = ata_sff_data_xfer_noirq,
.sff_data_xfer = ata_sff_data_xfer_noirq,
};
/**
......
drivers/ata/pata_winbond.c
View file @ 5682ed33
......@@ -127,7 +127,7 @@ static struct scsi_host_template winbond_sht = {
static struct ata_port_operations winbond_port_ops = {
.inherits = &ata_sff_port_ops,
.data_xfer = winbond_data_xfer,
.sff_data_xfer = winbond_data_xfer,
.cable_detect = ata_cable_40wire,
.set_piomode = winbond_set_piomode,
};
......
drivers/ata/sata_fsl.c
View file @ 5682ed33
......@@ -1190,10 +1190,10 @@ static struct scsi_host_template sata_fsl_sht = {
static const struct ata_port_operations sata_fsl_ops = {
.inherits = &sata_port_ops,
.check_status = sata_fsl_check_status,
.check_altstatus = sata_fsl_check_status,
.sff_check_status = sata_fsl_check_status,
.sff_check_altstatus = sata_fsl_check_status,
.tf_read = sata_fsl_tf_read,
.sff_tf_read = sata_fsl_tf_read,
.qc_prep = sata_fsl_qc_prep,
.qc_issue = sata_fsl_qc_issue,
......
drivers/ata/sata_inic162x.c
View file @ 5682ed33
......@@ -222,7 +222,7 @@ static void inic_bmdma_setup(struct ata_queued_cmd *qc)
writeb(pp->cached_prdctl, port_base + PORT_PRD_CTL);
/* issue r/w command */
ap->ops->exec_command(ap, &qc->tf);
ap->ops->sff_exec_command(ap, &qc->tf);
}
static void inic_bmdma_start(struct ata_queued_cmd *qc)
......@@ -267,14 +267,14 @@ static void inic_host_intr(struct ata_port *ap)
ata_qc_from_tag(ap, ap->link.active_tag);
if (unlikely(!qc || (qc->tf.flags & ATA_TFLAG_POLLING))) {
ap->ops->check_status(ap); /* clear ATA interrupt */
ap->ops->sff_check_status(ap); /* clear ATA interrupt */
return;
}
if (likely(ata_sff_host_intr(ap, qc)))
return;
ap->ops->check_status(ap); /* clear ATA interrupt */
ap->ops->sff_check_status(ap); /* clear ATA interrupt */
ata_port_printk(ap, KERN_WARNING, "unhandled "
"interrupt, irq_stat=%x\n", irq_stat);
return;
......@@ -351,7 +351,7 @@ static unsigned int inic_qc_issue(struct ata_queued_cmd *qc)
*/
if (unlikely(qc->tf.command == ATA_CMD_ID_ATA ||
qc->tf.command == ATA_CMD_ID_ATAPI)) {
u8 stat = ap->ops->check_status(ap);
u8 stat = ap->ops->sff_check_status(ap);
if (stat == 0x7f || stat == 0xff)
return AC_ERR_HSM;
}
......@@ -365,7 +365,7 @@ static void inic_freeze(struct ata_port *ap)
__inic_set_pirq_mask(ap, PIRQ_MASK_FREEZE);
ap->ops->check_status(ap);
ap->ops->sff_check_status(ap);
writeb(0xff, port_base + PORT_IRQ_STAT);
readb(port_base + PORT_IRQ_STAT); /* flush */
......@@ -375,7 +375,7 @@ static void inic_thaw(struct ata_port *ap)
{
void __iomem *port_base = inic_port_base(ap);
ap->ops->check_status(ap);
ap->ops->sff_check_status(ap);
writeb(0xff, port_base + PORT_IRQ_STAT);
__inic_set_pirq_mask(ap, PIRQ_MASK_OTHER);
......
drivers/ata/sata_nv.c
View file @ 5682ed33
......@@ -429,11 +429,11 @@ static struct ata_port_operations nv_adma_ops = {
.inherits = &nv_generic_ops,
.check_atapi_dma = nv_adma_check_atapi_dma,
.tf_read = nv_adma_tf_read,
.sff_tf_read = nv_adma_tf_read,
.qc_defer = ata_std_qc_defer,
.qc_prep = nv_adma_qc_prep,
.qc_issue = nv_adma_qc_issue,
.irq_clear = nv_adma_irq_clear,
.sff_irq_clear = nv_adma_irq_clear,
.freeze = nv_adma_freeze,
.thaw = nv_adma_thaw,
......@@ -1440,7 +1440,7 @@ static irqreturn_t nv_generic_interrupt(int irq, void *dev_instance)
else
// No request pending? Clear interrupt status
// anyway, in case there's one pending.
ap->ops->check_status(ap);
ap->ops->sff_check_status(ap);
}
}
......@@ -1739,7 +1739,7 @@ static void nv_swncq_ncq_stop(struct ata_port *ap)
pp->dhfis_bits, pp->dmafis_bits, pp->sdbfis_bits);
ata_port_printk(ap, KERN_ERR, "ATA_REG 0x%X ERR_REG 0x%X\n",
ap->ops->check_status(ap),
ap->ops->sff_check_status(ap),
ioread8(ap->ioaddr.error_addr));
sactive = readl(pp->sactive_block);
......@@ -1765,7 +1765,7 @@ static void nv_swncq_ncq_stop(struct ata_port *ap)
}
nv_swncq_pp_reinit(ap);
ap->ops->irq_clear(ap);
ap->ops->sff_irq_clear(ap);
__ata_bmdma_stop(ap);
nv_swncq_irq_clear(ap, 0xffff);
}
......@@ -1987,8 +1987,8 @@ static unsigned int nv_swncq_issue_atacmd(struct ata_port *ap,
pp->dmafis_bits &= ~(1 << qc->tag);
pp->qc_active |= (0x1 << qc->tag);
ap->ops->tf_load(ap, &qc->tf); /* load tf registers */
ap->ops->exec_command(ap, &qc->tf);
ap->ops->sff_tf_load(ap, &qc->tf); /* load tf registers */
ap->ops->sff_exec_command(ap, &qc->tf);
DPRINTK("Issued tag %u\n", qc->tag);
......@@ -2060,7 +2060,7 @@ static int nv_swncq_sdbfis(struct ata_port *ap)
return -EINVAL;
}
ap->ops->irq_clear(ap);
ap->ops->sff_irq_clear(ap);
__ata_bmdma_stop(ap);
sactive = readl(pp->sactive_block);
......@@ -2182,7 +2182,7 @@ static void nv_swncq_host_interrupt(struct ata_port *ap, u16 fis)
u8 ata_stat;
int rc = 0;
ata_stat = ap->ops->check_status(ap);
ata_stat = ap->ops->sff_check_status(ap);
nv_swncq_irq_clear(ap, fis);
if (!fis)
return;
......@@ -2245,7 +2245,7 @@ static void nv_swncq_host_interrupt(struct ata_port *ap, u16 fis)
if (!(fis & NV_SWNCQ_IRQ_DMASETUP) &&
!(pp->ncq_flags & ncq_saw_dmas)) {
ata_stat = ap->ops->check_status(ap);
ata_stat = ap->ops->sff_check_status(ap);
if (ata_stat & ATA_BUSY)
goto irq_exit;
......
drivers/ata/sata_promise.c
View file @ 5682ed33
......@@ -162,12 +162,12 @@ static struct scsi_host_template pdc_ata_sht = {
static const struct ata_port_operations pdc_common_ops = {
.inherits = &ata_sff_port_ops,
.tf_load = pdc_tf_load_mmio,
.exec_command = pdc_exec_command_mmio,
.sff_tf_load = pdc_tf_load_mmio,
.sff_exec_command = pdc_exec_command_mmio,
.check_atapi_dma = pdc_check_atapi_dma,
.qc_prep = pdc_qc_prep,
.qc_issue = pdc_qc_issue,
.irq_clear = pdc_irq_clear,
.sff_irq_clear = pdc_irq_clear,
.post_internal_cmd = pdc_post_internal_cmd,
.error_handler = pdc_error_handler,
......
drivers/ata/sata_sil.c
View file @ 5682ed33
......@@ -369,7 +369,7 @@ static void sil_host_intr(struct ata_port *ap, u32 bmdma2)
if (unlikely(!qc || (qc->tf.flags & ATA_TFLAG_POLLING))) {
/* this sometimes happens, just clear IRQ */
ap->ops->check_status(ap);
ap->ops->sff_check_status(ap);
return;
}
......@@ -405,7 +405,7 @@ static void sil_host_intr(struct ata_port *ap, u32 bmdma2)
}
/* check main status, clearing INTRQ */
status = ap->ops->check_status(ap);
status = ap->ops->sff_check_status(ap);
if (unlikely(status & ATA_BUSY))
goto err_hsm;
......@@ -480,7 +480,7 @@ static void sil_thaw(struct ata_port *ap)
u32 tmp;
/* clear IRQ */
ap->ops->check_status(ap);
ap->ops->sff_check_status(ap);
ata_sff_irq_clear(ap);
/* turn on SATA IRQ if supported */
......
drivers/ata/sata_sil24.c
View file @ 5682ed33
......@@ -401,9 +401,9 @@ static struct scsi_host_template sil24_sht = {
static struct ata_port_operations sil24_ops = {
.inherits = &sata_pmp_port_ops,
.check_status = sil24_check_status,
.check_altstatus = sil24_check_status,
.tf_read = sil24_tf_read,
.sff_check_status = sil24_check_status,
.sff_check_altstatus = sil24_check_status,
.sff_tf_read = sil24_tf_read,
.qc_defer = sil24_qc_defer,
.qc_prep = sil24_qc_prep,
.qc_issue = sil24_qc_issue,
......
drivers/ata/sata_svw.c
View file @ 5682ed33
......@@ -233,7 +233,7 @@ static void k2_bmdma_setup_mmio(struct ata_queued_cmd *qc)
/* issue r/w command if this is not a ATA DMA command*/
if (qc->tf.protocol != ATA_PROT_DMA)
ap->ops->exec_command(ap, &qc->tf);
ap->ops->sff_exec_command(ap, &qc->tf);
}
/**
......@@ -269,7 +269,7 @@ static void k2_bmdma_start_mmio(struct ata_queued_cmd *qc)
and the start command. */
/* issue r/w command if the access is to ATA*/
if (qc->tf.protocol == ATA_PROT_DMA)
ap->ops->exec_command(ap, &qc->tf);
ap->ops->sff_exec_command(ap, &qc->tf);
}
......@@ -336,9 +336,9 @@ static struct scsi_host_template k2_sata_sht = {
static struct ata_port_operations k2_sata_ops = {
.inherits = &ata_bmdma_port_ops,
.tf_load = k2_sata_tf_load,
.tf_read = k2_sata_tf_read,
.check_status = k2_stat_check_status,
.sff_tf_load = k2_sata_tf_load,
.sff_tf_read = k2_sata_tf_read,
.sff_check_status = k2_stat_check_status,
.check_atapi_dma = k2_sata_check_atapi_dma,
.bmdma_setup = k2_bmdma_setup_mmio,
.bmdma_start = k2_bmdma_start_mmio,
......
drivers/ata/sata_sx4.c
View file @ 5682ed33
......@@ -243,18 +243,18 @@ static struct scsi_host_template pdc_sata_sht = {
/* TODO: inherit from base port_ops after converting to new EH */
static struct ata_port_operations pdc_20621_ops = {
.tf_load = pdc_tf_load_mmio,
.tf_read = ata_sff_tf_read,
.check_status = ata_sff_check_status,
.exec_command = pdc_exec_command_mmio,
.dev_select = ata_sff_dev_select,
.sff_tf_load = pdc_tf_load_mmio,
.sff_tf_read = ata_sff_tf_read,
.sff_check_status = ata_sff_check_status,
.sff_exec_command = pdc_exec_command_mmio,
.sff_dev_select = ata_sff_dev_select,
.phy_reset = pdc_20621_phy_reset,
.qc_prep = pdc20621_qc_prep,
.qc_issue = pdc20621_qc_issue,
.data_xfer = ata_sff_data_xfer,
.sff_data_xfer = ata_sff_data_xfer,
.eng_timeout = pdc_eng_timeout,
.irq_clear = pdc20621_irq_clear,
.irq_on = ata_sff_irq_on,
.sff_irq_clear = pdc20621_irq_clear,
.sff_irq_on = ata_sff_irq_on,
.port_start = pdc_port_start,
};
......
drivers/ata/sata_via.c
View file @ 5682ed33
......@@ -173,7 +173,7 @@ static void svia_noop_freeze(struct ata_port *ap)
/* Some VIA controllers choke if ATA_NIEN is manipulated in
* certain way. Leave it alone and just clear pending IRQ.
*/
ap->ops->check_status(ap);
ap->ops->sff_check_status(ap);
ata_sff_irq_clear(ap);
}
......
drivers/ata/sata_vsc.c
View file @ 5682ed33
......@@ -251,7 +251,7 @@ static void vsc_port_intr(u8 port_status, struct ata_port *ap)
* simply clear the interrupt
*/
if (unlikely(!handled))
ap->ops->check_status(ap);
ap->ops->sff_check_status(ap);
}
/*
......@@ -306,8 +306,8 @@ static struct scsi_host_template vsc_sata_sht = {
static struct ata_port_operations vsc_sata_ops = {
.inherits = &ata_bmdma_port_ops,
.tf_load = vsc_sata_tf_load,
.tf_read = vsc_sata_tf_read,
.sff_tf_load = vsc_sata_tf_load,
.sff_tf_read = vsc_sata_tf_read,
.freeze = vsc_freeze,
.thaw = vsc_thaw,
.scr_read = vsc_sata_scr_read,
......
drivers/scsi/ipr.c
View file @ 5682ed33
......@@ -5271,13 +5271,13 @@ static u8 ipr_ata_check_altstatus(struct ata_port *ap)
}
static struct ata_port_operations ipr_sata_ops = {
.check_status = ipr_ata_check_status,
.check_altstatus = ipr_ata_check_altstatus,
.dev_select = ata_noop_dev_select,
.sff_check_status = ipr_ata_check_status,
.sff_check_altstatus = ipr_ata_check_altstatus,
.sff_dev_select = ata_noop_dev_select,
.phy_reset = ipr_ata_phy_reset,
.hardreset = ipr_sata_reset,
.post_internal_cmd = ipr_ata_post_internal,
.tf_read = ipr_tf_read,
.sff_tf_read = ipr_tf_read,
.qc_prep = ata_noop_qc_prep,
.qc_issue = ipr_qc_issue,
.port_start = ata_sas_port_start,
......
drivers/scsi/libsas/sas_ata.c
View file @ 5682ed33
......@@ -348,12 +348,12 @@ static int sas_ata_scr_read(struct ata_port *ap, unsigned int sc_reg_in,
}
static struct ata_port_operations sas_sata_ops = {
.check_status = sas_ata_check_status,
.check_altstatus = sas_ata_check_status,
.dev_select = ata_noop_dev_select,
.sff_check_status = sas_ata_check_status,
.sff_check_altstatus = sas_ata_check_status,
.sff_dev_select = ata_noop_dev_select,
.phy_reset = sas_ata_phy_reset,
.post_internal_cmd = sas_ata_post_internal,
.tf_read = sas_ata_tf_read,
.sff_tf_read = sas_ata_tf_read,
.qc_prep = ata_noop_qc_prep,
.qc_issue = sas_ata_qc_issue,
.port_start = ata_sas_port_start,
......
include/linux/libata.h
View file @ 5682ed33
......@@ -743,17 +743,18 @@ struct ata_port_operations {
/*
* SFF / taskfile oriented ops
*/
void (*dev_select)(struct ata_port *ap, unsigned int device);
u8 (*check_status)(struct ata_port *ap);
u8 (*check_altstatus)(struct ata_port *ap);
void (*tf_load)(struct ata_port *ap, const struct ata_taskfile *tf);
void (*tf_read)(struct ata_port *ap, struct ata_taskfile *tf);
void (*exec_command)(struct ata_port *ap, const struct ata_taskfile *tf);
unsigned int (*data_xfer)(struct ata_device *dev, unsigned char *buf,
unsigned int buflen, int rw);
u8 (*irq_on)(struct ata_port *);
void (*irq_clear)(struct ata_port *);
void (*sff_dev_select)(struct ata_port *ap, unsigned int device);
u8 (*sff_check_status)(struct ata_port *ap);
u8 (*sff_check_altstatus)(struct ata_port *ap);
void (*sff_tf_load)(struct ata_port *ap, const struct ata_taskfile *tf);
void (*sff_tf_read)(struct ata_port *ap, struct ata_taskfile *tf);
void (*sff_exec_command)(struct ata_port *ap,
const struct ata_taskfile *tf);
unsigned int (*sff_data_xfer)(struct ata_device *dev,
unsigned char *buf, unsigned int buflen, int rw);
u8 (*sff_irq_on)(struct ata_port *);
void (*sff_irq_clear)(struct ata_port *);
void (*bmdma_setup)(struct ata_queued_cmd *qc);
void (*bmdma_start)(struct ata_queued_cmd *qc);
void (*bmdma_stop)(struct ata_queued_cmd *qc);
......@@ -1438,7 +1439,7 @@ static inline u8 ata_sff_busy_wait(struct ata_port *ap, unsigned int bits,
do {
udelay(10);
status = ap->ops->check_status(ap);
status = ap->ops->sff_check_status(ap);
max--;
} while (status != 0xff && (status & bits) && (max > 0));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7