From 1ddcb9bb625ccc9c023d2ae051cbcff35267c8f4 Mon Sep 17 00:00:00 2001
From: Shane Huang <shane.huang@amd.com>
Date: Wed, 5 Aug 2009 10:10:41 +0800
Subject: [PATCH] --- yaml --- r: 156660 b: refs/heads/master c:
 b6931c1fbaf7fda9ea7f120228a96600d7090049 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/ata/ahci.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 90160c7fda41..c684626d8c95 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 20308871588518b5e209c403de2a3ad9a2eba9af
+refs/heads/master: b6931c1fbaf7fda9ea7f120228a96600d7090049
diff --git a/trunk/drivers/ata/ahci.c b/trunk/drivers/ata/ahci.c
index 958c1fa41900..838ff73b08e1 100644
--- a/trunk/drivers/ata/ahci.c
+++ b/trunk/drivers/ata/ahci.c
@@ -1773,7 +1773,8 @@ static int ahci_sb600_softreset(struct ata_link *link, unsigned int *class,
 		irq_sts = readl(port_mmio + PORT_IRQ_STAT);
 		if (irq_sts & PORT_IRQ_BAD_PMP) {
 			ata_link_printk(link, KERN_WARNING,
-					"failed due to HW bug, retry pmp=0\n");
+					"applying SB600 PMP SRST workaround "
+					"and retrying\n");
 			rc = ahci_do_softreset(link, class, 0, deadline,
 					       ahci_check_ready);
 		}