mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-01 14:44:12 +00:00
net: dsa: b53: Fix calculating number of switch ports
[ Upstream commitcdb067d31c
] 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:967dd82ffc
("net: dsa: b53: Add support for Broadcom RoboSwitch") Signed-off-by: Rafał Miłecki <rafal@milecki.pl> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
2dcd759ab0
commit
cca6b5d4c4
1 changed files with 1 additions and 2 deletions
|
@ -1843,9 +1843,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);
|
||||
|
||||
dev->ports = devm_kzalloc(dev->dev,
|
||||
sizeof(struct b53_port) * dev->num_ports,
|
||||
|
|
Loading…
Reference in a new issue