Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1310446 > unrolled thread

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

Started byTejun Heo <tj@kernel.org>
First post2016-01-15 21:20 +0100
Last post2016-01-25 21:50 +0100
Articles 6 — 3 participants

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.

Contents

  [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

#1310446 — [PATCH v2] libata: disable forced PORTS_IMPL for >= AHCI 1.3

FromTejun Heo <tj@kernel.org>
Date2016-01-15 21:20 +0100
Subject[PATCH v2] libata: disable forced PORTS_IMPL for >= AHCI 1.3
Message-ID<qRj0K-2C0-23@gated-at.bofh.it>
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
---
Hello, Andy.

Can you please see whether this one works?

Thanks.

 drivers/ata/libahci.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
index d61740e..a91432a 100644
--- a/drivers/ata/libahci.c
+++ b/drivers/ata/libahci.c
@@ -496,8 +496,9 @@ 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 >> 16) ||
+			  ((vers >> 16) == 1 && (vers & 0xFFFF) < 0x300))) {
 		port_map = (1 << ahci_nr_ports(cap)) - 1;
 		dev_warn(dev, "forcing PORTS_IMPL to 0x%x\n", port_map);

[toc] | [next] | [standalone]

#1310515

FromAndy Lutomirski <luto@amacapital.net>
Date2016-01-15 23:50 +0100
Message-ID<qRllU-42W-15@gated-at.bofh.it>
In reply to#1310446
On Fri, Jan 15, 2016 at 12:13 PM, Tejun Heo <tj@kernel.org> wrote:
> 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.

Tested-by: Andy Lutomirski <luto@kernel.org>

--Andy

[toc] | [prev] | [next] | [standalone]

#1310917

FromSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Date2016-01-16 11:10 +0100
Message-ID<qRvXX-2Ws-1@gated-at.bofh.it>
In reply to#1310446
Hello.

On 1/15/2016 11:13 PM, Tejun Heo wrote:

> 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
> ---
> Hello, Andy.
>
> Can you please see whether this one works?
>
> Thanks.
>
>   drivers/ata/libahci.c |    5 +++--
>   1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
> index d61740e..a91432a 100644
> --- a/drivers/ata/libahci.c
> +++ b/drivers/ata/libahci.c
> @@ -496,8 +496,9 @@ 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 >> 16) ||
> +			  ((vers >> 16) == 1 && (vers & 0xFFFF) < 0x300))) {

     Hm, won't just (vers < 0x1300) just work?

MBR, Sergei

[toc] | [prev] | [next] | [standalone]

#1312396

FromTejun Heo <tj@kernel.org>
Date2016-01-19 18:30 +0100
Message-ID<qSIgq-2zg-11@gated-at.bofh.it>
In reply to#1310917
On Sat, Jan 16, 2016 at 01:09:37PM +0300, Sergei Shtylyov wrote:
> >+	/* fabricate port_map from cap.nr_ports for < AHCI 1.3 */
> >+	if (!port_map && (!(vers >> 16) ||
> >+			  ((vers >> 16) == 1 && (vers & 0xFFFF) < 0x300))) {
> 
>     Hm, won't just (vers < 0x1300) just work?

lol, indeed.  Lemme update the patch.

Thanks.

-- 
tejun

[toc] | [prev] | [next] | [standalone]

#1312398

FromSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Date2016-01-19 18:30 +0100
Message-ID<qSIgr-2zg-27@gated-at.bofh.it>
In reply to#1312396
Hello.

On 01/19/2016 08:22 PM, Tejun Heo wrote:

>>> +	/* fabricate port_map from cap.nr_ports for < AHCI 1.3 */
>>> +	if (!port_map && (!(vers >> 16) ||
>>> +			  ((vers >> 16) == 1 && (vers & 0xFFFF) < 0x300))) {
>>
>>      Hm, won't just (vers < 0x1300) just work?
>
> lol, indeed.  Lemme update the patch.

    Oops. 0x10300, of course.

> Thanks.

MBR, Sergei

[toc] | [prev] | [next] | [standalone]

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

FromTejun Heo <tj@kernel.org>
Date2016-01-25 21:50 +0100
Subject[PATCH v3] libata: disable forced PORTS_IMPL for >= AHCI 1.3
Message-ID<qUWfh-12K-17@gated-at.bofh.it>
In reply to#1310446
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

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web