Skip to contentSkip to conversation

failures due to "libata: disable forced PORTS_IMPL for >= AHCI 1.3 patch"

PATCH Srinivas Kandagatla 3 participants 4 messages Mar 23, 2016 – Mar 24, 2016

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Hi Tejun,

Its bit late but just found that commit 566d18 "libata: disable forced PORTS_IMPL for >= AHCI 1.3" is breaking AHCI on Qualcomm APQ8064 platforms in the mainline kernel (arch/arm/boot/dts/qcom-apq8064.dtsi).

This platform uses "generic-ahci" platform driver and reports AHCI version as 0x10300, and PORTS_IMPL is never set, so the existing workaround was correct for this platform, however the latest patch broken this.

There are few ways to fix this issue,

1> Add new compatible string to achi_platform driver so that this platform can force the port_map,

Or

2> Have a generic dt binding to force the port map.

I would like to know if you have plans to fix this in any other better way? Below patch fixes issue for me, will split the patches once we agree if this is the correct direction to fix it.

--------------------------->cut<--------------------------

drivers/ata/ahci_platform.c +4 -0
index 4044233..b5cf9b1 100644
@@ -51,6 +51,9 @@ static int ahci_probe(struct platform_device *pdev)
        if (rc)
                return rc;
 
+       if (of_device_is_compatible(dev->of_node, "qcom,apq8064-ahci"))
+               hpriv->force_port_map = 1;
+
        if (of_device_is_compatible(dev->of_node, "hisilicon,hisi-ahci"))
                hpriv->flags |= AHCI_HFLAG_NO_FBS | AHCI_HFLAG_NO_NCQ;
 
@@ -72,6 +75,7 @@ static const struct of_device_id ahci_of_match[] = {
        { .compatible = "generic-ahci", },
        /* Keep the following compatibles for device tree compatibility */
        { .compatible = "snps,spear-ahci", },
+       { .compatible = "qcom,apq8064-ahci", },
        { .compatible = "snps,exynos5440-ahci", },
        { .compatible = "ibm,476gtr-ahci", },
        { .compatible = "snps,dwc-ahci", },
drivers/ata/libahci.c +1 -0
index 3982054..a5d7c1c 100644
@@ -507,6 +507,7 @@ void ahci_save_initial_config(struct device *dev, struct ahci_host_priv *hpriv)
                dev_info(dev, "forcing port_map 0x%x -> 0x%x\n",
                         port_map, hpriv->force_port_map);
                port_map = hpriv->force_port_map;
+               hpriv->saved_port_map = port_map;
        }
 
        if (hpriv->mask_port_map) {

--------------------------->cut<--------------------------

Thanks,
srini

#1 lore raw
Quoted 10 lines · Srinivas Kandagatla

Hi Tejun,

Its bit late but just found that commit 566d18 "libata: disable forced PORTS_IMPL for >= AHCI 1.3" is breaking AHCI on Qualcomm APQ8064 platforms in the mainline kernel (arch/arm/boot/dts/qcom-apq8064.dtsi).

This platform uses "generic-ahci" platform driver and reports AHCI version as 0x10300, and PORTS_IMPL is never set, so the existing workaround was correct for this platform, however the latest patch broken this.

Quoted 9 lines

There are few ways to fix this issue,

1> Add new compatible string to achi_platform driver so that this platform can force the port_map,

Or

2> Have a generic dt binding to force the port map.

A generic dt binding is probably a better way forward. The Annapurna Alpine platform seems to have the same issue.

-Justin

#2 lore raw
Quoted 17 lines · Justin Maggard
Quoted 15 lines · Srinivas Kandagatla

Hi Tejun,

Its bit late but just found that commit 566d18 "libata: disable forced PORTS_IMPL for >= AHCI 1.3" is breaking AHCI on Qualcomm APQ8064 platforms in the mainline kernel (arch/arm/boot/dts/qcom-apq8064.dtsi).

This platform uses "generic-ahci" platform driver and reports AHCI version as 0x10300, and PORTS_IMPL is never set, so the existing workaround was correct for this platform, however the latest patch broken this.

There are few ways to fix this issue,

1> Add new compatible string to achi_platform driver so that this platform can force the port_map,

Quoted 7 lines
Quoted 4 lines

Or

2> Have a generic dt binding to force the port map.

A generic dt binding is probably a better way forward. The Annapurna Alpine platform seems to have the same issue.

+1 for generic bindings.

I suspected that other platforms would also hit the same issue.

--srini

Quoted 3 lines

-Justin

#3 lore raw

Hello,

Quoted 6 lines · Srinivas Kandagatla
Quoted 2 lines

A generic dt binding is probably a better way forward. The Annapurna Alpine platform seems to have the same issue.

+1 for generic bindings.

I suspected that other platforms would also hit the same issue.

I can change the code so that PORTS_IMPL workaround is applied automatically for all platform drivers as a stop-gap. Do we need that or can we push dt based solution quickly enough?

Thanks.

Signature · 1 line
tejun