From: Kefeng Wang <kefeng.wang@linaro.org>
Date: Tue, 24 Jun 2014 20:54:23 +0000 (-0400)
Subject: ahci: disable ncq feature for hisilicon sata
X-Git-Tag: v3.16-rc5~25^2~3
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=72cbaa3d2f563d7b48c9f8aef47ec9aa3a31adf2;p=~emulex%2Finfiniband.git

ahci: disable ncq feature for hisilicon sata

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>
---

diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c
index ebe505c1776..b10d81ddb52 100644
--- a/drivers/ata/ahci_platform.c
+++ b/drivers/ata/ahci_platform.c
@@ -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);