From: Guodong Xu <guodong.xu@linaro.org>
To: marcel@holtmann.org, gustavo@padovan.org,
johan.hedberg@gmail.com, davem@davemloft.net,
xuwei5@hisilicon.com, robh+dt@kernel.org, pawel.moll@arm.com,
mark.rutland@arm.com, ijc+devicetree@hellion.org.uk,
galak@codeaurora.org, catalin.marinas@arm.com,
will.deacon@arm.com, haojian.zhuang@linaro.org,
linus.walleij@linaro.org, tony@atomide.com
Cc: linux-bluetooth@vger.kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, devicetree@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
Guodong Xu <guodong.xu@linaro.org>
Subject: [PATCH 1/2] Bluetooth: Add LED triggers for HCI frames tx and rx
Date: Thu, 23 Jun 2016 12:58:42 +0800 [thread overview]
Message-ID: <1466657923-5776-1-git-send-email-guodong.xu@linaro.org> (raw)
Two LED triggers are defined: tx_led and rx_led. Upon frames
available in HCI core layer, for tx or for rx, the combined LED
can blink.
Verified on HiKey, 96boards. It uses hi6220 SoC and TI WL1835 combo
chip.
Signed-off-by: Guodong Xu <guodong.xu@linaro.org>
---
include/net/bluetooth/hci_core.h | 1 +
net/bluetooth/hci_core.c | 3 +++
net/bluetooth/leds.c | 15 +++++++++++++++
net/bluetooth/leds.h | 2 ++
4 files changed, 21 insertions(+)
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index dc71473..37b8dd9 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -398,6 +398,7 @@ struct hci_dev {
bdaddr_t rpa;
struct led_trigger *power_led;
+ struct led_trigger *tx_led, *rx_led;
int (*open)(struct hci_dev *hdev);
int (*close)(struct hci_dev *hdev);
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 45a9fc6..c6e1210 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -3248,6 +3248,7 @@ int hci_recv_frame(struct hci_dev *hdev, struct sk_buff *skb)
skb_queue_tail(&hdev->rx_q, skb);
queue_work(hdev->workqueue, &hdev->rx_work);
+ hci_leds_blink_oneshot(hdev->rx_led);
return 0;
}
EXPORT_SYMBOL(hci_recv_frame);
@@ -3325,6 +3326,8 @@ static void hci_send_frame(struct hci_dev *hdev, struct sk_buff *skb)
BT_ERR("%s sending frame failed (%d)", hdev->name, err);
kfree_skb(skb);
}
+
+ hci_leds_blink_oneshot(hdev->tx_led);
}
/* Send HCI command */
diff --git a/net/bluetooth/leds.c b/net/bluetooth/leds.c
index 8319c84..c4825d5 100644
--- a/net/bluetooth/leds.c
+++ b/net/bluetooth/leds.c
@@ -19,6 +19,8 @@ struct hci_basic_led_trigger {
#define to_hci_basic_led_trigger(arg) container_of(arg, \
struct hci_basic_led_trigger, led_trigger)
+#define BLUETOOTH_BLINK_DELAY 50 /* ms */
+
void hci_leds_update_powered(struct hci_dev *hdev, bool enabled)
{
if (hdev->power_led)
@@ -37,6 +39,15 @@ static void power_activate(struct led_classdev *led_cdev)
led_trigger_event(led_cdev->trigger, powered ? LED_FULL : LED_OFF);
}
+void hci_leds_blink_oneshot(struct led_trigger *trig)
+{
+ unsigned long led_delay = BLUETOOTH_BLINK_DELAY;
+
+ if (!trig)
+ return;
+ led_trigger_blink_oneshot(trig, &led_delay, &led_delay, 0);
+}
+
static struct led_trigger *led_allocate_basic(struct hci_dev *hdev,
void (*activate)(struct led_classdev *led_cdev),
const char *name)
@@ -71,4 +82,8 @@ void hci_leds_init(struct hci_dev *hdev)
{
/* initialize power_led */
hdev->power_led = led_allocate_basic(hdev, power_activate, "power");
+ /* initialize tx_led */
+ hdev->tx_led = led_allocate_basic(hdev, NULL, "tx");
+ /* initialize rx_led */
+ hdev->rx_led = led_allocate_basic(hdev, NULL, "rx");
}
diff --git a/net/bluetooth/leds.h b/net/bluetooth/leds.h
index a9c4d6e..9b1cccd 100644
--- a/net/bluetooth/leds.h
+++ b/net/bluetooth/leds.h
@@ -9,8 +9,10 @@
#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 hci_leds_blink_oneshot(struct led_trigger *trig);
#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 hci_leds_blink_oneshot(struct led_trigger *trig) {}
#endif
--
1.9.1
next reply other threads:[~2016-06-23 4:58 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-23 4:58 Guodong Xu [this message]
2016-06-23 4:58 ` [PATCH 2/2] arm64: dts: hikey: set bluetooth led trigger Guodong Xu
2016-07-12 5:31 ` [PATCH 1/2] Bluetooth: Add LED triggers for HCI frames tx and rx Guodong Xu
2016-07-13 8:07 ` Marcel Holtmann
2016-07-14 7:08 ` Guodong Xu
2016-07-14 9:30 ` Guodong Xu
2016-07-14 9:42 ` Marcel Holtmann
2016-07-15 12:08 ` Guodong Xu
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=1466657923-5776-1-git-send-email-guodong.xu@linaro.org \
--to=guodong.xu@linaro.org \
--cc=catalin.marinas@arm.com \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=galak@codeaurora.org \
--cc=gustavo@padovan.org \
--cc=haojian.zhuang@linaro.org \
--cc=ijc+devicetree@hellion.org.uk \
--cc=johan.hedberg@gmail.com \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-bluetooth@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marcel@holtmann.org \
--cc=mark.rutland@arm.com \
--cc=netdev@vger.kernel.org \
--cc=pawel.moll@arm.com \
--cc=robh+dt@kernel.org \
--cc=tony@atomide.com \
--cc=will.deacon@arm.com \
--cc=xuwei5@hisilicon.com \
/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).