summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis V. Lunev <den@openvz.org>2014-01-30 15:20:30 +0400
committerTejun Heo <tj@kernel.org>2014-01-31 07:05:44 -0500
commitefb9e0f4f43780f0ae0c6428d66bd03e805c7539 (patch)
tree2782f0d94a64e6331a927beb7d5ed53d6d22e68f
parent49c8f1ffe26ffddfb7244a24db21c0b4a79e1c52 (diff)
downloadlinux-stable-efb9e0f4f43780f0ae0c6428d66bd03e805c7539.tar.gz
linux-stable-efb9e0f4f43780f0ae0c6428d66bd03e805c7539.tar.bz2
linux-stable-efb9e0f4f43780f0ae0c6428d66bd03e805c7539.zip
ata: enable quirk from jmicron JMB350 for JMB394
Without the patch the kernel generates the following error. ata11.15: SATA link up 1.5 Gbps (SStatus 113 SControl 310) ata11.15: Port Multiplier vendor mismatch '0x197b' != '0x123' ata11.15: PMP revalidation failed (errno=-19) ata11.15: failed to recover PMP after 5 tries, giving up This patch helps to bypass this error and the device becomes functional. Signed-off-by: Denis V. Lunev <den@openvz.org> Signed-off-by: Tejun Heo <tj@kernel.org> Cc: <linux-ide@vger.kernel.org> Cc: stable@vger.kernel.org
-rw-r--r--drivers/ata/libata-pmp.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/ata/libata-pmp.c b/drivers/ata/libata-pmp.c
index 20fd337a5731..7ccc084bf1df 100644
--- a/drivers/ata/libata-pmp.c
+++ b/drivers/ata/libata-pmp.c
@@ -447,8 +447,11 @@ static void sata_pmp_quirks(struct ata_port *ap)
* otherwise. Don't try hard to recover it.
*/
ap->pmp_link[ap->nr_pmp_links - 1].flags |= ATA_LFLAG_NO_RETRY;
- } else if (vendor == 0x197b && devid == 0x2352) {
- /* chip found in Thermaltake BlackX Duet, jmicron JMB350? */
+ } else if (vendor == 0x197b && (devid == 0x2352 || devid == 0x0325)) {
+ /*
+ * 0x2352: found in Thermaltake BlackX Duet, jmicron JMB350?
+ * 0x0325: jmicron JMB394.
+ */
ata_for_each_link(link, ap, EDGE) {
/* SRST breaks detection and disks get misclassified
* LPM disabled to avoid potential problems