From patchwork Thu Jun 23 04:58:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guodong Xu X-Patchwork-Id: 70726 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp241724qgy; Wed, 22 Jun 2016 21:59:32 -0700 (PDT) X-Received: by 10.66.156.197 with SMTP id wg5mr3466017pab.8.1466657971976; Wed, 22 Jun 2016 21:59:31 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l187si4375293pfc.167.2016.06.22.21.59.30; Wed, 22 Jun 2016 21:59:31 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751912AbcFWE7Y (ORCPT + 30 others); Thu, 23 Jun 2016 00:59:24 -0400 Received: from mail-pf0-f170.google.com ([209.85.192.170]:34036 "EHLO mail-pf0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751571AbcFWE7W (ORCPT ); Thu, 23 Jun 2016 00:59:22 -0400 Received: by mail-pf0-f170.google.com with SMTP id h14so24739119pfe.1 for ; Wed, 22 Jun 2016 21:59:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=TJ9sawmGL3DQLXwLdvy+iKXThTg6VT16yLGq0e7BcU4=; b=GXzv27NaCtEmT7gdlAvrBiWAdfN6nDbLAAOvPPBMx1CBrxLLvD1cjgBisiLArTE+xk od9QiS4Lo2fUF+16NeYDgCNtwk/DTt45KoGfMRUVJKFx/bp7GB5e/5sdiI3WZZTLSXke WMVu1ZpxNxsn7Eu7uwdBX1G4aaVWByAWUMCG0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=TJ9sawmGL3DQLXwLdvy+iKXThTg6VT16yLGq0e7BcU4=; b=OKh7gC85InpnYyocKz56SInb5+6rdFmdCwDTvW7dvpcvau7lxEc8tcBZ+R753/hf4r CcgHRn7ZiTq8vB5OvbmE5mp+pMpVk4rHGnCNucbZNrb5nE4WP80neOvCovYbaKQJ3+D+ xNb9t10dWT0sqzNVdn2eqBEMasSQs4mduUAOrGw0g2mVhdLfPnDzdDrhQxubQ+4bHoKQ XYEiGmV0SwQKaSXQlJ04w2wPq+2G+n1w91mW8eQuJLTHXO6pauL9nn7NNM36cpfQSMoz jjtwRfuyuFzj46JWnv5yOIyg9m2iVbWll9gc2AV/FN+JcUyaOXS6u95ejR9S+BEwJWqx lm2Q== X-Gm-Message-State: ALyK8tLDCXCJpxkq48ABsVR/OwQDfx0wYL1XU4NzhYT3CCafmwnU89zAHudj8i4J6vzhMvmQ X-Received: by 10.98.68.84 with SMTP id r81mr40167045pfa.26.1466657961072; Wed, 22 Jun 2016 21:59:21 -0700 (PDT) Received: from localhost.localdomain ([45.56.152.22]) by smtp.gmail.com with ESMTPSA id bt5sm3435099pac.47.2016.06.22.21.59.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 22 Jun 2016 21:59:20 -0700 (PDT) From: Guodong Xu 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 Subject: [PATCH 1/2] Bluetooth: Add LED triggers for HCI frames tx and rx Date: Thu, 23 Jun 2016 12:58:42 +0800 Message-Id: <1466657923-5776-1-git-send-email-guodong.xu@linaro.org> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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(+) -- 1.9.1 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