usb: Add LED triggers for USB activity

With this patch, USB activity can be signaled by blinking a LED. There
are two triggers, one for activity on USB host and one for USB gadget.

Both triggers should work with all host/device controllers. Tested only
with musb.

Performace: I measured performance overheads on ARM Cortex-A8 (TI
AM335x) running on 600 MHz.

Duration of usb_led_activity():
- with no LED attached to the trigger:        2 ± 1 µs
- with one GPIO LED attached to the trigger:  2 ± 1 µs or 8 ± 2 µs (two peaks in histogram)

Duration of functions calling usb_led_activity() (with this patch
applied and no LED attached to the trigger):
- __usb_hcd_giveback_urb():    10 - 25 µs
- usb_gadget_giveback_request(): 2 - 6 µs

Signed-off-by: Michal Sojka <sojka@merica.cz>
Acked-by: Felipe Balbi <balbi@ti.com>
Tested-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index cf1b19bca3064621a8d772b76a37f504346bb848..ae481c37a20860aff2791cdd74705dbb0117507e 100644 (file)
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -149,4 +149,14 @@ source "drivers/usb/phy/Kconfig"
 
 source "drivers/usb/gadget/Kconfig"
 
+config USB_LED_TRIG
+       bool "USB LED Triggers"
+       depends on LEDS_CLASS && USB_COMMON && LEDS_TRIGGERS
+       help
+         This option adds LED triggers for USB host and/or gadget activity.
+
+         Say Y here if you are working on a system with led-class supported
+         LEDs and you want to use them as activity indicators for USB host or
+         gadget.
+
 endif # USB_SUPPORT

diff --git a/drivers/usb/common/Makefile b/drivers/usb/common/Makefile
index 052c12069c2487b674e430343a62985efd9db82c..ca2f8bd0e4315c512ad95225961707b752c5f13f 100644 (file)
--- a/drivers/usb/common/Makefile
+++ b/drivers/usb/common/Makefile
@@ -4,5 +4,6 @@
 
 obj-$(CONFIG_USB_COMMON)         += usb-common.o
 usb-common-y                     += common.o
+usb-common-$(CONFIG_USB_LED_TRIG) += led.o
 
 obj-$(CONFIG_USB_OTG_FSM) += usb-otg-fsm.o

diff --git a/drivers/usb/common/led.c b/drivers/usb/common/led.c
new file mode 100644 (file)
index 0000000..df23da0
--- /dev/null
+++ b/drivers/usb/common/led.c
@@ -0,0 +1,57 @@
+/*
+ * LED Triggers for USB Activity
+ *
+ * Copyright 2014 Michal Sojka <sojka@merica.cz>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/leds.h>
+#include <linux/usb.h>
+
+#define BLINK_DELAY 30
+
+static unsigned long usb_blink_delay = BLINK_DELAY;
+
+DEFINE_LED_TRIGGER(ledtrig_usb_gadget);
+DEFINE_LED_TRIGGER(ledtrig_usb_host);
+
+void usb_led_activity(enum usb_led_event ev)
+{
+       struct led_trigger *trig = NULL;
+
+       switch (ev) {
+       case USB_LED_EVENT_GADGET:
+               trig = ledtrig_usb_gadget;
+               break;
+       case USB_LED_EVENT_HOST:
+               trig = ledtrig_usb_host;
+               break;
+       }
+       /* led_trigger_blink_oneshot() handles trig == NULL gracefully */
+       led_trigger_blink_oneshot(trig, &usb_blink_delay, &usb_blink_delay, 0);
+}
+EXPORT_SYMBOL_GPL(usb_led_activity);
+
+
+static int __init ledtrig_usb_init(void)
+{
+       led_trigger_register_simple("usb-gadget", &ledtrig_usb_gadget);
+       led_trigger_register_simple("usb-host", &ledtrig_usb_host);
+       return 0;
+}
+
+static void __exit ledtrig_usb_exit(void)
+{
+       led_trigger_unregister_simple(ledtrig_usb_gadget);
+       led_trigger_unregister_simple(ledtrig_usb_host);
+}
+
+module_init(ledtrig_usb_init);
+module_exit(ledtrig_usb_exit);

diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index d3fe161bec0544bed43aff9cd3169c205b335c3c..bcb96ff207ba3e74fc0e47b39e21f4c62b9ec7b4 100644 (file)
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -1664,6 +1664,8 @@ static void __usb_hcd_giveback_urb(struct urb *urb)
        usbmon_urb_complete(&hcd->self, urb, status);
        usb_anchor_suspend_wakeups(anchor);
        usb_unanchor_urb(urb);
+       if (likely(status == 0))
+               usb_led_activity(USB_LED_EVENT_HOST);
 
        /* pass ownership to the completion handler */
        urb->status = status;

diff --git a/drivers/usb/gadget/udc/udc-core.c b/drivers/usb/gadget/udc/udc-core.c
index 16d3f6fedd1c8bdcc6ee46d586a4f4757abd89ce..f107bb60a5ab3bc342adf61ae771707653ac23b2 100644 (file)
--- a/drivers/usb/gadget/udc/udc-core.c
+++ b/drivers/usb/gadget/udc/udc-core.c
@@ -27,6 +27,7 @@
 
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
+#include <linux/usb.h>
 
 /**
  * struct usb_udc - describes one usb device controller
@@ -116,6 +117,9 @@ EXPORT_SYMBOL_GPL(usb_gadget_unmap_request);
 void usb_gadget_giveback_request(struct usb_ep *ep,
                struct usb_request *req)
 {
+       if (likely(req->status == 0))
+               usb_led_activity(USB_LED_EVENT_GADGET);
+
        req->complete(ep, req);
 }
 EXPORT_SYMBOL_GPL(usb_gadget_giveback_request);

diff --git a/include/linux/usb.h b/include/linux/usb.h
index d2465bc0e73c211011af86b1b05d74baa5ae2ab6..447a7e2fc19bacfd92b2f11182e4dbf8863bf400 100644 (file)
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -1862,6 +1862,18 @@ extern void usb_unregister_notify(struct notifier_block *nb);
 /* debugfs stuff */
 extern struct dentry *usb_debug_root;
 
+/* LED triggers */
+enum usb_led_event {
+       USB_LED_EVENT_HOST = 0,
+       USB_LED_EVENT_GADGET = 1,
+};
+
+#ifdef CONFIG_USB_LED_TRIG
+extern void usb_led_activity(enum usb_led_event ev);
+#else
+static inline void usb_led_activity(enum usb_led_event ev) {}
+#endif
+
 #endif  /* __KERNEL__ */
 
 #endif