[GIT PULL 0/4] PHY: for 3.14

[GIT PULL 0/4] PHY: for 3.14

[Kishon Vijay Abraham I]

Hi Greg,

here's the patches for 3.14. It contains few fixes on phy-core and added a new
PHY driver used by SATA in Marvell SoCs.

Let me know if you need any changes.

Thanks
Kishon

The following changes since commit 413541dd66d51f791a0b169d9b9014e4f56be13c:

  Linux 3.13-rc5 (2013-12-22 13:08:32 -0800)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git tags/for_3.14

for you to fetch changes up to e3eae85773ebd2165d19ca8661cca3b9c60b2ba1:

  Phy: Add a PHY driver for Marvell MVEBU SATA PHY. (2013-12-24 23:52:58 +0530)

----------------------------------------------------------------
Pull request for PHY subsystem contains few fixes in PHY-CORE mostly
w.r.t PM and reference counting and also a new PHY driver used by SATA
in Marvell SoC.

----------------------------------------------------------------
Andrew Lunn (1):
      Phy: Add a PHY driver for Marvell MVEBU SATA PHY.

Felipe Balbi (1):
      phy: core: properly handle failure of pm_runtime_get functions

Kishon Vijay Abraham I (2):
      phy: phy-core: increment refcounting variables only on 'success'
      phy: phy-core.c: remove unnecessary initialization of local variables

 drivers/phy/Kconfig          |    6 ++++++
 drivers/phy/Makefile         |    1 +
 drivers/phy/phy-core.c       |   44 +++++++++++++++++++++++++++++-------------
 drivers/phy/phy-mvebu-sata.c |  137 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 175 insertions(+), 13 deletions(-)
 create mode 100644 drivers/phy/phy-mvebu-sata.c

-- 
1.7.10.4

[PATCH 1/4] phy: core: properly handle failure of pm_runtime_get functions

[Kishon Vijay Abraham I]

From: Felipe Balbi <balbi@ti.com>

In case pm_runtime_get*() fails, it still
increments pm usage counter, so we *must*
make sure to pm_runtime_put() even in those
cases.

This patch fixes that mistake the same way
usbcore treats those possible failures.

Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
 drivers/phy/phy-core.c |   16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/drivers/phy/phy-core.c b/drivers/phy/phy-core.c
index 58e0e97..8797bb7 100644
--- a/drivers/phy/phy-core.c
+++ b/drivers/phy/phy-core.c
@@ -94,19 +94,31 @@ static struct phy_provider *of_phy_provider_lookup(struct device_node *node)
 
 int phy_pm_runtime_get(struct phy *phy)
 {
+	int ret;
+
 	if (!pm_runtime_enabled(&phy->dev))
 		return -ENOTSUPP;
 
-	return pm_runtime_get(&phy->dev);
+	ret = pm_runtime_get(&phy->dev);
+	if (ret < 0 && ret != -EINPROGRESS)
+		pm_runtime_put_noidle(&phy->dev);
+
+	return ret;
 }
 EXPORT_SYMBOL_GPL(phy_pm_runtime_get);
 
 int phy_pm_runtime_get_sync(struct phy *phy)
 {
+	int ret;
+
 	if (!pm_runtime_enabled(&phy->dev))
 		return -ENOTSUPP;
 
-	return pm_runtime_get_sync(&phy->dev);
+	ret = pm_runtime_get_sync(&phy->dev);
+	if (ret < 0)
+		pm_runtime_put_sync(&phy->dev);
+
+	return ret;
 }
 EXPORT_SYMBOL_GPL(phy_pm_runtime_get_sync);
 
-- 
1.7.10.4

[PATCH 2/4] phy: phy-core: increment refcounting variables only on 'success'

[Kishon Vijay Abraham I]

Increment 'init_count' only if the 'init' callback succeeded and decrement
'init_count' only if the 'exit' callback succeded. Increment 'power_count'
only if 'power_on' callback succeded and if it failed disable the clocks using
phy_pm_runtime_put_sync(). Also decrement 'power_count' only if 'power_off'
callback succeded and if it failed do not disable the clocks.

Reported-by: George Cherian <george.cherian@ti.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
 drivers/phy/phy-core.c |   22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/drivers/phy/phy-core.c b/drivers/phy/phy-core.c
index 8797bb7..33fcbcc 100644
--- a/drivers/phy/phy-core.c
+++ b/drivers/phy/phy-core.c
@@ -167,13 +167,14 @@ int phy_init(struct phy *phy)
 		return ret;
 
 	mutex_lock(&phy->mutex);
