| Message ID | 65b5c84f-1222-bbc3-24f5-723e07bbb6ed@maciej.szmigiero.name |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | net: phy: leds: Add support for "link" trigger | expand |
On 10/28/2017 08:27 AM, Maciej S. Szmigiero wrote: > Currently, we create a LED trigger for any link speed known to a PHY. > These triggers only fire when their exact link speed had been negotiated > (they aren't cumulative, that is, they don't fire for "their or any higher" > link speed). > > What we are missing, however, is a trigger which will fire on any link > speed known to the PHY. Such trigger can then be used for implementing a > poor man's substitute of the "link" LED on boards that lack it. > Let's add it. The use case definitively makes sense, but the implementation a little less. > > Signed-off-by: Maciej S. Szmigiero <mail@maciej.szmigiero.name> > --- > drivers/net/phy/Kconfig | 7 +++++-- > drivers/net/phy/phy_led_triggers.c | 19 ++++++++++++++++--- > 2 files changed, 21 insertions(+), 5 deletions(-) > > diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig > index cd931cf9dcc2..3bcc2107ad77 100644 > --- a/drivers/net/phy/Kconfig > +++ b/drivers/net/phy/Kconfig > @@ -191,11 +191,14 @@ config LED_TRIGGER_PHY > Adds support for a set of LED trigger events per-PHY. Link > state change will trigger the events, for consumption by an > LED class driver. There are triggers for each link speed currently > - supported by the phy, and are of the form: > + supported by the PHY and also a one common "link" trigger as a > + logical-or of all the link speed ones. > + All these triggers are named according to the following pattern: > <mii bus id>:<phy>:<speed> > > Where speed is in the form: > - <Speed in megabits>Mbps or <Speed in gigabits>Gbps > + <Speed in megabits>Mbps OR <Speed in gigabits>Gbps OR link > + for any speed known to the PHY. > > > comment "MII PHY device drivers" > diff --git a/drivers/net/phy/phy_led_triggers.c b/drivers/net/phy/phy_led_triggers.c > index 94ca42e630bb..5b6f1876f514 100644 > --- a/drivers/net/phy/phy_led_triggers.c > +++ b/drivers/net/phy/phy_led_triggers.c > @@ -20,7 +20,8 @@ static struct phy_led_trigger *phy_speed_to_led_trigger(struct phy_device *phy, > { > unsigned int i; > > - for (i = 0; i < phy->phy_num_led_triggers; i++) { > + /* the first (i = 0) trigger is for "any" speed */ > + for (i = 1; i < phy->phy_num_led_triggers; i++) { > if (phy->phy_led_triggers[i].speed == speed) > return &phy->phy_led_triggers[i]; This looks unnecessary, because existing LED triggers are all relative to a particular speed, you need to coerce the existing code into accepting SPEED_UNKNOWN as a hint to mean "link". Just implement "link" as a different trigger that does not need the speed argument/lookup to be happening and don't change how the indexing into the array of speed triggers is done. Just have a separate "link" trigger that is stored separately from that existing array. Also, what happens if I set both "link" and a given "speed" and my RJ-45 connector only has two LEDs, and one of them is already used for "activity"?
On 30.10.2017 19:36, Florian Fainelli wrote: > On 10/28/2017 08:27 AM, Maciej S. Szmigiero wrote: >> Currently, we create a LED trigger for any link speed known to a PHY. >> These triggers only fire when their exact link speed had been negotiated >> (they aren't cumulative, that is, they don't fire for "their or any higher" >> link speed). >> >> What we are missing, however, is a trigger which will fire on any link >> speed known to the PHY. Such trigger can then be used for implementing a >> poor man's substitute of the "link" LED on boards that lack it. >> Let's add it. > > The use case definitively makes sense, but the implementation a little less. > >> >> Signed-off-by: Maciej S. Szmigiero <mail@maciej.szmigiero.name> >> --- >> drivers/net/phy/Kconfig | 7 +++++-- >> drivers/net/phy/phy_led_triggers.c | 19 ++++++++++++++++--- >> 2 files changed, 21 insertions(+), 5 deletions(-) >> >> diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig >> index cd931cf9dcc2..3bcc2107ad77 100644 >> --- a/drivers/net/phy/Kconfig >> +++ b/drivers/net/phy/Kconfig >> @@ -191,11 +191,14 @@ config LED_TRIGGER_PHY >> Adds support for a set of LED trigger events per-PHY. Link >> state change will trigger the events, for consumption by an >> LED class driver. There are triggers for each link speed currently >> - supported by the phy, and are of the form: >> + supported by the PHY and also a one common "link" trigger as a >> + logical-or of all the link speed ones. >> + All these triggers are named according to the following pattern: >> <mii bus id>:<phy>:<speed> >> >> Where speed is in the form: >> - <Speed in megabits>Mbps or <Speed in gigabits>Gbps >> + <Speed in megabits>Mbps OR <Speed in gigabits>Gbps OR link >> + for any speed known to the PHY. >> >> >> comment "MII PHY device drivers" >> diff --git a/drivers/net/phy/phy_led_triggers.c b/drivers/net/phy/phy_led_triggers.c >> index 94ca42e630bb..5b6f1876f514 100644 >> --- a/drivers/net/phy/phy_led_triggers.c >> +++ b/drivers/net/phy/phy_led_triggers.c >> @@ -20,7 +20,8 @@ static struct phy_led_trigger *phy_speed_to_led_trigger(struct phy_device *phy, >> { >> unsigned int i; >> >> - for (i = 0; i < phy->phy_num_led_triggers; i++) { >> + /* the first (i = 0) trigger is for "any" speed */ >> + for (i = 1; i < phy->phy_num_led_triggers; i++) { >> if (phy->phy_led_triggers[i].speed == speed) >> return &phy->phy_led_triggers[i]; > > This looks unnecessary, because existing LED triggers are all relative > to a particular speed, you need to coerce the existing code into > accepting SPEED_UNKNOWN as a hint to mean "link". Just implement "link" > as a different trigger that does not need the speed argument/lookup to > be happening and don't change how the indexing into the array of speed > triggers is done. Just have a separate "link" trigger that is stored > separately from that existing array. This way of implementation (overloading SPEED_UNKNOWN) needed least modification to the driver, but if a purer way is preferred then ok. > Also, what happens if I set both "link" and a given "speed" and my RJ-45 > connector only has two LEDs, and one of them is already used for "activity"? One LED can have only one trigger attached AFAIK. Maciej
On 10/30/2017 11:46 AM, Maciej S. Szmigiero wrote: > On 30.10.2017 19:36, Florian Fainelli wrote: >> On 10/28/2017 08:27 AM, Maciej S. Szmigiero wrote: >>> Currently, we create a LED trigger for any link speed known to a PHY. >>> These triggers only fire when their exact link speed had been negotiated >>> (they aren't cumulative, that is, they don't fire for "their or any higher" >>> link speed). >>> >>> What we are missing, however, is a trigger which will fire on any link >>> speed known to the PHY. Such trigger can then be used for implementing a >>> poor man's substitute of the "link" LED on boards that lack it. >>> Let's add it. >> >> The use case definitively makes sense, but the implementation a little less. >> >>> >>> Signed-off-by: Maciej S. Szmigiero <mail@maciej.szmigiero.name> >>> --- >>> drivers/net/phy/Kconfig | 7 +++++-- >>> drivers/net/phy/phy_led_triggers.c | 19 ++++++++++++++++--- >>> 2 files changed, 21 insertions(+), 5 deletions(-) >>> >>> diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig >>> index cd931cf9dcc2..3bcc2107ad77 100644 >>> --- a/drivers/net/phy/Kconfig >>> +++ b/drivers/net/phy/Kconfig >>> @@ -191,11 +191,14 @@ config LED_TRIGGER_PHY >>> Adds support for a set of LED trigger events per-PHY. Link >>> state change will trigger the events, for consumption by an >>> LED class driver. There are triggers for each link speed currently >>> - supported by the phy, and are of the form: >>> + supported by the PHY and also a one common "link" trigger as a >>> + logical-or of all the link speed ones. >>> + All these triggers are named according to the following pattern: >>> <mii bus id>:<phy>:<speed> >>> >>> Where speed is in the form: >>> - <Speed in megabits>Mbps or <Speed in gigabits>Gbps >>> + <Speed in megabits>Mbps OR <Speed in gigabits>Gbps OR link >>> + for any speed known to the PHY. >>> >>> >>> comment "MII PHY device drivers" >>> diff --git a/drivers/net/phy/phy_led_triggers.c b/drivers/net/phy/phy_led_triggers.c >>> index 94ca42e630bb..5b6f1876f514 100644 >>> --- a/drivers/net/phy/phy_led_triggers.c >>> +++ b/drivers/net/phy/phy_led_triggers.c >>> @@ -20,7 +20,8 @@ static struct phy_led_trigger *phy_speed_to_led_trigger(struct phy_device *phy, >>> { >>> unsigned int i; >>> >>> - for (i = 0; i < phy->phy_num_led_triggers; i++) { >>> + /* the first (i = 0) trigger is for "any" speed */ >>> + for (i = 1; i < phy->phy_num_led_triggers; i++) { >>> if (phy->phy_led_triggers[i].speed == speed) >>> return &phy->phy_led_triggers[i]; >> >> This looks unnecessary, because existing LED triggers are all relative >> to a particular speed, you need to coerce the existing code into >> accepting SPEED_UNKNOWN as a hint to mean "link". Just implement "link" >> as a different trigger that does not need the speed argument/lookup to >> be happening and don't change how the indexing into the array of speed >> triggers is done. Just have a separate "link" trigger that is stored >> separately from that existing array. > > This way of implementation (overloading SPEED_UNKNOWN) needed least > modification to the driver, but if a purer way is preferred then ok. Sure, that makes it simpler to implement, but it seems to me this would be cleaner if the "link" trigger was handled separately, the next thing that comes to mind is actually implementing an "activity" trigger, and this one is likely also reasonably speed independent. > >> Also, what happens if I set both "link" and a given "speed" and my RJ-45 >> connector only has two LEDs, and one of them is already used for "activity"? > > One LED can have only one trigger attached AFAIK. True, so we should be fine, thanks!
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig index cd931cf9dcc2..3bcc2107ad77 100644 --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig @@ -191,11 +191,14 @@ config LED_TRIGGER_PHY Adds support for a set of LED trigger events per-PHY. Link state change will trigger the events, for consumption by an LED class driver. There are triggers for each link speed currently - supported by the phy, and are of the form: + supported by the PHY and also a one common "link" trigger as a + logical-or of all the link speed ones. + All these triggers are named according to the following pattern: <mii bus id>:<phy>:<speed> Where speed is in the form: - <Speed in megabits>Mbps or <Speed in gigabits>Gbps + <Speed in megabits>Mbps OR <Speed in gigabits>Gbps OR link + for any speed known to the PHY. comment "MII PHY device drivers" diff --git a/drivers/net/phy/phy_led_triggers.c b/drivers/net/phy/phy_led_triggers.c index 94ca42e630bb..5b6f1876f514 100644 --- a/drivers/net/phy/phy_led_triggers.c +++ b/drivers/net/phy/phy_led_triggers.c @@ -20,7 +20,8 @@ static struct phy_led_trigger *phy_speed_to_led_trigger(struct phy_device *phy, { unsigned int i; - for (i = 0; i < phy->phy_num_led_triggers; i++) { + /* the first (i = 0) trigger is for "any" speed */ + for (i = 1; i < phy->phy_num_led_triggers; i++) { if (phy->phy_led_triggers[i].speed == speed) return &phy->phy_led_triggers[i]; } @@ -46,6 +47,10 @@ void phy_led_trigger_change_speed(struct phy_device *phy) } if (plt != phy->last_triggered) { + if (!phy->last_triggered) + led_trigger_event(&phy->phy_led_triggers[0].trigger, + LED_FULL); + led_trigger_event(&phy->last_triggered->trigger, LED_OFF); led_trigger_event(&plt->trigger, LED_FULL); phy->last_triggered = plt; @@ -56,6 +61,8 @@ void phy_led_trigger_change_speed(struct phy_device *phy) if (phy->last_triggered) { led_trigger_event(&phy->last_triggered->trigger, LED_OFF); + led_trigger_event(&phy->phy_led_triggers[0].trigger, + LED_OFF); phy->last_triggered = NULL; } } @@ -69,7 +76,9 @@ static int phy_led_trigger_register(struct phy_device *phy, plt->speed = speed; - if (speed < SPEED_1000) + if (speed == SPEED_UNKNOWN) + snprintf(name_suffix, sizeof(name_suffix), "link"); + else if (speed < SPEED_1000) snprintf(name_suffix, sizeof(name_suffix), "%dMbps", speed); else if (speed == SPEED_2500) snprintf(name_suffix, sizeof(name_suffix), "2.5Gbps"); @@ -99,6 +108,9 @@ int phy_led_triggers_register(struct phy_device *phy) if (!phy->phy_num_led_triggers) return 0; + /* include "any" speed */ + phy->phy_num_led_triggers++; + phy->phy_led_triggers = devm_kzalloc(&phy->mdio.dev, sizeof(struct phy_led_trigger) * phy->phy_num_led_triggers, @@ -110,7 +122,8 @@ int phy_led_triggers_register(struct phy_device *phy) for (i = 0; i < phy->phy_num_led_triggers; i++) { err = phy_led_trigger_register(phy, &phy->phy_led_triggers[i], - speeds[i]); + i == 0 ? SPEED_UNKNOWN : + speeds[i - 1]); if (err) goto out_unreg; }
Currently, we create a LED trigger for any link speed known to a PHY. These triggers only fire when their exact link speed had been negotiated (they aren't cumulative, that is, they don't fire for "their or any higher" link speed). What we are missing, however, is a trigger which will fire on any link speed known to the PHY. Such trigger can then be used for implementing a poor man's substitute of the "link" LED on boards that lack it. Let's add it. Signed-off-by: Maciej S. Szmigiero <mail@maciej.szmigiero.name> --- drivers/net/phy/Kconfig | 7 +++++-- drivers/net/phy/phy_led_triggers.c | 19 ++++++++++++++++--- 2 files changed, 21 insertions(+), 5 deletions(-)