Commit 7b3b0e89 authored by Russell King's avatar Russell King Committed by David S. Miller

net: phylink: support for link gpio interrupt

Add support for using GPIO interrupts with a fixed-link GPIO rather than
polling the GPIO every second and invoking the phylink resolution.  This
avoids unnecessary calls to mac_config().
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7fdc455e
...@@ -59,6 +59,7 @@ struct phylink { ...@@ -59,6 +59,7 @@ struct phylink {
phy_interface_t cur_interface; phy_interface_t cur_interface;
struct gpio_desc *link_gpio; struct gpio_desc *link_gpio;
unsigned int link_irq;
struct timer_list link_poll; struct timer_list link_poll;
void (*get_fixed_state)(struct net_device *dev, void (*get_fixed_state)(struct net_device *dev,
struct phylink_link_state *s); struct phylink_link_state *s);
...@@ -665,7 +666,7 @@ void phylink_destroy(struct phylink *pl) ...@@ -665,7 +666,7 @@ void phylink_destroy(struct phylink *pl)
{ {
if (pl->sfp_bus) if (pl->sfp_bus)
sfp_unregister_upstream(pl->sfp_bus); sfp_unregister_upstream(pl->sfp_bus);
if (!IS_ERR_OR_NULL(pl->link_gpio)) if (pl->link_gpio)
gpiod_put(pl->link_gpio); gpiod_put(pl->link_gpio);
cancel_work_sync(&pl->resolve); cancel_work_sync(&pl->resolve);
...@@ -928,6 +929,15 @@ void phylink_mac_change(struct phylink *pl, bool up) ...@@ -928,6 +929,15 @@ void phylink_mac_change(struct phylink *pl, bool up)
} }
EXPORT_SYMBOL_GPL(phylink_mac_change); EXPORT_SYMBOL_GPL(phylink_mac_change);
static irqreturn_t phylink_link_handler(int irq, void *data)
{
struct phylink *pl = data;
phylink_run_resolve(pl);
return IRQ_HANDLED;
}
/** /**
* phylink_start() - start a phylink instance * phylink_start() - start a phylink instance
* @pl: a pointer to a &struct phylink returned from phylink_create() * @pl: a pointer to a &struct phylink returned from phylink_create()
...@@ -964,7 +974,22 @@ void phylink_start(struct phylink *pl) ...@@ -964,7 +974,22 @@ void phylink_start(struct phylink *pl)
clear_bit(PHYLINK_DISABLE_STOPPED, &pl->phylink_disable_state); clear_bit(PHYLINK_DISABLE_STOPPED, &pl->phylink_disable_state);
phylink_run_resolve(pl); phylink_run_resolve(pl);
if (pl->link_an_mode == MLO_AN_FIXED && !IS_ERR(pl->link_gpio)) if (pl->link_an_mode == MLO_AN_FIXED && pl->link_gpio) {
int irq = gpiod_to_irq(pl->link_gpio);
if (irq > 0) {
if (!request_irq(irq, phylink_link_handler,
IRQF_TRIGGER_RISING |
IRQF_TRIGGER_FALLING,
"netdev link", pl))
pl->link_irq = irq;
else
irq = 0;
}
if (irq <= 0)
mod_timer(&pl->link_poll, jiffies + HZ);
}
if (pl->link_an_mode == MLO_AN_FIXED && pl->get_fixed_state)
mod_timer(&pl->link_poll, jiffies + HZ); mod_timer(&pl->link_poll, jiffies + HZ);
if (pl->sfp_bus) if (pl->sfp_bus)
sfp_upstream_start(pl->sfp_bus); sfp_upstream_start(pl->sfp_bus);
...@@ -990,8 +1015,11 @@ void phylink_stop(struct phylink *pl) ...@@ -990,8 +1015,11 @@ void phylink_stop(struct phylink *pl)
phy_stop(pl->phydev); phy_stop(pl->phydev);
if (pl->sfp_bus) if (pl->sfp_bus)
sfp_upstream_stop(pl->sfp_bus); sfp_upstream_stop(pl->sfp_bus);
if (pl->link_an_mode == MLO_AN_FIXED && !IS_ERR(pl->link_gpio)) del_timer_sync(&pl->link_poll);
del_timer_sync(&pl->link_poll); if (pl->link_irq) {
free_irq(pl->link_irq, pl);
pl->link_irq = 0;
}
phylink_run_resolve_and_disable(pl, PHYLINK_DISABLE_STOPPED); phylink_run_resolve_and_disable(pl, PHYLINK_DISABLE_STOPPED);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment