Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ac63e39 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

net: phy: phylink: Allow setting a custom link state callback 



phylink_get_fixed_state() currently consults an optional "link_gpio"
GPIO descriptor, expand this mechanism to allow specifying a custom
callback. This is necessary to support out of band link notifcation
(e.g: from an interrupt within a MMIO register).

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d38b4afd

drivers/net/phy/phylink.c

+32 −2
Original line number Diff line number Diff line
@@ -54,6 +54,8 @@ struct phylink { 
	/* The link configuration settings */

	struct phylink_link_state link_config;

	struct gpio_desc *link_gpio;

	void (*get_fixed_state)(struct net_device *dev,

				struct phylink_link_state *s);



	struct mutex state_mutex;

	struct phylink_link_state phy_state;
@@ -350,12 +352,14 @@ static int phylink_get_mac_state(struct phylink *pl, struct phylink_link_state * 
}



/* The fixed state is... fixed except for the link state,

 * which may be determined by a GPIO.

 * which may be determined by a GPIO or a callback.

 */

static void phylink_get_fixed_state(struct phylink *pl, struct phylink_link_state *state)

{

	*state = pl->link_config;

	if (pl->link_gpio)

	if (pl->get_fixed_state)

		pl->get_fixed_state(pl->netdev, state);

	else if (pl->link_gpio)

		state->link = !!gpiod_get_value(pl->link_gpio);

}
@@ -814,6 +818,32 @@ void phylink_disconnect_phy(struct phylink *pl) 
}

EXPORT_SYMBOL_GPL(phylink_disconnect_phy);



/**

 * phylink_fixed_state_cb() - allow setting a fixed link callback

 * @pl: a pointer to a &struct phylink returned from phylink_create()

 * @cb: callback to execute to determine the fixed link state.

 *

 * The MAC driver should call this driver when the state of its link

 * can be determined through e.g: an out of band MMIO register.

 */

int phylink_fixed_state_cb(struct phylink *pl,

			   void (*cb)(struct net_device *dev,

				      struct phylink_link_state *state))

{

	/* It does not make sense to let the link be overriden unless we use

	 * MLO_AN_FIXED

	 */

	if (pl->link_an_mode != MLO_AN_FIXED)

		return -EINVAL;



	mutex_lock(&pl->state_mutex);

	pl->get_fixed_state = cb;

	mutex_unlock(&pl->state_mutex);



	return 0;

}

EXPORT_SYMBOL_GPL(phylink_fixed_state_cb);



/**

 * phylink_mac_change() - notify phylink of a change in MAC state

 * @pl: a pointer to a &struct phylink returned from phylink_create()

include/linux/phylink.h

+3 −0
Original line number Diff line number Diff line
@@ -190,6 +190,9 @@ void phylink_destroy(struct phylink *); 
int phylink_connect_phy(struct phylink *, struct phy_device *);

int phylink_of_phy_connect(struct phylink *, struct device_node *, u32 flags);

void phylink_disconnect_phy(struct phylink *);

int phylink_fixed_state_cb(struct phylink *,

			   void (*cb)(struct net_device *dev,

				      struct phylink_link_state *));



void phylink_mac_change(struct phylink *, bool up);