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

Commit 360ff783 authored by Tejun Heo's avatar Tejun Heo Committed by Jeff Garzik
Browse files

libata-sff: separate out BMDMA qc_issue 



Separate out ata_bmdma_qc_issue() from ata_sff_qc_issue() such that
ata_sff_qc_issue() only deals with non-BMDMA SFF protocols (PIO and
nodata) while ata_bmdma_qc_issue() deals with the BMDMA protocols and
uses ata_sff_qc_issue() for non-DMA commands.  All the users are
updated accordingly.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent f60d7011

drivers/ata/libata-sff.c

+67 −45
Original line number Diff line number Diff line
@@ -1379,15 +1379,11 @@ fsm_start: 
}



/**

 *	ata_sff_qc_issue - issue taskfile to device in proto-dependent manner

 *	ata_sff_qc_issue - issue taskfile to a SFF controller

 *	@qc: command to issue to device

 *

 *	Using various libata functions and hooks, this function

 *	starts an ATA command.  ATA commands are grouped into

 *	classes called "protocols", and issuing each type of protocol

 *	is slightly different.

 *

 *	May be used as the qc_issue() entry in ata_port_operations.

 *	This function issues a PIO or NODATA command to a SFF

 *	controller.

 *

 *	LOCKING:

 *	spin_lock_irqsave(host lock)
@@ -1402,23 +1398,8 @@ unsigned int ata_sff_qc_issue(struct ata_queued_cmd *qc) 
	/* Use polling pio if the LLD doesn't handle

	 * interrupt driven pio and atapi CDB interrupt.

	 */

	if (ap->flags & ATA_FLAG_PIO_POLLING) {

		switch (qc->tf.protocol) {

		case ATA_PROT_PIO:

		case ATA_PROT_NODATA:

		case ATAPI_PROT_PIO:

		case ATAPI_PROT_NODATA:

	if (ap->flags & ATA_FLAG_PIO_POLLING)

		qc->tf.flags |= ATA_TFLAG_POLLING;

			break;

		case ATAPI_PROT_DMA:

			if (qc->dev->flags & ATA_DFLAG_CDB_INTR)

				/* see ata_dma_blacklisted() */

				BUG();

			break;

		default:

			break;

		}

	}



	/* select the device */

	ata_dev_select(ap, qc->dev->devno, 1, 0);
@@ -1437,15 +1418,6 @@ unsigned int ata_sff_qc_issue(struct ata_queued_cmd *qc) 


		break;



	case ATA_PROT_DMA:

		WARN_ON_ONCE(qc->tf.flags & ATA_TFLAG_POLLING);



		ap->ops->sff_tf_load(ap, &qc->tf);  /* load tf registers */

		ap->ops->bmdma_setup(qc);	    /* set up bmdma */

		ap->ops->bmdma_start(qc);	    /* initiate bmdma */

		ap->hsm_task_state = HSM_ST_LAST;

		break;



	case ATA_PROT_PIO:

		if (qc->tf.flags & ATA_TFLAG_POLLING)

			ata_qc_set_polling(qc);
@@ -1490,18 +1462,6 @@ unsigned int ata_sff_qc_issue(struct ata_queued_cmd *qc) 
			ata_sff_queue_pio_task(ap, 0);

		break;



	case ATAPI_PROT_DMA:

		WARN_ON_ONCE(qc->tf.flags & ATA_TFLAG_POLLING);



		ap->ops->sff_tf_load(ap, &qc->tf);  /* load tf registers */

		ap->ops->bmdma_setup(qc);	    /* set up bmdma */

		ap->hsm_task_state = HSM_ST_FIRST;



		/* send cdb by polling if no cdb interrupt */

		if (!(qc->dev->flags & ATA_DFLAG_CDB_INTR))

			ata_sff_queue_pio_task(ap, 0);

		break;



	default:

		WARN_ON_ONCE(1);

		return AC_ERR_SYSTEM;
@@ -2618,6 +2578,7 @@ const struct ata_port_operations ata_bmdma_port_ops = { 
	.post_internal_cmd	= ata_bmdma_post_internal_cmd,



	.qc_prep		= ata_bmdma_qc_prep,

	.qc_issue		= ata_bmdma_qc_issue,



	.bmdma_setup		= ata_bmdma_setup,

	.bmdma_start		= ata_bmdma_start,
@@ -2781,6 +2742,67 @@ void ata_bmdma_dumb_qc_prep(struct ata_queued_cmd *qc) 
}

EXPORT_SYMBOL_GPL(ata_bmdma_dumb_qc_prep);



