]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
ahci: disable ncq feature for hisilicon sata
authorKefeng Wang <kefeng.wang@linaro.org>
Tue, 24 Jun 2014 20:54:23 +0000 (16:54 -0400)
committerTejun Heo <tj@kernel.org>
Tue, 24 Jun 2014 20:54:23 +0000 (16:54 -0400)
NCQ feature is unsupported on hisilicon sata controller, so disable
it.  This version of IP is used by hip04 and hix5hd2 soc.

tj: "|=" was replaced with "=" for no reason.  Restored "|=".

Signed-off-by: Kefeng Wang <kefeng.wang@linaro.org>
Sigend-off-by: Tejun Heo <tj@kernel.org>
drivers/ata/ahci_platform.c

index ebe505c1776398dca27141638c732a6e802e7987..b10d81ddb52891e41ef0343a8894bfae9b1cd5a1 100644 (file)
@@ -58,7 +58,7 @@ static int ahci_probe(struct platform_device *pdev)
        }
 
        if (of_device_is_compatible(dev->of_node, "hisilicon,hisi-ahci"))
-               hflags |= AHCI_HFLAG_NO_FBS;
+               hflags |= AHCI_HFLAG_NO_FBS | AHCI_HFLAG_NO_NCQ;
 
        rc = ahci_platform_init_host(pdev, hpriv, &ahci_port_info,
                                     hflags, 0, 0);