Re: [PATCH 2/2] ahci: add support for Hisilicon sata

[Hans de Goede <hdegoede@redhat.com>]

Hi,

On 04/09/2014 12:30 PM, Kefeng Wang wrote:
> From: Kefeng Wang <kefeng.wang@linaro.org>
> 
> The hip04 SoC of hisilicon has an AHCI compliant SATA controller,
> and it is compliant with the ahci 1.3 and sata 3.0 specification.
> 
> There is a wrong bit in HOST_CAP of hip04 sata controller, which
> enable unsupported feature of FBS, use AHCI_HFLAG_NO_FBS hflag to
> disable it.
> 
> Signed-off-by: Kefeng Wang <kefeng.wang@linaro.org>
> ---
>  .../devicetree/bindings/ata/ahci-platform.txt      |    3 +-
>  drivers/ata/ahci_platform.c                        |   65 +++++++++++++++-----
>  2 files changed, 52 insertions(+), 16 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/ata/ahci-platform.txt b/Documentation/devicetree/bindings/ata/ahci-platform.txt
> index 48b285f..aab1d70 100644
> --- a/Documentation/devicetree/bindings/ata/ahci-platform.txt
> +++ b/Documentation/devicetree/bindings/ata/ahci-platform.txt
> @@ -7,7 +7,8 @@ Required properties:
>  - compatible        : compatible list, one of "snps,spear-ahci",
>                        "snps,exynos5440-ahci", "ibm,476gtr-ahci",
>                        "allwinner,sun4i-a10-ahci", "fsl,imx53-ahci"
> -                      "fsl,imx6q-ahci" or "snps,dwc-ahci"
> +                      "fsl,imx6q-ahci", "snps,dwc-ahci" or
> +                      "hisilicon,hisi-ahci"
>  - interrupts        : <interrupt mapping for SATA IRQ>
>  - reg               : <registers mapping>
>  
> diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c
> index ef67e79..9581d51 100644
> --- a/drivers/ata/ahci_platform.c
> +++ b/drivers/ata/ahci_platform.c
> @@ -17,22 +17,61 @@
>  #include <linux/pm.h>
>  #include <linux/device.h>
>  #include <linux/platform_device.h>
> +#include <linux/of.h>
> +#include <linux/of_device.h>
>  #include <linux/libata.h>
>  #include <linux/ahci_platform.h>
>  #include "ahci.h"
>  
> -static const struct ata_port_info ahci_port_info = {
> -	.flags		= AHCI_FLAG_COMMON,
> -	.pio_mask	= ATA_PIO4,
> -	.udma_mask	= ATA_UDMA6,
> -	.port_ops	= &ahci_platform_ops,
> +enum ahci_type {
> +	AHCI,		/* standard platform ahci */
> +	HIP04_AHCI,	/* ahci on HiP04 */
>  };
>  
> +static const struct ata_port_info ahci_port_info[] = {
> +	[AHCI] = {
> +		.flags		= AHCI_FLAG_COMMON,
> +		.pio_mask	= ATA_PIO4,
> +		.udma_mask	= ATA_UDMA6,
> +		.port_ops	= &ahci_platform_ops,
> +	},
> +	[HIP04_AHCI] = {
> +		AHCI_HFLAGS	(AHCI_HFLAG_NO_FBS),
> +		.flags		= AHCI_FLAG_COMMON,
> +		.pio_mask	= ATA_PIO4,
> +		.udma_mask	= ATA_UDMA6,
> +		.port_ops	= &ahci_platform_ops,
> +	},
> +};
> +
> +static const struct of_device_id ahci_of_match[] = {
> +	{ .compatible = "snps,spear-ahci", },
> +	{ .compatible = "snps,exynos5440-ahci", },
> +	{ .compatible = "ibm,476gtr-ahci", },
> +	{ .compatible = "snps,dwc-ahci", },
> +	{ .compatible = "hisilicon,hisi-ahci", .data = (void *)HIP04_AHCI, },
> +	{},
> +};
> +MODULE_DEVICE_TABLE(of, ahci_of_match);
> +
> +static int ahci_match_of_id(struct platform_device *pdev,
> +			    enum ahci_type *ahci_type)
> +{
> +	const struct of_device_id *of_id = of_match_device(ahci_of_match,
> +							   &pdev->dev);
> +	if (!of_id)
> +		return -ENODEV;
> +	*ahci_type = (unsigned long)(of_id->data);
> +	return 0;
> +}
> +


Hmm, it would be a lot cleaner to not do all of the above, and then
... (continued below).

>  static int ahci_probe(struct platform_device *pdev)
>  {
>  	struct device *dev = &pdev->dev;
>  	struct ahci_platform_data *pdata = dev_get_platdata(dev);
>  	struct ahci_host_priv *hpriv;
> +	struct ata_port_info pi;
> +	enum ahci_type ahci_type;
>  	int rc;
>  
>  	hpriv = ahci_platform_get_resources(pdev);

Replace the 2 new lines here with:
	struct ata_port_info pi = ahci_port_info;
and ...

> @@ -55,7 +94,12 @@ static int ahci_probe(struct platform_device *pdev)
>  			goto disable_resources;
>  	}
>  
> -	rc = ahci_platform_init_host(pdev, hpriv, &ahci_port_info, 0, 0);
> +	if (!ahci_match_of_id(pdev, &ahci_type))
> +		pi = ahci_port_info[ahci_type];
> +	else
> +		pi = ahci_port_info[AHCI];
> +
> +	rc = ahci_platform_init_host(pdev, hpriv, &pi, 0, 0);
>  	if (rc)
>  		goto pdata_exit;
>  

Replace the above with:
	if (of_device_is_compatible(pdev->dev.of_node, "hisilicon,hisi-ahci"))
		pi.private_data = (void *)AHCI_HFLAG_NO_FBS;

	rc = ahci_platform_init_host(pdev, hpriv, &pi, 0, 0);

Note we should consider giving ahci_platform_init_host a hflags argument to avoid
having struct ata_port_info on the stack twice, once in ahci_probe and once in
ahci_platform_init_host.


> @@ -71,15 +115,6 @@ disable_resources:
>  static SIMPLE_DEV_PM_OPS(ahci_pm_ops, ahci_platform_suspend,
>  			 ahci_platform_resume);
>  
> -static const struct of_device_id ahci_of_match[] = {
> -	{ .compatible = "snps,spear-ahci", },
> -	{ .compatible = "snps,exynos5440-ahci", },
> -	{ .compatible = "ibm,476gtr-ahci", },
> -	{ .compatible = "snps,dwc-ahci", },
> -	{},
> -};
> -MODULE_DEVICE_TABLE(of, ahci_of_match);
> -
>  static struct platform_driver ahci_driver = {
>  	.probe = ahci_probe,
>  	.remove = ata_platform_remove_one,
> 

Regards,

Hans