-	if (phy->init_count++ == 0 && phy->ops->init) {
+	if (phy->init_count == 0 && phy->ops->init) {
 		ret = phy->ops->init(phy);
 		if (ret < 0) {
 			dev_err(&phy->dev, "phy init failed --> %d\n", ret);
 			goto out;
 		}
 	}
+	++phy->init_count;
 
 out:
 	mutex_unlock(&phy->mutex);
@@ -191,13 +192,14 @@ int phy_exit(struct phy *phy)
 		return ret;
 
 	mutex_lock(&phy->mutex);
-	if (--phy->init_count == 0 && phy->ops->exit) {
+	if (phy->init_count == 1 && phy->ops->exit) {
 		ret = phy->ops->exit(phy);
 		if (ret < 0) {
 			dev_err(&phy->dev, "phy exit failed --> %d\n", ret);
 			goto out;
 		}
 	}
+	--phy->init_count;
 
 out:
 	mutex_unlock(&phy->mutex);
@@ -215,16 +217,20 @@ int phy_power_on(struct phy *phy)
 		return ret;
 
 	mutex_lock(&phy->mutex);
-	if (phy->power_count++ == 0 && phy->ops->power_on) {
+	if (phy->power_count == 0 && phy->ops->power_on) {
 		ret = phy->ops->power_on(phy);
 		if (ret < 0) {
 			dev_err(&phy->dev, "phy poweron failed --> %d\n", ret);
 			goto out;
 		}
 	}
+	++phy->power_count;
+	mutex_unlock(&phy->mutex);
+	return 0;
 
 out:
 	mutex_unlock(&phy->mutex);
+	phy_pm_runtime_put_sync(phy);
 
 	return ret;
 }
@@ -235,19 +241,19 @@ int phy_power_off(struct phy *phy)
 	int ret = -ENOTSUPP;
 
 	mutex_lock(&phy->mutex);
-	if (--phy->power_count == 0 && phy->ops->power_off) {
+	if (phy->power_count == 1 && phy->ops->power_off) {
 		ret =  phy->ops->power_off(phy);
 		if (ret < 0) {
 			dev_err(&phy->dev, "phy poweroff failed --> %d\n", ret);
-			goto out;
+			mutex_unlock(&phy->mutex);
+			return ret;
 		}
 	}
-
-out:
+	--phy->power_count;
 	mutex_unlock(&phy->mutex);
 	phy_pm_runtime_put(phy);
 
-	return ret;
+	return 0;
 }
 EXPORT_SYMBOL_GPL(phy_power_off);
 
-- 
1.7.10.4

[PATCH 3/4] phy: phy-core.c: remove unnecessary initialization of local variables

[Kishon Vijay Abraham I]

There were a few places where variables are initialized unncessarily.
Remove those initializations.

Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
 drivers/phy/phy-core.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/phy/phy-core.c b/drivers/phy/phy-core.c
index 33fcbcc..645c867 100644
--- a/drivers/phy/phy-core.c
+++ b/drivers/phy/phy-core.c
@@ -210,7 +210,7 @@ EXPORT_SYMBOL_GPL(phy_exit);
 
 int phy_power_on(struct phy *phy)
 {
-	int ret = -ENOTSUPP;
+	int ret;
 
 	ret = phy_pm_runtime_get_sync(phy);
 	if (ret < 0 && ret != -ENOTSUPP)
@@ -238,7 +238,7 @@ EXPORT_SYMBOL_GPL(phy_power_on);
 
 int phy_power_off(struct phy *phy)
 {
-	int ret = -ENOTSUPP;
+	int ret;
 
 	mutex_lock(&phy->mutex);
 	if (phy->power_count == 1 && phy->ops->power_off) {
@@ -378,7 +378,7 @@ EXPORT_SYMBOL_GPL(of_phy_simple_xlate);
 struct phy *phy_get(struct device *dev, const char *string)
 {
 	int index = 0;
-	struct phy *phy = NULL;
+	struct phy *phy;
 
 	if (string == NULL) {
 		dev_WARN(dev, "missing string\n");
-- 
1.7.10.4

[PATCH 4/4] Phy: Add a PHY driver for Marvell MVEBU SATA PHY.

[Kishon Vijay Abraham I]

From: Andrew Lunn <andrew@lunn.ch>

Kirkwood and Dove can turn the SATA phy on and off. Add a PHY driver
to control this.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
 drivers/phy/Kconfig          |    6 ++
 drivers/phy/Makefile         |    1 +
 drivers/phy/phy-mvebu-sata.c |  137 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 144 insertions(+)
 create mode 100644 drivers/phy/phy-mvebu-sata.c

diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
index 330ef2d..d0611b8 100644
--- a/drivers/phy/Kconfig
+++ b/drivers/phy/Kconfig
@@ -21,6 +21,12 @@ config PHY_EXYNOS_MIPI_VIDEO
 	  Support for MIPI CSI-2 and MIPI DSI DPHY found on Samsung S5P
 	  and EXYNOS SoCs.
 
+config PHY_MVEBU_SATA
+	def_bool y
+	depends on ARCH_KIRKWOOD || ARCH_DOVE
+	depends on OF
+	select GENERIC_PHY
+
 config OMAP_USB2
 	tristate "OMAP USB2 PHY Driver"
 	depends on ARCH_OMAP2PLUS
diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile
index d0caae9..4e4adc9 100644
--- a/drivers/phy/Makefile
+++ b/drivers/phy/Makefile
@@ -5,5 +5,6 @@
 obj-$(CONFIG_GENERIC_PHY)		+= phy-core.o
 obj-$(CONFIG_PHY_EXYNOS_DP_VIDEO)	+= phy-exynos-dp-video.o
 obj-$(CONFIG_PHY_EXYNOS_MIPI_VIDEO)	+= phy-exynos-mipi-video.o
+obj-$(CONFIG_PHY_MVEBU_SATA)		+= phy-mvebu-sata.o
 obj-$(CONFIG_OMAP_USB2)			+= phy-omap-usb2.o
 obj-$(CONFIG_TWL4030_USB)		+= phy-twl4030-usb.o
diff --git a/drivers/phy/phy-mvebu-sata.c b/drivers/phy/phy-mvebu-sata.c
new file mode 100644
index 0000000..d43786f
--- /dev/null
+++ b/drivers/phy/phy-mvebu-sata.c
@@ -0,0 +1,137 @@
+/*
+ *	phy-mvebu-sata.c: SATA Phy driver for the Marvell mvebu SoCs.
+ *
+ *	Copyright (C) 2013 Andrew Lunn <andrew@lunn.ch>
+ *
+ *	This program is free software; you can redistribute it and/or
+ *	modify it under the terms of the GNU General Public License
+ *	as published by the Free Software Foundation; either version
+ *	2 of the License, or (at your option) any later version.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/clk.h>
+#include <linux/phy/phy.h>
+#include <linux/io.h>
+#include <linux/platform_device.h>
+
+struct priv {
+	struct clk	*clk;
+	void __iomem	*base;
+};
+
+#define SATA_PHY_MODE_2	0x0330
+#define  MODE_2_FORCE_PU_TX	BIT(0)
+#define  MODE_2_FORCE_PU_RX	BIT(1)
+#define  MODE_2_PU_PLL		BIT(2)
+#define  MODE_2_PU_IVREF	BIT(3)
+#define SATA_IF_CTRL	0x0050
+#define  CTRL_PHY_SHUTDOWN	BIT(9)
+
+static int phy_mvebu_sata_power_on(struct phy *phy)
+{
+	struct priv *priv = phy_get_drvdata(phy);
+	u32 reg;
+
+	clk_prepare_enable(priv->clk);
+
+	/* Enable PLL and IVREF */
+	reg = readl(priv->base + SATA_PHY_MODE_2);
+	reg |= (MODE_2_FORCE_PU_TX | MODE_2_FORCE_PU_RX |
+		MODE_2_PU_PLL | MODE_2_PU_IVREF);
+	writel(reg , priv->base + SATA_PHY_MODE_2);
+
+	/* Enable PHY */
+	reg = readl(priv->base + SATA_IF_CTRL);
+	reg &= ~CTRL_PHY_SHUTDOWN;
+	writel(reg, priv->base + SATA_IF_CTRL);
+
+	clk_disable_unprepare(priv->clk);
+
+	return 0;
+}
+
+static int phy_mvebu_sata_power_off(struct phy *phy)
+{
+	struct priv *priv = phy_get_drvdata(phy);
+	u32 reg;
+
+	clk_prepare_enable(priv->clk);
+
+	/* Disable PLL and IVREF */
+	reg = readl(priv->base + SATA_PHY_MODE_2);
+	reg &= ~(MODE_2_FORCE_PU_TX | MODE_2_FORCE_PU_RX |
+		 MODE_2_PU_PLL | MODE_2_PU_IVREF);
+	writel(reg, priv->base + SATA_PHY_MODE_2);
+
+	/* Disable PHY */
+	reg = readl(priv->base + SATA_IF_CTRL);
+	reg |= CTRL_PHY_SHUTDOWN;
+	writel(reg, priv->base + SATA_IF_CTRL);
+
+	clk_disable_unprepare(priv->clk);
+
+	return 0;
+}
+
+static struct phy_ops phy_mvebu_sata_ops = {
+	.power_on	= phy_mvebu_sata_power_on,
+	.power_off	= phy_mvebu_sata_power_off,
+	.owner		= THIS_MODULE,
+};
+
+static int phy_mvebu_sata_probe(struct platform_device *pdev)
+{
+	struct phy_provider *phy_provider;
+	struct resource *res;
+	struct priv *priv;
+	struct phy *phy;
+
+	priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
+
+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+	priv->base = devm_ioremap_resource(&pdev->dev, res);
+	if (IS_ERR(priv->base))
+		return PTR_ERR(priv->base);
+
+	priv->clk = devm_clk_get(&pdev->dev, "sata");
+	if (IS_ERR(priv->clk))
+		return PTR_ERR(priv->clk);
+
+	phy_provider = devm_of_phy_provider_register(&pdev->dev,
+						     of_phy_simple_xlate);
+	if (IS_ERR(phy_provider))
+		return PTR_ERR(phy_provider);
+
+	phy = devm_phy_create(&pdev->dev, &phy_mvebu_sata_ops, NULL);
+	if (IS_ERR(phy))
+		return PTR_ERR(phy);
+
+	phy_set_drvdata(phy, priv);
+
+	/* The boot loader may of left it on. Turn it off. */
+	phy_mvebu_sata_power_off(phy);
+
+	return 0;
+}
+
+static const struct of_device_id phy_mvebu_sata_of_match[] = {
+	{ .compatible = "marvell,mvebu-sata-phy" },
+	{ },
+};
+MODULE_DEVICE_TABLE(of, phy_mvebu_sata_of_match);
+
+static struct platform_driver phy_mvebu_sata_driver = {
+	.probe	= phy_mvebu_sata_probe,
+	.driver = {
+		.name	= "phy-mvebu-sata",
+		.owner	= THIS_MODULE,
+		.of_match_table	= phy_mvebu_sata_of_match,
+	}
+};
+module_platform_driver(phy_mvebu_sata_driver);
+
+MODULE_AUTHOR("Andrew Lunn <andrew@lunn.ch>");
+MODULE_DESCRIPTION("Marvell MVEBU SATA PHY driver");
+MODULE_LICENSE("GPL v2");
-- 
1.7.10.4

Re: [GIT PULL 0/4] PHY: for 3.14

[Kishon Vijay Abraham I]

Hi Greg,

On Thursday 26 December 2013 10:17 PM, Kishon Vijay Abraham I wrote:
> Hi Greg,
> 
> here's the patches for 3.14. It contains few fixes on phy-core and added a new
> PHY driver used by SATA in Marvell SoCs.
> 
> Let me know if you need any changes.
> 
> Thanks
> Kishon
> 
> The following changes since commit 413541dd66d51f791a0b169d9b9014e4f56be13c:
> 
>   Linux 3.13-rc5 (2013-12-22 13:08:32 -0800)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git tags/for_3.14
> 
> for you to fetch changes up to e3eae85773ebd2165d19ca8661cca3b9c60b2ba1:
> 
>   Phy: Add a PHY driver for Marvell MVEBU SATA PHY. (2013-12-24 23:52:58 +0530)
> 
> ----------------------------------------------------------------
> Pull request for PHY subsystem contains few fixes in PHY-CORE mostly
> w.r.t PM and reference counting and also a new PHY driver used by SATA
> in Marvell SoC.
> 
> ----------------------------------------------------------------
> Andrew Lunn (1):
>       Phy: Add a PHY driver for Marvell MVEBU SATA PHY.
> 
> Felipe Balbi (1):
>       phy: core: properly handle failure of pm_runtime_get functions
> 
> Kishon Vijay Abraham I (2):
>       phy: phy-core: increment refcounting variables only on 'success'
>       phy: phy-core.c: remove unnecessary initialization of local variables\


Will you be taking these patches?

Thanks
Kishon
> 
>  drivers/phy/Kconfig          |    6 ++++++
>  drivers/phy/Makefile         |    1 +
>  drivers/phy/phy-core.c       |   44 +++++++++++++++++++++++++++++-------------
>  drivers/phy/phy-mvebu-sata.c |  137 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>  4 files changed, 175 insertions(+), 13 deletions(-)
>  create mode 100644 drivers/phy/phy-mvebu-sata.c
> 

Re: [GIT PULL 0/4] PHY: for 3.14

[Greg KH]

On Wed, Jan 08, 2014 at 10:54:13AM +0530, Kishon Vijay Abraham I wrote:
> Hi Greg,
> 
> On Thursday 26 December 2013 10:17 PM, Kishon Vijay Abraham I wrote:
> > Hi Greg,
> > 
> > here's the patches for 3.14. It contains few fixes on phy-core and added a new
> > PHY driver used by SATA in Marvell SoCs.
> > 
> > Let me know if you need any changes.
> > 
> > Thanks
> > Kishon
> > 
> > The following changes since commit 413541dd66d51f791a0b169d9b9014e4f56be13c:
> > 
> >   Linux 3.13-rc5 (2013-12-22 13:08:32 -0800)
> > 
> > are available in the git repository at:
> > 
> >   git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git tags/for_3.14
> > 
> > for you to fetch changes up to e3eae85773ebd2165d19ca8661cca3b9c60b2ba1:
> > 
> >   Phy: Add a PHY driver for Marvell MVEBU SATA PHY. (2013-12-24 23:52:58 +0530)
> > 
> > ----------------------------------------------------------------
> > Pull request for PHY subsystem contains few fixes in PHY-CORE mostly
> > w.r.t PM and reference counting and also a new PHY driver used by SATA
> > in Marvell SoC.
> > 
> > ----------------------------------------------------------------
> > Andrew Lunn (1):
> >       Phy: Add a PHY driver for Marvell MVEBU SATA PHY.
> > 
> > Felipe Balbi (1):
> >       phy: core: properly handle failure of pm_runtime_get functions
> > 
> > Kishon Vijay Abraham I (2):
> >       phy: phy-core: increment refcounting variables only on 'success'
> >       phy: phy-core.c: remove unnecessary initialization of local variables\
> 
> 
> Will you be taking these patches?

Yes, sorry, catching up from my vacation backlog...

greg k-h

Re: [GIT PULL 0/4] PHY: for 3.14

[Kishon Vijay Abraham I]

On Thursday 09 January 2014 09:06 AM, Greg KH wrote:
> On Wed, Jan 08, 2014 at 10:54:13AM +0530, Kishon Vijay Abraham I wrote:
>> Hi Greg,
>>
>> On Thursday 26 December 2013 10:17 PM, Kishon Vijay Abraham I wrote:
>>> Hi Greg,
>>>
>>> here's the patches for 3.14. It contains few fixes on phy-core and added a new
>>> PHY driver used by SATA in Marvell SoCs.
>>>
>>> Let me know if you need any changes.
>>>
>>> Thanks
>>> Kishon
>>>
>>> The following changes since commit 413541dd66d51f791a0b169d9b9014e4f56be13c:
>>>
>>>   Linux 3.13-rc5 (2013-12-22 13:08:32 -0800)
>>>
>>> are available in the git repository at:
>>>
>>>   git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git tags/for_3.14
>>>
>>> for you to fetch changes up to e3eae85773ebd2165d19ca8661cca3b9c60b2ba1:
>>>
>>>   Phy: Add a PHY driver for Marvell MVEBU SATA PHY. (2013-12-24 23:52:58 +0530)
>>>
>>> ----------------------------------------------------------------
>>> Pull request for PHY subsystem contains few fixes in PHY-CORE mostly
>>> w.r.t PM and reference counting and also a new PHY driver used by SATA
>>> in Marvell SoC.
>>>
>>> ----------------------------------------------------------------
>>> Andrew Lunn (1):
>>>       Phy: Add a PHY driver for Marvell MVEBU SATA PHY.
>>>
>>> Felipe Balbi (1):
>>>       phy: core: properly handle failure of pm_runtime_get functions
>>>
>>> Kishon Vijay Abraham I (2):
>>>       phy: phy-core: increment refcounting variables only on 'success'
>>>       phy: phy-core.c: remove unnecessary initialization of local variables\
>>
>>
>> Will you be taking these patches?
> 
> Yes, sorry, catching up from my vacation backlog...

no problem, thanks.

-Kishon
> 
> greg k-h
> 

Re: [GIT PULL 0/4] PHY: for 3.14

[Greg KH]

On Thu, Dec 26, 2013 at 10:17:16PM +0530, Kishon Vijay Abraham I wrote:
> Hi Greg,
> 
> here's the patches for 3.14. It contains few fixes on phy-core and added a new
> PHY driver used by SATA in Marvell SoCs.
> 
> Let me know if you need any changes.
> 
> Thanks
> Kishon
> 
> The following changes since commit 413541dd66d51f791a0b169d9b9014e4f56be13c:
> 
>   Linux 3.13-rc5 (2013-12-22 13:08:32 -0800)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git tags/for_3.14

Pulled and pushed out, sorry for the delay.

greg k-h