Commit 894341ad authored by Ivan Bornyakov's avatar Ivan Bornyakov Committed by David S. Miller
Browse files

net: phylink: support validated pause and autoneg in fixed-link 



In fixed-link setup phylink_parse_fixedlink() unconditionally sets
Pause, Asym_Pause and Autoneg bits to "supported" bitmap, while MAC may
not support these.

This leads to ethtool reporting:

 > Supported pause frame use: Symmetric Receive-only
 > Supports auto-negotiation: Yes

regardless of what is actually supported.

Instead of unconditionally set Pause, Asym_Pause and Autoneg it is
sensible to set them according to validated "supported" bitmap, i.e. the
result of phylink_validate().

Signed-off-by: default avatarIvan Bornyakov <i.bornyakov@metrotek.ru>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fe33311c

drivers/net/phy/phylink.c

+14 −3
Original line number Diff line number Diff line
@@ -711,6 +711,7 @@ static int phylink_parse_fixedlink(struct phylink *pl, 
				   struct fwnode_handle *fwnode)

{

	struct fwnode_handle *fixed_node;

	bool pause, asym_pause, autoneg;

	const struct phy_setting *s;

	struct gpio_desc *desc;

	u32 speed;
@@ -783,13 +784,23 @@ static int phylink_parse_fixedlink(struct phylink *pl, 
	linkmode_copy(pl->link_config.advertising, pl->supported);

	phylink_validate(pl, pl->supported, &pl->link_config);



	pause = phylink_test(pl->supported, Pause);

	asym_pause = phylink_test(pl->supported, Asym_Pause);

	autoneg = phylink_test(pl->supported, Autoneg);

	s = phy_lookup_setting(pl->link_config.speed, pl->link_config.duplex,

			       pl->supported, true);

	linkmode_zero(pl->supported);

	phylink_set(pl->supported, MII);



	if (pause)

		phylink_set(pl->supported, Pause);



	if (asym_pause)

		phylink_set(pl->supported, Asym_Pause);



	if (autoneg)

		phylink_set(pl->supported, Autoneg);



	if (s) {

		__set_bit(s->bit, pl->supported);

		__set_bit(s->bit, pl->link_config.lp_advertising);