netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] leds: trigger: netdev: skip setting baseline state in activate if hw-controlled
@ 2023-11-29 10:41 Heiner Kallweit
  2023-11-29 16:36 ` Andrew Lunn
  0 siblings, 1 reply; 10+ messages in thread
From: Heiner Kallweit @ 2023-11-29 10:41 UTC (permalink / raw)
  To: Pavel Machek, Lee Jones, Andrew Lunn, Christian Marangi,
	Jakub Kicinski
  Cc: linux-leds@vger.kernel.org, netdev@vger.kernel.org

The current codes uses the sw_control path in set_baseline_state() when
called from netdev_trig_activate() even if we're hw-controlled. This
may result in errors when led_set_brightness() is called because we may
not have set_brightness led ops (if hw doesn't support setting a LED
to ON).

Therefore set trigger_data->hw_control = true before calling
set_device_name() from netdev_trig_activate(). In this call chain we
have to prevent set_baseline_state() from being called, because this
would call hw_control_set(). Use led_cdev->trigger_data == NULL as
indicator for being called from netdev_trig_activate().

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
 drivers/leds/trigger/ledtrig-netdev.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/leds/trigger/ledtrig-netdev.c b/drivers/leds/trigger/ledtrig-netdev.c
index 7ed2d0b64..b58396600 100644
--- a/drivers/leds/trigger/ledtrig-netdev.c
+++ b/drivers/leds/trigger/ledtrig-netdev.c
@@ -251,7 +251,11 @@ static int set_device_name(struct led_netdev_data *trigger_data,
 
 	trigger_data->last_activity = 0;
 
-	set_baseline_state(trigger_data);
+	/* skip if we're called from netdev_trig_activate() and hw_control is true */
+	if (!trigger_data->hw_control ||
+	    led_get_trigger_data(trigger_data->led_cdev))
+		set_baseline_state(trigger_data);
+
 	mutex_unlock(&trigger_data->lock);
 	rtnl_unlock();
 
@@ -568,8 +572,8 @@ static int netdev_trig_activate(struct led_classdev *led_cdev)
 		if (dev) {
 			const char *name = dev_name(dev);
 
-			set_device_name(trigger_data, name, strlen(name));
 			trigger_data->hw_control = true;
+			set_device_name(trigger_data, name, strlen(name));
 
 			rc = led_cdev->hw_control_get(led_cdev, &mode);
 			if (!rc)
-- 
2.43.0


^ permalink raw reply related	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2023-12-06 18:32 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-11-29 10:41 [PATCH] leds: trigger: netdev: skip setting baseline state in activate if hw-controlled Heiner Kallweit
2023-11-29 16:36 ` Andrew Lunn
2023-11-29 21:50   ` Heiner Kallweit
2023-11-29 22:02     ` Andrew Lunn
2023-12-01 22:32       ` Heiner Kallweit
2023-12-05  3:00         ` Andrew Lunn
2023-12-05 12:40           ` Heiner Kallweit
2023-12-05 12:57             ` Heiner Kallweit
2023-12-06 17:45               ` Andrew Lunn
2023-12-06 18:32                 ` Heiner Kallweit

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).