2020-02-14 21:48:47

by Scott Branden

Subject: [PATCH v2] net: phy: restore mdio regs in the iproc mdio driver

From: Arun Parameswaran <[email protected]>

The mii management register in iproc mdio block
does not have a retention register so it is lost on suspend.
Save and restore value of register while resuming from suspend.

Fixes: bb1a619735b4 ("net: phy: Initialize mdio clock at probe function")

Signed-off-by: Arun Parameswaran <[email protected]>
Signed-off-by: Scott Branden <[email protected]>
---
drivers/net/phy/mdio-bcm-iproc.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)

diff --git a/drivers/net/phy/mdio-bcm-iproc.c b/drivers/net/phy/mdio-bcm-iproc.c
index 7e9975d25066..f1ded03f0229 100644
--- a/drivers/net/phy/mdio-bcm-iproc.c
+++ b/drivers/net/phy/mdio-bcm-iproc.c
@@ -178,6 +178,23 @@ static int iproc_mdio_remove(struct platform_device *pdev)
return 0;
}

+#ifdef CONFIG_PM_SLEEP
+int iproc_mdio_resume(struct device *dev)
+{
+ struct platform_device *pdev = to_platform_device(dev);
+ struct iproc_mdio_priv *priv = platform_get_drvdata(pdev);
+
+ /* restore the mii clock configuration */
+ iproc_mdio_config_clk(priv->base);
+
+ return 0;
+}
+
+static const struct dev_pm_ops iproc_mdio_pm_ops = {
+ .resume = iproc_mdio_resume
+};
+#endif /* CONFIG_PM_SLEEP */
+
static const struct of_device_id iproc_mdio_of_match[] = {
{ .compatible = "brcm,iproc-mdio", },
{ /* sentinel */ },
@@ -188,6 +205,9 @@ static struct platform_driver iproc_mdio_driver = {
.driver = {
.name = "iproc-mdio",
.of_match_table = iproc_mdio_of_match,
+#ifdef CONFIG_PM_SLEEP
+ .pm = &iproc_mdio_pm_ops,
+#endif
},
.probe = iproc_mdio_probe,
.remove = iproc_mdio_remove,
--
2.17.1

2020-02-14 21:51:12

by Andrew Lunn

Subject: Re: [PATCH v2] net: phy: restore mdio regs in the iproc mdio driver

On Fri, Feb 14, 2020 at 01:47:46PM -0800, Scott Branden wrote:
> From: Arun Parameswaran <[email protected]>
>
> The mii management register in iproc mdio block
> does not have a retention register so it is lost on suspend.
> Save and restore value of register while resuming from suspend.

You actually just reconfigure, you don't save it. But that is minor.

Reviewed-by: Andrew Lunn <[email protected]>

Andrew

2020-02-14 22:03:54

by Florian Fainelli

Subject: Re: [PATCH v2] net: phy: restore mdio regs in the iproc mdio driver

On 2/14/20 1:47 PM, Scott Branden wrote:
> From: Arun Parameswaran <[email protected]>
>
> The mii management register in iproc mdio block
> does not have a retention register so it is lost on suspend.
> Save and restore value of register while resuming from suspend.
>
> Fixes: bb1a619735b4 ("net: phy: Initialize mdio clock at probe function")
>
> Signed-off-by: Arun Parameswaran <[email protected]>
> Signed-off-by: Scott Branden <[email protected]>

Reviewed-by: Florian Fainelli <[email protected]>
--
Florian

2020-02-17 03:21:07

by David Miller

Subject: Re: [PATCH v2] net: phy: restore mdio regs in the iproc mdio driver

From: Scott Branden <[email protected]>
Date: Fri, 14 Feb 2020 13:47:46 -0800

> From: Arun Parameswaran <[email protected]>
>
> The mii management register in iproc mdio block
> does not have a retention register so it is lost on suspend.
> Save and restore value of register while resuming from suspend.
>
> Fixes: bb1a619735b4 ("net: phy: Initialize mdio clock at probe function")
>
> Signed-off-by: Arun Parameswaran <[email protected]>
> Signed-off-by: Scott Branden <[email protected]>

Applied and queued up for -stable.