Commit 96de900a authored by Shenwei Wang's avatar Shenwei Wang Committed by David S. Miller
Browse files

net: phylink: add mac_managed_pm in phylink_config structure 



The recent commit

'commit 744d23c7 ("net: phy: Warn about incorrect
mdio_bus_phy_resume() state")'

requires the MAC driver explicitly tell the phy driver who is
managing the PM, otherwise you will see warning during resume
stage.

Add a boolean property in the phylink_config structure so that
the MAC driver can use it to tell the PHY driver if it wants to
manage the PM.

Fixes: 744d23c7 ("net: phy: Warn about incorrect mdio_bus_phy_resume() state")
Signed-off-by: default avatarShenwei Wang <shenwei.wang@nxp.com>
Acked-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Reviewed-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fc8695eb

drivers/net/phy/phylink.c

+3 −0
Original line number Diff line number Diff line
@@ -1661,6 +1661,9 @@ static int phylink_bringup_phy(struct phylink *pl, struct phy_device *phy, 
	if (phy_interrupt_is_valid(phy))

		phy_request_interrupt(phy);



	if (pl->config->mac_managed_pm)

		phy->mac_managed_pm = true;



	return 0;

}

include/linux/phylink.h

+2 −0
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ enum phylink_op_type { 
 *	(See commit 7cceb599d15d ("net: phylink: avoid mac_config calls")

 * @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.

 * @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.
@@ -134,6 +135,7 @@ struct phylink_config { 
	enum phylink_op_type type;

	bool legacy_pre_march2020;

	bool poll_fixed_state;

	bool mac_managed_pm;

	bool ovr_an_inband;

	void (*get_fixed_state)(struct phylink_config *config,

				struct phylink_link_state *state);