diff mbox

[1/2] ata: mediatek: add support for MediaTek SATA controller

Message ID a91f55e576d8c853bdbe6a9a0008caf21a834562.1501134896.git.ryder.lee@mediatek.com (mailing list archive)
State New, archived
Headers show

Commit Message

Ryder Lee July 27, 2017, 6:38 a.m. UTC
This adds support the AHCI-compliant Serial ATA controller present
on MediaTek SoCs.

Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
---
 drivers/ata/Kconfig    |  10 +++
 drivers/ata/Makefile   |   1 +
 drivers/ata/ahci_mtk.c | 196 +++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 207 insertions(+)
 create mode 100644 drivers/ata/ahci_mtk.c

Comments

kernel test robot July 29, 2017, 8:15 a.m. UTC | #1
Hi Ryder,

[auto build test WARNING on tj-libata/for-next]
[also build test WARNING on v4.13-rc2 next-20170728]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url:    https://github.com/0day-ci/linux/commits/Ryder-Lee/Add-support-for-MediaTek-AHCI-SATA/20170728-164513
base:   https://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git for-next
config: arm64-allyesconfig (attached as .config)
compiler: aarch64-linux-gnu-gcc (Debian 6.1.1-9) 6.1.1 20160705
reproduce:
        wget https://raw.githubusercontent.com/01org/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # save the attached .config to linux build tree
        make.cross ARCH=arm64 

All warnings (new ones prefixed by >>):

   drivers/ata/ahci_mtk.c: In function 'mtk_ahci_platform_resets':
>> drivers/ata/ahci_mtk.c:60:32: warning: comparison of constant '-517' with boolean expression is always false [-Wbool-compare]
     if (IS_ERR(drv_data->axi_rst) == -EPROBE_DEFER)
                                   ^~
   drivers/ata/ahci_mtk.c:64:31: warning: comparison of constant '-517' with boolean expression is always false [-Wbool-compare]
     if (IS_ERR(drv_data->sw_rst) == -EPROBE_DEFER)
                                  ^~
   drivers/ata/ahci_mtk.c:68:32: warning: comparison of constant '-517' with boolean expression is always false [-Wbool-compare]
     if (IS_ERR(drv_data->reg_rst) == -EPROBE_DEFER)
                                   ^~
>> drivers/ata/ahci_mtk.c:60:6: warning: ignoring return value of 'IS_ERR', declared with attribute warn_unused_result [-Wunused-result]
     if (IS_ERR(drv_data->axi_rst) == -EPROBE_DEFER)
         ^~~~~~~~~~~~~~~~~~~~~~~~~
   drivers/ata/ahci_mtk.c:64:6: warning: ignoring return value of 'IS_ERR', declared with attribute warn_unused_result [-Wunused-result]
     if (IS_ERR(drv_data->sw_rst) == -EPROBE_DEFER)
         ^~~~~~~~~~~~~~~~~~~~~~~~
   drivers/ata/ahci_mtk.c:68:6: warning: ignoring return value of 'IS_ERR', declared with attribute warn_unused_result [-Wunused-result]
     if (IS_ERR(drv_data->reg_rst) == -EPROBE_DEFER)
         ^~~~~~~~~~~~~~~~~~~~~~~~~

vim +60 drivers/ata/ahci_mtk.c

    51	
    52	static int mtk_ahci_platform_resets(struct ahci_host_priv *hpriv,
    53					    struct device *dev)
    54	{
    55		struct mtk_ahci_drv_data *drv_data = hpriv->plat_data;
    56		int err;
    57	
    58		/* reset AXI bus and phy part */
    59		drv_data->axi_rst = devm_reset_control_get_optional(dev, "axi-rst");
  > 60		if (IS_ERR(drv_data->axi_rst) == -EPROBE_DEFER)
    61			return -EPROBE_DEFER;
    62	
    63		drv_data->sw_rst = devm_reset_control_get_optional(dev, "sw-rst");
    64		if (IS_ERR(drv_data->sw_rst) == -EPROBE_DEFER)
    65			return -EPROBE_DEFER;
    66	
    67		drv_data->reg_rst = devm_reset_control_get_optional(dev, "reg-rst");
    68		if (IS_ERR(drv_data->reg_rst) == -EPROBE_DEFER)
    69			return -EPROBE_DEFER;
    70	
    71		err = reset_control_assert(drv_data->axi_rst);
    72		if (err) {
    73			dev_err(dev, "assert axi bus failed\n");
    74			return err;
    75		}
    76	
    77		err = reset_control_assert(drv_data->sw_rst);
    78		if (err) {
    79			dev_err(dev, "assert phy digital part failed\n");
    80			return err;
    81		}
    82	
    83		err = reset_control_assert(drv_data->reg_rst);
    84		if (err) {
    85			dev_err(dev, "assert phy register part failed\n");
    86			return err;
    87		}
    88	
    89		err = reset_control_deassert(drv_data->reg_rst);
    90		if (err) {
    91			dev_err(dev, "deassert phy register part failed\n");
    92			return err;
    93		}
    94	
    95		err = reset_control_deassert(drv_data->sw_rst);
    96		if (err) {
    97			dev_err(dev, "deassert phy digital part failed\n");
    98			return err;
    99		}
   100	
   101		err = reset_control_deassert(drv_data->axi_rst);
   102		if (err) {
   103			dev_err(dev, "deassert axi bus failed\n");
   104			return err;
   105		}
   106	
   107		return 0;
   108	}
   109	

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation
diff mbox

