diff options
| author | Rafał Miłecki <rafal@milecki.pl> | 2021-09-02 10:30:50 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-09-22 11:45:35 +0200 |
| commit | cca6b5d4c4eb0f9b04ba8a48c196d386960a10cb (patch) | |
| tree | 8371d24d5d66a2b10218e7fd89a52afd08e1e74a | |
| parent | 2dcd759ab0f6ab33fbfad471fac1d138339c532d (diff) | |
| download | linux-cca6b5d4c4eb0f9b04ba8a48c196d386960a10cb.tar.gz linux-cca6b5d4c4eb0f9b04ba8a48c196d386960a10cb.tar.bz2 linux-cca6b5d4c4eb0f9b04ba8a48c196d386960a10cb.zip | |
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: 967dd82ffc52 ("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>
| -rw-r--r-- | drivers/net/dsa/b53/b53_common.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c index 820aed3e2352..9fff49229435 100644 --- a/drivers/net/dsa/b53/b53_common.c +++ b/drivers/net/dsa/b53/b53_common.c @@ -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, |