2023-12-01 15:03:35

by Eric Woudstra

Subject: [PATCH RFC] leds: trigger: netdev: add 2500 link speed mode

This will be useful for PHY leds where the PHY supports 2500Mbps.

Changes to be committed:
modified: drivers/leds/trigger/ledtrig-netdev.c
modified: include/linux/leds.h

Signed-off-by: Eric Woudstra <[email protected]>
---
drivers/leds/trigger/ledtrig-netdev.c | 12 +++++++++++-
include/linux/leds.h | 1 +
2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/drivers/leds/trigger/ledtrig-netdev.c b/drivers/leds/trigger/ledtrig-netdev.c
index e358e77e4b38..66dfd327ee5b 100644
--- a/drivers/leds/trigger/ledtrig-netdev.c
+++ b/drivers/leds/trigger/ledtrig-netdev.c
@@ -99,6 +99,10 @@ static void set_baseline_state(struct led_netdev_data *trigger_data)
trigger_data->link_speed == SPEED_1000)
blink_on = true;

+ if (test_bit(TRIGGER_NETDEV_LINK_2500, &trigger_data->mode) &&
+ trigger_data->link_speed == SPEED_2500)
+ blink_on = true;
+
if (test_bit(TRIGGER_NETDEV_HALF_DUPLEX, &trigger_data->mode) &&
trigger_data->duplex == DUPLEX_HALF)
blink_on = true;
@@ -286,6 +290,7 @@ static ssize_t netdev_led_attr_show(struct device *dev, char *buf,
case TRIGGER_NETDEV_LINK_10:
case TRIGGER_NETDEV_LINK_100:
case TRIGGER_NETDEV_LINK_1000:
+ case TRIGGER_NETDEV_LINK_2500:
case TRIGGER_NETDEV_HALF_DUPLEX:
case TRIGGER_NETDEV_FULL_DUPLEX:
case TRIGGER_NETDEV_TX:
@@ -316,6 +321,7 @@ static ssize_t netdev_led_attr_store(struct device *dev, const char *buf,
case TRIGGER_NETDEV_LINK_10:
case TRIGGER_NETDEV_LINK_100:
case TRIGGER_NETDEV_LINK_1000:
+ case TRIGGER_NETDEV_LINK_2500:
case TRIGGER_NETDEV_HALF_DUPLEX:
case TRIGGER_NETDEV_FULL_DUPLEX:
case TRIGGER_NETDEV_TX:
@@ -334,7 +340,8 @@ static ssize_t netdev_led_attr_store(struct device *dev, const char *buf,
if (test_bit(TRIGGER_NETDEV_LINK, &mode) &&
(test_bit(TRIGGER_NETDEV_LINK_10, &mode) ||
test_bit(TRIGGER_NETDEV_LINK_100, &mode) ||
- test_bit(TRIGGER_NETDEV_LINK_1000, &mode)))
+ test_bit(TRIGGER_NETDEV_LINK_1000, &mode) ||
+ test_bit(TRIGGER_NETDEV_LINK_2500, &mode)))
return -EINVAL;

cancel_delayed_work_sync(&trigger_data->work);
@@ -364,6 +371,7 @@ DEFINE_NETDEV_TRIGGER(link, TRIGGER_NETDEV_LINK);
DEFINE_NETDEV_TRIGGER(link_10, TRIGGER_NETDEV_LINK_10);
DEFINE_NETDEV_TRIGGER(link_100, TRIGGER_NETDEV_LINK_100);
DEFINE_NETDEV_TRIGGER(link_1000, TRIGGER_NETDEV_LINK_1000);
+DEFINE_NETDEV_TRIGGER(link_2500, TRIGGER_NETDEV_LINK_2500);
DEFINE_NETDEV_TRIGGER(half_duplex, TRIGGER_NETDEV_HALF_DUPLEX);
DEFINE_NETDEV_TRIGGER(full_duplex, TRIGGER_NETDEV_FULL_DUPLEX);
DEFINE_NETDEV_TRIGGER(tx, TRIGGER_NETDEV_TX);
@@ -422,6 +430,7 @@ static struct attribute *netdev_trig_attrs[] = {
&dev_attr_link_10.attr,
&dev_attr_link_100.attr,
&dev_attr_link_1000.attr,
+ &dev_attr_link_2500.attr,
&dev_attr_full_duplex.attr,
&dev_attr_half_duplex.attr,
&dev_attr_rx.attr,
@@ -519,6 +528,7 @@ static void netdev_trig_work(struct work_struct *work)
test_bit(TRIGGER_NETDEV_LINK_10, &trigger_data->mode) ||
test_bit(TRIGGER_NETDEV_LINK_100, &trigger_data->mode) ||
test_bit(TRIGGER_NETDEV_LINK_1000, &trigger_data->mode) ||
+ test_bit(TRIGGER_NETDEV_LINK_2500, &trigger_data->mode) ||
test_bit(TRIGGER_NETDEV_HALF_DUPLEX, &trigger_data->mode) ||
test_bit(TRIGGER_NETDEV_FULL_DUPLEX, &trigger_data->mode);
interval = jiffies_to_msecs(
diff --git a/include/linux/leds.h b/include/linux/leds.h
index aa16dc2a8230..c2ae68df50e2 100644
--- a/include/linux/leds.h
+++ b/include/linux/leds.h
@@ -588,6 +588,7 @@ enum led_trigger_netdev_modes {
TRIGGER_NETDEV_LINK_10,
TRIGGER_NETDEV_LINK_100,
TRIGGER_NETDEV_LINK_1000,
+ TRIGGER_NETDEV_LINK_2500,
TRIGGER_NETDEV_HALF_DUPLEX,
TRIGGER_NETDEV_FULL_DUPLEX,
TRIGGER_NETDEV_TX,
--
2.42.1

2023-12-01 15:11:38

by Eric Woudstra

Subject: Re: [PATCH RFC] leds: trigger: netdev: add 2500 link speed mode

Never mind, thanks, I see just a few days ago this is already send in.

On 12/1/23 16:02, Eric Woudstra wrote:
> This will be useful for PHY leds where the PHY supports 2500Mbps.
>
> Changes to be committed:
> modified: drivers/leds/trigger/ledtrig-netdev.c
> modified: include/linux/leds.h
>
> Signed-off-by: Eric Woudstra <[email protected]>
> ---
> drivers/leds/trigger/ledtrig-netdev.c | 12 +++++++++++-
> include/linux/leds.h | 1 +
> 2 files changed, 12 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/leds/trigger/ledtrig-netdev.c b/drivers/leds/trigger/ledtrig-netdev.c
> index e358e77e4b38..66dfd327ee5b 100644
> --- a/drivers/leds/trigger/ledtrig-netdev.c
> +++ b/drivers/leds/trigger/ledtrig-netdev.c
> @@ -99,6 +99,10 @@ static void set_baseline_state(struct led_netdev_data *trigger_data)
> trigger_data->link_speed == SPEED_1000)
> blink_on = true;
>
> + if (test_bit(TRIGGER_NETDEV_LINK_2500, &trigger_data->mode) &&
> + trigger_data->link_speed == SPEED_2500)
> + blink_on = true;
> +
> if (test_bit(TRIGGER_NETDEV_HALF_DUPLEX, &trigger_data->mode) &&
> trigger_data->duplex == DUPLEX_HALF)
> blink_on = true;
> @@ -286,6 +290,7 @@ static ssize_t netdev_led_attr_show(struct device *dev, char *buf,
> case TRIGGER_NETDEV_LINK_10:
> case TRIGGER_NETDEV_LINK_100:
> case TRIGGER_NETDEV_LINK_1000:
> + case TRIGGER_NETDEV_LINK_2500:
> case TRIGGER_NETDEV_HALF_DUPLEX:
> case TRIGGER_NETDEV_FULL_DUPLEX:
> case TRIGGER_NETDEV_TX:
> @@ -316,6 +321,7 @@ static ssize_t netdev_led_attr_store(struct device *dev, const char *buf,
> case TRIGGER_NETDEV_LINK_10:
> case TRIGGER_NETDEV_LINK_100:
> case TRIGGER_NETDEV_LINK_1000:
> + case TRIGGER_NETDEV_LINK_2500:
> case TRIGGER_NETDEV_HALF_DUPLEX:
> case TRIGGER_NETDEV_FULL_DUPLEX:
> case TRIGGER_NETDEV_TX:
> @@ -334,7 +340,8 @@ static ssize_t netdev_led_attr_store(struct device *dev, const char *buf,
> if (test_bit(TRIGGER_NETDEV_LINK, &mode) &&
> (test_bit(TRIGGER_NETDEV_LINK_10, &mode) ||
> test_bit(TRIGGER_NETDEV_LINK_100, &mode) ||
> - test_bit(TRIGGER_NETDEV_LINK_1000, &mode)))
> + test_bit(TRIGGER_NETDEV_LINK_1000, &mode) ||
> + test_bit(TRIGGER_NETDEV_LINK_2500, &mode)))
> return -EINVAL;
>
> cancel_delayed_work_sync(&trigger_data->work);
> @@ -364,6 +371,7 @@ DEFINE_NETDEV_TRIGGER(link, TRIGGER_NETDEV_LINK);
> DEFINE_NETDEV_TRIGGER(link_10, TRIGGER_NETDEV_LINK_10);
> DEFINE_NETDEV_TRIGGER(link_100, TRIGGER_NETDEV_LINK_100);
> DEFINE_NETDEV_TRIGGER(link_1000, TRIGGER_NETDEV_LINK_1000);
> +DEFINE_NETDEV_TRIGGER(link_2500, TRIGGER_NETDEV_LINK_2500);
> DEFINE_NETDEV_TRIGGER(half_duplex, TRIGGER_NETDEV_HALF_DUPLEX);
> DEFINE_NETDEV_TRIGGER(full_duplex, TRIGGER_NETDEV_FULL_DUPLEX);
> DEFINE_NETDEV_TRIGGER(tx, TRIGGER_NETDEV_TX);
> @@ -422,6 +430,7 @@ static struct attribute *netdev_trig_attrs[] = {
> &dev_attr_link_10.attr,
> &dev_attr_link_100.attr,
> &dev_attr_link_1000.attr,
> + &dev_attr_link_2500.attr,
> &dev_attr_full_duplex.attr,
> &dev_attr_half_duplex.attr,
> &dev_attr_rx.attr,
> @@ -519,6 +528,7 @@ static void netdev_trig_work(struct work_struct *work)
> test_bit(TRIGGER_NETDEV_LINK_10, &trigger_data->mode) ||
> test_bit(TRIGGER_NETDEV_LINK_100, &trigger_data->mode) ||
> test_bit(TRIGGER_NETDEV_LINK_1000, &trigger_data->mode) ||
> + test_bit(TRIGGER_NETDEV_LINK_2500, &trigger_data->mode) ||
> test_bit(TRIGGER_NETDEV_HALF_DUPLEX, &trigger_data->mode) ||
> test_bit(TRIGGER_NETDEV_FULL_DUPLEX, &trigger_data->mode);
> interval = jiffies_to_msecs(
> diff --git a/include/linux/leds.h b/include/linux/leds.h
> index aa16dc2a8230..c2ae68df50e2 100644
> --- a/include/linux/leds.h
> +++ b/include/linux/leds.h
> @@ -588,6 +588,7 @@ enum led_trigger_netdev_modes {
> TRIGGER_NETDEV_LINK_10,
> TRIGGER_NETDEV_LINK_100,
> TRIGGER_NETDEV_LINK_1000,
> + TRIGGER_NETDEV_LINK_2500,
> TRIGGER_NETDEV_HALF_DUPLEX,
> TRIGGER_NETDEV_FULL_DUPLEX,
> TRIGGER_NETDEV_TX,