tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: prestera: cache port state for non-phylink ports too

Browse Source 
Port event data must stored to port-state cache regardless of whether
the port uses phylink or not since this data is used by ethtool.

Fixes: 52323ef754 ("net: marvell: prestera: add phylink support")
Signed-off-by: Oleksandr Mazur <oleksandr.mazur@plvision.eu>
Signed-off-by: Maksym Glubokiy <maksym.glubokiy@plvision.eu>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Maksym Glubokiy
2022-08-18 14:18:21 +03:00
committed by David S. Miller
parent 105b0468d7
commit 704438dd4f
1 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/net/ethernet/marvell/prestera/prestera_main.c
+17 -19
View File
@@ -797,32 +797,30 @@ static void prestera_port_handle_event(struct prestera_switch *sw,
caching_dw = &port->cached_hw_stats.caching_dw;
if (port->phy_link) {
memset(&smac, 0, sizeof(smac));
smac.valid = true;
smac.oper = pevt->data.mac.oper;
if (smac.oper) {
smac.mode = pevt->data.mac.mode;
smac.speed = pevt->data.mac.speed;
smac.duplex = pevt->data.mac.duplex;
smac.fc = pevt->data.mac.fc;
smac.fec = pevt->data.mac.fec;
phylink_mac_change(port->phy_link, true);
} else {
phylink_mac_change(port->phy_link, false);
}
prestera_port_mac_state_cache_write(port, &smac);
memset(&smac, 0, sizeof(smac));
smac.valid = true;
smac.oper = pevt->data.mac.oper;
if (smac.oper) {
smac.mode = pevt->data.mac.mode;
smac.speed = pevt->data.mac.speed;
smac.duplex = pevt->data.mac.duplex;
smac.fc = pevt->data.mac.fc;
smac.fec = pevt->data.mac.fec;
}
prestera_port_mac_state_cache_write(port, &smac);
if (port->state_mac.oper) {
if (!port->phy_link)
if (port->phy_link)
phylink_mac_change(port->phy_link, true);
else
netif_carrier_on(port->dev);
if (!delayed_work_pending(caching_dw))
queue_delayed_work(prestera_wq, caching_dw, 0);
} else if (netif_running(port->dev) &&
netif_carrier_ok(port->dev)) {
if (!port->phy_link)
} else {
if (port->phy_link)
phylink_mac_change(port->phy_link, false);
else if (netif_running(port->dev) && netif_carrier_ok(port->dev))
netif_carrier_off(port->dev);
if (delayed_work_pending(caching_dw))