From: Michal Sojka <sojka@merica.cz>
To: linux-usb@vger.kernel.org
Cc: Michal Sojka <sojka@merica.cz>, Bryan Wu <cooloney@gmail.com>,
Felipe Balbi <balbi@ti.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Linux LED Subsystem <linux-leds@vger.kernel.org>,
linux-kernel@vger.kernel.org, michal.vokac@comap.cz
Subject: [PATCH v2 2/3] usb: Add LED trigger for USB host activity
Date: Sat, 23 Aug 2014 02:08:21 +0200 [thread overview]
Message-ID: <1408752502-4162-3-git-send-email-sojka@merica.cz> (raw)
In-Reply-To: <1408752502-4162-1-git-send-email-sojka@merica.cz>
With this patch, USB host activity can be signaled by blinking a LED.
This should work with all host controllers. Tested only with musb.
Signed-off-by: Michal Sojka <sojka@merica.cz>
---
drivers/usb/core/Kconfig | 9 +++++++++
drivers/usb/core/Makefile | 1 +
drivers/usb/core/hcd.c | 2 ++
drivers/usb/core/led.c | 38 ++++++++++++++++++++++++++++++++++++++
include/linux/usb/hcd.h | 6 ++++++
5 files changed, 56 insertions(+)
create mode 100644 drivers/usb/core/led.c
diff --git a/drivers/usb/core/Kconfig b/drivers/usb/core/Kconfig
index 1060657..8295f65 100644
--- a/drivers/usb/core/Kconfig
+++ b/drivers/usb/core/Kconfig
@@ -90,3 +90,12 @@ config USB_OTG_FSM
Implements OTG Finite State Machine as specified in On-The-Go
and Embedded Host Supplement to the USB Revision 2.0 Specification.
+config USB_HOST_LED
+ bool "USB Host LED Trigger"
+ depends on LEDS_CLASS
+ select LEDS_TRIGGERS
+ help
+ This option adds a LED trigger for USB host controllers.
+
+ Say Y here if you are working on a system with led-class supported
+ LEDs and you want to use them as USB host activity indicators.
diff --git a/drivers/usb/core/Makefile b/drivers/usb/core/Makefile
index 2f6f932..324c8c9 100644
--- a/drivers/usb/core/Makefile
+++ b/drivers/usb/core/Makefile
@@ -9,5 +9,6 @@ usbcore-y += port.o
usbcore-$(CONFIG_PCI) += hcd-pci.o
usbcore-$(CONFIG_ACPI) += usb-acpi.o
+usbcore-$(CONFIG_USB_HOST_LED) += led.o
obj-$(CONFIG_USB) += usbcore.o
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index 487abcf..46d9f3a 100644
--- 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 (status == 0)
+ usb_hcd_led_activity();
/* pass ownership to the completion handler */
urb->status = status;
diff --git a/drivers/usb/core/led.c b/drivers/usb/core/led.c
new file mode 100644
index 0000000..49ff76c
--- /dev/null
+++ b/drivers/usb/core/led.c
@@ -0,0 +1,38 @@
+/*
+ * LED Trigger for USB Host 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/hcd.h>
+
+#define BLINK_DELAY 30
+
+DEFINE_LED_TRIGGER(ledtrig_usb_hcd);
+static unsigned long usb_hcd_blink_delay = BLINK_DELAY;
+
+void usb_hcd_led_activity(void)
+{
+ led_trigger_blink_oneshot(ledtrig_usb_hcd,
+ &usb_hcd_blink_delay, &usb_hcd_blink_delay, 0);
+}
+
+int __init ledtrig_usb_hcd_init(void)
+{
+ led_trigger_register_simple("usb-host", &ledtrig_usb_hcd);
+ return 0;
+}
+
+void __exit ledtrig_usb_hcd_exit(void)
+{
+ led_trigger_unregister_simple(ledtrig_usb_hcd);
+}
diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h
index b43f0fe..eb5fa0f 100644
--- a/include/linux/usb/hcd.h
+++ b/include/linux/usb/hcd.h
@@ -700,6 +700,12 @@ extern struct rw_semaphore ehci_cf_port_reset_rwsem;
#define USB_EHCI_LOADED 2
extern unsigned long usb_hcds_loaded;
+#ifdef CONFIG_USB_HOST_LED
+extern void usb_hcd_led_activity(void);
+#else
+static inline void usb_hcd_led_activity(void) {}
+#endif
+
#endif /* __KERNEL__ */
#endif /* __USB_CORE_HCD_H */
--
2.1.0
next prev parent reply other threads:[~2014-08-23 0:08 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-22 11:53 [PATCH 1/2] leds: usb: Add LED trigger for USB gadget activity Michal Sojka
2014-08-22 11:53 ` [PATCH 2/2] leds: usb: Add LED trigger for USB host activity Michal Sojka
[not found] ` <1408708399-20423-1-git-send-email-sojka-Knnw/vAvyUalVyrhU4qvOw@public.gmane.org>
2014-08-22 17:39 ` [PATCH 1/2] leds: usb: Add LED trigger for USB gadget activity Bryan Wu
2014-08-22 21:42 ` Greg Kroah-Hartman
2014-08-22 23:41 ` Bryan Wu
2014-08-22 23:44 ` Michal Sojka
2014-08-22 21:59 ` Felipe Balbi
2014-08-22 23:54 ` Michal Sojka
2014-08-23 0:08 ` [PATCH v2 0/3] LED triggers for USB host and device Michal Sojka
2014-08-23 0:08 ` [PATCH v2 1/3] usb: Add missing #include Michal Sojka
2014-08-23 0:08 ` Michal Sojka [this message]
2014-08-23 0:30 ` [PATCH v2 2/3] usb: Add LED trigger for USB host activity Bryan Wu
2014-08-23 9:52 ` Michal Sojka
[not found] ` <87egw7a5yd.fsf-RBRde3N6TzKEyWgh05NgWw@public.gmane.org>
2014-08-25 18:59 ` Bryan Wu
2014-08-27 13:03 ` [PATCH v3 0/2] LED triggers for USB host and device Michal Sojka
2014-08-27 13:03 ` [PATCH v3 1/2] usb: gadget: Refactor request completion Michal Sojka
2014-08-27 13:43 ` Michal Sojka
2014-08-27 15:03 ` Alan Stern
[not found] ` <1409144625-25274-2-git-send-email-sojka-Knnw/vAvyUalVyrhU4qvOw@public.gmane.org>
2014-08-27 20:17 ` Felipe Balbi
2014-08-27 13:03 ` [PATCH v3 2/2] usb: Add LED triggers for USB activity Michal Sojka
2014-08-27 19:27 ` Greg Kroah-Hartman
2014-08-27 19:30 ` Felipe Balbi
2014-08-27 20:57 ` [PATCH v4 0/3] LED triggers for USB host and device Michal Sojka
2014-08-27 20:57 ` [PATCH v4 1/3] usb: gadget: Refactor request completion Michal Sojka
2014-08-27 21:03 ` Alan Stern
2014-08-27 21:09 ` Greg Kroah-Hartman
2014-08-27 20:57 ` [PATCH v4 2/3] usb: Rename usb-common.c Michal Sojka
2014-08-27 20:58 ` [PATCH v4 3/3] usb: Add LED triggers for USB activity Michal Sojka
2014-08-27 21:08 ` Greg Kroah-Hartman
2014-08-29 12:57 ` Michal Sojka
2014-08-29 13:07 ` [PATCH v5 0/3] LED triggers for USB host and device Michal Sojka
2014-08-29 13:07 ` [PATCH v5 1/3] usb: gadget: Refactor request completion Michal Sojka
2014-08-29 13:07 ` [PATCH v5 2/3] usb: Rename usb-common.c Michal Sojka
2014-08-29 13:07 ` [PATCH v5 3/3] usb: Add LED triggers for USB activity Michal Sojka
2014-08-23 0:08 ` [PATCH v2 3/3] usb: Add LED trigger for USB gadget activity Michal Sojka
2014-08-23 0:23 ` [PATCH v2 0/3] LED triggers for USB host and device Bryan Wu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1408752502-4162-3-git-send-email-sojka@merica.cz \
--to=sojka@merica.cz \
--cc=balbi@ti.com \
--cc=cooloney@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-leds@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=michal.vokac@comap.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).