Patch

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index 948fc86..7d3eb47 100644
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -153,6 +153,16 @@  config AHCI_CEVA
 
 	  If unsure, say N.
 
+config AHCI_MTK
+	tristate "MediaTek AHCI SATA support"
+	depends on ARCH_MEDIATEK
+	select MFD_SYSCON
+	help
+	  This option enables support for the MediaTek SoC's
+	  onboard AHCI SATA controller.
+
+	  If unsure, say N.
+
 config AHCI_MVEBU
 	tristate "Marvell EBU AHCI SATA support"
 	depends on ARCH_MVEBU
diff --git a/drivers/ata/Makefile b/drivers/ata/Makefile
index a26ef5a..ff9cd2e 100644
--- a/drivers/ata/Makefile
+++ b/drivers/ata/Makefile
@@ -17,6 +17,7 @@  obj-$(CONFIG_AHCI_CEVA)		+= ahci_ceva.o libahci.o libahci_platform.o
 obj-$(CONFIG_AHCI_DA850)	+= ahci_da850.o libahci.o libahci_platform.o
 obj-$(CONFIG_AHCI_DM816)	+= ahci_dm816.o libahci.o libahci_platform.o
 obj-$(CONFIG_AHCI_IMX)		+= ahci_imx.o libahci.o libahci_platform.o
+obj-$(CONFIG_AHCI_MTK)		+= ahci_mtk.o libahci.o libahci_platform.o
 obj-$(CONFIG_AHCI_MVEBU)	+= ahci_mvebu.o libahci.o libahci_platform.o
 obj-$(CONFIG_AHCI_OCTEON)	+= ahci_octeon.o
 obj-$(CONFIG_AHCI_SUNXI)	+= ahci_sunxi.o libahci.o libahci_platform.o
