[PATCH v3] libata: disable forced PORTS_IMPL for >= AHCI 1.3

From	Tejun Heo <tj@kernel.org>
Newsgroups	linux.kernel
Subject	[PATCH v3] libata: disable forced PORTS_IMPL for >= AHCI 1.3
Date	2016-01-25 21:50 +0100
Message-ID	<qUWfh-12K-17@gated-at.bofh.it> (permalink)
References	<qQnzs-4iP-11@gated-at.bofh.it> <qQYIG-5f6-9@gated-at.bofh.it> <qRj0K-2C0-23@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

Hello,

Applied the following to libata/for-4.5-fixes.

Thanks.

------ 8< ------
From 566d1827df2ef0cbe921d3d6946ac3007b1a6938 Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Fri, 15 Jan 2016 15:13:05 -0500
Subject: [PATCH] libata: disable forced PORTS_IMPL for >= AHCI 1.3

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>
Cc: stable@vger.kernel.org
---
 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 284a176..4029679 100644
--- a/drivers/ata/libahci.c
+++ b/drivers/ata/libahci.c
@@ -496,8 +496,8 @@ void ahci_save_initial_config(struct device *dev, struct ahci_host_priv *hpriv)
 		}
 	}
 
-	/* 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.5.0

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH v2] libata: disable forced PORTS_IMPL for >= AHCI 1.3 Tejun Heo <tj@kernel.org> - 2016-01-15 21:20 +0100
  Re: [PATCH v2] libata: disable forced PORTS_IMPL for >= AHCI 1.3 Andy Lutomirski <luto@amacapital.net> - 2016-01-15 23:50 +0100
  Re: [PATCH v2] libata: disable forced PORTS_IMPL for >= AHCI 1.3 Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> - 2016-01-16 11:10 +0100
    Re: [PATCH v2] libata: disable forced PORTS_IMPL for >= AHCI 1.3 Tejun Heo <tj@kernel.org> - 2016-01-19 18:30 +0100
      Re: [PATCH v2] libata: disable forced PORTS_IMPL for >= AHCI 1.3 Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> - 2016-01-19 18:30 +0100
  [PATCH v3] libata: disable forced PORTS_IMPL for >= AHCI 1.3 Tejun Heo <tj@kernel.org> - 2016-01-25 21:50 +0100

csiph-web