| Message ID | 20220726230918.2772378-1-mw@semihalf.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | cc1049ccee20df870f2394c4d5d5fa8cabc4d0af |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next:,v2] net: dsa: mv88e6xxx: fix speed setting for CPU/DSA ports | expand |
On Wed, Jul 27, 2022 at 01:09:18AM +0200, Marcin Wojtas wrote: > Commit 3c783b83bd0f ("net: dsa: mv88e6xxx: get rid of SPEED_MAX setting") > stopped relying on SPEED_MAX constant and hardcoded speed settings > for the switch ports and rely on phylink configuration. > > It turned out, however, that when the relevant code is called, > the mac_capabilites of CPU/DSA port remain unset. > mv88e6xxx_setup_port() is called via mv88e6xxx_setup() in > dsa_tree_setup_switches(), which precedes setting the caps in > phylink_get_caps down in the chain of dsa_tree_setup_ports(). > > As a result the mac_capabilites are 0 and the default speed for CPU/DSA > port is 10M at the start. To fix that, execute mv88e6xxx_get_caps() > and obtain the capabilities driectly. > > Fixes: 3c783b83bd0f ("net: dsa: mv88e6xxx: get rid of SPEED_MAX setting") > Signed-off-by: Marcin Wojtas <mw@semihalf.com> > --- Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
Hello: This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <kuba@kernel.org>: On Wed, 27 Jul 2022 01:09:18 +0200 you wrote: > Commit 3c783b83bd0f ("net: dsa: mv88e6xxx: get rid of SPEED_MAX setting") > stopped relying on SPEED_MAX constant and hardcoded speed settings > for the switch ports and rely on phylink configuration. > > It turned out, however, that when the relevant code is called, > the mac_capabilites of CPU/DSA port remain unset. > mv88e6xxx_setup_port() is called via mv88e6xxx_setup() in > dsa_tree_setup_switches(), which precedes setting the caps in > phylink_get_caps down in the chain of dsa_tree_setup_ports(). > > [...] Here is the summary with links: - [net-next:,v2] net: dsa: mv88e6xxx: fix speed setting for CPU/DSA ports https://git.kernel.org/netdev/net-next/c/cc1049ccee20 You are awesome, thank you!
diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c index 37b649501500..07e9a4da924c 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -3293,7 +3293,12 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port) * port and all DSA ports to their maximum bandwidth and full duplex. */ if (dsa_is_cpu_port(ds, port) || dsa_is_dsa_port(ds, port)) { - unsigned long caps = dp->pl_config.mac_capabilities; + struct phylink_config pl_config = {}; + unsigned long caps; + + mv88e6xxx_get_caps(ds, port, &pl_config); + + caps = pl_config.mac_capabilities; if (chip->info->ops->port_max_speed_mode) mode = chip->info->ops->port_max_speed_mode(port);
Commit 3c783b83bd0f ("net: dsa: mv88e6xxx: get rid of SPEED_MAX setting") stopped relying on SPEED_MAX constant and hardcoded speed settings for the switch ports and rely on phylink configuration. It turned out, however, that when the relevant code is called, the mac_capabilites of CPU/DSA port remain unset. mv88e6xxx_setup_port() is called via mv88e6xxx_setup() in dsa_tree_setup_switches(), which precedes setting the caps in phylink_get_caps down in the chain of dsa_tree_setup_ports(). As a result the mac_capabilites are 0 and the default speed for CPU/DSA port is 10M at the start. To fix that, execute mv88e6xxx_get_caps() and obtain the capabilities driectly. Fixes: 3c783b83bd0f ("net: dsa: mv88e6xxx: get rid of SPEED_MAX setting") Signed-off-by: Marcin Wojtas <mw@semihalf.com> --- Changelog v1->v2 * Use an on-stack struct phylink_config pl_config. * Use mv88e6xxx_get_caps() directly. drivers/net/dsa/mv88e6xxx/chip.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)