summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLior Amsalem <alior@marvell.com>2015-06-30 16:09:49 +0200
committerTejun Heo <tj@kernel.org>2015-07-14 17:46:38 -0400
commit945b47441d83d2392ac9f984e0267ad521f24268 (patch)
treec8ea107d03732dfe9b9916d6b2d9053efa8614b5
parentd770e558e21961ad6cfdf0ff7df0eb5d7d4f0754 (diff)
downloadlinux-stable-945b47441d83d2392ac9f984e0267ad521f24268.tar.gz
linux-stable-945b47441d83d2392ac9f984e0267ad521f24268.tar.bz2
linux-stable-945b47441d83d2392ac9f984e0267ad521f24268.zip
ata: pmp: add quirk for Marvell 4140 SATA PMP
This commit adds the necessary quirk to make the Marvell 4140 SATA PMP work properly. This PMP doesn't like SRST on port number 4 (the host port) so this commit marks this port as not supporting SRST. Signed-off-by: Lior Amsalem <alior@marvell.com> Reviewed-by: Nadav Haklai <nadavh@marvell.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Tejun Heo <tj@kernel.org> Cc: stable@vger.kernel.org
-rw-r--r--drivers/ata/libata-pmp.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/ata/libata-pmp.c b/drivers/ata/libata-pmp.c
index 7ccc084bf1df..85aa76116a30 100644
--- a/drivers/ata/libata-pmp.c
+++ b/drivers/ata/libata-pmp.c
@@ -460,6 +460,13 @@ static void sata_pmp_quirks(struct ata_port *ap)
ATA_LFLAG_NO_SRST |
ATA_LFLAG_ASSUME_ATA;
}
+ } else if (vendor == 0x11ab && devid == 0x4140) {
+ /* Marvell 4140 quirks */
+ ata_for_each_link(link, ap, EDGE) {
+ /* port 4 is for SEMB device and it doesn't like SRST */
+ if (link->pmp == 4)
+ link->flags |= ATA_LFLAG_DISABLED;
+ }
}
}