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 12:26:45 +0200 |
| commit | b79204169de5941e645a011b3a45c1c40b0800bd (patch) | |
| tree | c5e44e190a6cd5d4321c45bb2340e7e9a47e562d /drivers/net | |
| parent | d5c0f016ae85337f3fe22a533eeec7e261bced02 (diff) | |
| download | linux-stable-b79204169de5941e645a011b3a45c1c40b0800bd.tar.gz linux-stable-b79204169de5941e645a011b3a45c1c40b0800bd.tar.bz2 linux-stable-b79204169de5941e645a011b3a45c1c40b0800bd.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>
Diffstat (limited to 'drivers/net')
| -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 e78b683f7305..825d840cdb8c 100644 --- a/drivers/net/dsa/b53/b53_common.c +++ b/drivers/net/dsa/b53/b53_common.c @@ -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)) { |