Commit 685df9c3 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-dsa-turn-arrays-of-ports-into-a-list' 



Vivien Didelot says:

====================
The dsa_switch structure represents the physical switch device itself,
and is allocated by the driver. The dsa_switch_tree and dsa_port structures
represent the logical switch fabric (eventually composed of multiple switch
devices) and its ports, and are allocated by the DSA core.

This branch lists the logical ports directly in the fabric which simplifies
the iteration over all ports when assigning the default CPU port or configuring
the D in DSA in drivers like mv88e6xxx.

This also removes the unique dst->cpu_dp pointer and is a first step towards
supporting multiple CPU ports and dropping the DSA_MAX_PORTS limitation.

Because the dsa_port structures are not tied to the dsa_switch structure
anymore, we do not need to provide an helper for the drivers to allocate a
switch structure. Like in many other subsystems, drivers can now embed their
dsa_switch structure as they wish into their private structure. This will
be particularly interesting for the Broadcom drivers which were currently
limited by the dynamically allocated array of DSA ports.

The series implements the list of dsa_port structures, makes use of it,
then drops dst->cpu_dp and the dsa_switch_alloc helper.
====================

Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
parents 88652bf8 7e99e347

drivers/net/dsa/b53/b53_common.c

+7 −4
Original line number Diff line number Diff line
@@ -524,7 +524,7 @@ int b53_enable_port(struct dsa_switch *ds, int port, struct phy_device *phy) 
	if (!dsa_is_user_port(ds, port))

		return 0;



	cpu_port = ds->ports[port].cpu_dp->index;

	cpu_port = dsa_to_port(ds, port)->cpu_dp->index;



	if (dev->ops->irq_enable)

		ret = dev->ops->irq_enable(dev, port);
@@ -1629,7 +1629,7 @@ EXPORT_SYMBOL(b53_fdb_dump); 
int b53_br_join(struct dsa_switch *ds, int port, struct net_device *br)

