From: Tejun Heo Date: Fri, 15 Jan 2016 20:13:05 +0000 (-0500) Subject: libata: disable forced PORTS_IMPL for >= AHCI 1.3 X-Git-Tag: v2.6.32.71~38 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2bd8e6793e5ada59a0a1f74bd10266258a54c946;p=thirdparty%2Fkernel%2Fstable.git 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 Reported-by: Andy Lutomirski Link: http://lkml.kernel.org/g/CALCETrU7yMvXEDhjAUShoHEhDwifJGapdw--BKxsP0jmjKGmRw@mail.gmail.com Cc: Sergei Shtylyov Signed-off-by: Ben Hutchings [wt: file is drivers/ata/ahci.c in 2.6.32] Signed-off-by: Willy Tarreau --- diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 6787aab9a2650..c075664a8161f 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -924,8 +924,8 @@ static void ahci_save_initial_config(struct pci_dev *pdev, } } - /* 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_printk(KERN_WARNING, &pdev->dev, "forcing PORTS_IMPL to 0x%x\n", port_map);