Commit 3337022b authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-renesas-rswitch-add-speed-change-support' 

Yoshihiro Shimoda says:

====================
net: renesas: rswitch: Add speed change support

Add speed change support at runtime for the latest SoC version.
Also, add ethtool .[gs]et_link_ksettings.

v1: https://lore.kernel.org/all/20230803120621.1471440-1-yoshihiro.shimoda.uh@renesas.com/
====================

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


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents f1d152eb 20f8be6b

drivers/net/ethernet/renesas/rswitch.c

+26 −3
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <linux/rtnetlink.h>

#include <linux/slab.h>

#include <linux/spinlock.h>

#include <linux/sys_soc.h>



#include "rswitch.h"
@@ -1243,7 +1244,6 @@ static void rswitch_adjust_link(struct net_device *ndev) 
	struct rswitch_device *rdev = netdev_priv(ndev);

	struct phy_device *phydev = ndev->phydev;



	/* Current hardware has a restriction not to change speed at runtime */

	if (phydev->link != rdev->etha->link) {

		phy_print_status(phydev);

		if (phydev->link)
@@ -1252,13 +1252,23 @@ static void rswitch_adjust_link(struct net_device *ndev) 
			phy_power_off(rdev->serdes);



		rdev->etha->link = phydev->link;



		if (!rdev->priv->etha_no_runtime_change &&

		    phydev->speed != rdev->etha->speed) {

			rdev->etha->speed = phydev->speed;



			rswitch_etha_hw_init(rdev->etha, rdev->ndev->dev_addr);

			phy_set_speed(rdev->serdes, rdev->etha->speed);

		}

	}

}



static void rswitch_phy_remove_link_mode(struct rswitch_device *rdev,

					 struct phy_device *phydev)

{

	/* Current hardware has a restriction not to change speed at runtime */

	if (!rdev->priv->etha_no_runtime_change)

		return;



	switch (rdev->etha->speed) {

	case SPEED_2500:

		phy_remove_link_mode(phydev, ETHTOOL_LINK_MODE_1000baseT_Full_BIT);
@@ -1347,6 +1357,7 @@ static int rswitch_ether_port_init_one(struct rswitch_device *rdev) 
		err = rswitch_etha_hw_init(rdev->etha, rdev->ndev->dev_addr);

		if (err < 0)

			return err;

		if (rdev->priv->etha_no_runtime_change)

			rdev->etha->operated = true;

	}
@@ -1653,6 +1664,8 @@ static int rswitch_get_ts_info(struct net_device *ndev, struct ethtool_ts_info * 


static const struct ethtool_ops rswitch_ethtool_ops = {

	.get_ts_info = rswitch_get_ts_info,

	.get_link_ksettings = phy_ethtool_get_link_ksettings,

	.set_link_ksettings = phy_ethtool_set_link_ksettings,

};



static const struct of_device_id renesas_eth_sw_of_table[] = {
@@ -1853,8 +1866,14 @@ static int rswitch_init(struct rswitch_private *priv) 
	return err;

}



static const struct soc_device_attribute rswitch_soc_no_speed_change[]  = {

	{ .soc_id = "r8a779f0", .revision = "ES1.0" },

	{ /* Sentinel */ }

};



static int renesas_eth_sw_probe(struct platform_device *pdev)

{

	const struct soc_device_attribute *attr;

	struct rswitch_private *priv;

	struct resource *res;

	int ret;
@@ -1869,6 +1888,10 @@ static int renesas_eth_sw_probe(struct platform_device *pdev) 
	if (!priv)

		return -ENOMEM;



	attr = soc_device_match(rswitch_soc_no_speed_change);

	if (attr)

		priv->etha_no_runtime_change = true;



	priv->ptp_priv = rcar_gen4_ptp_alloc(pdev);

	if (!priv->ptp_priv)

		return -ENOMEM;

drivers/net/ethernet/renesas/rswitch.h

+1 −0
Original line number Diff line number Diff line
@@ -1011,6 +1011,7 @@ struct rswitch_private { 
	struct rswitch_etha etha[RSWITCH_NUM_PORTS];

	struct rswitch_mfwd mfwd;



	bool etha_no_runtime_change;

	bool gwca_halt;

};