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

Commit 405e66b3 authored by Tejun Heo's avatar Tejun Heo Committed by Jeff Garzik
Browse files

libata: implement protocol tests 



Implement protocol tests - ata_is_atapi(), ata_is_nodata(),
ata_is_pio(), ata_is_dma(), ata_is_ncq() and ata_is_data() and use
them to replace is_atapi_taskfile() and hard coded protocol tests.

Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent f20ded38

drivers/ata/ahci.c

+1 −1
Original line number Diff line number Diff line
@@ -1511,7 +1511,7 @@ static void ahci_qc_prep(struct ata_queued_cmd *qc) 
{

	struct ata_port *ap = qc->ap;

	struct ahci_port_priv *pp = ap->private_data;

	int is_atapi = is_atapi_taskfile(&qc->tf);

	int is_atapi = ata_is_atapi(qc->tf.protocol);

	void *cmd_tbl;

	u32 opts;

	const u32 cmd_fis_len = 5; /* five dwords */

drivers/ata/libata-core.c

+7 −29
Original line number Diff line number Diff line
@@ -5358,7 +5358,7 @@ static inline int ata_hsm_ok_in_wq(struct ata_port *ap, struct ata_queued_cmd *q 
		    (qc->tf.flags & ATA_TFLAG_WRITE))

		    return 1;



		if (is_atapi_taskfile(&qc->tf) &&

		if (ata_is_atapi(qc->tf.protocol) &&

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

			return 1;

	}
@@ -5955,30 +5955,6 @@ int ata_qc_complete_multiple(struct ata_port *ap, u32 qc_active, 
	return nr_done;

}



static inline int ata_should_dma_map(struct ata_queued_cmd *qc)

{

	struct ata_port *ap = qc->ap;



	switch (qc->tf.protocol) {

	case ATA_PROT_NCQ:

	case ATA_PROT_DMA:

	case ATA_PROT_ATAPI_DMA:

		return 1;



	case ATA_PROT_ATAPI:

	case ATA_PROT_PIO:

		if (ap->flags & ATA_FLAG_PIO_DMA)

			return 1;



		/* fall through */



	default:

		return 0;

	}



	/* never reached */

}



/**

 *	ata_qc_issue - issue taskfile to device

 *	@qc: command to issue to device
@@ -5995,6 +5971,7 @@ void ata_qc_issue(struct ata_queued_cmd *qc) 
{

	struct ata_port *ap = qc->ap;

	struct ata_link *link = qc->dev->link;

	u8 prot = qc->tf.protocol;



	/* Make sure only one non-NCQ command is outstanding.  The

	 * check is skipped for old EH because it reuses active qc to
@@ -6002,7 +5979,7 @@ void ata_qc_issue(struct ata_queued_cmd *qc) 
	 */

	WARN_ON(ap->ops->error_handler && ata_tag_valid(link->active_tag));



	if (qc->tf.protocol == ATA_PROT_NCQ) {

	if (prot == ATA_PROT_NCQ) {

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



		if (!link->sactive)
@@ -6018,7 +5995,8 @@ void ata_qc_issue(struct ata_queued_cmd *qc) 
	qc->flags |= ATA_QCFLAG_ACTIVE;

	ap->qc_active |= 1 << qc->tag;



	if (ata_should_dma_map(qc)) {

	if (ata_is_dma(prot) || (ata_is_pio(prot) &&

				 (ap->flags & ATA_FLAG_PIO_DMA))) {

		if (qc->flags & ATA_QCFLAG_SG) {

			if (ata_sg_setup(qc))

				goto sg_err;
@@ -6217,8 +6195,8 @@ inline unsigned int ata_host_intr(struct ata_port *ap, 
		 */



		/* Check the ATA_DFLAG_CDB_INTR flag is enough here.

		 * The flag was turned on only for atapi devices.

		 * No need to check is_atapi_taskfile(&qc->tf) again.

		 * The flag was turned on only for atapi devices.  No

		 * need to check ata_is_atapi(qc->tf.protocol) again.

		 */

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

			goto idle_irq;

drivers/ata/sata_fsl.c

+1 −1
Original line number Diff line number Diff line
@@ -417,7 +417,7 @@ static void sata_fsl_qc_prep(struct ata_queued_cmd *qc) 
	}



	/* setup "ACMD - atapi command" in cmd. desc. if this is ATAPI cmd */

	if (is_atapi_taskfile(&qc->tf)) {

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

		desc_info |= ATAPI_CMD;

		memset((void *)&cd->acmd, 0, 32);

		memcpy((void *)&cd->acmd, qc->cdb, qc->dev->cdb_len);

drivers/ata/sata_sil.c

+4 −6
Original line number Diff line number Diff line
@@ -416,15 +416,14 @@ static void sil_host_intr(struct ata_port *ap, u32 bmdma2) 
		 */



		/* Check the ATA_DFLAG_CDB_INTR flag is enough here.

		 * The flag was turned on only for atapi devices.

		 * No need to check is_atapi_taskfile(&qc->tf) again.

		 * The flag was turned on only for atapi devices.  No

		 * need to check ata_is_atapi(qc->tf.protocol) again.

		 */

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

			goto err_hsm;

		break;

	case HSM_ST_LAST:

		if (qc->tf.protocol == ATA_PROT_DMA ||

		    qc->tf.protocol == ATA_PROT_ATAPI_DMA) {

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

			/* clear DMA-Start bit */

			ap->ops->bmdma_stop(qc);
@@ -451,8 +450,7 @@ static void sil_host_intr(struct ata_port *ap, u32 bmdma2) 
	/* kick HSM in the ass */

	ata_hsm_move(ap, qc, status, 0);



	if (unlikely(qc->err_mask) && (qc->tf.protocol == ATA_PROT_DMA ||

				       qc->tf.protocol == ATA_PROT_ATAPI_DMA))

	if (unlikely(qc->err_mask) && ata_is_dma(qc->tf.protocol))

		ata_ehi_push_desc(ehi, "BMDMA2 stat 0x%x", bmdma2);



	return;

drivers/ata/sata_sil24.c

+4 −20
Original line number Diff line number Diff line
@@ -852,9 +852,7 @@ static int sil24_qc_defer(struct ata_queued_cmd *qc) 
	 *   set.

	 *

 	 */

	int is_excl = (prot == ATA_PROT_ATAPI ||

		       prot == ATA_PROT_ATAPI_NODATA ||

		       prot == ATA_PROT_ATAPI_DMA ||

	int is_excl = (ata_is_atapi(prot) ||

		       (qc->flags & ATA_QCFLAG_RESULT_TF));



	if (unlikely(ap->excl_link)) {
@@ -885,35 +883,21 @@ static void sil24_qc_prep(struct ata_queued_cmd *qc) 


	cb = &pp->cmd_block[sil24_tag(qc->tag)];



	switch (qc->tf.protocol) {

	case ATA_PROT_PIO:

	case ATA_PROT_DMA:

	case ATA_PROT_NCQ:

	case ATA_PROT_NODATA:

	if (!ata_is_atapi(qc->tf.protocol)) {

		prb = &cb->ata.prb;

		sge = cb->ata.sge;

		break;



	case ATA_PROT_ATAPI:

	case ATA_PROT_ATAPI_DMA:

	case ATA_PROT_ATAPI_NODATA:

	} else {

		prb = &cb->atapi.prb;

		sge = cb->atapi.sge;

		memset(cb->atapi.cdb, 0, 32);

		memcpy(cb->atapi.cdb, qc->cdb, qc->dev->cdb_len);



		if (qc->tf.protocol != ATA_PROT_ATAPI_NODATA) {

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

			if (qc->tf.flags & ATA_TFLAG_WRITE)

				ctrl = PRB_CTRL_PACKET_WRITE;

			else

				ctrl = PRB_CTRL_PACKET_READ;

		}

		break;



	default:

		prb = NULL;	/* shut up, gcc */

		sge = NULL;

		BUG();

	}



	prb->ctrl = cpu_to_le16(ctrl);