diff options
| author | Tejun Heo <tj@kernel.org> | 2016-01-15 15:13:05 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-19 14:22:41 -0800 |
| commit | f6c2bfd8a8829cc0cddefe6f952b7436b875cd18 (patch) | |
| tree | 3c303926e3596361808173efe48071b44404e0bb | |
| parent | d2b76ee2681e369a0ab38fdd7df9ea3ea94c2bd2 (diff) | |
| download | linux-stable-f6c2bfd8a8829cc0cddefe6f952b7436b875cd18.tar.gz linux-stable-f6c2bfd8a8829cc0cddefe6f952b7436b875cd18.tar.bz2 linux-stable-f6c2bfd8a8829cc0cddefe6f952b7436b875cd18.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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 b18f569f74c7..d04f5c8dbbdc 100644 --- a/drivers/ata/libahci.c +++ b/drivers/ata/libahci.c @@ -486,8 +486,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); |