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

Commit 19799bfc authored by David Milburn's avatar David Milburn Committed by Jeff Garzik
Browse files

[libata] sata_sx4: fixup interrupt handling 

Issuing ATA_CMD_SET_FEATURES (0xef) times out because
pdc20621_interrupt ignores command completion since
ATA_TFLAG_POLLING flag is set.

This has already been fixed for sata_promise:

commit 51b94d2a
Author: Tejun Heo <htejun@gmail.com>
Date:   Fri Jun 8 13:46:55 2007 -0700

    sata_promise: use TF interface for polling NODATA commands

Also, this patch includes Mikael's original patches:

http://marc.info/?l=linux-ide&m=121135828227724&w=2
http://marc.info/?l=linux-ide&m=121144512109826&w=2



Signed-off-by: default avatarMikael Pettersson <mikpe@it.uu.se>
Signed-off-by: default avatarDavid Milburn <dmilburn@redhat.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 67651ee5

drivers/ata/sata_sx4.c

+9 −13
Original line number Diff line number Diff line
@@ -687,8 +687,11 @@ static void pdc20621_packet_start(struct ata_queued_cmd *qc) 
static unsigned int pdc20621_qc_issue(struct ata_queued_cmd *qc)

{

	switch (qc->tf.protocol) {

	case ATA_PROT_DMA:

	case ATA_PROT_NODATA:

		if (qc->tf.flags & ATA_TFLAG_POLLING)

			break;

		/*FALLTHROUGH*/

	case ATA_PROT_DMA:

		pdc20621_packet_start(qc);

		return 0;
@@ -787,12 +790,7 @@ static inline unsigned int pdc20621_host_intr(struct ata_port *ap, 


static void pdc20621_irq_clear(struct ata_port *ap)

{

	struct ata_host *host = ap->host;

	void __iomem *mmio = host->iomap[PDC_MMIO_BAR];



	mmio += PDC_CHIP0_OFS;



	readl(mmio + PDC_20621_SEQMASK);

	ioread8(ap->ioaddr.status_addr);

}



static irqreturn_t pdc20621_interrupt(int irq, void *dev_instance)
@@ -877,14 +875,12 @@ static void pdc_freeze(struct ata_port *ap) 
static void pdc_thaw(struct ata_port *ap)

{

	void __iomem *mmio = ap->ioaddr.cmd_addr;

	void __iomem *mmio_base;

	u32 tmp;



	/* FIXME: start HDMA engine, if zero ATA engines running */



	/* reading SEQ mask register clears IRQ */

	mmio_base = ap->host->iomap[PDC_MMIO_BAR] + PDC_CHIP0_OFS;

	readl(mmio_base + PDC_20621_SEQMASK);

	/* clear IRQ */

	ioread8(ap->ioaddr.status_addr);



	/* turn IRQ back on */

	tmp = readl(mmio + PDC_CTLSTAT);
@@ -974,7 +970,7 @@ static int pdc_check_atapi_dma(struct ata_queued_cmd *qc) 
static void pdc_tf_load_mmio(struct ata_port *ap, const struct ata_taskfile *tf)

{

	WARN_ON(tf->protocol == ATA_PROT_DMA ||

		tf->protocol == ATA_PROT_NODATA);

		tf->protocol == ATAPI_PROT_DMA);

	ata_sff_tf_load(ap, tf);

}
@@ -982,7 +978,7 @@ static void pdc_tf_load_mmio(struct ata_port *ap, const struct ata_taskfile *tf) 
static void pdc_exec_command_mmio(struct ata_port *ap, const struct ata_taskfile *tf)

{

	WARN_ON(tf->protocol == ATA_PROT_DMA ||

		tf->protocol == ATA_PROT_NODATA);

		tf->protocol == ATAPI_PROT_DMA);

	ata_sff_exec_command(ap, tf);

}