| Message ID | 20240301-rxc_bugfix-v5-1-8dac30230050@bootlin.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Fix missing PHY-to-MAC RX clock | expand |
On Fri, Mar 01, 2024 at 04:34:58PM +0100, Romain Gantois wrote: > From: Russell King <linux@armlinux.org.uk> > > Some MAC controllers (e.g. stmmac) require their connected PHY to > continuously provide a receive clock signal. This can cause issues in two > cases: > > 1. The clock signal hasn't been started yet by the time the MAC driver > initializes its hardware. This can make the initialization fail, as in > the case of the rzn1 GMAC1 driver. > 2. The clock signal is cut during a power saving event. By the time the > MAC is brought back up, the clock signal is still not active since > phylink_start hasn't been called yet. This brings us back to case 1. > > If a PHY driver reads this flag, it should ensure that the receive clock > signal is started as soon as possible, and that it isn't brought down when > the PHY goes into suspend. > > Signed-off-by: Russell King <linux@armlinux.org.uk> > [rgantois: commit log] > Signed-off-by: Romain Gantois <romain.gantois@bootlin.com> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Andrew
On Fri, Mar 01, 2024 at 04:34:58PM +0100, Romain Gantois wrote: > From: Russell King <linux@armlinux.org.uk> > > Some MAC controllers (e.g. stmmac) require their connected PHY to > continuously provide a receive clock signal. This can cause issues in two > cases: > > 1. The clock signal hasn't been started yet by the time the MAC driver > initializes its hardware. This can make the initialization fail, as in > the case of the rzn1 GMAC1 driver. > 2. The clock signal is cut during a power saving event. By the time the > MAC is brought back up, the clock signal is still not active since > phylink_start hasn't been called yet. This brings us back to case 1. > > If a PHY driver reads this flag, it should ensure that the receive clock > signal is started as soon as possible, and that it isn't brought down when > the PHY goes into suspend. > > Signed-off-by: Russell King <linux@armlinux.org.uk> This is not the sign-off I sent you with my patches. At the very least, it doesn't acknowledge my employer, and also has the wrong email address that I use for _all_ my kernel attributations. Therefore, I can definitively say that that you made this up. Please correct it back to the sign-off in my patches that you derived this combined work from. Given that sign-offs have legal purpose, what's more concerning is that care has not been taken on your side to ensure that your handling of it is correct, and has taken several postings before this cockup has been noticed. This is not good.
On Mon, 4 Mar 2024, Russell King (Oracle) wrote: > > the PHY goes into suspend. > > > > Signed-off-by: Russell King <linux@armlinux.org.uk> > > This is not the sign-off I sent you with my patches. At the very least, > it doesn't acknowledge my employer, and also has the wrong email address > that I use for _all_ my kernel attributations. Therefore, I can > definitively say that that you made this up. Please correct it back to > the sign-off in my patches that you derived this combined work from. My apologies, I'll fix the commit tags. Best Regards,
diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c index 503fd7c40523..2bb583543dea 100644 --- a/drivers/net/phy/phylink.c +++ b/drivers/net/phy/phylink.c @@ -1923,6 +1923,8 @@ static int phylink_bringup_phy(struct phylink *pl, struct phy_device *phy, static int phylink_attach_phy(struct phylink *pl, struct phy_device *phy, phy_interface_t interface) { + u32 flags = 0; + if (WARN_ON(pl->cfg_link_an_mode == MLO_AN_FIXED || (pl->cfg_link_an_mode == MLO_AN_INBAND && phy_interface_mode_is_8023z(interface) && !pl->sfp_bus))) @@ -1931,7 +1933,10 @@ static int phylink_attach_phy(struct phylink *pl, struct phy_device *phy, if (pl->phydev) return -EBUSY; - return phy_attach_direct(pl->netdev, phy, 0, interface); + if (pl->config->mac_requires_rxc) + flags |= PHY_F_RXC_ALWAYS_ON; + + return phy_attach_direct(pl->netdev, phy, flags, interface); } /** @@ -2034,6 +2039,9 @@ int phylink_fwnode_phy_connect(struct phylink *pl, pl->link_config.interface = pl->link_interface; } + if (pl->config->mac_requires_rxc) + flags |= PHY_F_RXC_ALWAYS_ON; + ret = phy_attach_direct(pl->netdev, phy_dev, flags, pl->link_interface); phy_device_free(phy_dev); diff --git a/include/linux/phy.h b/include/linux/phy.h index e3ab2c347a59..89aff9224c4d 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -773,6 +773,7 @@ struct phy_device { /* Generic phy_device::dev_flags */ #define PHY_F_NO_IRQ 0x80000000 +#define PHY_F_RXC_ALWAYS_ON 0x40000000 static inline struct phy_device *to_phy_device(const struct device *dev) { diff --git a/include/linux/phylink.h b/include/linux/phylink.h index 6ba411732a0d..019993e5f570 100644 --- a/include/linux/phylink.h +++ b/include/linux/phylink.h @@ -138,6 +138,9 @@ enum phylink_op_type { * @poll_fixed_state: if true, starts link_poll, * if MAC link is at %MLO_AN_FIXED mode. * @mac_managed_pm: if true, indicate the MAC driver is responsible for PHY PM. + * @mac_requires_rxc: if true, the MAC always requires a receive clock from PHY. + * The PHY driver should start the clock signal as soon as + * possible and avoid stopping it during suspend events. * @ovr_an_inband: if true, override PCS to MLO_AN_INBAND * @get_fixed_state: callback to execute to determine the fixed link state, * if MAC link is at %MLO_AN_FIXED mode. @@ -150,6 +153,7 @@ struct phylink_config { enum phylink_op_type type; bool poll_fixed_state; bool mac_managed_pm; + bool mac_requires_rxc; bool ovr_an_inband; void (*get_fixed_state)(struct phylink_config *config, struct phylink_link_state *state);