linux-ide.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Albert Lee <albertcc@tw.ibm.com>
To: Jeff Garzik <jgarzik@pobox.com>
Cc: Tejun Heo <htejun@gmail.com>, Linux IDE <linux-ide@vger.kernel.org>
Subject: [PATCH] libata: minor fix for 2.6.16 (respin)
Date: Wed, 15 Feb 2006 14:55:50 +0800	[thread overview]
Message-ID: <43F2D076.4080207@tw.ibm.com> (raw)
In-Reply-To: <43F2C524.6030705@gmail.com>

Jeff,

Respin two minor fixes from libata-dev tree that might be good for 2.6.16:
 - Fix the array index value in ata_rwcmd_protocol() for the added FUA commands.
   (This only affects some VIA PATA adapters. Other hardware is safe from this bug.)
 - Filter out ATAPI packet command error messages in ata_pio_error()

Patch against the libata-dev upstream branch
(f1b318793dcd2d9ff6b5ac06e7762098fa079cee).
For your review, thanks.

Albert

Signed-off-by: Albert Lee <albertcc@tw.ibm.com> 

---

--- upstream/drivers/scsi/libata-core.c	2006-02-15 14:36:20.000000000 +0800
+++ upstream-mod/drivers/scsi/libata-core.c	2006-02-15 14:39:33.000000000 +0800
@@ -213,7 +213,7 @@ int ata_rwcmd_protocol(struct ata_queued
 	} else if (lba48 && (qc->ap->flags & ATA_FLAG_PIO_LBA48)) {
 		/* Unable to use DMA due to host limitation */
 		tf->protocol = ATA_PROT_PIO;
-		index = dev->multi_count ? 0 : 4;
+		index = dev->multi_count ? 0 : 8;
 	} else {
 		tf->protocol = ATA_PROT_DMA;
 		index = 16;
@@ -3426,11 +3426,12 @@ static void ata_pio_error(struct ata_por
 {
 	struct ata_queued_cmd *qc;
 
-	printk(KERN_WARNING "ata%u: PIO error\n", ap->id);
-
 	qc = ata_qc_from_tag(ap, ap->active_tag);
 	WARN_ON(qc == NULL);
 
+	if (qc->tf.command != ATA_CMD_PACKET)
+		printk(KERN_WARNING "ata%u: PIO error\n", ap->id);
+
 	/* make sure qc->err_mask is available to 
 	 * know what's wrong and recover
 	 */



  reply	other threads:[~2006-02-15  6:56 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-02-13 10:55 [PATCH] libata: minor fix for 2.6.16-rc3 Albert Lee
2006-02-15  6:07 ` Tejun Heo
2006-02-15  6:55   ` Albert Lee [this message]
2006-02-20 11:16     ` [PATCH] libata: minor fix for 2.6.16 (respin) Jeff Garzik

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=43F2D076.4080207@tw.ibm.com \
    --to=albertcc@tw.ibm.com \
    --cc=albertl@mail.com \
    --cc=htejun@gmail.com \
    --cc=jgarzik@pobox.com \
    --cc=linux-ide@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).