diff options
| author | Lior Amsalem <alior@marvell.com> | 2015-06-30 16:09:49 +0200 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2015-08-27 13:25:46 -0400 |
| commit | 274a010fd5b56667261c5ec48a47c46bc839aa55 (patch) | |
| tree | 805398003fbf1905863cac1cc887b73a9749421d /drivers/ata | |
| parent | 595422856699eec52732e03d3711c7045ab96f08 (diff) | |
| download | lwn-274a010fd5b56667261c5ec48a47c46bc839aa55.tar.gz lwn-274a010fd5b56667261c5ec48a47c46bc839aa55.zip | |
ata: pmp: add quirk for Marvell 4140 SATA PMP
[ Upstream commit 945b47441d83d2392ac9f984e0267ad521f24268 ]
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
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/libata-pmp.c | 7 |
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; + } } } |