git.openwrt.org Git - openwrt/staging/nbd.git/blob

   1 From 26f732791f2bcab18f59c61915bbe35225f30136 Mon Sep 17 00:00:00 2001
   2 From: Daniel Golle <daniel@makrotopia.org>
   3 Date: Sat, 12 Jul 2025 16:39:21 +0100
   4 Subject: [PATCH] Revert "leds: trigger: netdev: Configure LED blink interval
   5  for HW offload"
   6
   7 This reverts commit c629c972b310af41e9e072febb6dae9a299edde6.
   8
   9 While .led_blink_set() would previously put an LED into an unconditional
  10 permanently blinking state, the offending commit now uses same operation
  11 to (also?) set the blink timing of the netdev trigger when offloading.
  12
  13 This breaks many if not all of the existing PHY drivers which offer
  14 offloading LED operations, as those drivers would just put the LED into
  15 blinking state after .led_blink_set() has been called.
  16
  17 Unfortunately the change even made it into stable kernels for unknown
  18 reasons, so it should be reverted there as well.
  19
  20 Fixes: c629c972b310a ("leds: trigger: netdev: Configure LED blink interval for HW offload")
  21 Link: https://lore.kernel.org/linux-leds/c6134e26-2e45-4121-aa15-58aaef327201@lunn.ch/T/#m9d6fe81bbcb273e59f12bbedbd633edd32118387
  22 Suggested-by: Andrew Lunn <andrew@lunn.ch>
  23 Cc: stable@vger.kernel.org
  24 Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  25 Reviewed-by: Andrew Lunn <andrew@lunn.ch>
  26 Link: https://lore.kernel.org/r/6dcc77ee1c9676891d6250d8994850f521426a0f.1752334655.git.daniel@makrotopia.org
  27 Signed-off-by: Lee Jones <lee@kernel.org>
  28 ---
  29  drivers/leds/trigger/ledtrig-netdev.c | 16 +++-------------
  30  1 file changed, 3 insertions(+), 13 deletions(-)
  31
  32 --- a/drivers/leds/trigger/ledtrig-netdev.c
  33 +++ b/drivers/leds/trigger/ledtrig-netdev.c
  34 @@ -54,7 +54,6 @@ struct led_netdev_data {
  35         unsigned int last_activity;
  36
  37         unsigned long mode;
  38 -       unsigned long blink_delay;
  39         int link_speed;
  40         u8 duplex;
  41
  42 @@ -70,10 +69,6 @@ static void set_baseline_state(struct le
  43         /* Already validated, hw control is possible with the requested mode */
  44         if (trigger_data->hw_control) {
  45                 led_cdev->hw_control_set(led_cdev, trigger_data->mode);
  46 -               if (led_cdev->blink_set) {
  47 -                       led_cdev->blink_set(led_cdev, &trigger_data->blink_delay,
  48 -                                           &trigger_data->blink_delay);
  49 -               }
  50
  51                 return;
  52         }
  53 @@ -415,11 +410,10 @@ static ssize_t interval_store(struct dev
  54                               size_t size)
  55  {
  56         struct led_netdev_data *trigger_data = led_trigger_get_drvdata(dev);
  57 -       struct led_classdev *led_cdev = trigger_data->led_cdev;
  58         unsigned long value;
  59         int ret;
  60
  61 -       if (trigger_data->hw_control && !led_cdev->blink_set)
  62 +       if (trigger_data->hw_control)
  63                 return -EINVAL;
  64
  65         ret = kstrtoul(buf, 0, &value);
  66 @@ -428,13 +422,9 @@ static ssize_t interval_store(struct dev
  67
  68         /* impose some basic bounds on the timer interval */
  69         if (value >= 5 && value <= 10000) {
  70 -               if (trigger_data->hw_control) {
  71 -                       trigger_data->blink_delay = value;
  72 -               } else {
  73 -                       cancel_delayed_work_sync(&trigger_data->work);
  74 +               cancel_delayed_work_sync(&trigger_data->work);
  75
  76 -                       atomic_set(&trigger_data->interval, msecs_to_jiffies(value));
  77 -               }
  78 +               atomic_set(&trigger_data->interval, msecs_to_jiffies(value));
  79                 set_baseline_state(trigger_data);       /* resets timer */
  80         }
  81