generic: backport initial LEDs hw control support
[openwrt/openwrt.git] / target / linux / generic / backport-6.1 / 804-v6.5-10-leds-trigger-netdev-init-mode-if-hw-control-already-.patch
diff --git a/target/linux/generic/backport-6.1/804-v6.5-10-leds-trigger-netdev-init-mode-if-hw-control-already-.patch b/target/linux/generic/backport-6.1/804-v6.5-10-leds-trigger-netdev-init-mode-if-hw-control-already-.patch
new file mode 100644 (file)
index 0000000..e20594c
--- /dev/null
@@ -0,0 +1,53 @@
+From 0316cc5629d15880dd3f097d221c55ca648bcd61 Mon Sep 17 00:00:00 2001
+From: Christian Marangi <ansuelsmth@gmail.com>
+Date: Mon, 29 May 2023 18:32:40 +0200
+Subject: [PATCH 10/13] leds: trigger: netdev: init mode if hw control already
+ active
+
+On netdev trigger activation, hw control may be already active by
+default. If this is the case and a device is actually provided by
+hw_control_get_device(), init the already active mode and set the
+bool to hw_control bool to true to reflect the already set mode in the
+trigger_data.
+
+Co-developed-by: Andrew Lunn <andrew@lunn.ch>
+Signed-off-by: Andrew Lunn <andrew@lunn.ch>
+Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ drivers/leds/trigger/ledtrig-netdev.c | 17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
+
+--- a/drivers/leds/trigger/ledtrig-netdev.c
++++ b/drivers/leds/trigger/ledtrig-netdev.c
+@@ -454,6 +454,8 @@ static void netdev_trig_work(struct work
+ static int netdev_trig_activate(struct led_classdev *led_cdev)
+ {
+       struct led_netdev_data *trigger_data;
++      unsigned long mode;
++      struct device *dev;
+       int rc;
+       trigger_data = kzalloc(sizeof(struct led_netdev_data), GFP_KERNEL);
+@@ -475,6 +477,21 @@ static int netdev_trig_activate(struct l
+       atomic_set(&trigger_data->interval, msecs_to_jiffies(NETDEV_LED_DEFAULT_INTERVAL));
+       trigger_data->last_activity = 0;
++      /* Check if hw control is active by default on the LED.
++       * Init already enabled mode in hw control.
++       */
++      if (supports_hw_control(led_cdev) &&
++          !led_cdev->hw_control_get(led_cdev, &mode)) {
++              dev = led_cdev->hw_control_get_device(led_cdev);
++              if (dev) {
++                      const char *name = dev_name(dev);
++
++                      set_device_name(trigger_data, name, strlen(name));
++                      trigger_data->hw_control = true;
++                      trigger_data->mode = mode;
++              }
++      }
++
+       led_set_trigger_data(led_cdev, trigger_data);
+       rc = register_netdevice_notifier(&trigger_data->notifier);