Skip to content

Commit

Permalink
libata: replace tf_read with qc_fill_rtf for non-SFF drivers
Browse files Browse the repository at this point in the history 
Now that all SFF stuff is separated out of core layer, core layer
doesn't call ops->tf_read directly.  It gets called only via
ops->qc_fill_rtf() for non-SFF drivers.  This patch directly
implements private ops->qc_fill_rtf() for non-SFF controllers and kill
ops->tf_read().

This is much cleaner for non-SFF controllers as some of them have to
cache SFF register values in private data structure and report the
cached values via ops->tf_read().  Also, ops->tf_read() gets nasty for
controllers which don't have clear notion of TF registers when
operation is not in progress.

As this change makes default ops->qc_fill_rtf unnecessary, move
ata_sff_qc_fill_rtf() form ata_base_port_ops to ata_sff_port_ops where
it belongs.

Signed-off-by: Tejun Heo <htejun@gmail.com>
  • Loading branch information
Tejun Heo authored and Jeff Garzik committed Apr 17, 2008
1 parent 79f97da commit 4c9bf4e
Show file tree
Hide file tree
Showing 7 changed files with 66 additions and 65 deletions.
21 changes: 11 additions & 10 deletions drivers/ata/ahci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -243,9 +243,9 @@ static int ahci_scr_read(struct ata_port *ap, unsigned int sc_reg, u32 *val);
static int ahci_scr_write(struct ata_port *ap, unsigned int sc_reg, u32 val);
static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent);
static unsigned int ahci_qc_issue(struct ata_queued_cmd *qc);
static bool ahci_qc_fill_rtf(struct ata_queued_cmd *qc);
static int ahci_port_start(struct ata_port *ap);
static void ahci_port_stop(struct ata_port *ap);
static void ahci_tf_read(struct ata_port *ap, struct ata_taskfile *tf);
static void ahci_qc_prep(struct ata_queued_cmd *qc);
static u8 ahci_check_status(struct ata_port *ap);
static void ahci_freeze(struct ata_port *ap);
Expand Down Expand Up @@ -295,10 +295,10 @@ static struct ata_port_operations ahci_ops = {
.sff_check_status = ahci_check_status,
.sff_check_altstatus = ahci_check_status,

.sff_tf_read = ahci_tf_read,
.qc_defer = sata_pmp_qc_defer_cmd_switch,
.qc_prep = ahci_qc_prep,
.qc_issue = ahci_qc_issue,
.qc_fill_rtf = ahci_qc_fill_rtf,

.freeze = ahci_freeze,
.thaw = ahci_thaw,
Expand Down Expand Up @@ -1473,14 +1473,6 @@ static u8 ahci_check_status(struct ata_port *ap)
return readl(mmio + PORT_TFDATA) & 0xFF;
}

static void ahci_tf_read(struct ata_port *ap, struct ata_taskfile *tf)
{
struct ahci_port_priv *pp = ap->private_data;
u8 *d2h_fis = pp->rx_fis + RX_FIS_D2H_REG;

ata_tf_from_fis(d2h_fis, tf);
}

static unsigned int ahci_fill_sg(struct ata_queued_cmd *qc, void *cmd_tbl)
{
struct scatterlist *sg;
Expand Down Expand Up @@ -1779,6 +1771,15 @@ static unsigned int ahci_qc_issue(struct ata_queued_cmd *qc)
return 0;
}

static bool ahci_qc_fill_rtf(struct ata_queued_cmd *qc)
{
struct ahci_port_priv *pp = qc->ap->private_data;
u8 *d2h_fis = pp->rx_fis + RX_FIS_D2H_REG;

ata_tf_from_fis(d2h_fis, &qc->result_tf);
return true;
}