diff --git a/drivers/ata/ahci_mtk.c b/drivers/ata/ahci_mtk.c
new file mode 100644
index 0000000..220dce6
--- /dev/null
+++ b/drivers/ata/ahci_mtk.c
@@ -0,0 +1,196 @@ 
+/*
+ * MeidaTek AHCI SATA driver
+ *
+ * Copyright (c) 2017 MediaTek Inc.
+ * Author: Ryder Lee <ryder.lee@mediatek.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/ahci_platform.h>
+#include <linux/kernel.h>
+#include <linux/libata.h>
+#include <linux/mfd/syscon.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/pm.h>
+#include <linux/regmap.h>
+#include <linux/reset.h>
+#include "ahci.h"
+
+#define DRV_NAME		"ahci"
+
+#define SYS_CFG			0x14
+#define SYS_CFG_SATA_MSK	GENMASK(31, 30)
+#define SYS_CFG_SATA_EN		BIT(31)
+
+struct mtk_ahci_drv_data {
+	struct regmap *mode;
+	struct reset_control *axi_rst;
+	struct reset_control *sw_rst;
+	struct reset_control *reg_rst;
+};
+
+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,
+};
+
+static struct scsi_host_template ahci_platform_sht = {
+	AHCI_SHT(DRV_NAME),
+};
+
+static int mtk_ahci_platform_resets(struct ahci_host_priv *hpriv,
+				    struct device *dev)
+{
+	struct mtk_ahci_drv_data *drv_data = hpriv->plat_data;
+	int err;
+
+	/* reset AXI bus and phy part */
+	drv_data->axi_rst = devm_reset_control_get_optional(dev, "axi-rst");
+	if (IS_ERR(drv_data->axi_rst) == -EPROBE_DEFER)
+		return -EPROBE_DEFER;
+
+	drv_data->sw_rst = devm_reset_control_get_optional(dev, "sw-rst");
+	if (IS_ERR(drv_data->sw_rst) == -EPROBE_DEFER)
+		return -EPROBE_DEFER;
+
+	drv_data->reg_rst = devm_reset_control_get_optional(dev, "reg-rst");
+	if (IS_ERR(drv_data->reg_rst) == -EPROBE_DEFER)
+		return -EPROBE_DEFER;
+
+	err = reset_control_assert(drv_data->axi_rst);
+	if (err) {
+		dev_err(dev, "assert axi bus failed\n");
+		return err;
+	}
+
+	err = reset_control_assert(drv_data->sw_rst);
+	if (err) {
+		dev_err(dev, "assert phy digital part failed\n");
+		return err;
+	}
+
+	err = reset_control_assert(drv_data->reg_rst);
+	if (err) {
+		dev_err(dev, "assert phy register part failed\n");
+		return err;
+	}
+
+	err = reset_control_deassert(drv_data->reg_rst);
+	if (err) {
+		dev_err(dev, "deassert phy register part failed\n");
+		return err;
+	}
+
+	err = reset_control_deassert(drv_data->sw_rst);
+	if (err) {
+		dev_err(dev, "deassert phy digital part failed\n");
+		return err;
+	}
+
+	err = reset_control_deassert(drv_data->axi_rst);
+	if (err) {
+		dev_err(dev, "deassert axi bus failed\n");
+		return err;
+	}
+
+	return 0;
+}
+
+static int mtk_ahci_parse_property(struct ahci_host_priv *hpriv,
+				   struct device *dev)
+{
+	struct mtk_ahci_drv_data *drv_data = hpriv->plat_data;
+	struct device_node *np = dev->of_node;
+
+	/* enable SATA function if needed */
+	if (of_find_property(np, "mediatek,phy-mode", NULL)) {
+		drv_data->mode = syscon_regmap_lookup_by_phandle(
+						np, "mediatek,phy-mode");
+		if (IS_ERR(drv_data->mode)) {
+			dev_err(dev, "missing phy-mode phandle\n");
+			return PTR_ERR(drv_data->mode);
+		}
+
+		regmap_update_bits(drv_data->mode, SYS_CFG, SYS_CFG_SATA_MSK,
+				   SYS_CFG_SATA_EN);
+	}
+
+	of_property_read_u32(np, "ports-implemented", &hpriv->force_port_map);
+
+	return 0;
+}
+
+static int mtk_ahci_probe(struct platform_device *pdev)
+{
+	struct device *dev = &pdev->dev;
+	struct mtk_ahci_drv_data *drv_data;
+	struct ahci_host_priv *hpriv;
+	int err;
+
+	drv_data = devm_kzalloc(dev, sizeof(*drv_data), GFP_KERNEL);
+	if (!drv_data)
+		return -ENOMEM;
+
+	hpriv = ahci_platform_get_resources(pdev);
+	if (IS_ERR(hpriv))
+		return PTR_ERR(hpriv);
+
+	hpriv->plat_data = drv_data;
+
+	err = mtk_ahci_parse_property(hpriv, dev);
+	if (err)
+		return err;
+
+	err = mtk_ahci_platform_resets(hpriv, dev);
+	if (err)
+		return err;
+
+	err = ahci_platform_enable_resources(hpriv);
+	if (err)
+		return err;
+
+	err = ahci_platform_init_host(pdev, hpriv, &ahci_port_info,
+				      &ahci_platform_sht);
+	if (err)
+		goto disable_resources;
+
+	return 0;
+
+disable_resources:
+	ahci_platform_disable_resources(hpriv);
+	return err;
+}
+
+static SIMPLE_DEV_PM_OPS(ahci_pm_ops, ahci_platform_suspend,
+			 ahci_platform_resume);
+
+static const struct of_device_id ahci_of_match[] = {
+	{ .compatible = "mediatek,ahci", },
+	{},
+};
+MODULE_DEVICE_TABLE(of, ahci_of_match);
+
+static struct platform_driver mtk_ahci_driver = {
+	.probe = mtk_ahci_probe,
+	.remove = ata_platform_remove_one,
+	.driver = {
+		.name = DRV_NAME,
+		.of_match_table = ahci_of_match,
+		.pm = &ahci_pm_ops,
+	},
+};
+module_platform_driver(mtk_ahci_driver);
+
+MODULE_DESCRIPTION("MeidaTek SATA AHCI Driver");
+MODULE_LICENSE("GPL v2");