net: phy: leds: Add support for "link" trigger

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>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index 8125412c8814228028048a80c0e475183c593231..bdfbabb86ee0a57173aa976f213bc72bc023f05c 100644 (file)
--- 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 c736f29b3b2af945946d83659082036bdbd67133..39ecad25b20128bbcebf69d5baa7b37223ba3432 100644 (file)
--- a/drivers/net/phy/phy_led_triggers.c
+++ b/drivers/net/phy/phy_led_triggers.c
@@ -31,6 +31,7 @@ static void phy_led_trigger_no_link(struct phy_device *phy)
 {
        if (phy->last_triggered) {
                led_trigger_event(&phy->last_triggered->trigger, LED_OFF);
+               led_trigger_event(&phy->led_link_trigger->trigger, LED_OFF);
                phy->last_triggered = NULL;
        }
 }
@@ -54,6 +55,10 @@ void phy_led_trigger_change_speed(struct phy_device *phy)
        }
 
        if (plt != phy->last_triggered) {
+               if (!phy->last_triggered)
+                       led_trigger_event(&phy->led_link_trigger->trigger,
+                                         LED_FULL);
+
                led_trigger_event(&phy->last_triggered->trigger, LED_OFF);
                led_trigger_event(&plt->trigger, LED_FULL);
                phy->last_triggered = plt;
@@ -61,6 +66,13 @@ void phy_led_trigger_change_speed(struct phy_device *phy)
 }
 EXPORT_SYMBOL_GPL(phy_led_trigger_change_speed);
 
+static void phy_led_trigger_format_name(struct phy_device *phy, char *buf,
+                                       size_t size, char *suffix)
+{
+       snprintf(buf, size, PHY_ID_FMT ":%s",
+                phy->mdio.bus->id, phy->mdio.addr, suffix);
+}
+
 static int phy_led_trigger_register(struct phy_device *phy,
                                    struct phy_led_trigger *plt,
                                    unsigned int speed)
@@ -77,8 +89,8 @@ static int phy_led_trigger_register(struct phy_device *phy,
                snprintf(name_suffix, sizeof(name_suffix), "%dGbps",
                         DIV_ROUND_CLOSEST(speed, 1000));
 
-       snprintf(plt->name, sizeof(plt->name), PHY_ID_FMT ":%s",
-                phy->mdio.bus->id, phy->mdio.addr, name_suffix);
+       phy_led_trigger_format_name(phy, plt->name, sizeof(plt->name),
+                                   name_suffix);
        plt->trigger.name = plt->name;
 
        return led_trigger_register(&plt->trigger);
@@ -99,13 +111,30 @@ int phy_led_triggers_register(struct phy_device *phy)
        if (!phy->phy_num_led_triggers)
                return 0;
 
+       phy->led_link_trigger = devm_kzalloc(&phy->mdio.dev,
+                                            sizeof(*phy->led_link_trigger),
+                                            GFP_KERNEL);
+       if (!phy->led_link_trigger) {
+               err = -ENOMEM;
+               goto out_clear;
+       }
+
+       phy_led_trigger_format_name(phy, phy->led_link_trigger->name,
+                                   sizeof(phy->led_link_trigger->name),
+                                   "link");
+       phy->led_link_trigger->trigger.name = phy->led_link_trigger->name;
+
+       err = led_trigger_register(&phy->led_link_trigger->trigger);
+       if (err)
+               goto out_free_link;
+
        phy->phy_led_triggers = devm_kzalloc(&phy->mdio.dev,
                                            sizeof(struct phy_led_trigger) *
                                                   phy->phy_num_led_triggers,
                                            GFP_KERNEL);
        if (!phy->phy_led_triggers) {
                err = -ENOMEM;
-               goto out_clear;
+               goto out_unreg_link;
        }
 
        for (i = 0; i < phy->phy_num_led_triggers; i++) {
@@ -123,6 +152,11 @@ int phy_led_triggers_register(struct phy_device *phy)
        while (i--)
                phy_led_trigger_unregister(&phy->phy_led_triggers[i]);
        devm_kfree(&phy->mdio.dev, phy->phy_led_triggers);
+out_unreg_link:
+       phy_led_trigger_unregister(phy->led_link_trigger);
+out_free_link:
+       devm_kfree(&phy->mdio.dev, phy->led_link_trigger);
+       phy->led_link_trigger = NULL;
 out_clear:
        phy->phy_num_led_triggers = 0;
        return err;
@@ -135,5 +169,8 @@ void phy_led_triggers_unregister(struct phy_device *phy)
 
        for (i = 0; i < phy->phy_num_led_triggers; i++)
                phy_led_trigger_unregister(&phy->phy_led_triggers[i]);
+
+       if (phy->led_link_trigger)
+               phy_led_trigger_unregister(phy->led_link_trigger);
 }
 EXPORT_SYMBOL_GPL(phy_led_triggers_unregister);

diff --git a/include/linux/phy.h b/include/linux/phy.h
index d78cd01ea5131018717d28d692b1af7abc3cff77..dc82a07cb4fdc797ea8e570d4f32194492203363 100644 (file)
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -451,6 +451,8 @@ struct phy_device {
        struct phy_led_trigger *phy_led_triggers;
        unsigned int phy_num_led_triggers;
        struct phy_led_trigger *last_triggered;
+
+       struct phy_led_trigger *led_link_trigger;
 #endif
 
        /*