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

Commit 299752a7 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

net: dsa: b53: Make b53_enable_cpu_port() take a port argument 



In preparation for future changes allowing the configuring of multiple
CPU ports, make b53_enable_cpu_port() take a port argument.

Reviewed-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7131cc9f

drivers/net/dsa/b53/b53_common.c

+5 −6
Original line number Diff line number Diff line
@@ -538,19 +538,18 @@ static void b53_disable_port(struct dsa_switch *ds, int port, 
	b53_write8(dev, B53_CTRL_PAGE, B53_PORT_CTRL(port), reg);

}



static void b53_enable_cpu_port(struct b53_device *dev)

static void b53_enable_cpu_port(struct b53_device *dev, int port)

{

	unsigned int cpu_port = dev->cpu_port;

	u8 port_ctrl;



	/* BCM5325 CPU port is at 8 */

	if ((is5325(dev) || is5365(dev)) && cpu_port == B53_CPU_PORT_25)

		cpu_port = B53_CPU_PORT;

	if ((is5325(dev) || is5365(dev)) && port == B53_CPU_PORT_25)

		port = B53_CPU_PORT;



	port_ctrl = PORT_CTRL_RX_BCST_EN |

		    PORT_CTRL_RX_MCST_EN |

		    PORT_CTRL_RX_UCST_EN;

	b53_write8(dev, B53_CTRL_PAGE, B53_PORT_CTRL(cpu_port), port_ctrl);

	b53_write8(dev, B53_CTRL_PAGE, B53_PORT_CTRL(port), port_ctrl);

}



static void b53_enable_mib(struct b53_device *dev)
@@ -820,7 +819,7 @@ static int b53_setup(struct dsa_switch *ds) 
		if (BIT(port) & ds->enabled_port_mask)

			b53_enable_port(ds, port, NULL);

		else if (dsa_is_cpu_port(ds, port))

			b53_enable_cpu_port(dev);

			b53_enable_cpu_port(dev, port);

		else

			b53_disable_port(ds, port, NULL);

	}