/**

 *	ata_bmdma_qc_issue - issue taskfile to a BMDMA controller

 *	@qc: command to issue to device

 *

 *	This function issues a PIO, NODATA or DMA command to a

 *	SFF/BMDMA controller.  PIO and NODATA are handled by

 *	ata_sff_qc_issue().

 *

 *	LOCKING:

 *	spin_lock_irqsave(host lock)

 *

 *	RETURNS:

 *	Zero on success, AC_ERR_* mask on failure

 */

unsigned int ata_bmdma_qc_issue(struct ata_queued_cmd *qc)

{

	struct ata_port *ap = qc->ap;



	/* see ata_dma_blacklisted() */

	BUG_ON((ap->flags & ATA_FLAG_PIO_POLLING) &&

	       qc->tf.protocol == ATAPI_PROT_DMA);



	/* defer PIO handling to sff_qc_issue */

	if (!ata_is_dma(qc->tf.protocol))

		return ata_sff_qc_issue(qc);



	/* select the device */

	ata_dev_select(ap, qc->dev->devno, 1, 0);



	/* start the command */

	switch (qc->tf.protocol) {

	case ATA_PROT_DMA:

		WARN_ON_ONCE(qc->tf.flags & ATA_TFLAG_POLLING);



		ap->ops->sff_tf_load(ap, &qc->tf);  /* load tf registers */

		ap->ops->bmdma_setup(qc);	    /* set up bmdma */

		ap->ops->bmdma_start(qc);	    /* initiate bmdma */

		ap->hsm_task_state = HSM_ST_LAST;

		break;



	case ATAPI_PROT_DMA:

		WARN_ON_ONCE(qc->tf.flags & ATA_TFLAG_POLLING);



		ap->ops->sff_tf_load(ap, &qc->tf);  /* load tf registers */

		ap->ops->bmdma_setup(qc);	    /* set up bmdma */

		ap->hsm_task_state = HSM_ST_FIRST;



		/* send cdb by polling if no cdb interrupt */

		if (!(qc->dev->flags & ATA_DFLAG_CDB_INTR))

			ata_sff_queue_pio_task(ap, 0);

		break;



	default:

		WARN_ON(1);

		return AC_ERR_SYSTEM;

	}



	return 0;

}

EXPORT_SYMBOL_GPL(ata_bmdma_qc_issue);



/**

 *	ata_bmdma_error_handler - Stock error handler for BMDMA controller

 *	@ap: port to handle error for

drivers/ata/pata_acpi.c

+2 −2
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ static unsigned int pacpi_qc_issue(struct ata_queued_cmd *qc) 
	struct pata_acpi *acpi = ap->private_data;



	if (acpi->gtm.flags & 0x10)

		return ata_sff_qc_issue(qc);

		return ata_bmdma_qc_issue(qc);



	if (adev != acpi->last) {

		pacpi_set_piomode(ap, adev);
@@ -180,7 +180,7 @@ static unsigned int pacpi_qc_issue(struct ata_queued_cmd *qc) 
			pacpi_set_dmamode(ap, adev);

		acpi->last = adev;

	}

	return ata_sff_qc_issue(qc);

	return ata_bmdma_qc_issue(qc);

}



/**

drivers/ata/pata_cs5530.c

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ static unsigned int cs5530_qc_issue(struct ata_queued_cmd *qc) 
		    	cs5530_set_dmamode(ap, adev);

	}



	return ata_sff_qc_issue(qc);

	return ata_bmdma_qc_issue(qc);

}



static struct scsi_host_template cs5530_sht = {

drivers/ata/pata_hpt3x2n.c

+1 −1
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ static unsigned int hpt3x2n_qc_issue(struct ata_queued_cmd *qc) 


		hpt3x2n_set_clock(ap, dpll ? 0x21 : 0x23);

	}

	return ata_sff_qc_issue(qc);

	return ata_bmdma_qc_issue(qc);

}



static struct scsi_host_template hpt3x2n_sht = {

drivers/ata/pata_it821x.c

+2 −2
Original line number Diff line number Diff line
@@ -430,7 +430,7 @@ static unsigned int it821x_smart_qc_issue(struct ata_queued_cmd *qc) 
		case 0xFC:	/* Internal 'report rebuild state' */

		/* Arguably should just no-op this one */

		case ATA_CMD_SET_FEATURES:

			return ata_sff_qc_issue(qc);

			return ata_bmdma_qc_issue(qc);

	}

	printk(KERN_DEBUG "it821x: can't process command 0x%02X\n", qc->tf.command);

	return AC_ERR_DEV;
@@ -448,7 +448,7 @@ static unsigned int it821x_smart_qc_issue(struct ata_queued_cmd *qc) 
static unsigned int it821x_passthru_qc_issue(struct ata_queued_cmd *qc)

{

	it821x_passthru_dev_select(qc->ap, qc->dev->devno);

	return ata_sff_qc_issue(qc);

	return ata_bmdma_qc_issue(qc);

}



/**