Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc96ee37 authored by Alexandre Belloni's avatar Alexandre Belloni Committed by David S. Miller
Browse files

net: mscc: ocelot: add bonding support 



Add link aggregation hardware offload support for Ocelot.

ocelot_get_link_ksettings() is not great but it does work until the driver
is reworked to switch to phylink.

Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 964fc35c

drivers/net/ethernet/mscc/ocelot.c

+160 −0
Original line number Diff line number Diff line
@@ -780,6 +780,8 @@ static const struct ethtool_ops ocelot_ethtool_ops = { 
	.get_strings		= ocelot_get_strings,

	.get_ethtool_stats	= ocelot_get_ethtool_stats,

	.get_sset_count		= ocelot_get_sset_count,

	.get_link_ksettings	= phy_ethtool_get_link_ksettings,

	.set_link_ksettings	= phy_ethtool_set_link_ksettings,

};



static int ocelot_port_attr_get(struct net_device *dev,
@@ -1088,6 +1090,137 @@ static void ocelot_port_bridge_leave(struct ocelot_port *ocelot_port, 
		ocelot->hw_bridge_dev = NULL;

}



static void ocelot_set_aggr_pgids(struct ocelot *ocelot)

{

	int i, port, lag;



	/* Reset destination and aggregation PGIDS */

	for (port = 0; port < ocelot->num_phys_ports; port++)

		ocelot_write_rix(ocelot, BIT(port), ANA_PGID_PGID, port);



	for (i = PGID_AGGR; i < PGID_SRC; i++)

		ocelot_write_rix(ocelot, GENMASK(ocelot->num_phys_ports - 1, 0),

				 ANA_PGID_PGID, i);



	/* Now, set PGIDs for each LAG */

	for (lag = 0; lag < ocelot->num_phys_ports; lag++) {

		unsigned long bond_mask;

		int aggr_count = 0;

		u8 aggr_idx[16];



		bond_mask = ocelot->lags[lag];

		if (!bond_mask)

			continue;



		for_each_set_bit(port, &bond_mask, ocelot->num_phys_ports) {

			// Destination mask

			ocelot_write_rix(ocelot, bond_mask,

					 ANA_PGID_PGID, port);

			aggr_idx[aggr_count] = port;

			aggr_count++;

		}



		for (i = PGID_AGGR; i < PGID_SRC; i++) {

			u32 ac;



			ac = ocelot_read_rix(ocelot, ANA_PGID_PGID, i);

			ac &= ~bond_mask;

			ac |= BIT(aggr_idx[i % aggr_count]);

			ocelot_write_rix(ocelot, ac, ANA_PGID_PGID, i);

		}

	}

}



static void ocelot_setup_lag(struct ocelot *ocelot, int lag)

{

	unsigned long bond_mask = ocelot->lags[lag];

	unsigned int p;



	for_each_set_bit(p, &bond_mask, ocelot->num_phys_ports) {

		u32 port_cfg = ocelot_read_gix(ocelot, ANA_PORT_PORT_CFG, p);



		port_cfg &= ~ANA_PORT_PORT_CFG_PORTID_VAL_M;



		/* Use lag port as logical port for port i */

		ocelot_write_gix(ocelot, port_cfg |

				 ANA_PORT_PORT_CFG_PORTID_VAL(lag),

				 ANA_PORT_PORT_CFG, p);

	}

}



static int ocelot_port_lag_join(struct ocelot_port *ocelot_port,

				struct net_device *bond)

{

	struct ocelot *ocelot = ocelot_port->ocelot;

	int p = ocelot_port->chip_port;

	int lag, lp;

	struct net_device *ndev;

	u32 bond_mask = 0;



	rcu_read_lock();

	for_each_netdev_in_bond_rcu(bond, ndev) {

		struct ocelot_port *port = netdev_priv(ndev);



		bond_mask |= BIT(port->chip_port);

	}

	rcu_read_unlock();



	lp = __ffs(bond_mask);



	/* If the new port is the lowest one, use it as the logical port from

	 * now on

	 */

	if (p == lp) {

		lag = p;

		ocelot->lags[p] = bond_mask;

		bond_mask &= ~BIT(p);

		if (bond_mask) {

			lp = __ffs(bond_mask);

			ocelot->lags[lp] = 0;

		}

	} else {

		lag = lp;

		ocelot->lags[lp] |= BIT(p);

	}



	ocelot_setup_lag(ocelot, lag);

	ocelot_set_aggr_pgids(ocelot);



	return 0;

}



static void ocelot_port_lag_leave(struct ocelot_port *ocelot_port,

				  struct net_device *bond)

{

	struct ocelot *ocelot = ocelot_port->ocelot;

	int p = ocelot_port->chip_port;

	u32 port_cfg;

	int i;



	/* Remove port from any lag */

	for (i = 0; i < ocelot->num_phys_ports; i++)

		ocelot->lags[i] &= ~BIT(ocelot_port->chip_port);



	/* if it was the logical port of the lag, move the lag config to the

	 * next port

	 */

	if (ocelot->lags[p]) {

		int n = __ffs(ocelot->lags[p]);



		ocelot->lags[n] = ocelot->lags[p];

		ocelot->lags[p] = 0;



		ocelot_setup_lag(ocelot, n);

	}



	port_cfg = ocelot_read_gix(ocelot, ANA_PORT_PORT_CFG, p);

	port_cfg &= ~ANA_PORT_PORT_CFG_PORTID_VAL_M;

	ocelot_write_gix(ocelot, port_cfg | ANA_PORT_PORT_CFG_PORTID_VAL(p),

			 ANA_PORT_PORT_CFG, p);



	ocelot_set_aggr_pgids(ocelot);

}



/* Checks if the net_device instance given to us originate from our driver. */

static bool ocelot_netdevice_dev_check(const struct net_device *dev)

{
@@ -1114,6 +1247,14 @@ static int ocelot_netdevice_port_event(struct net_device *dev, 
				ocelot_port_bridge_leave(ocelot_port,

							 info->upper_dev);

		}

		if (netif_is_lag_master(info->upper_dev)) {

			if (info->linking)

				err = ocelot_port_lag_join(ocelot_port,

							   info->upper_dev);

			else

				ocelot_port_lag_leave(ocelot_port,

						      info->upper_dev);

		}

		break;

	default:

		break;
@@ -1129,6 +1270,20 @@ static int ocelot_netdevice_event(struct notifier_block *unused, 
	struct net_device *dev = netdev_notifier_info_to_dev(ptr);

	int ret = 0;



	if (event == NETDEV_PRECHANGEUPPER &&

	    netif_is_lag_master(info->upper_dev)) {

		struct netdev_lag_upper_info *lag_upper_info = info->upper_info;

		struct netlink_ext_ack *extack;



		if (lag_upper_info->tx_type != NETDEV_LAG_TX_TYPE_HASH) {

			extack = netdev_notifier_info_to_extack(&info->info);

			NL_SET_ERR_MSG_MOD(extack, "LAG device using unsupported Tx type");



			ret = -EINVAL;

			goto notify;

		}

	}



	if (netif_is_lag_master(dev)) {

		struct net_device *slave;

		struct list_head *iter;
@@ -1201,6 +1356,11 @@ int ocelot_init(struct ocelot *ocelot) 
	int i, cpu = ocelot->num_phys_ports;

	char queue_name[32];



	ocelot->lags = devm_kcalloc(ocelot->dev, ocelot->num_phys_ports,

				    sizeof(u32), GFP_KERNEL);

	if (!ocelot->lags)

		return -ENOMEM;



	ocelot->stats = devm_kcalloc(ocelot->dev,

				     ocelot->num_phys_ports * ocelot->num_stats,

				     sizeof(u64), GFP_KERNEL);

drivers/net/ethernet/mscc/ocelot.h

+1 −1
Original line number Diff line number Diff line
@@ -493,7 +493,7 @@ struct ocelot { 
	u8 num_cpu_ports;

	struct ocelot_port **ports;



	u16 lags[16];

	u32 *lags;



	/* Keep track of the vlan port masks */

	u32 vlan_mask[VLAN_N_VID];