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

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

libata-sff: separate out BMDMA irq handler 



Separate out BMDMA irq handler from SFF irq handler.  The misnamed
host_intr() functions are renamed to ata_sff_port_intr() and
ata_bmdma_port_intr().  Common parts are factored into
__ata_sff_port_intr() and __ata_sff_interrupt() and used by sff and
bmdma interrupt routines.

All BMDMA drivers now use ata_bmdma_interrupt() or
ata_bmdma_port_intr() while all non-BMDMA SFF ones use
ata_sff_interrupt() or ata_sff_port_intr().

For now, ata_pci_sff_init_one() uses ata_bmdma_interrupt() as it's
used by both SFF and BMDMA drivers.

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

drivers/ata/ata_piix.c

+1 −1
Original line number Diff line number Diff line
@@ -1626,7 +1626,7 @@ static int __devinit piix_init_one(struct pci_dev *pdev, 
	host->flags |= ATA_HOST_PARALLEL_SCAN;



	pci_set_master(pdev);

	return ata_pci_sff_activate_host(host, ata_sff_interrupt, &piix_sht);

	return ata_pci_sff_activate_host(host, ata_bmdma_interrupt, &piix_sht);

}



static void piix_remove_one(struct pci_dev *pdev)

drivers/ata/libata-sff.c

+130 −78
Original line number Diff line number Diff line
@@ -1469,27 +1469,27 @@ bool ata_sff_qc_fill_rtf(struct ata_queued_cmd *qc) 
}

EXPORT_SYMBOL_GPL(ata_sff_qc_fill_rtf);



/**

 *	ata_sff_host_intr - Handle host interrupt for given (port, task)

 *	@ap: Port on which interrupt arrived (possibly...)

 *	@qc: Taskfile currently active in engine

 *

 *	Handle host interrupt for given queued command.  Currently,

 *	only DMA interrupts are handled.  All other commands are

 *	handled via polling with interrupts disabled (nIEN bit).

 *

 *	LOCKING:

 *	spin_lock_irqsave(host lock)

 *

 *	RETURNS:

 *	One if interrupt was handled, zero if not (shared irq).

 */

unsigned int ata_sff_host_intr(struct ata_port *ap,

				      struct ata_queued_cmd *qc)

static unsigned int ata_sff_idle_irq(struct ata_port *ap)

{

	struct ata_eh_info *ehi = &ap->link.eh_info;

	u8 status, host_stat = 0;

	bool bmdma_stopped = false;

	ap->stats.idle_irq++;



#ifdef ATA_IRQ_TRAP

	if ((ap->stats.idle_irq % 1000) == 0) {

		ap->ops->sff_check_status(ap);

		if (ap->ops->sff_irq_clear)

			ap->ops->sff_irq_clear(ap);

		ata_port_printk(ap, KERN_WARNING, "irq trap\n");

		return 1;

	}

#endif

	return 0;	/* irq not handled */

}



static unsigned int __ata_sff_port_intr(struct ata_port *ap,

					struct ata_queued_cmd *qc,

					bool hsmv_on_idle)

{

	u8 status;



	VPRINTK("ata%u: protocol %d task_state %d\n",

		ap->print_id, qc->tf.protocol, ap->hsm_task_state);
@@ -1506,47 +1506,24 @@ unsigned int ata_sff_host_intr(struct ata_port *ap, 
		 * need to check ata_is_atapi(qc->tf.protocol) again.

		 */

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

			goto idle_irq;

		break;

	case HSM_ST_LAST:

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

		    qc->tf.protocol == ATAPI_PROT_DMA) {

			/* check status of DMA engine */

			host_stat = ap->ops->bmdma_status(ap);

			VPRINTK("ata%u: host_stat 0x%X\n",

				ap->print_id, host_stat);



			/* if it's not our irq... */

			if (!(host_stat & ATA_DMA_INTR))

				goto idle_irq;



			/* before we do anything else, clear DMA-Start bit */

			ap->ops->bmdma_stop(qc);

			bmdma_stopped = true;



			if (unlikely(host_stat & ATA_DMA_ERR)) {

				/* error when transfering data to/from memory */

				qc->err_mask |= AC_ERR_HOST_BUS;

				ap->hsm_task_state = HSM_ST_ERR;

			}

		}

			return ata_sff_idle_irq(ap);

		break;

	case HSM_ST:

	case HSM_ST_LAST:

		break;

	default:

		goto idle_irq;

		return ata_sff_idle_irq(ap);

	}





	/* check main status, clearing INTRQ if needed */

	status = ata_sff_irq_status(ap);

	if (status & ATA_BUSY) {

		if (bmdma_stopped) {

		if (hsmv_on_idle) {

			/* BMDMA engine is already stopped, we're screwed */

			qc->err_mask |= AC_ERR_HSM;

			ap->hsm_task_state = HSM_ST_ERR;

		} else

			goto idle_irq;

			return ata_sff_idle_irq(ap);

	}



	/* clear irq events */
@@ -1555,43 +1532,30 @@ unsigned int ata_sff_host_intr(struct ata_port *ap, 


	ata_sff_hsm_move(ap, qc, status, 0);



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

				       qc->tf.protocol == ATAPI_PROT_DMA))

		ata_ehi_push_desc(ehi, "BMDMA stat 0x%x", host_stat);



	return 1;	/* irq handled */



