libata: skip old error history when counting probe trials

Submitted by Lin Ming on May 3, 2012, 1:23 a.m.

Details

Message ID 1336008189.5520.25.camel@minggr
State Not Applicable
Delegated to: David Miller
Headers show

Commit Message

Lin Ming May 3, 2012, 1:23 a.m.
Commit d902747 introduced ATA_EFLAG_OLD_ER to mark entries in the
error ring as cleared.

But ata_count_probe_trials_cb() didn't check this flag and it still
counts the old error history. So wrong probe trials count is returned
and it causes problem, for example, SATA link speed is slowed down from
3.0Gbps to 1.5Gbps.

Fix it by checking ATA_EFLAG_OLD_ER in ata_count_probe_trials_cb().

Cc: stable <stable@vger.kernel.org> # 2.6.37+
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
---
 drivers/ata/libata-eh.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

Comments

Sergei Shtylyov May 3, 2012, 11:10 a.m.
Hello.

On 03-05-2012 5:23, Lin Ming wrote:

> Commit d902747

    Please also specify the summary of that commit in parens.

> introduced ATA_EFLAG_OLD_ER to mark entries in the
> error ring as cleared.

> But ata_count_probe_trials_cb() didn't check this flag and it still
> counts the old error history. So wrong probe trials count is returned
> and it causes problem, for example, SATA link speed is slowed down from
> 3.0Gbps to 1.5Gbps.

> Fix it by checking ATA_EFLAG_OLD_ER in ata_count_probe_trials_cb().

> Cc: stable<stable@vger.kernel.org>  # 2.6.37+
> Signed-off-by: Lin Ming<ming.m.lin@intel.com>

MBR, Sergei
--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Lin Ming May 3, 2012, 2:15 p.m.
On Thu, May 3, 2012 at 7:10 PM, Sergei Shtylyov <sshtylyov@mvista.com> wrote:
> Hello.
>
> On 03-05-2012 5:23, Lin Ming wrote:
>
>> Commit d902747
>
>
>   Please also specify the summary of that commit in parens.

OK, just sent out the updated version.
--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch hide | download patch | download mbox

diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index c61316e..d1fbd59 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -3501,7 +3501,8 @@  static int ata_count_probe_trials_cb(struct ata_ering_entry *ent, void *void_arg
 	u64 now = get_jiffies_64();
 	int *trials = void_arg;
 
-	if (ent->timestamp < now - min(now, interval))
+	if ((ent->eflags & ATA_EFLAG_OLD_ER) ||
+	    (ent->timestamp < now - min(now, interval)))
 		return -1;
 
 	(*trials)++;