summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLior Amsalem <alior@marvell.com>2015-06-30 16:09:49 +0200
committerJiri Slaby <jslaby@suse.cz>2015-08-19 08:36:40 +0200
commit6a060daa4b84051711f69b99164ca1d23d99d7a6 (patch)
treefaba6caa6b29c41d3c128a68294cc91699cdb61b /drivers
parent5b6498698ac43c94cc9265e5bc6e125505a97871 (diff)
downloadlwn-6a060daa4b84051711f69b99164ca1d23d99d7a6.tar.gz
lwn-6a060daa4b84051711f69b99164ca1d23d99d7a6.zip
ata: pmp: add quirk for Marvell 4140 SATA PMP
commit 945b47441d83d2392ac9f984e0267ad521f24268 upstream. 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> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'drivers')
-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;
+ }
}
}