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

Commit a0c02161 authored by Vivien Didelot's avatar Vivien Didelot Committed by David S. Miller
Browse files

net: dsa: variable number of ports 



Change the ports[DSA_MAX_PORTS] array of the dsa_switch structure for a
zero-length array, allocated at the same time as the dsa_switch
structure itself. A dsa_switch_alloc() helper is provided for that.

This commit brings no functional change yet since we pass DSA_MAX_PORTS
as the number of ports for the moment. Future patches can update the DSA
drivers separately to support dynamic number of ports.

Signed-off-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1f5d492a

drivers/net/dsa/b53/b53_common.c

+4 −3
Original line number Diff line number Diff line
@@ -1790,14 +1790,15 @@ struct b53_device *b53_switch_alloc(struct device *base, 
	struct dsa_switch *ds;

	struct b53_device *dev;



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

	ds = dsa_switch_alloc(base, DSA_MAX_PORTS);

	if (!ds)

		return NULL;



	dev = (struct b53_device *)(ds + 1);

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

	if (!dev)

		return NULL;



	ds->priv = dev;

	ds->dev = base;

	dev->dev = base;



	dev->ds = ds;

drivers/net/dsa/mv88e6xxx/chip.c

+1 −2
Original line number Diff line number Diff line
@@ -4361,11 +4361,10 @@ static int mv88e6xxx_register_switch(struct mv88e6xxx_chip *chip) 
	struct device *dev = chip->dev;

	struct dsa_switch *ds;



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

	ds = dsa_switch_alloc(dev, DSA_MAX_PORTS);

	if (!ds)

		return -ENOMEM;



	ds->dev = dev;

	ds->priv = chip;

	ds->ops = &mv88e6xxx_switch_ops;

drivers/net/dsa/qca8k.c

+1 −2
Original line number Diff line number Diff line
@@ -954,12 +954,11 @@ qca8k_sw_probe(struct mdio_device *mdiodev) 
	if (id != QCA8K_ID_QCA8337)

		return -ENODEV;



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

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

	if (!priv->ds)

		return -ENOMEM;



	priv->ds->priv = priv;

	priv->ds->dev = &mdiodev->dev;

	priv->ds->ops = &qca8k_switch_ops;

	mutex_init(&priv->reg_mutex);

	dev_set_drvdata(&mdiodev->dev, priv);

include/net/dsa.h

+5 −1
Original line number Diff line number Diff line
@@ -190,8 +190,11 @@ struct dsa_switch { 
	u32			cpu_port_mask;

	u32			enabled_port_mask;

	u32			phys_mii_mask;

	struct dsa_port		ports[DSA_MAX_PORTS];

	struct mii_bus		*slave_mii_bus;



	/* Dynamically allocated ports, keep last */

	size_t num_ports;

	struct dsa_port ports[];

};



static inline bool dsa_is_cpu_port(struct dsa_switch *ds, int p)
@@ -386,6 +389,7 @@ static inline bool dsa_uses_tagged_protocol(struct dsa_switch_tree *dst) 
	return dst->rcv != NULL;

}



struct dsa_switch *dsa_switch_alloc(struct device *dev, size_t n);

void dsa_unregister_switch(struct dsa_switch *ds);

int dsa_register_switch(struct dsa_switch *ds, struct device *dev);

#ifdef CONFIG_PM_SLEEP

net/dsa/dsa.c

+2 −3
Original line number Diff line number Diff line
@@ -347,8 +347,8 @@ dsa_switch_setup(struct dsa_switch_tree *dst, int index, 
	/*

	 * Allocate and initialise switch state.

	 */

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

	if (ds == NULL)

	ds = dsa_switch_alloc(parent, DSA_MAX_PORTS);

	if (!ds)

		return ERR_PTR(-ENOMEM);



	ds->dst = dst;
@@ -356,7 +356,6 @@ dsa_switch_setup(struct dsa_switch_tree *dst, int index, 
	ds->cd = cd;

	ds->ops = ops;

	ds->priv = priv;

	ds->dev = parent;



	ret = dsa_switch_setup_one(ds, parent);

	if (ret)