idle_irq:

	ap->stats.idle_irq++;



#ifdef ATA_IRQ_TRAP

	if ((ap->stats.idle_irq % 1000) == 0) {

		ap->ops->sff_check_status(ap);

		if (ap->ops->sff_irq_clear)

			ap->ops->sff_irq_clear(ap);

		ata_port_printk(ap, KERN_WARNING, "irq trap\n");

		return 1;

	}

#endif

	return 0;	/* irq not handled */

}

EXPORT_SYMBOL_GPL(ata_sff_host_intr);



/**

 *	ata_sff_interrupt - Default ATA host interrupt handler

 *	@irq: irq line (unused)

 *	@dev_instance: pointer to our ata_host information structure

 *	ata_sff_port_intr - Handle SFF port interrupt

 *	@ap: Port on which interrupt arrived (possibly...)

 *	@qc: Taskfile currently active in engine

 *

 *	Default interrupt handler for PCI IDE devices.  Calls

 *	ata_sff_host_intr() for each port that is not disabled.

 *	Handle port interrupt for given queued command.

 *

 *	LOCKING:

 *	Obtains host lock during operation.

 *	spin_lock_irqsave(host lock)

 *

 *	RETURNS:

 *	IRQ_NONE or IRQ_HANDLED.

 *	One if interrupt was handled, zero if not (shared irq).

 */

irqreturn_t ata_sff_interrupt(int irq, void *dev_instance)

unsigned int ata_sff_port_intr(struct ata_port *ap, struct ata_queued_cmd *qc)

{

	return __ata_sff_port_intr(ap, qc, false);

}

EXPORT_SYMBOL_GPL(ata_sff_port_intr);



static inline irqreturn_t __ata_sff_interrupt(int irq, void *dev_instance,

	unsigned int (*port_intr)(struct ata_port *, struct ata_queued_cmd *))

{

	struct ata_host *host = dev_instance;

	bool retried = false;
@@ -1611,7 +1575,7 @@ irqreturn_t ata_sff_interrupt(int irq, void *dev_instance) 
		qc = ata_qc_from_tag(ap, ap->link.active_tag);

		if (qc) {

			if (!(qc->tf.flags & ATA_TFLAG_POLLING))

				handled |= ata_sff_host_intr(ap, qc);

				handled |= port_intr(ap, qc);

			else

				polling |= 1 << i;

		} else
@@ -1661,6 +1625,25 @@ irqreturn_t ata_sff_interrupt(int irq, void *dev_instance) 


	return IRQ_RETVAL(handled);

}



/**

 *	ata_sff_interrupt - Default SFF ATA host interrupt handler

 *	@irq: irq line (unused)

 *	@dev_instance: pointer to our ata_host information structure

 *

 *	Default interrupt handler for PCI IDE devices.  Calls

 *	ata_sff_port_intr() for each port that is not disabled.

 *

 *	LOCKING:

 *	Obtains host lock during operation.

 *

 *	RETURNS:

 *	IRQ_NONE or IRQ_HANDLED.

 */

irqreturn_t ata_sff_interrupt(int irq, void *dev_instance)

{

	return __ata_sff_interrupt(irq, dev_instance, ata_sff_port_intr);

}

EXPORT_SYMBOL_GPL(ata_sff_interrupt);



/**
@@ -1698,7 +1681,7 @@ void ata_sff_lost_interrupt(struct ata_port *ap) 
								status);

	/* Run the host interrupt logic as if the interrupt had not been

	   lost */

	ata_sff_host_intr(ap, qc);

	ata_sff_port_intr(ap, qc);

}

