Commit 319e4dd1 authored by Vladimir Oltean's avatar Vladimir Oltean Committed by David S. Miller
Browse files

net: mscc: ocelot: introduce conversion helpers between port and netdev 



Since the mscc_ocelot_switch_lib is common between a pure switchdev and
a DSA driver, the procedure of retrieving a net_device for a certain
port index differs, as those are registered by their individual
front-ends.

Up to now that has been dealt with by always passing the port index to
the switch library, but now, we're going to need to work with net_device
pointers from the tc-flower offload, for things like indev, or mirred.
It is not desirable to refactor that, so let's make sure that the flower
offload core has the ability to translate between a net_device and a
port index properly.

Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Acked-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ea9d1f30

drivers/net/dsa/ocelot/felix.c

+22 −0
Original line number Diff line number Diff line
@@ -810,3 +810,25 @@ const struct dsa_switch_ops felix_switch_ops = { 
	.cls_flower_stats	= felix_cls_flower_stats,

	.port_setup_tc		= felix_port_setup_tc,

};



struct net_device *felix_port_to_netdev(struct ocelot *ocelot, int port)

{

	struct felix *felix = ocelot_to_felix(ocelot);

	struct dsa_switch *ds = felix->ds;



	if (!dsa_is_user_port(ds, port))

		return NULL;



	return dsa_to_port(ds, port)->slave;

}



int felix_netdev_to_port(struct net_device *dev)

{

	struct dsa_port *dp;



	dp = dsa_port_from_netdev(dev);

	if (IS_ERR(dp))

		return -EINVAL;



	return dp->index;

}

drivers/net/dsa/ocelot/felix.h

+3 −0
Original line number Diff line number Diff line
@@ -52,4 +52,7 @@ struct felix { 
	resource_size_t			imdio_base;

};



struct net_device *felix_port_to_netdev(struct ocelot *ocelot, int port);

int felix_netdev_to_port(struct net_device *dev);



#endif

drivers/net/dsa/ocelot/felix_vsc9959.c

+2 −0
Original line number Diff line number Diff line
@@ -1006,6 +1006,8 @@ static u16 vsc9959_wm_enc(u16 value) 
static const struct ocelot_ops vsc9959_ops = {

	.reset			= vsc9959_reset,

	.wm_enc			= vsc9959_wm_enc,

	.port_to_netdev		= felix_port_to_netdev,

	.netdev_to_port		= felix_netdev_to_port,

};



static int vsc9959_mdio_bus_alloc(struct ocelot *ocelot)

drivers/net/dsa/ocelot/seville_vsc9953.c

+2 −0
Original line number Diff line number Diff line
@@ -1058,6 +1058,8 @@ static u16 vsc9953_wm_enc(u16 value) 
static const struct ocelot_ops vsc9953_ops = {

	.reset			= vsc9953_reset,

	.wm_enc			= vsc9953_wm_enc,

	.port_to_netdev		= felix_port_to_netdev,

	.netdev_to_port		= felix_netdev_to_port,

};



static int vsc9953_mdio_bus_alloc(struct ocelot *ocelot)

drivers/net/ethernet/mscc/ocelot.h

+2 −0
Original line number Diff line number Diff line
@@ -98,6 +98,8 @@ int ocelot_port_lag_join(struct ocelot *ocelot, int port, 
			 struct net_device *bond);

void ocelot_port_lag_leave(struct ocelot *ocelot, int port,

			   struct net_device *bond);

struct net_device *ocelot_port_to_netdev(struct ocelot *ocelot, int port);

int ocelot_netdev_to_port(struct net_device *dev);



u32 ocelot_port_readl(struct ocelot_port *port, u32 reg);

void ocelot_port_writel(struct ocelot_port *port, u32 val, u32 reg);

CRA Git | Maintained and supported by SUSTech CRA and CCSE