[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <6b1297a1aeabe4ee9daf71c0e3087d4b2e4c2605.1456308281.git.jslaby@suse.cz>
Date: Wed, 24 Feb 2016 11:04:22 +0100
From: Jiri Slaby <jslaby@...e.cz>
To: stable@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, Tejun Heo <tj@...nel.org>,
Sergei Shtylyov <sergei.shtylyov@...entembedded.com>,
Jiri Slaby <jslaby@...e.cz>
Subject: [PATCH 3.12 067/142] libata: disable forced PORTS_IMPL for >= AHCI 1.3
From: Tejun Heo <tj@...nel.org>
3.12-stable review patch. If anyone has any objections, please let me know.
===============
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@...nel.org>
Reported-by: Andy Lutomirski <luto@...capital.net>
Link: http://lkml.kernel.org/g/CALCETrU7yMvXEDhjAUShoHEhDwifJGapdw--BKxsP0jmjKGmRw@mail.gmail.com
Cc: Sergei Shtylyov <sergei.shtylyov@...entembedded.com>
Signed-off-by: Jiri Slaby <jslaby@...e.cz>
---
drivers/ata/libahci.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
index 6f8eb7a3710c..a0b449003aea 100644
--- a/drivers/ata/libahci.c
+++ b/drivers/ata/libahci.c
@@ -490,8 +490,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);
--
2.7.1
Powered by blists - more mailing lists