Attachment 156042 Details for Bug 242387 – Patch from Jeff Garzik for libata

[patch] Patch from Jeff Garzik for libata

libata_polling_setxfer_piix.diff (text/plain), 1.70 KB, created by Chris Rankin on 2007-06-03 22:07:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Rankin

Created: 2007-06-03 22:07:48 UTC

Size: 1.70 KB

patch

obsolete

>diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
>index 3ca9c61..4d6de65 100644
>--- a/drivers/ata/libata-core.c
>+++ b/drivers/ata/libata-core.c
>@@ -3932,10 +3932,13 @@ static unsigned int ata_dev_set_xfermode
> 	/* set up set-features taskfile */
> 	DPRINTK("set features - xfer mode\n");
> 
>+	/* Some controllers and ATAPI devices show flaky interrupt
>+	 * behavior after setting xfer mode.  Use polling instead.
>+	 */
> 	ata_tf_init(dev, &tf);
> 	tf.command = ATA_CMD_SET_FEATURES;
> 	tf.feature = SETFEATURES_XFER;
>-	tf.flags |= ATA_TFLAG_ISADDR | ATA_TFLAG_DEVICE;
>+	tf.flags |= ATA_TFLAG_ISADDR | ATA_TFLAG_DEVICE | ATA_TFLAG_POLLING;
> 	tf.protocol = ATA_PROT_NODATA;
> 	tf.nsect = dev->xfer_mode;
> 
>@@ -5413,14 +5416,6 @@ unsigned int ata_qc_issue_prot(struct at
> 		}
> 	}
> 
>-	/* Some controllers show flaky interrupt behavior after
>-	 * setting xfer mode.  Use polling instead.
>-	 */
>-	if (unlikely(qc->tf.command == ATA_CMD_SET_FEATURES &&
>-		     qc->tf.feature == SETFEATURES_XFER) &&
>-	    (ap->flags & ATA_FLAG_SETXFER_POLLING))
>-		qc->tf.flags |= ATA_TFLAG_POLLING;
>-
> 	/* select the device */
> 	ata_dev_select(ap, qc->dev->devno, 1, 0);
> 
>diff --git a/include/linux/libata.h b/include/linux/libata.h
>index 85f7b1b..a6a3113 100644
>--- a/include/linux/libata.h
>+++ b/include/linux/libata.h
>@@ -171,7 +171,6 @@ enum {
> 	ATA_FLAG_SKIP_D2H_BSY	= (1 << 12), /* can't wait for the first D2H
> 					      * Register FIS clearing BSY */
> 	ATA_FLAG_DEBUGMSG	= (1 << 13),
>-	ATA_FLAG_SETXFER_POLLING= (1 << 14), /* use polling for SETXFER */
> 	ATA_FLAG_IGN_SIMPLEX	= (1 << 15), /* ignore SIMPLEX */
> 	ATA_FLAG_NO_IORDY	= (1 << 16), /* controller lacks iordy */
> 	ATA_FLAG_ACPI_SATA	= (1 << 17), /* need native SATA ACPI layout */
>
>-

Actions: View | Diff

Attachments on bug 242387: 156042