[PATCH v2] ahci: qoriq: Revert "ahci: qoriq: Disable NCQ on ls2080a SoC"

[PATCH v2] ahci: qoriq: Revert "ahci: qoriq: Disable NCQ on ls2080a SoC"

[yuantian.tang]

From: Tang Yuantian <Yuantian.Tang@nxp.com>

This reverts commit 640847298e2b7f19 ("ahci: qoriq: Disable NCQ
on ls2080a SoC")

The erratum has been fixed in ls2080a v2.0 and later soc.
In reality, customer will not get any ls2080a v1.0 soc. Neither apply
to any products. So reverting this commit won't create any side effect.

Blacklisting v2.0 could also be a option, but that needs to check the
soc version which is not suitable in the driver.

Signed-off-by: Tang Yuantian <yuantian.tang@nxp.com>
---
v2:
	- refined the commit message

 drivers/ata/ahci_qoriq.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/drivers/ata/ahci_qoriq.c b/drivers/ata/ahci_qoriq.c
index 925c4b6..1eba8df 100644
--- a/drivers/ata/ahci_qoriq.c
+++ b/drivers/ata/ahci_qoriq.c
@@ -136,7 +136,7 @@ static struct ata_port_operations ahci_qoriq_ops = {
 	.hardreset	= ahci_qoriq_hardreset,
 };
 
-static struct ata_port_info ahci_qoriq_port_info = {
+static const struct ata_port_info ahci_qoriq_port_info = {
 	.flags		= AHCI_FLAG_COMMON | ATA_FLAG_NCQ,
 	.pio_mask	= ATA_PIO4,
 	.udma_mask	= ATA_UDMA6,
@@ -221,12 +221,6 @@ static int ahci_qoriq_probe(struct platform_device *pdev)
 	if (rc)
 		goto disable_resources;
 
-	/* Workaround for ls2080a */
-	if (qoriq_priv->type == AHCI_LS2080A) {
-		hpriv->flags |= AHCI_HFLAG_NO_NCQ;
-		ahci_qoriq_port_info.flags &= ~ATA_FLAG_NCQ;
-	}
-
 	rc = ahci_platform_init_host(pdev, hpriv, &ahci_qoriq_port_info,
 				     &ahci_qoriq_sht);
 	if (rc)
-- 
2.1.0.27.g96db324

Re: [PATCH v2] ahci: qoriq: Revert "ahci: qoriq: Disable NCQ on ls2080a SoC"

[Tejun Heo]

On Fri, Sep 30, 2016 at 02:13:13PM +0800, yuantian.tang@nxp.com wrote:
> From: Tang Yuantian <Yuantian.Tang@nxp.com>
> 
> This reverts commit 640847298e2b7f19 ("ahci: qoriq: Disable NCQ
> on ls2080a SoC")
> 
> The erratum has been fixed in ls2080a v2.0 and later soc.
> In reality, customer will not get any ls2080a v1.0 soc. Neither apply
> to any products. So reverting this commit won't create any side effect.
> 
> Blacklisting v2.0 could also be a option, but that needs to check the
> soc version which is not suitable in the driver.
>
> Signed-off-by: Tang Yuantian <yuantian.tang@nxp.com>

Applied to libata/for-4.9.

Thanks.

-- 
tejun