diff mbox

ahci: disable ncq feature for hisilicon sata

Message ID 5396D529.308@linaro.org
State Accepted
Commit 72cbaa3d2f563d7b48c9f8aef47ec9aa3a31adf2
Headers show

Commit Message

Kefeng Wang June 10, 2014, 9:51 a.m. UTC
NCQ feature is unsupported on hisilicon sata controller, so disable it.
This version of IP is used by hip04 and hix5hd2 soc.

Signed-off-by: Kefeng Wang <kefeng.wang@linaro.org>
---
 drivers/ata/ahci_platform.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Kefeng Wang June 10, 2014, 10:07 a.m. UTC | #1
Hi Tejun,

I have a question, the hip04 and hix5hd2 soc use the old version of IP, but they
also have a new version of IP which support FBS and NCQ, and now the new one is
used by a new soc. How can I distinguish them, use "hisilicon,hisi-ahci-vX" or just
add "generic-ahci" string for the IP which is conformant with spec and has
no special customization and issue? Any advices, thanks.

Regards,
Kefeng

On 2014-6-10 17:51, kefeng.wang wrote:
> NCQ feature is unsupported on hisilicon sata controller, so disable it.
> This version of IP is used by hip04 and hix5hd2 soc.
> 
> Signed-off-by: Kefeng Wang <kefeng.wang@linaro.org>
> ---
>  drivers/ata/ahci_platform.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c
> index ebe505c..0cfda8b 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);
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/
Hans de Goede June 10, 2014, 1:56 p.m. UTC | #2
Hi Kefeng,

On 06/10/2014 12:07 PM, kefeng.wang wrote:
> Hi Tejun,
> 
> I have a question, the hip04 and hix5hd2 soc use the old version of IP, but they
> also have a new version of IP which support FBS and NCQ, and now the new one is
> used by a new soc. How can I distinguish them, use "hisilicon,hisi-ahci-vX" or just
> add "generic-ahci" string for the IP which is conformant with spec and has
> no special customization and issue? Any advices, thanks.

Please use "hisilicon,hisi-ahci-vX", this way it will be easier to add any
special behavior in case this turns out to be necessary later.

Regards,

Hans
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/
Kefeng Wang June 24, 2014, 7:11 a.m. UTC | #3
On 2014-6-10 21:56, Hans de Goede wrote:
> Hi Kefeng,
> 
> On 06/10/2014 12:07 PM, kefeng.wang wrote:
>> Hi Tejun,
>>
>> I have a question, the hip04 and hix5hd2 soc use the old version of IP, but they
>> also have a new version of IP which support FBS and NCQ, and now the new one is
>> used by a new soc. How can I distinguish them, use "hisilicon,hisi-ahci-vX" or just
>> add "generic-ahci" string for the IP which is conformant with spec and has
>> no special customization and issue? Any advices, thanks.
> 
> Please use "hisilicon,hisi-ahci-vX", this way it will be easier to add any
> special behavior in case this turns out to be necessary later.

OK, thanks for your guidance. If necessary, we will use hisi-ahci-vX for hisi's IP.

Hi Tejun, could you merger this patch please? thanks.

Regards,
Kefeng

> 
> Regards,
> 
> Hans
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/
diff mbox

Patch

diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c
index ebe505c..0cfda8b 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);