Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e5b6260 authored by Jens Axboe's avatar Jens Axboe Committed by Tejun Heo
Browse files

libata: convert core and drivers to ->hw_tag usage 



Anything that goes to the hardware should use ->hw_tag, anything
related to internal lookup should be using ->tag.

Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent 5ac40790

drivers/ata/acard-ahci.c

+2 −2
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ static void acard_ahci_qc_prep(struct ata_queued_cmd *qc) 
	 * Fill in command table information.  First, the header,

	 * a SATA Register - Host to Device command FIS.

	 */

	cmd_tbl = pp->cmd_tbl + qc->tag * AHCI_CMD_TBL_SZ;

	cmd_tbl = pp->cmd_tbl + qc->hw_tag * AHCI_CMD_TBL_SZ;



	ata_tf_to_fis(&qc->tf, qc->dev->link->pmp, 1, cmd_tbl);

	if (is_atapi) {
@@ -294,7 +294,7 @@ static void acard_ahci_qc_prep(struct ata_queued_cmd *qc) 
	if (is_atapi)

		opts |= AHCI_CMD_ATAPI | AHCI_CMD_PREFETCH;



	ahci_fill_cmd_slot(pp, qc->tag, opts);

	ahci_fill_cmd_slot(pp, qc->hw_tag, opts);

}



static bool acard_ahci_qc_fill_rtf(struct ata_queued_cmd *qc)

drivers/ata/libahci.c

+4 −4
Original line number Diff line number Diff line
@@ -1645,7 +1645,7 @@ static void ahci_qc_prep(struct ata_queued_cmd *qc) 
	 * Fill in command table information.  First, the header,

	 * a SATA Register - Host to Device command FIS.

	 */

	cmd_tbl = pp->cmd_tbl + qc->tag * AHCI_CMD_TBL_SZ;

	cmd_tbl = pp->cmd_tbl + qc->hw_tag * AHCI_CMD_TBL_SZ;



	ata_tf_to_fis(&qc->tf, qc->dev->link->pmp, 1, cmd_tbl);

	if (is_atapi) {
@@ -1666,7 +1666,7 @@ static void ahci_qc_prep(struct ata_queued_cmd *qc) 
	if (is_atapi)

		opts |= AHCI_CMD_ATAPI | AHCI_CMD_PREFETCH;



	ahci_fill_cmd_slot(pp, qc->tag, opts);

	ahci_fill_cmd_slot(pp, qc->hw_tag, opts);

}



static void ahci_fbs_dec_intr(struct ata_port *ap)
@@ -2002,7 +2002,7 @@ unsigned int ahci_qc_issue(struct ata_queued_cmd *qc) 
	pp->active_link = qc->dev->link;



	if (ata_is_ncq(qc->tf.protocol))

		writel(1 << qc->tag, port_mmio + PORT_SCR_ACT);

		writel(1 << qc->hw_tag, port_mmio + PORT_SCR_ACT);



	if (pp->fbs_enabled && pp->fbs_last_dev != qc->dev->link->pmp) {

		u32 fbs = readl(port_mmio + PORT_FBS);
@@ -2012,7 +2012,7 @@ unsigned int ahci_qc_issue(struct ata_queued_cmd *qc) 
		pp->fbs_last_dev = qc->dev->link->pmp;

	}



	writel(1 << qc->tag, port_mmio + PORT_CMD_ISSUE);

	writel(1 << qc->hw_tag, port_mmio + PORT_CMD_ISSUE);



	ahci_sw_activity(qc->dev->link);

drivers/ata/libata-core.c

+4 −4
Original line number Diff line number Diff line
@@ -5177,7 +5177,7 @@ void __ata_qc_complete(struct ata_queued_cmd *qc) 


	/* command should be marked inactive atomically with qc completion */

	if (ata_is_ncq(qc->tf.protocol)) {

		link->sactive &= ~(1 << qc->tag);

		link->sactive &= ~(1 << qc->hw_tag);

		if (!link->sactive)

			ap->nr_active_links--;

	} else {
@@ -5405,16 +5405,16 @@ void ata_qc_issue(struct ata_queued_cmd *qc) 
	WARN_ON_ONCE(ap->ops->error_handler && ata_tag_valid(link->active_tag));



	if (ata_is_ncq(prot)) {

		WARN_ON_ONCE(link->sactive & (1 << qc->tag));

		WARN_ON_ONCE(link->sactive & (1 << qc->hw_tag));



		if (!link->sactive)

			ap->nr_active_links++;

		link->sactive |= 1 << qc->tag;

		link->sactive |= 1 << qc->hw_tag;

	} else {

		WARN_ON_ONCE(link->sactive);



		ap->nr_active_links++;

		link->active_tag = qc->tag;

		link->active_tag = qc->hw_tag;

	}



	qc->flags |= ATA_QCFLAG_ACTIVE;

drivers/ata/libata-scsi.c

+5 −5
Original line number Diff line number Diff line
@@ -1898,7 +1898,7 @@ static unsigned int ata_scsi_rw_xlat(struct ata_queued_cmd *qc) 
	qc->nbytes = n_block * scmd->device->sector_size;



	rc = ata_build_rw_tf(&qc->tf, qc->dev, block, n_block, tf_flags,

			     qc->tag, class);

			     qc->hw_tag, class);



	if (likely(rc == 0))

		return 0;