static void ahci_freeze(struct ata_port *ap)
{
void __iomem *port_mmio = ahci_port_base(ap);
Expand Down
1 change: 0 additions & 1 deletion drivers/ata/libata-core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ 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 = {
.qc_fill_rtf = ata_sff_qc_fill_rtf,
.prereset = ata_std_prereset,
.postreset = ata_std_postreset,
.error_handler = ata_std_error_handler,
Expand Down
1 change: 1 addition & 0 deletions drivers/ata/libata-sff.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ const struct ata_port_operations ata_sff_port_ops = {

.qc_prep = ata_sff_qc_prep,
.qc_issue = ata_sff_qc_issue,
.qc_fill_rtf = ata_sff_qc_fill_rtf,

.freeze = ata_sff_freeze,
.thaw = ata_sff_thaw,
Expand Down
24 changes: 15 additions & 9 deletions drivers/ata/sata_fsl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -464,6 +464,20 @@ static unsigned int sata_fsl_qc_issue(struct ata_queued_cmd *qc)
return 0;
}

static bool sata_fsl_qc_fill_rtf(struct ata_queued_cmd *qc)
{
struct sata_fsl_port_priv *pp = qc->ap->private_data;
struct sata_fsl_host_priv *host_priv = qc->ap->host->private_data;
void __iomem *hcr_base = host_priv->hcr_base;
unsigned int tag = sata_fsl_tag(qc->tag, hcr_base);
struct command_desc *cd;

cd = pp->cmdentry + tag;

ata_tf_from_fis(cd->sfis, &qc->result_tf);
return true;
}

static int sata_fsl_scr_write(struct ata_port *ap, unsigned int sc_reg_in,
u32 val)
{
Expand Down Expand Up @@ -580,13 +594,6 @@ static u8 sata_fsl_check_status(struct ata_port *ap)
return pp->tf.command;
}

static void sata_fsl_tf_read(struct ata_port *ap, struct ata_taskfile *tf)
{
struct sata_fsl_port_priv *pp = ap->private_data;

*tf = pp->tf;
}

static int sata_fsl_port_start(struct ata_port *ap)
{
struct device *dev = ap->host->dev;
Expand Down Expand Up @@ -1193,10 +1200,9 @@ static const struct ata_port_operations sata_fsl_ops = {
.sff_check_status = sata_fsl_check_status,
.sff_check_altstatus = sata_fsl_check_status,

.sff_tf_read = sata_fsl_tf_read,

.qc_prep = sata_fsl_qc_prep,
.qc_issue = sata_fsl_qc_issue,
.qc_fill_rtf = sata_fsl_qc_fill_rtf,

.scr_read = sata_fsl_scr_read,
.scr_write = sata_fsl_scr_write,
Expand Down
8 changes: 0 additions & 8 deletions drivers/ata/sata_sil24.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,6 @@ static void sil24_dev_config(struct ata_device *dev);
static u8 sil24_check_status(struct ata_port *ap);
static int sil24_scr_read(struct ata_port *ap, unsigned sc_reg, u32 *val);
static int sil24_scr_write(struct ata_port *ap, unsigned sc_reg, u32 val);
static void sil24_tf_read(struct ata_port *ap, struct ata_taskfile *tf);
static int sil24_qc_defer(struct ata_queued_cmd *qc);
static void sil24_qc_prep(struct ata_queued_cmd *qc);
static unsigned int sil24_qc_issue(struct ata_queued_cmd *qc);
Expand Down Expand Up @@ -404,7 +403,6 @@ static struct ata_port_operations sil24_ops = {

.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,
Expand Down Expand Up @@ -533,12 +531,6 @@ static int sil24_scr_write(struct ata_port *ap, unsigned sc_reg, u32 val)
return -EINVAL;
}

static void sil24_tf_read(struct ata_port *ap, struct ata_taskfile *tf)
{
struct sil24_port_priv *pp = ap->private_data;
*tf = pp->tf;
}

static void sil24_config_port(struct ata_port *ap)
{
void __iomem *port = ap->ioaddr.cmd_addr;
Expand Down
59 changes: 30 additions & 29 deletions drivers/scsi/ipr.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5040,33 +5040,6 @@ static void ipr_ata_post_internal(struct ata_queued_cmd *qc)
spin_unlock_irqrestore(ioa_cfg->host->host_lock, flags);
}

/**
* ipr_tf_read - Read the current ATA taskfile for the ATA port
* @ap: ATA port
* @tf: destination ATA taskfile
*
* Return value:
* none
**/
static void ipr_tf_read(struct ata_port *ap, struct ata_taskfile *tf)
{
struct ipr_sata_port *sata_port = ap->private_data;
struct ipr_ioasa_gata *g = &sata_port->ioasa;

tf->feature = g->error;
tf->nsect = g->nsect;
tf->lbal = g->lbal;
tf->lbam = g->lbam;
tf->lbah = g->lbah;
tf->device = g->device;
tf->command = g->status;
tf->hob_nsect = g->hob_nsect;
tf->hob_lbal = g->hob_lbal;
tf->hob_lbam = g->hob_lbam;
tf->hob_lbah = g->hob_lbah;
tf->ctl = g->alt_status;
}

/**
* ipr_copy_sata_tf - Copy a SATA taskfile to an IOA data structure
* @regs: destination
Expand Down Expand Up @@ -5244,6 +5217,35 @@ static unsigned int ipr_qc_issue(struct ata_queued_cmd *qc)
return 0;
}

/**
* ipr_qc_fill_rtf - Read result TF
* @qc: ATA queued command
*
* Return value:
* true
**/
static bool ipr_qc_fill_rtf(struct ata_queued_cmd *qc)
{
struct ipr_sata_port *sata_port = qc->ap->private_data;
struct ipr_ioasa_gata *g = &sata_port->ioasa;
struct ata_taskfile *tf = &qc->result_tf;

tf->feature = g->error;
tf->nsect = g->nsect;
tf->lbal = g->lbal;
tf->lbam = g->lbam;
tf->lbah = g->lbah;
tf->device = g->device;
tf->command = g->status;
tf->hob_nsect = g->hob_nsect;
tf->hob_lbal = g->hob_lbal;
tf->hob_lbam = g->hob_lbam;
tf->hob_lbah = g->hob_lbah;
tf->ctl = g->alt_status;

return true;
}

/**
* ipr_ata_check_status - Return last ATA status
* @ap: ATA port
Expand Down Expand Up @@ -5277,10 +5279,9 @@ static struct ata_port_operations ipr_sata_ops = {
.phy_reset = ipr_ata_phy_reset,
.hardreset = ipr_sata_reset,
.post_internal_cmd = ipr_ata_post_internal,
.sff_tf_read = ipr_tf_read,
.qc_prep = ata_noop_qc_prep,
.qc_issue = ipr_qc_issue,
.qc_fill_rtf = ata_sff_qc_fill_rtf,
.qc_fill_rtf = ipr_qc_fill_rtf,
.port_start = ata_sas_port_start,
.port_stop = ata_sas_port_stop
};
Expand Down
17 changes: 9 additions & 8 deletions drivers/scsi/libsas/sas_ata.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,14 @@ static unsigned int sas_ata_qc_issue(struct ata_queued_cmd *qc)
return 0;
}

static bool sas_ata_qc_fill_rtf(struct ata_queued_cmd *qc)
{
struct domain_device *dev = qc->ap->private_data;

memcpy(&qc->result_tf, &dev->sata_dev.tf, sizeof(qc->result_tf));
return true;
}

static u8 sas_ata_check_status(struct ata_port *ap)
{
struct domain_device *dev = ap->private_data;
Expand Down Expand Up @@ -292,12 +300,6 @@ static void sas_ata_post_internal(struct ata_queued_cmd *qc)
}
}

static void sas_ata_tf_read(struct ata_port *ap, struct ata_taskfile *tf)
{
struct domain_device *dev = ap->private_data;
memcpy(tf, &dev->sata_dev.tf, sizeof (*tf));
}

static int sas_ata_scr_write(struct ata_port *ap, unsigned int sc_reg_in,
u32 val)
{
Expand Down Expand Up @@ -353,10 +355,9 @@ static struct ata_port_operations sas_sata_ops = {
.sff_dev_select = ata_noop_dev_select,
.phy_reset = sas_ata_phy_reset,
.post_internal_cmd = sas_ata_post_internal,
.sff_tf_read = sas_ata_tf_read,
.qc_prep = ata_noop_qc_prep,
.qc_issue = sas_ata_qc_issue,
.qc_fill_rtf = ata_sff_qc_fill_rtf,
.qc_fill_rtf = sas_ata_qc_fill_rtf,
.port_start = ata_sas_port_start,
.port_stop = ata_sas_port_stop,
.scr_read = sas_ata_scr_read,
Expand Down

0 comments on commit 4c9bf4e

Please sign in to comment.