Bluetooth: Add combined LED trigger for controller power

Instead of just having a LED trigger for power on a specific controller,
this adds the LED trigger "bluetooth-power" that combines the power
states of all controllers into a single trigger. This simplifies the
trigger selection and also supports multiple controllers per host
system via a single LED.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>

diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c
index 0b5f729d08d2b41abcfcdb1d7322d3c1ce01fa89..1d96ff3a8d87cad2bf8c99c00bf4894d5597eba6 100644 (file)
--- a/net/bluetooth/af_bluetooth.c
+++ b/net/bluetooth/af_bluetooth.c
@@ -31,6 +31,7 @@
 #include <net/bluetooth/bluetooth.h>
 #include <linux/proc_fs.h>
 
+#include "leds.h"
 #include "selftest.h"
 
 /* Bluetooth sockets */
@@ -726,6 +727,8 @@ static int __init bt_init(void)
 
        bt_debugfs = debugfs_create_dir("bluetooth", NULL);
 
+       bt_leds_init();
+
        err = bt_sysfs_init();
        if (err < 0)
                return err;
@@ -785,6 +788,8 @@ static void __exit bt_exit(void)
 
        bt_sysfs_cleanup();
 
+       bt_leds_cleanup();
+
        debugfs_remove_recursive(bt_debugfs);
 }
 

diff --git a/net/bluetooth/leds.c b/net/bluetooth/leds.c
index 8319c8440c899897a3f5c082ce611fd5fdeaed07..cb670b5594eb4ddb06e535643554c520f185daf8 100644 (file)
--- a/net/bluetooth/leds.c
+++ b/net/bluetooth/leds.c
@@ -11,6 +11,8 @@
 
 #include "leds.h"
 
+DEFINE_LED_TRIGGER(bt_power_led_trigger);
+
 struct hci_basic_led_trigger {
        struct led_trigger      led_trigger;
        struct hci_dev          *hdev;
@@ -24,6 +26,21 @@ void hci_leds_update_powered(struct hci_dev *hdev, bool enabled)
        if (hdev->power_led)
                led_trigger_event(hdev->power_led,
                                  enabled ? LED_FULL : LED_OFF);
+
+       if (!enabled) {
+               struct hci_dev *d;
+
+               read_lock(&hci_dev_list_lock);
+
+               list_for_each_entry(d, &hci_dev_list, list) {
+                       if (test_bit(HCI_UP, &d->flags))
+                               enabled = true;
+               }
+
+               read_unlock(&hci_dev_list_lock);
+       }
+
+       led_trigger_event(bt_power_led_trigger, enabled ? LED_FULL : LED_OFF);
 }
 
 static void power_activate(struct led_classdev *led_cdev)
@@ -72,3 +89,13 @@ void hci_leds_init(struct hci_dev *hdev)
        /* initialize power_led */
        hdev->power_led = led_allocate_basic(hdev, power_activate, "power");
 }
+
+void bt_leds_init(void)
+{
+       led_trigger_register_simple("bluetooth-power", &bt_power_led_trigger);
+}
+
+void bt_leds_cleanup(void)
+{
+       led_trigger_unregister_simple(bt_power_led_trigger);
+}

diff --git a/net/bluetooth/leds.h b/net/bluetooth/leds.h
index a9c4d6ea01cf8c8ee6b1a02659c06f826174c814..08725a2fbd9b5682434347e567ff07c1f595cbcc 100644 (file)
--- a/net/bluetooth/leds.h
+++ b/net/bluetooth/leds.h
@@ -7,10 +7,20 @@
  */
 
 #if IS_ENABLED(CONFIG_BT_LEDS)
+
 void hci_leds_update_powered(struct hci_dev *hdev, bool enabled);
 void hci_leds_init(struct hci_dev *hdev);
+
+void bt_leds_init(void);
+void bt_leds_cleanup(void);
+
 #else
+
 static inline void hci_leds_update_powered(struct hci_dev *hdev,
                                           bool enabled) {}
 static inline void hci_leds_init(struct hci_dev *hdev) {}
+
+static inline void bt_leds_init(void) {}
+static inline void bt_leds_cleanup(void) {}
+
 #endif