{

	struct b53_device *dev = ds->priv;

	s8 cpu_port = ds->ports[port].cpu_dp->index;

	s8 cpu_port = dsa_to_port(ds, port)->cpu_dp->index;

	u16 pvlan, reg;

	unsigned int i;
@@ -1675,7 +1675,7 @@ void b53_br_leave(struct dsa_switch *ds, int port, struct net_device *br) 
{

	struct b53_device *dev = ds->priv;

	struct b53_vlan *vl = &dev->vlans[0];

	s8 cpu_port = ds->ports[port].cpu_dp->index;

	s8 cpu_port = dsa_to_port(ds, port)->cpu_dp->index;

	unsigned int i;

	u16 pvlan, reg, pvid;
@@ -2341,10 +2341,13 @@ struct b53_device *b53_switch_alloc(struct device *base, 
	struct dsa_switch *ds;

	struct b53_device *dev;



	ds = dsa_switch_alloc(base, DSA_MAX_PORTS);

	ds = devm_kzalloc(base, sizeof(*ds), GFP_KERNEL);

	if (!ds)

		return NULL;



	ds->dev = base;

	ds->num_ports = DSA_MAX_PORTS;



	dev = devm_kzalloc(base, sizeof(*dev), GFP_KERNEL);

	if (!dev)

		return NULL;

drivers/net/dsa/bcm_sf2.c

+4 −4
Original line number Diff line number Diff line
@@ -662,7 +662,7 @@ static void bcm_sf2_sw_fixed_state(struct dsa_switch *ds, int port, 
		 * state machine and make it go in PHY_FORCING state instead.

		 */

		if (!status->link)

			netif_carrier_off(ds->ports[port].slave);

			netif_carrier_off(dsa_to_port(ds, port)->slave);

		status->duplex = DUPLEX_FULL;

	} else {

		status->link = true;
@@ -728,7 +728,7 @@ static int bcm_sf2_sw_resume(struct dsa_switch *ds) 
static void bcm_sf2_sw_get_wol(struct dsa_switch *ds, int port,

			       struct ethtool_wolinfo *wol)

{

	struct net_device *p = ds->ports[port].cpu_dp->master;

	struct net_device *p = dsa_to_port(ds, port)->cpu_dp->master;

	struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);

	struct ethtool_wolinfo pwol = { };
@@ -752,9 +752,9 @@ static void bcm_sf2_sw_get_wol(struct dsa_switch *ds, int port, 
static int bcm_sf2_sw_set_wol(struct dsa_switch *ds, int port,

			      struct ethtool_wolinfo *wol)

{

	struct net_device *p = ds->ports[port].cpu_dp->master;

	struct net_device *p = dsa_to_port(ds, port)->cpu_dp->master;

	struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);

	s8 cpu_port = ds->ports[port].cpu_dp->index;

	s8 cpu_port = dsa_to_port(ds, port)->cpu_dp->index;

	struct ethtool_wolinfo pwol =  { };



	if (p->ethtool_ops->get_wol)

drivers/net/dsa/bcm_sf2_cfp.c

+3 −3
Original line number Diff line number Diff line
@@ -821,7 +821,7 @@ static int bcm_sf2_cfp_rule_insert(struct dsa_switch *ds, int port, 
				   struct ethtool_rx_flow_spec *fs)

{

	struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);

	s8 cpu_port = ds->ports[port].cpu_dp->index;

	s8 cpu_port = dsa_to_port(ds, port)->cpu_dp->index;

	__u64 ring_cookie = fs->ring_cookie;

	unsigned int queue_num, port_num;

	int ret;
@@ -1049,7 +1049,7 @@ static int bcm_sf2_cfp_rule_get_all(struct bcm_sf2_priv *priv, 
int bcm_sf2_get_rxnfc(struct dsa_switch *ds, int port,

		      struct ethtool_rxnfc *nfc, u32 *rule_locs)

{

	struct net_device *p = ds->ports[port].cpu_dp->master;

	struct net_device *p = dsa_to_port(ds, port)->cpu_dp->master;

	struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);

	int ret = 0;
@@ -1092,7 +1092,7 @@ int bcm_sf2_get_rxnfc(struct dsa_switch *ds, int port, 
int bcm_sf2_set_rxnfc(struct dsa_switch *ds, int port,

		      struct ethtool_rxnfc *nfc)

{

	struct net_device *p = ds->ports[port].cpu_dp->master;

	struct net_device *p = dsa_to_port(ds, port)->cpu_dp->master;

	struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);

	int ret = 0;

drivers/net/dsa/dsa_loop.c

+4 −1
Original line number Diff line number Diff line
@@ -286,10 +286,13 @@ static int dsa_loop_drv_probe(struct mdio_device *mdiodev) 
	dev_info(&mdiodev->dev, "%s: 0x%0x\n",

		 pdata->name, pdata->enabled_ports);



	ds = dsa_switch_alloc(&mdiodev->dev, DSA_MAX_PORTS);

	ds = devm_kzalloc(&mdiodev->dev, sizeof(*ds), GFP_KERNEL);

	if (!ds)

		return -ENOMEM;



	ds->dev = &mdiodev->dev;

	ds->num_ports = DSA_MAX_PORTS;



	ps = devm_kzalloc(&mdiodev->dev, sizeof(*ps), GFP_KERNEL);

	if (!ps)

		return -ENOMEM;

drivers/net/dsa/lan9303-core.c

+3 −1
Original line number Diff line number Diff line
@@ -1283,10 +1283,12 @@ static int lan9303_register_switch(struct lan9303 *chip) 
{

	int base;



	chip->ds = dsa_switch_alloc(chip->dev, LAN9303_NUM_PORTS);

	chip->ds = devm_kzalloc(chip->dev, sizeof(*chip->ds), GFP_KERNEL);

	if (!chip->ds)

		return -ENOMEM;



	chip->ds->dev = chip->dev;

	chip->ds->num_ports = LAN9303_NUM_PORTS;

	chip->ds->priv = chip;

	chip->ds->ops = &lan9303_switch_ops;

	base = chip->phy_addr_base;

CRA Git | Maintained and supported by SUSTech CRA and CCSE