Commit 6cc5280a authored by Pawel Dembicki's avatar Pawel Dembicki Committed by Jakub Kicinski
Browse files

net: dsa: vsc73xx: Add define for max num of ports 



This patch introduces a new define: VSC73XX_MAX_NUM_PORTS, which can be
used in the future instead of a hardcoded value.

Currently, the only hardcoded value is vsc->ds->num_ports. It is being
replaced with the new define.

Suggested-by: default avatarVladimir Oltean <olteanv@gmail.com>
Signed-off-by: default avatarPawel Dembicki <paweldembicki@gmail.com>
Reviewed-by: default avatarVladimir Oltean <olteanv@gmail.com>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Reviewed-by: default avatarFlorian Fainelli <florian.fainelli@broadcom.com>
Link: https://lore.kernel.org/r/20240417205048.3542839-5-paweldembicki@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 12af94b2

drivers/net/dsa/vitesse-vsc73xx-core.c

+1 −12
Original line number Diff line number Diff line
@@ -1186,23 +1186,12 @@ int vsc73xx_probe(struct vsc73xx *vsc) 
		 vsc->addr[0], vsc->addr[1], vsc->addr[2],

		 vsc->addr[3], vsc->addr[4], vsc->addr[5]);



	/* The VSC7395 switch chips have 5+1 ports which means 5

	 * ordinary ports and a sixth CPU port facing the processor

	 * with an RGMII interface. These ports are numbered 0..4

	 * and 6, so they leave a "hole" in the port map for port 5,

	 * which is invalid.

	 *

	 * The VSC7398 has 8 ports, port 7 is again the CPU port.

	 *

	 * We allocate 8 ports and avoid access to the nonexistant

	 * ports.

	 */

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

	if (!vsc->ds)

		return -ENOMEM;



	vsc->ds->dev = dev;

	vsc->ds->num_ports = 8;

	vsc->ds->num_ports = VSC73XX_MAX_NUM_PORTS;

	vsc->ds->priv = vsc;



	vsc->ds->ops = &vsc73xx_ds_ops;

drivers/net/dsa/vitesse-vsc73xx.h

+11 −0
Original line number Diff line number Diff line
@@ -3,6 +3,17 @@ 
#include <linux/etherdevice.h>

#include <linux/gpio/driver.h>



/* The VSC7395 switch chips have 5+1 ports which means 5 ordinary ports and

 * a sixth CPU port facing the processor with an RGMII interface. These ports

 * are numbered 0..4 and 6, so they leave a "hole" in the port map for port 5,

 * which is invalid.

 *

 * The VSC7398 has 8 ports, port 7 is again the CPU port.

 *

 * We allocate 8 ports and avoid access to the nonexistent ports.

 */

#define VSC73XX_MAX_NUM_PORTS	8



/**

 * struct vsc73xx - VSC73xx state container

 */