| Message ID | 20200618064029.32168-8-kurt@linutronix.de |
|---|---|
| State | RFC |
| Delegated to: | David Miller |
| Headers | show |
| Series | Hirschmann Hellcreek DSA driver | expand |
On Thu, Jun 18, 2020 at 08:40:27AM +0200, Kurt Kanzenbach wrote: > The switch has two controllable I/Os which are usually connected to LEDs. This > is useful to immediately visually see the PTP status. > > These provide two signals: > > * is_gm > > This LED can be activated if the current device is the grand master in that > PTP domain. > > * sync_good > > This LED can be activated if the current device is in sync with the network > time. > > Expose these via the LED framework to be controlled via user space > e.g. linuxptp. Hi Kurt Is the hardware driving these signals at all? Or are these just suggested names in the documentation? It would not be an issue to have user space to configure them to use the heartbeat trigger, etc? Andrew
Hi Andrew, On Thu Jun 18 2020, Andrew Lunn wrote: > On Thu, Jun 18, 2020 at 08:40:27AM +0200, Kurt Kanzenbach wrote: >> The switch has two controllable I/Os which are usually connected to LEDs. This >> is useful to immediately visually see the PTP status. >> >> These provide two signals: >> >> * is_gm >> >> This LED can be activated if the current device is the grand master in that >> PTP domain. >> >> * sync_good >> >> This LED can be activated if the current device is in sync with the network >> time. >> >> Expose these via the LED framework to be controlled via user space >> e.g. linuxptp. > > Hi Kurt > > Is the hardware driving these signals at all? Or are these just > suggested names in the documentation? It would not be an issue to have > user space to configure them to use the heartbeat trigger, etc? These are more like GPIOs. If a 1 is set into the register then the hardware drives the signal to high. The names are from the documentation: * sync_good: This signal indicates that the switch is in sync * is_gm: This signal indicates that the switch is the grand master However, these signals have to be set by user space. Most likely these signals are connected to LEDs. Thanks, Kurt
On Fri, Jun 19, 2020 at 10:45:36AM +0200, Kurt Kanzenbach wrote: > Hi Andrew, > > On Thu Jun 18 2020, Andrew Lunn wrote: > > On Thu, Jun 18, 2020 at 08:40:27AM +0200, Kurt Kanzenbach wrote: > >> The switch has two controllable I/Os which are usually connected to LEDs. This > >> is useful to immediately visually see the PTP status. > >> > >> These provide two signals: > >> > >> * is_gm > >> > >> This LED can be activated if the current device is the grand master in that > >> PTP domain. > >> > >> * sync_good > >> > >> This LED can be activated if the current device is in sync with the network > >> time. > >> > >> Expose these via the LED framework to be controlled via user space > >> e.g. linuxptp. > > > > Hi Kurt > > > > Is the hardware driving these signals at all? Or are these just > > suggested names in the documentation? It would not be an issue to have > > user space to configure them to use the heartbeat trigger, etc? > > These are more like GPIOs. If a 1 is set into the register then the > hardware drives the signal to high. The names are from the > documentation: > > * sync_good: This signal indicates that the switch is in sync > * is_gm: This signal indicates that the switch is the grand master > > However, these signals have to be set by user space. Most likely these > signals are connected to LEDs. Thanks Since these are general purpose LEDs, you might want to look at Documentation/devicetree/bindings/leds/common.yaml and implement some of the common properties. The label should ideally correspond to the text on the case, not what the datasheet says. So getting it from DT is a good idea. Do Hirschmanns own cases use this text on there front plate? Andrew
diff --git a/drivers/net/dsa/hirschmann/hellcreek.h b/drivers/net/dsa/hirschmann/hellcreek.h index 59cc7b59ff2c..18e78d7e0a55 100644 --- a/drivers/net/dsa/hirschmann/hellcreek.h +++ b/drivers/net/dsa/hirschmann/hellcreek.h @@ -17,6 +17,7 @@ #include <linux/timecounter.h> #include <linux/spinlock.h> #include <linux/hrtimer.h> +#include <linux/leds.h> #include <net/dsa.h> /* Ports: @@ -281,6 +282,8 @@ struct hellcreek { struct hellcreek_port ports[4]; struct delayed_work overflow_work; struct dentry *debug_dir; + struct led_classdev led_is_gm; + struct led_classdev led_sync_good; spinlock_t reg_lock; /* Switch IP register lock */ spinlock_t ptp_lock; /* PTP IP register lock */ void __iomem *base; @@ -288,6 +291,7 @@ struct hellcreek { u8 *vidmbrcfg; /* vidmbrcfg shadow */ u64 seconds; /* PTP seconds */ u64 last_ts; /* Used for overflow detection */ + u16 status_out; /* ptp.status_out shadow */ size_t fdb_entries; }; diff --git a/drivers/net/dsa/hirschmann/hellcreek_ptp.c b/drivers/net/dsa/hirschmann/hellcreek_ptp.c index 2fab998cbb12..6161ab821308 100644 --- a/drivers/net/dsa/hirschmann/hellcreek_ptp.c +++ b/drivers/net/dsa/hirschmann/hellcreek_ptp.c @@ -236,6 +236,57 @@ static void hellcreek_ptp_overflow_check(struct work_struct *work) HELLCREEK_OVERFLOW_PERIOD); } +static enum led_brightness hellcreek_get_brightness(struct hellcreek *hellcreek, + int led) +{ + return (hellcreek->status_out & led) ? 1 : 0; +} + +static void hellcreek_set_brightness(struct hellcreek *hellcreek, int led, + enum led_brightness b) +{ + spin_lock(&hellcreek->ptp_lock); + + if (b) + hellcreek->status_out |= led; + else + hellcreek->status_out &= ~led; + + hellcreek_ptp_write(hellcreek, hellcreek->status_out, STATUS_OUT); + + spin_unlock(&hellcreek->ptp_lock); +} + +static void hellcreek_led_sync_good_set(struct led_classdev *ldev, + enum led_brightness b) +{ + struct hellcreek *hellcreek = led_to_hellcreek(ldev, led_sync_good); + + hellcreek_set_brightness(hellcreek, STATUS_OUT_SYNC_GOOD, b); +} + +static enum led_brightness hellcreek_led_sync_good_get(struct led_classdev *ldev) +{ + struct hellcreek *hellcreek = led_to_hellcreek(ldev, led_sync_good); + + return hellcreek_get_brightness(hellcreek, STATUS_OUT_SYNC_GOOD); +} + +static void hellcreek_led_is_gm_set(struct led_classdev *ldev, + enum led_brightness b) +{ + struct hellcreek *hellcreek = led_to_hellcreek(ldev, led_is_gm); + + hellcreek_set_brightness(hellcreek, STATUS_OUT_IS_GM, b); +} + +static enum led_brightness hellcreek_led_is_gm_get(struct led_classdev *ldev) +{ + struct hellcreek *hellcreek = led_to_hellcreek(ldev, led_is_gm); + + return hellcreek_get_brightness(hellcreek, STATUS_OUT_IS_GM); +} + int hellcreek_ptp_setup(struct hellcreek *hellcreek) { u16 status; @@ -285,6 +336,23 @@ int hellcreek_ptp_setup(struct hellcreek *hellcreek) hellcreek_ptp_write(hellcreek, status | PR_CLOCK_STATUS_C_ENA_DRIFT, PR_CLOCK_STATUS_C); + /* LED setup */ + hellcreek->led_sync_good.name = "sync_good"; + hellcreek->led_sync_good.brightness = hellcreek_get_brightness(hellcreek, STATUS_OUT_SYNC_GOOD); + hellcreek->led_sync_good.max_brightness = 1; + hellcreek->led_sync_good.brightness_set = hellcreek_led_sync_good_set; + hellcreek->led_sync_good.brightness_get = hellcreek_led_sync_good_get; + led_classdev_register(hellcreek->dev, &hellcreek->led_sync_good); + + hellcreek->led_is_gm.name = "is_gm"; + hellcreek->led_is_gm.brightness = hellcreek_get_brightness(hellcreek, STATUS_OUT_IS_GM); + hellcreek->led_is_gm.max_brightness = 1; + hellcreek->led_is_gm.brightness_set = hellcreek_led_is_gm_set; + hellcreek->led_is_gm.brightness_get = hellcreek_led_is_gm_get; + led_classdev_register(hellcreek->dev, &hellcreek->led_is_gm); + + hellcreek->status_out = 0; + schedule_delayed_work(&hellcreek->overflow_work, HELLCREEK_OVERFLOW_PERIOD); @@ -293,6 +361,8 @@ int hellcreek_ptp_setup(struct hellcreek *hellcreek) void hellcreek_ptp_free(struct hellcreek *hellcreek) { + led_classdev_unregister(&hellcreek->led_is_gm); + led_classdev_unregister(&hellcreek->led_sync_good); cancel_delayed_work_sync(&hellcreek->overflow_work); ptp_clock_unregister(hellcreek->ptp_clock); hellcreek->ptp_clock = NULL; diff --git a/drivers/net/dsa/hirschmann/hellcreek_ptp.h b/drivers/net/dsa/hirschmann/hellcreek_ptp.h index 169fafb3ab6a..42988291ba4c 100644 --- a/drivers/net/dsa/hirschmann/hellcreek_ptp.h +++ b/drivers/net/dsa/hirschmann/hellcreek_ptp.h @@ -70,4 +70,7 @@ u64 __hellcreek_ptp_gettime_seconds(struct hellcreek *hellcreek, u64 ns); #define dw_overflow_to_hellcreek(dw) \ container_of(dw, struct hellcreek, overflow_work) +#define led_to_hellcreek(ldev, led) \ + container_of(ldev, struct hellcreek, led) + #endif /* _HELLCREEK_PTP_H_ */
The switch has two controllable I/Os which are usually connected to LEDs. This is useful to immediately visually see the PTP status. These provide two signals: * is_gm This LED can be activated if the current device is the grand master in that PTP domain. * sync_good This LED can be activated if the current device is in sync with the network time. Expose these via the LED framework to be controlled via user space e.g. linuxptp. Signed-off-by: Kurt Kanzenbach <kurt@linutronix.de> --- drivers/net/dsa/hirschmann/hellcreek.h | 4 ++ drivers/net/dsa/hirschmann/hellcreek_ptp.c | 70 ++++++++++++++++++++++ drivers/net/dsa/hirschmann/hellcreek_ptp.h | 3 + 3 files changed, 77 insertions(+)