From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1765322AbcINVz6 (ORCPT ); Wed, 14 Sep 2016 17:55:58 -0400 Received: from skprod2.natinst.com ([130.164.80.23]:49027 "EHLO ni.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1763486AbcINVzz (ORCPT ); Wed, 14 Sep 2016 17:55:55 -0400 From: Zach Brown To: f.fainelli@gmail.com Cc: mlindner@marvell.com, stephen@networkplumber.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org, florian.c.schilhabel@googlemail.com, Larry.Finger@lwfinger.net Subject: [RFC 3/3] phy,leds: add support for led triggers on phy link state change Date: Wed, 14 Sep 2016 16:55:49 -0500 Message-Id: <1473890149-2066-4-git-send-email-zach.brown@ni.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1473890149-2066-1-git-send-email-zach.brown@ni.com> References: <1473890149-2066-1-git-send-email-zach.brown@ni.com> X-MIMETrack: Itemize by SMTP Server on US-AUS-MGWOut1/AUS/H/NIC(Release 8.5.3FP6 HF1218|December 12, 2014) at 09/14/2016 04:55:49 PM, Serialize by Router on US-AUS-MGWOut1/AUS/H/NIC(Release 8.5.3FP6 HF1218|December 12, 2014) at 09/14/2016 04:55:50 PM, Serialize complete at 09/14/2016 04:55:50 PM X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2016-09-14_10:,, signatures=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Josh Cartwright Create an option CONFIG_LED_TRIGGER_PHY (default n), which will create a set of led triggers for each instantiated PHY device. There is one LED trigger per link-speed, per-phy. This allows for a user to configure their system to allow a set of LEDs to represent link state changes on the phy. Signed-off-by: Josh Cartwright Signed-off-by: Nathan Sullivan Signed-off-by: Zach Brown --- drivers/net/phy/Kconfig | 12 ++++ drivers/net/phy/Makefile | 1 + drivers/net/phy/phy.c | 8 +++ drivers/net/phy/phy_device.c | 4 ++ drivers/net/phy/phy_led_triggers.c | 109 +++++++++++++++++++++++++++++++++++++ include/linux/phy.h | 9 +++ include/linux/phy_led_triggers.h | 42 ++++++++++++++ 7 files changed, 185 insertions(+) create mode 100644 drivers/net/phy/phy_led_triggers.c create mode 100644 include/linux/phy_led_triggers.h diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig index 1c3e07c..4aeaba4 100644 --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig @@ -15,6 +15,18 @@ if PHYLIB config SWPHY bool +config LED_TRIGGER_PHY + bool "Support LED triggers for tracking link state" + depends on LEDS_TRIGGERS + ---help--- + 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, + and are of the form: + :: + + Where speed is one of: 10Mb, 100Mb, Gb, 2.5Gb, or 10GbE. + comment "MDIO bus device drivers" config MDIO_BCM_IPROC diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile index e58667d..86d12cd 100644 --- a/drivers/net/phy/Makefile +++ b/drivers/net/phy/Makefile @@ -2,6 +2,7 @@ libphy-y := phy.o phy_device.o mdio_bus.o mdio_device.o libphy-$(CONFIG_SWPHY) += swphy.o +libphy-$(CONFIG_LED_TRIGGER_PHY) += phy_led_triggers.o obj-$(CONFIG_PHYLIB) += libphy.o diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index c6f6683..3345767 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -936,6 +936,7 @@ void phy_state_machine(struct work_struct *work) phydev->state = PHY_NOLINK; netif_carrier_off(phydev->attached_dev); phydev->adjust_link(phydev->attached_dev); + phy_led_trigger_change_speed(phydev); break; } @@ -949,6 +950,7 @@ void phy_state_machine(struct work_struct *work) phydev->state = PHY_RUNNING; netif_carrier_on(phydev->attached_dev); phydev->adjust_link(phydev->attached_dev); + phy_led_trigger_change_speed(phydev); } else if (0 == phydev->link_timeout--) needs_aneg = true; @@ -976,6 +978,7 @@ void phy_state_machine(struct work_struct *work) phydev->state = PHY_RUNNING; netif_carrier_on(phydev->attached_dev); phydev->adjust_link(phydev->attached_dev); + phy_led_trigger_change_speed(phydev); } break; case PHY_FORCING: @@ -992,6 +995,7 @@ void phy_state_machine(struct work_struct *work) } phydev->adjust_link(phydev->attached_dev); + phy_led_trigger_change_speed(phydev); break; case PHY_RUNNING: /* Only register a CHANGE if we are polling and link changed @@ -1021,6 +1025,7 @@ void phy_state_machine(struct work_struct *work) } phydev->adjust_link(phydev->attached_dev); + phy_led_trigger_change_speed(phydev); if (phy_interrupt_is_valid(phydev)) err = phy_config_interrupt(phydev, @@ -1031,6 +1036,7 @@ void phy_state_machine(struct work_struct *work) phydev->link = 0; netif_carrier_off(phydev->attached_dev); phydev->adjust_link(phydev->attached_dev); + phy_led_trigger_change_speed(phydev); do_suspend = true; } break; @@ -1055,6 +1061,7 @@ void phy_state_machine(struct work_struct *work) phydev->state = PHY_NOLINK; } phydev->adjust_link(phydev->attached_dev); + phy_led_trigger_change_speed(phydev); } else { phydev->state = PHY_AN; phydev->link_timeout = PHY_AN_TIMEOUT; @@ -1071,6 +1078,7 @@ void phy_state_machine(struct work_struct *work) phydev->state = PHY_NOLINK; } phydev->adjust_link(phydev->attached_dev); + phy_led_trigger_change_speed(phydev); } break; } diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index e977ba9..4671c13 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -57,6 +58,7 @@ static void phy_mdio_device_free(struct mdio_device *mdiodev) static void phy_device_release(struct device *dev) { + phy_led_triggers_unregister(to_phy_device(dev)); kfree(to_phy_device(dev)); } @@ -345,6 +347,8 @@ struct phy_device *phy_device_create(struct mii_bus *bus, int addr, int phy_id, dev->state = PHY_DOWN; + phy_led_triggers_register(dev); + mutex_init(&dev->lock); INIT_DELAYED_WORK(&dev->state_queue, phy_state_machine); INIT_WORK(&dev->phy_queue, phy_change); diff --git a/drivers/net/phy/phy_led_triggers.c b/drivers/net/phy/phy_led_triggers.c new file mode 100644 index 0000000..6c40414 --- /dev/null +++ b/drivers/net/phy/phy_led_triggers.c @@ -0,0 +1,109 @@ +/* Copyright (C) 2016 National Instruments Corp. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ +#include +#include + +void phy_led_trigger_change_speed(struct phy_device *phy) +{ + struct phy_led_trigger *plt; + + if (!phy->link) { + if (phy->last_triggered) { + led_trigger_event(&phy->last_triggered->trigger, + LED_OFF); + phy->last_triggered = NULL; + } + return; + } + + switch (phy->speed) { + case SPEED_10: + plt = &phy->phy_led_trigger[0]; + break; + case SPEED_100: + plt = &phy->phy_led_trigger[1]; + break; + case SPEED_1000: + plt = &phy->phy_led_trigger[2]; + break; + case SPEED_2500: + plt = &phy->phy_led_trigger[3]; + break; + case SPEED_10000: + plt = &phy->phy_led_trigger[4]; + break; + default: + plt = NULL; + break; + } + + if (plt != phy->last_triggered) { + led_trigger_event(&phy->last_triggered->trigger, LED_OFF); + led_trigger_event(&plt->trigger, LED_FULL); + phy->last_triggered = plt; + } +} +EXPORT_SYMBOL_GPL(phy_led_trigger_change_speed); + +static int phy_led_trigger_register(struct phy_device *phy, + struct phy_led_trigger *plt, int i) +{ + static const char * const name_suffix[] = { + "10Mb", + "100Mb", + "Gb", + "2.5Gb", + "10GbE", + }; + snprintf(plt->name, sizeof(plt->name), PHY_ID_FMT ":%s", + phy->mdio.bus->id, phy->mdio.addr, name_suffix[i]); + plt->trigger.name = plt->name; + return led_trigger_register(&plt->trigger); +} + +static void phy_led_trigger_unregister(struct phy_led_trigger *plt) +{ + led_trigger_unregister(&plt->trigger); +} + +int phy_led_triggers_register(struct phy_device *phy) +{ + int i, err; + + for (i = 0; i < ARRAY_SIZE(phy->phy_led_trigger); i++) { + err = phy_led_trigger_register(phy, &phy->phy_led_trigger[i], + i); + if (err) + goto out_unreg; + } + + phy->last_triggered = NULL; + phy_led_trigger_change_speed(phy); + + return 0; + +out_unreg: + while (i--) + phy_led_trigger_unregister(&phy->phy_led_trigger[i]); + return err; +} +EXPORT_SYMBOL_GPL(phy_led_triggers_register); + +void phy_led_triggers_unregister(struct phy_device *phy) +{ + int i; + + for (i = 0; i < ARRAY_SIZE(phy->phy_led_trigger); i++) + phy_led_trigger_unregister(&phy->phy_led_trigger[i]); +} +EXPORT_SYMBOL_GPL(phy_led_triggers_unregister); diff --git a/include/linux/phy.h b/include/linux/phy.h index 2d24b28..315dd06 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -25,6 +25,7 @@ #include #include #include +#include #include @@ -402,6 +403,14 @@ struct phy_device { int link_timeout; +#ifdef CONFIG_LED_TRIGGER_PHY + /* + * A led_trigger per SPEED_* + */ + struct phy_led_trigger phy_led_trigger[5]; + struct phy_led_trigger *last_triggered; +#endif + /* * Interrupt number for this PHY * -1 means no interrupt diff --git a/include/linux/phy_led_triggers.h b/include/linux/phy_led_triggers.h new file mode 100644 index 0000000..1fb6506 --- /dev/null +++ b/include/linux/phy_led_triggers.h @@ -0,0 +1,42 @@ +/* Copyright (C) 2016 National Instruments Corp. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ +#ifndef __PHY_LED_TRIGGERS +#define __PHY_LED_TRIGGERS + +struct phy_device; + +#ifdef CONFIG_LED_TRIGGER_PHY + +#include + +struct phy_led_trigger { + struct led_trigger trigger; + char name[64]; +}; + +extern int phy_led_triggers_register(struct phy_device *phy); +extern void phy_led_triggers_unregister(struct phy_device *phy); +extern void phy_led_trigger_change_speed(struct phy_device *phy); + +#else + +static inline int phy_led_triggers_register(struct phy_device *phy) +{ + return 0; +} +static inline void phy_led_triggers_unregister(struct phy_device *phy) { } +static inline void phy_led_trigger_change_speed(struct phy_device *phy) { } + +#endif + +#endif -- 2.7.4