Commit 65e4f450 authored by Paolo Abeni's avatar Paolo Abeni
Browse files

Merge branch 'rswitch-add-pm-ops' 

Yoshihiro Shimoda says:

====================
rswitch: Add PM ops

This patch is based on the latest net-next.git / next branch.
After applied this patch with the following patches, the system can
enter/exit Suspend to Idle without any error:
https://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git/commit/?h=next&id=aa4c0bbf820ddb9dd8105a403aa12df57b9e5129
https://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git/commit/?h=next&id=1a5361189b7acac15b9b086b2300a11b7aa84c06
====================

Link: https://lore.kernel.org/r/20231017113402.849735-1-yoshihiro.shimoda.uh@renesas.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parents 0916c65a 35b78409

drivers/net/ethernet/renesas/rswitch.c

+49 −4
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/of_net.h>

#include <linux/phy/phy.h>

#include <linux/platform_device.h>

#include <linux/pm.h>

#include <linux/pm_runtime.h>

#include <linux/rtnetlink.h>

#include <linux/slab.h>
@@ -1315,6 +1316,7 @@ static int rswitch_phy_device_init(struct rswitch_device *rdev) 
	if (!phydev)

		goto out;

	__set_bit(rdev->etha->phy_interface, phydev->host_interfaces);

	phydev->mac_managed_pm = true;



	phydev = of_phy_connect(rdev->ndev, phy, rswitch_adjust_link, 0,

				rdev->etha->phy_interface);
@@ -1405,7 +1407,8 @@ static void rswitch_ether_port_deinit_one(struct rswitch_device *rdev) 


static int rswitch_ether_port_init_all(struct rswitch_private *priv)

{

	int i, err;

	unsigned int i;

	int err;



	rswitch_for_each_enabled_port(priv, i) {

		err = rswitch_ether_port_init_one(priv->rdev[i]);
@@ -1786,7 +1789,8 @@ static void rswitch_device_free(struct rswitch_private *priv, int index) 


static int rswitch_init(struct rswitch_private *priv)

{

	int i, err;

	unsigned int i;

	int err;



	for (i = 0; i < RSWITCH_NUM_PORTS; i++)

		rswitch_etha_init(priv, i);
@@ -1816,7 +1820,7 @@ static int rswitch_init(struct rswitch_private *priv) 
	for (i = 0; i < RSWITCH_NUM_PORTS; i++) {

		err = rswitch_device_alloc(priv, i);

		if (err < 0) {

			for (i--; i >= 0; i--)

			for (; i-- > 0; )

				rswitch_device_free(priv, i);

			goto err_device_alloc;

		}
@@ -1959,7 +1963,7 @@ static int renesas_eth_sw_probe(struct platform_device *pdev) 


static void rswitch_deinit(struct rswitch_private *priv)

{

	int i;

	unsigned int i;



	rswitch_gwca_hw_deinit(priv);

	rcar_gen4_ptp_unregister(priv->ptp_priv);
@@ -1993,11 +1997,52 @@ static void renesas_eth_sw_remove(struct platform_device *pdev) 
	platform_set_drvdata(pdev, NULL);

}



static int renesas_eth_sw_suspend(struct device *dev)

{

	struct rswitch_private *priv = dev_get_drvdata(dev);

	struct net_device *ndev;

	unsigned int i;



	rswitch_for_each_enabled_port(priv, i) {

		ndev = priv->rdev[i]->ndev;

		if (netif_running(ndev)) {

			netif_device_detach(ndev);

			rswitch_stop(ndev);

		}

		if (priv->rdev[i]->serdes->init_count)

			phy_exit(priv->rdev[i]->serdes);

	}



	return 0;

}



static int renesas_eth_sw_resume(struct device *dev)

{

	struct rswitch_private *priv = dev_get_drvdata(dev);

	struct net_device *ndev;

	unsigned int i;



	rswitch_for_each_enabled_port(priv, i) {

		phy_init(priv->rdev[i]->serdes);

		ndev = priv->rdev[i]->ndev;

		if (netif_running(ndev)) {

			rswitch_open(ndev);

			netif_device_attach(ndev);

		}

	}



	return 0;

}



static DEFINE_SIMPLE_DEV_PM_OPS(renesas_eth_sw_pm_ops, renesas_eth_sw_suspend,

				renesas_eth_sw_resume);



static struct platform_driver renesas_eth_sw_driver_platform = {

	.probe = renesas_eth_sw_probe,

	.remove_new = renesas_eth_sw_remove,

	.driver = {

		.name = "renesas_eth_sw",

		.pm = pm_sleep_ptr(&renesas_eth_sw_pm_ops),

		.of_match_table = renesas_eth_sw_of_table,

	}

};

drivers/net/ethernet/renesas/rswitch.h

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
		else



#define rswitch_for_each_enabled_port_continue_reverse(priv, i)	\

	for (i--; i >= 0; i--)					\

	for (; i-- > 0; )					\

		if (priv->rdev[i]->disabled)			\

			continue;				\

		else