EXPORT_SYMBOL_GPL(ata_sff_lost_interrupt);
@@ -2541,7 +2524,7 @@ int ata_pci_sff_init_one(struct pci_dev *pdev, 
	host->flags |= hflag;



	pci_set_master(pdev);

	rc = ata_pci_sff_activate_host(host, ata_sff_interrupt, sht);

	rc = ata_pci_sff_activate_host(host, ata_bmdma_interrupt, sht);

out:

	if (rc == 0)

		devres_remove_group(&pdev->dev, NULL);
@@ -2787,6 +2770,75 @@ unsigned int ata_bmdma_qc_issue(struct ata_queued_cmd *qc) 
}

EXPORT_SYMBOL_GPL(ata_bmdma_qc_issue);



/**

 *	ata_bmdma_port_intr - Handle BMDMA port interrupt

 *	@ap: Port on which interrupt arrived (possibly...)

 *	@qc: Taskfile currently active in engine

 *

 *	Handle port interrupt for given queued command.

 *

 *	LOCKING:

 *	spin_lock_irqsave(host lock)

 *

 *	RETURNS:

 *	One if interrupt was handled, zero if not (shared irq).

 */

unsigned int ata_bmdma_port_intr(struct ata_port *ap, struct ata_queued_cmd *qc)

{

	struct ata_eh_info *ehi = &ap->link.eh_info;

	u8 host_stat = 0;

	bool bmdma_stopped = false;

	unsigned int handled;



	if (ap->hsm_task_state == HSM_ST_LAST && ata_is_dma(qc->tf.protocol)) {

		/* check status of DMA engine */

		host_stat = ap->ops->bmdma_status(ap);

		VPRINTK("ata%u: host_stat 0x%X\n", ap->print_id, host_stat);



		/* if it's not our irq... */

		if (!(host_stat & ATA_DMA_INTR))

			return ata_sff_idle_irq(ap);



		/* before we do anything else, clear DMA-Start bit */

		ap->ops->bmdma_stop(qc);

		bmdma_stopped = true;



		if (unlikely(host_stat & ATA_DMA_ERR)) {

			/* error when transfering data to/from memory */

			qc->err_mask |= AC_ERR_HOST_BUS;

			ap->hsm_task_state = HSM_ST_ERR;

		}

	}



	handled = __ata_sff_port_intr(ap, qc, bmdma_stopped);



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

		ata_ehi_push_desc(ehi, "BMDMA stat 0x%x", host_stat);



	return handled;

}

EXPORT_SYMBOL_GPL(ata_bmdma_port_intr);



/**

 *	ata_bmdma_interrupt - Default BMDMA ATA host interrupt handler

 *	@irq: irq line (unused)

 *	@dev_instance: pointer to our ata_host information structure

 *

 *	Default interrupt handler for PCI IDE devices.  Calls

 *	ata_bmdma_port_intr() for each port that is not disabled.

 *

 *	LOCKING:

 *	Obtains host lock during operation.

 *

 *	RETURNS:

 *	IRQ_NONE or IRQ_HANDLED.

 */

irqreturn_t ata_bmdma_interrupt(int irq, void *dev_instance)

{

	return __ata_sff_interrupt(irq, dev_instance, ata_bmdma_port_intr);

}

EXPORT_SYMBOL_GPL(ata_bmdma_interrupt);



/**

 *	ata_bmdma_error_handler - Stock error handler for BMDMA controller

 *	@ap: port to handle error for

drivers/ata/pata_atp867x.c

+1 −1
Original line number Diff line number Diff line
@@ -525,7 +525,7 @@ static int atp867x_init_one(struct pci_dev *pdev, 


	pci_set_master(pdev);



	rc = ata_host_activate(host, pdev->irq, ata_sff_interrupt,

	rc = ata_host_activate(host, pdev->irq, ata_bmdma_interrupt,

				IRQF_SHARED, &atp867x_sht);

	if (rc)

		dev_printk(KERN_ERR, &pdev->dev, "failed to activate host\n");

drivers/ata/pata_cs5520.c

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ static int __devinit cs5520_init_one(struct pci_dev *pdev, const struct pci_devi 
			continue;



		rc = devm_request_irq(&pdev->dev, irq[ap->port_no],

				      ata_sff_interrupt, 0, DRV_NAME, host);

				      ata_bmdma_interrupt, 0, DRV_NAME, host);

		if (rc)

			return rc;

drivers/ata/pata_hpt3x3.c

+1 −1
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ static int hpt3x3_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
		ata_port_pbar_desc(ap, 4, offset_cmd[i], "cmd");

	}

	pci_set_master(pdev);

	return ata_host_activate(host, pdev->irq, ata_sff_interrupt,

	return ata_host_activate(host, pdev->irq, ata_bmdma_interrupt,

				 IRQF_SHARED, &hpt3x3_sht);

}