From: Tejun Heo <htejun@gmail.com>
Date: Tue, 13 Mar 2007 16:20:51 +0000 (+0900)
Subject: libata: hardreset on SERR_INTERNAL
X-Git-Tag: v2.6.22-rc1~1111^2~46
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=771b8dad9653d2659e0ffcc237184cb16c317788;hp=176efb054422bffe6b5a34194ffad134366c7f7e;p=powerpc.git

libata: hardreset on SERR_INTERNAL

There was a rare report where SB600 reported SERR_INTERNAL and SRST
couldn't get it out of the failure mode.  Hardreset on SERR_INTERNAL.
As the problem is intermittent, whether this fixes the problem or not
hasn't been verified yet, but hardresetting the channel on internal
error is a good idea anyway.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
---

diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index 39f556c029..185876aba6 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -1056,7 +1056,7 @@ static void ata_eh_analyze_serror(struct ata_port *ap)
 	}
 	if (serror & SERR_INTERNAL) {
 		err_mask |= AC_ERR_SYSTEM;
-		action |= ATA_EH_SOFTRESET;
+		action |= ATA_EH_HARDRESET;
 	}
 	if (serror & (SERR_PHYRDY_CHG | SERR_DEV_XCHG))
 		ata_ehi_hotplugged(&ehc->i);