Call netif_carrier_on/off when link is up/down.
When link is up only wake TX netif queue if network device is
running.
Signed-off-by: Roger Quadros <rogerq@kernel.org>
---
drivers/net/ethernet/ti/am65-cpsw-nuss.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.c b/drivers/net/ethernet/ti/am65-cpsw-nuss.c
index dcb6662b473d..36c29d3db329 100644
--- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c
+++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c
@@ -2155,6 +2155,7 @@ static void am65_cpsw_nuss_mac_link_down(struct phylink_config *config, unsigned
cpsw_sl_ctl_clr(port->slave.mac_sl, mac_control);
am65_cpsw_qos_link_down(ndev);
+ netif_carrier_off(ndev);
netif_tx_stop_all_queues(ndev);
}
@@ -2196,7 +2197,9 @@ static void am65_cpsw_nuss_mac_link_up(struct phylink_config *config, struct phy
cpsw_ale_control_set(common->ale, port->port_id, ALE_PORT_STATE, ALE_PORT_STATE_FORWARD);
am65_cpsw_qos_link_up(ndev, speed);
- netif_tx_wake_all_queues(ndev);
+ netif_carrier_on(ndev);
+ if (netif_running(ndev))
+ netif_tx_wake_all_queues(ndev);
}
static const struct phylink_mac_ops am65_cpsw_phylink_mac_ops = {
--
2.34.1
On Wed, Jan 15, 2025 at 06:43:00PM +0200, Roger Quadros wrote:
> Call netif_carrier_on/off when link is up/down.
> When link is up only wake TX netif queue if network device is
> running.
Sorry, but no, this is wrong.
Documentation/networking/sfp-phylink.rst:
16. Verify that the driver does not call::
netif_carrier_on()
netif_carrier_off()
as these will interfere with phylink's tracking of the link state,
and cause phylink to omit calls via the :c:func:`mac_link_up` and
:c:func:`mac_link_down` methods.
--
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!
Hello Roger, On Wed, 15 Jan 2025 18:43:00 +0200 Roger Quadros <rogerq@kernel.org> wrote: > Call netif_carrier_on/off when link is up/down. > When link is up only wake TX netif queue if network device is > running. > > Signed-off-by: Roger Quadros <rogerq@kernel.org> > --- > drivers/net/ethernet/ti/am65-cpsw-nuss.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.c b/drivers/net/ethernet/ti/am65-cpsw-nuss.c > index dcb6662b473d..36c29d3db329 100644 > --- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c > +++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c > @@ -2155,6 +2155,7 @@ static void am65_cpsw_nuss_mac_link_down(struct phylink_config *config, unsigned > cpsw_sl_ctl_clr(port->slave.mac_sl, mac_control); > > am65_cpsw_qos_link_down(ndev); > + netif_carrier_off(ndev); You shouldn't need to do that, phylink does that for you : https://elixir.bootlin.com/linux/v6.13-rc3/source/drivers/net/phy/phylink.c#L1434 Are you facing any specific problem that motivates that patch ? > netif_tx_stop_all_queues(ndev); > } > > @@ -2196,7 +2197,9 @@ static void am65_cpsw_nuss_mac_link_up(struct phylink_config *config, struct phy > cpsw_ale_control_set(common->ale, port->port_id, ALE_PORT_STATE, ALE_PORT_STATE_FORWARD); > > am65_cpsw_qos_link_up(ndev, speed); > - netif_tx_wake_all_queues(ndev); > + netif_carrier_on(ndev); Same here, phylink will set the carrier on by itself. Thanks, Maxime
On 15/01/2025 19:13, Maxime Chevallier wrote: > Hello Roger, > > On Wed, 15 Jan 2025 18:43:00 +0200 > Roger Quadros <rogerq@kernel.org> wrote: > >> Call netif_carrier_on/off when link is up/down. >> When link is up only wake TX netif queue if network device is >> running. >> >> Signed-off-by: Roger Quadros <rogerq@kernel.org> >> --- >> drivers/net/ethernet/ti/am65-cpsw-nuss.c | 5 ++++- >> 1 file changed, 4 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.c b/drivers/net/ethernet/ti/am65-cpsw-nuss.c >> index dcb6662b473d..36c29d3db329 100644 >> --- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c >> +++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c >> @@ -2155,6 +2155,7 @@ static void am65_cpsw_nuss_mac_link_down(struct phylink_config *config, unsigned >> cpsw_sl_ctl_clr(port->slave.mac_sl, mac_control); >> >> am65_cpsw_qos_link_down(ndev); >> + netif_carrier_off(ndev); > > You shouldn't need to do that, phylink does that for you : > https://elixir.bootlin.com/linux/v6.13-rc3/source/drivers/net/phy/phylink.c#L1434 > > Are you facing any specific problem that motivates that patch ? No. I overlooked it. > >> netif_tx_stop_all_queues(ndev); >> } >> >> @@ -2196,7 +2197,9 @@ static void am65_cpsw_nuss_mac_link_up(struct phylink_config *config, struct phy >> cpsw_ale_control_set(common->ale, port->port_id, ALE_PORT_STATE, ALE_PORT_STATE_FORWARD); >> >> am65_cpsw_qos_link_up(ndev, speed); >> - netif_tx_wake_all_queues(ndev); >> + netif_carrier_on(ndev); > > Same here, phylink will set the carrier on by itself. Thanks for catching this. I'll drop this patch on next spin. > > Thanks, > > Maxime -- cheers, -roger
© 2016 - 2026 Red Hat, Inc.