Commit 2bd8e679 authored by Tejun Heo's avatar Tejun Heo Committed by Willy Tarreau

libata: disable forced PORTS_IMPL for >= AHCI 1.3

commit 566d1827 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: default avatarTejun Heo <tj@kernel.org>
Reported-by: default avatarAndy 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: default avatarBen Hutchings <ben@decadent.org.uk>
[wt: file is drivers/ata/ahci.c in 2.6.32]
Signed-off-by: default avatarWilly Tarreau <w@1wt.eu>
parent c5ab1213
...@@ -924,8 +924,8 @@ static void ahci_save_initial_config(struct pci_dev *pdev, ...@@ -924,8 +924,8 @@ static void ahci_save_initial_config(struct pci_dev *pdev,
} }
} }
/* fabricate port_map from cap.nr_ports */ /* fabricate port_map from cap.nr_ports for < AHCI 1.3 */
if (!port_map) { if (!port_map && vers < 0x10300) {
port_map = (1 << ahci_nr_ports(cap)) - 1; port_map = (1 << ahci_nr_ports(cap)) - 1;
dev_printk(KERN_WARNING, &pdev->dev, dev_printk(KERN_WARNING, &pdev->dev,
"forcing PORTS_IMPL to 0x%x\n", port_map); "forcing PORTS_IMPL to 0x%x\n", port_map);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment