diff options
author | Tejun Heo <tj@kernel.org> | 2016-01-15 15:13:05 -0500 |
---|---|---|
committer | Ben Hutchings <ben@decadent.org.uk> | 2016-02-27 14:28:44 +0000 |
commit | 70f16b6417a5725a7f4edfaade28e62694f9d784 (patch) | |
tree | 9202b9d87c8afa85d36e1e2b72329c9518553b20 | |
parent | 94d2d14172d0334d5fa53c9c20a1aef295c8fbcc (diff) | |
download | lwn-70f16b6417a5725a7f4edfaade28e62694f9d784.tar.gz lwn-70f16b6417a5725a7f4edfaade28e62694f9d784.zip |
libata: disable forced PORTS_IMPL for >= AHCI 1.3
commit 566d1827df2ef0cbe921d3d6946ac3007b1a6938 upstream.
Some early controllers incorrectly reported zero ports in PORTS_IMPL
register and the ahci driver fabricates PORTS_IMPL from the number of
ports in those cases. This hasn't mattered but with the new nvme
controllers there are cases where zero PORTS_IMPL is valid and should
be honored.
Disable the workaround for >= AHCI 1.3.
Signed-off-by: Tejun Heo <tj@kernel.org>
Reported-by: Andy Lutomirski <luto@amacapital.net>
Link: http://lkml.kernel.org/g/CALCETrU7yMvXEDhjAUShoHEhDwifJGapdw--BKxsP0jmjKGmRw@mail.gmail.com
Cc: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
-rw-r--r-- | drivers/ata/libahci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c index fa3eca351fec..1adb71733d05 100644 --- a/drivers/ata/libahci.c +++ b/drivers/ata/libahci.c @@ -480,8 +480,8 @@ void ahci_save_initial_config(struct device *dev, } } - /* fabricate port_map from cap.nr_ports */ - if (!port_map) { + /* fabricate port_map from cap.nr_ports for < AHCI 1.3 */ + if (!port_map && vers < 0x10300) { port_map = (1 << ahci_nr_ports(cap)) - 1; dev_warn(dev, "forcing PORTS_IMPL to 0x%x\n", port_map); |