From patchwork Mon Dec 4 03:21:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Lechner X-Patchwork-Id: 844081 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=lechnology.com header.i=@lechnology.com header.b="UzHFfN6P"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yqrYF2SQvz9s1h for ; Mon, 4 Dec 2017 14:52:17 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753474AbdLDDwP (ORCPT ); Sun, 3 Dec 2017 22:52:15 -0500 Received: from vern.gendns.com ([206.190.152.46]:34370 "EHLO vern.gendns.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752060AbdLDDwE (ORCPT ); Sun, 3 Dec 2017 22:52:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lechnology.com; s=default; h=References:In-Reply-To:Message-Id:Date:Subject :Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=fSnW1f0tyc+EHE44iNnewtEB+MBGkQ1YI2UjDNsh0jE=; b=UzHFfN6PfKTFhsV6hM0eRlS+y tuN66N6jPH6kyoAUDesT1Fxsd3Om99UPJSzUqLcyQXKgJbJERPGiBbystODIE1bRUyAgwDJ98iNDY ZPGgAZQDaz40VGlCQGJK1ocOI5qjJmc5fvMaKwqKHYNJMd+b1NnhwEIhnh0EIjdQimEfd8nWZLsoW 9d4ym7DDH0a2ydzFA8lhynfyykIifpSMlZd0qDlozXS6A4NE/5NAib2bv49ISd2ln2564/Zu7Oqm7 hI0uyusLFAUpHO/EzEj0WKiJ0CwyVvnlGpXWg5/D1dKvZmRmn4MNps9n5WEapYrrjuaj+D4MYvmuu Sk4KIGgWw==; Received: from 108-198-5-147.lightspeed.okcbok.sbcglobal.net ([108.198.5.147]:38892 helo=freyr.lechnology.com) by vern.gendns.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES128-SHA256:128) (Exim 4.89) (envelope-from ) id 1eLhIH-002X2k-39; Sun, 03 Dec 2017 22:19:45 -0500 From: David Lechner To: devicetree@vger.kernel.org, linux-bluetooth@vger.kernel.org Cc: David Lechner , Rob Herring , Mark Rutland , Marcel Holtmann , Gustavo Padovan , Johan Hedberg , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] dt-bindings: Add optional nvmem MAC address bindings to ti, wlink-st Date: Sun, 3 Dec 2017 21:21:20 -0600 Message-Id: <1512357682-8911-2-git-send-email-david@lechnology.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1512357682-8911-1-git-send-email-david@lechnology.com> References: <1512357682-8911-1-git-send-email-david@lechnology.com> X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - vern.gendns.com X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - lechnology.com X-Get-Message-Sender-Via: vern.gendns.com: authenticated_id: davidmain+lechnology.com/only user confirmed/virtual account not confirmed X-Authenticated-Sender: vern.gendns.com: davidmain@lechnology.com X-Source: X-Source-Args: X-Source-Dir: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This adds optional nvmem consumer properties to the ti,wlink-st device tree bindings to allow specifying the Bluetooth MAC address. Signed-off-by: David Lechner --- Documentation/devicetree/bindings/net/ti,wilink-st.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Documentation/devicetree/bindings/net/ti,wilink-st.txt b/Documentation/devicetree/bindings/net/ti,wilink-st.txt index 1649c1f..24eb897 100644 --- a/Documentation/devicetree/bindings/net/ti,wilink-st.txt +++ b/Documentation/devicetree/bindings/net/ti,wilink-st.txt @@ -32,6 +32,8 @@ Optional properties: See ../clocks/clock-bindings.txt for details. - clock-names : Must include the following entry: "ext_clock" (External clock provided to the TI combo chip). + - nvmem-cells: phandle to nvmem data cell that contains a MAC address + - nvmem-cell-names: "mac-address" (required when nvmem-cells is specified) Example: @@ -43,5 +45,7 @@ Example: enable-gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>; clocks = <&clk32k_wl18xx>; clock-names = "ext_clock"; + nvmem-cells: <&mac_address> + nvmem-cell-names "mac-address" }; }; From patchwork Mon Dec 4 03:21:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Lechner X-Patchwork-Id: 844079 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=lechnology.com header.i=@lechnology.com header.b="LF2mUGa3"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yqrY36qSMz9s1h for ; Mon, 4 Dec 2017 14:52:07 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753462AbdLDDwE (ORCPT ); Sun, 3 Dec 2017 22:52:04 -0500 Received: from vern.gendns.com ([206.190.152.46]:34368 "EHLO vern.gendns.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752981AbdLDDwB (ORCPT ); Sun, 3 Dec 2017 22:52:01 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lechnology.com; s=default; h=References:In-Reply-To:Message-Id:Date:Subject :Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=xCQEnrvuYaejFVjzGHk+PZB0G4r/j7HsRmOZbGbLf78=; b=LF2mUGa3Zs7LfSsPPQtusMcLl AroMLMrPw7KCkVmB95fV0ejcV9LxNuKGwMwFYi6KV7rVNPcpWGWsKVb9IfaNL8Ul8ACHl5BpSqA83 L+XKzNPZi2e2ztthcZVRZvrPgT3vongj9ejq6QY4QjpE7kxpORWjwQMQ6heR1TIQjnwu20Yz1wAtu tUIW4w9Fi38ClzcAM6lLcEaAXZniMMdn45a4GjvJV5ELSxAJd2KlTbsvBdM5WaZbe8yR1elD7p4NE 70QkZ01f9OKcs5gGMrb8CmOAJOLn9AwmHpOpScyXagEepuXGHkWX1xwORO870sjoJcvmmb6NhDYm+ g7pYVYWOg==; Received: from 108-198-5-147.lightspeed.okcbok.sbcglobal.net ([108.198.5.147]:38892 helo=freyr.lechnology.com) by vern.gendns.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES128-SHA256:128) (Exim 4.89) (envelope-from ) id 1eLhII-002X2k-By; Sun, 03 Dec 2017 22:19:46 -0500 From: David Lechner To: devicetree@vger.kernel.org, linux-bluetooth@vger.kernel.org Cc: David Lechner , Rob Herring , Mark Rutland , Marcel Holtmann , Gustavo Padovan , Johan Hedberg , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] bluetooth: hci_ll: add constant for vendor-specific command Date: Sun, 3 Dec 2017 21:21:21 -0600 Message-Id: <1512357682-8911-3-git-send-email-david@lechnology.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1512357682-8911-1-git-send-email-david@lechnology.com> References: <1512357682-8911-1-git-send-email-david@lechnology.com> X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - vern.gendns.com X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - lechnology.com X-Get-Message-Sender-Via: vern.gendns.com: authenticated_id: davidmain+lechnology.com/only user confirmed/virtual account not confirmed X-Authenticated-Sender: vern.gendns.com: davidmain@lechnology.com X-Source: X-Source-Args: X-Source-Dir: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This adds a #define for the vendor-specific HCI command to set the baudrate instead of using the bare 0xff36 multiple times. Signed-off-by: David Lechner --- drivers/bluetooth/hci_ll.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/bluetooth/hci_ll.c b/drivers/bluetooth/hci_ll.c index 447abea..974a788 100644 --- a/drivers/bluetooth/hci_ll.c +++ b/drivers/bluetooth/hci_ll.c @@ -56,6 +56,9 @@ #include "hci_uart.h" +/* Vendor-specific HCI commands */ +#define HCI_VS_UPDATE_UART_HCI_BAUDRATE 0xff36 + /* HCILL commands */ #define HCILL_GO_TO_SLEEP_IND 0x30 #define HCILL_GO_TO_SLEEP_ACK 0x31 @@ -620,7 +623,7 @@ static int download_firmware(struct ll_device *lldev) case ACTION_SEND_COMMAND: /* action send */ bt_dev_dbg(lldev->hu.hdev, "S"); cmd = (struct hci_command *)action_ptr; - if (cmd->opcode == 0xff36) { + if (cmd->opcode == HCI_VS_UPDATE_UART_HCI_BAUDRATE) { /* ignore remote change * baud rate HCI VS command */ @@ -704,7 +707,10 @@ static int ll_setup(struct hci_uart *hu) speed = 0; if (speed) { - struct sk_buff *skb = __hci_cmd_sync(hu->hdev, 0xff36, sizeof(speed), &speed, HCI_INIT_TIMEOUT); + struct sk_buff *skb; + + skb = __hci_cmd_sync(hu->hdev, HCI_VS_UPDATE_UART_HCI_BAUDRATE, + sizeof(speed), &speed, HCI_INIT_TIMEOUT); if (!IS_ERR(skb)) { kfree_skb(skb); serdev_device_set_baudrate(serdev, speed); From patchwork Mon Dec 4 03:21:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Lechner X-Patchwork-Id: 844080 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=lechnology.com header.i=@lechnology.com header.b="0D8Y8h9D"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yqrY62Fqyz9s72 for ; Mon, 4 Dec 2017 14:52:10 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753466AbdLDDwI (ORCPT ); Sun, 3 Dec 2017 22:52:08 -0500 Received: from vern.gendns.com ([206.190.152.46]:34376 "EHLO vern.gendns.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753461AbdLDDwE (ORCPT ); Sun, 3 Dec 2017 22:52:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lechnology.com; s=default; h=References:In-Reply-To:Message-Id:Date:Subject :Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=G/PwGkpOaHfcmjcCTwnwK5vPzMJ5Fiw+JkVS/RZzH/U=; b=0D8Y8h9D/BRvfn2JRdbR0BGLo 9IwkEGZrNxk5iv/1bN429HMBSeBoWzTM/rcVS+ob94vi2Wmqmi5B6PGMImWPcviulj7wA9M5wHwUp SGNV2AE3YP0ox9qImGB2CAvii94tLd6jZfEE45sXb6tcZxmP4/te2+dVJ+yf8sEt05iHosCPHkG2z k0wHhhudFPw9Y7uk3hJxeHxBcJ1RalHV/GFa25/bbmRb51CnCplvpHGtMNpR4xpB/4NBGxtdUagcE nwM70ppJr6L+5jp3wdjNYlEDKb3gqG4v9cMa4Jq2GIhoby4RjgCN35aW1dWzTVQv01TBPzhtetohd vOcHcXRZA==; Received: from 108-198-5-147.lightspeed.okcbok.sbcglobal.net ([108.198.5.147]:38892 helo=freyr.lechnology.com) by vern.gendns.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES128-SHA256:128) (Exim 4.89) (envelope-from ) id 1eLhIJ-002X2k-Og; Sun, 03 Dec 2017 22:19:47 -0500 From: David Lechner To: devicetree@vger.kernel.org, linux-bluetooth@vger.kernel.org Cc: David Lechner , Rob Herring , Mark Rutland , Marcel Holtmann , Gustavo Padovan , Johan Hedberg , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/3] bluetooth: hci_ll: Add optional nvmem MAC address source Date: Sun, 3 Dec 2017 21:21:22 -0600 Message-Id: <1512357682-8911-4-git-send-email-david@lechnology.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1512357682-8911-1-git-send-email-david@lechnology.com> References: <1512357682-8911-1-git-send-email-david@lechnology.com> X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - vern.gendns.com X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - lechnology.com X-Get-Message-Sender-Via: vern.gendns.com: authenticated_id: davidmain+lechnology.com/only user confirmed/virtual account not confirmed X-Authenticated-Sender: vern.gendns.com: davidmain@lechnology.com X-Source: X-Source-Args: X-Source-Dir: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This adds an optional nvmem consumer to get a MAC address from an external source. The MAC address is then set in the Bluetooth chip after the firmware has been loaded. This has been tested working with a TI CC2560A chip (in a LEGO MINDSTORMS EV3). Signed-off-by: David Lechner --- drivers/bluetooth/hci_ll.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/drivers/bluetooth/hci_ll.c b/drivers/bluetooth/hci_ll.c index 974a788..dd3b5c2 100644 --- a/drivers/bluetooth/hci_ll.c +++ b/drivers/bluetooth/hci_ll.c @@ -53,10 +53,12 @@ #include #include #include +#include #include "hci_uart.h" /* Vendor-specific HCI commands */ +#define HCI_VS_WRITE_BD_ADDR 0xfc06 #define HCI_VS_UPDATE_UART_HCI_BAUDRATE 0xff36 /* HCILL commands */ @@ -89,6 +91,7 @@ struct ll_device { struct serdev_device *serdev; struct gpio_desc *enable_gpio; struct clk *ext_clk; + u8 *bdaddr; }; struct ll_struct { @@ -698,6 +701,19 @@ static int ll_setup(struct hci_uart *hu) if (err) return err; + /* Set MAC address, if any */ + if (lldev->bdaddr) { + struct sk_buff *skb; + + skb = __hci_cmd_sync(hu->hdev, HCI_VS_WRITE_BD_ADDR, 6, + lldev->bdaddr, HCI_INIT_TIMEOUT); + if (IS_ERR(skb)) + bt_dev_err(hu->hdev, "Failed to set MAC address (%ld)", + PTR_ERR(skb)); + else + kfree_skb(skb); + } + /* Operational speed if any */ if (hu->oper_speed) speed = hu->oper_speed; @@ -726,6 +742,7 @@ static int hci_ti_probe(struct serdev_device *serdev) { struct hci_uart *hu; struct ll_device *lldev; + struct nvmem_cell *bdaddr_cell; u32 max_speed = 3000000; lldev = devm_kzalloc(&serdev->dev, sizeof(struct ll_device), GFP_KERNEL); @@ -747,6 +764,22 @@ static int hci_ti_probe(struct serdev_device *serdev) of_property_read_u32(serdev->dev.of_node, "max-speed", &max_speed); hci_uart_set_speeds(hu, 115200, max_speed); + /* optional MAC address from nvram */ + bdaddr_cell = nvmem_cell_get(&serdev->dev, "mac-address"); + if (IS_ERR(bdaddr_cell)) { + int err = PTR_ERR(bdaddr_cell); + + if (err != -ENOENT) { + if (err != -EPROBE_DEFER) + dev_err(&serdev->dev, + "Failed to get \"mac-address\" nvmem cell\n"); + return err; + } + } else { + lldev->bdaddr = nvmem_cell_read(bdaddr_cell, NULL); + nvmem_cell_put(bdaddr_cell); + } + return hci_uart_register_device(hu, &llp); }