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

Commit b7920416 authored by Rafał Miłecki's avatar Rafał Miłecki Committed by Greg Kroah-Hartman
Browse files

net: dsa: b53: Fix calculating number of switch ports 



[ Upstream commit cdb067d31c0fe4cce98b9d15f1f2ef525acaa094 ]

It isn't true that CPU port is always the last one. Switches BCM5301x
have 9 ports (port 6 being inactive) and they use port 5 as CPU by
default (depending on design some other may be CPU ports too).

A more reliable way of determining number of ports is to check for the
last set bit in the "enabled_ports" bitfield.

This fixes b53 internal state, it will allow providing accurate info to
the DSA and is required to fix BCM5301x support.

Fixes: 967dd82f ("net: dsa: b53: Add support for Broadcom RoboSwitch")
Signed-off-by: default avatarRafał Miłecki <rafal@milecki.pl>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent d5c0f016

drivers/net/dsa/b53/b53_common.c

+1 −2
Original line number Diff line number Diff line
@@ -2353,9 +2353,8 @@ static int b53_switch_init(struct b53_device *dev) 
			dev->cpu_port = 5;

	}



	/* cpu port is always last */

	dev->num_ports = dev->cpu_port + 1;

	dev->enabled_ports |= BIT(dev->cpu_port);

	dev->num_ports = fls(dev->enabled_ports);



	/* Include non standard CPU port built-in PHYs to be probed */

	if (is539x(dev) || is531x5(dev)) {