aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLior Amsalem <alior@marvell.com>2015-06-30 16:09:49 +0200
committerBen Hutchings <ben@decadent.org.uk>2015-08-12 16:33:21 +0200
commit7967fd4d81c08227999f7221b45f80860e233f12 (patch)
treea88aa1f7cb30cfef3da4f7c551684e9f94de8a88
parent67164064f2559098e72ecd23096541cf8fb22a81 (diff)
downloadkernel_samsung_smdk4412-7967fd4d81c08227999f7221b45f80860e233f12.zip
kernel_samsung_smdk4412-7967fd4d81c08227999f7221b45f80860e233f12.tar.gz
kernel_samsung_smdk4412-7967fd4d81c08227999f7221b45f80860e233f12.tar.bz2
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: Ben Hutchings <ben@decadent.org.uk>
-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 0ba32fe..93ea335 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;
+ }
}
}