@@ -3236,7 +3236,7 @@ static unsigned int ata_scsi_pass_thru(struct ata_queued_cmd *qc) 


	/* For NCQ commands copy the tag value */

	if (ata_is_ncq(tf->protocol))

		tf->nsect = qc->tag << 3;

		tf->nsect = qc->hw_tag << 3;



	/* enforce correct master/slave bit */

	tf->device = dev->devno ?
@@ -3516,7 +3516,7 @@ static unsigned int ata_scsi_write_same_xlat(struct ata_queued_cmd *qc) 
		tf->protocol = ATA_PROT_NCQ;

		tf->command = ATA_CMD_FPDMA_SEND;

		tf->hob_nsect = ATA_SUBCMD_FPDMA_SEND_DSM & 0x1f;

		tf->nsect = qc->tag << 3;

		tf->nsect = qc->hw_tag << 3;

		tf->hob_feature = (size / 512) >> 8;

		tf->feature = size / 512;
@@ -3736,7 +3736,7 @@ static unsigned int ata_scsi_zbc_in_xlat(struct ata_queued_cmd *qc) 
		tf->protocol = ATA_PROT_NCQ;

		tf->command = ATA_CMD_FPDMA_RECV;

		tf->hob_nsect = ATA_SUBCMD_FPDMA_RECV_ZAC_MGMT_IN & 0x1f;

		tf->nsect = qc->tag << 3;

		tf->nsect = qc->hw_tag << 3;

		tf->feature = sect & 0xff;

		tf->hob_feature = (sect >> 8) & 0xff;

		tf->auxiliary = ATA_SUBCMD_ZAC_MGMT_IN_REPORT_ZONES | (options << 8);
@@ -3815,7 +3815,7 @@ static unsigned int ata_scsi_zbc_out_xlat(struct ata_queued_cmd *qc) 
		tf->protocol = ATA_PROT_NCQ_NODATA;

		tf->command = ATA_CMD_NCQ_NON_DATA;

		tf->feature = ATA_SUBCMD_NCQ_NON_DATA_ZAC_MGMT_OUT;

		tf->nsect = qc->tag << 3;

		tf->nsect = qc->hw_tag << 3;

		tf->auxiliary = sa | ((u16)all << 8);

	} else {

		tf->protocol = ATA_PROT_NODATA;

drivers/ata/sata_dwc_460ex.c

+7 −7
Original line number Diff line number Diff line
@@ -761,7 +761,7 @@ static void sata_dwc_dma_xfer_complete(struct ata_port *ap, u32 check_status) 
	if (tag > 0) {

		dev_info(ap->dev,

			 "%s tag=%u cmd=0x%02x dma dir=%s proto=%s dmacr=0x%08x\n",

			 __func__, qc->tag, qc->tf.command,

			 __func__, qc->hw_tag, qc->tf.command,

			 get_dma_dir_descript(qc->dma_dir),

			 get_prot_descript(qc->tf.protocol),

			 sata_dwc_readl(&hsdev->sata_dwc_regs->dmacr));
@@ -789,7 +789,7 @@ static int sata_dwc_qc_complete(struct ata_port *ap, struct ata_queued_cmd *qc, 
{

	u8 status = 0;

	u32 mask = 0x0;

	u8 tag = qc->tag;

	u8 tag = qc->hw_tag;

	struct sata_dwc_device *hsdev = HSDEV_FROM_AP(ap);

	struct sata_dwc_device_port *hsdevp = HSDEVP_FROM_AP(ap);

	hsdev->sactive_queued = 0;
@@ -997,7 +997,7 @@ static void sata_dwc_bmdma_setup_by_tag(struct ata_queued_cmd *qc, u8 tag) 


static void sata_dwc_bmdma_setup(struct ata_queued_cmd *qc)

{

	u8 tag = qc->tag;

	u8 tag = qc->hw_tag;



	if (ata_is_ncq(qc->tf.protocol)) {

		dev_dbg(qc->ap->dev, "%s: ap->link.sactive=0x%08x tag=%d\n",
@@ -1059,7 +1059,7 @@ static void sata_dwc_bmdma_start_by_tag(struct ata_queued_cmd *qc, u8 tag) 


static void sata_dwc_bmdma_start(struct ata_queued_cmd *qc)

{

	u8 tag = qc->tag;

	u8 tag = qc->hw_tag;



	if (ata_is_ncq(qc->tf.protocol)) {

		dev_dbg(qc->ap->dev, "%s: ap->link.sactive=0x%08x tag=%d\n",
@@ -1074,17 +1074,17 @@ static void sata_dwc_bmdma_start(struct ata_queued_cmd *qc) 
static unsigned int sata_dwc_qc_issue(struct ata_queued_cmd *qc)

{

	u32 sactive;

	u8 tag = qc->tag;

	u8 tag = qc->hw_tag;

	struct ata_port *ap = qc->ap;

	struct sata_dwc_device_port *hsdevp = HSDEVP_FROM_AP(ap);



#ifdef DEBUG_NCQ

	if (qc->tag > 0 || ap->link.sactive > 1)

	if (qc->hw_tag > 0 || ap->link.sactive > 1)

		dev_info(ap->dev,

			 "%s ap id=%d cmd(0x%02x)=%s qc tag=%d prot=%s ap active_tag=0x%08x ap sactive=0x%08x\n",

			 __func__, ap->print_id, qc->tf.command,

			 ata_get_cmd_descript(qc->tf.command),

			 qc->tag, get_prot_descript(qc->tf.protocol),

			 qc->hw_tag, get_prot_descript(qc->tf.protocol),

			 ap->link.active_tag, ap->link.sactive);

#endif