Return-Path: Sender: "Gustavo F. Padovan" Date: Tue, 8 Feb 2011 16:16:59 -0200 From: "Gustavo F. Padovan" To: pavan_savoy@ti.com Cc: linux-bluetooth@vger.kernel.org, marcel@holtmann.org Subject: Re: [PATCH v9] Bluetooth: btwilink driver Message-ID: <20110208181659.GB2160@joana> References: <1297080737-21032-1-git-send-email-pavan_savoy@ti.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <1297080737-21032-1-git-send-email-pavan_savoy@ti.com> List-ID: Hi Pavan, * pavan_savoy@ti.com [2011-02-07 06:12:17 -0600]: > From: Pavan Savoy > > Gustavo, > > Find below the patch version v9. > Have taken care of Ville's comments. > In addition fixed the issue seen when built as module, with > repeated probe/remove of the platform driver. > > patch v8 comments taken care, > > As suggested, the modifications to TI ST driver to remove the bluetooth > references have been made and the changes have been merged to the > linux-next tree. > > Find below the patch for the btwilink driver, > I have taken care of your following comments, > 1. channel IDs and the offsets are now being taken from the > header file hci.h. > 2. removed the un-necessary BT_ERR. > 3. changed the order during return from st_register. > 4. continue to unregister even if 1st unregister fails. > > Please review and provide comments, > > Thanks & Regards, > Pavan Savoy > > -- patch description -- > > This is the bluetooth protocol driver for the TI WiLink7 chipsets. > Texas Instrument's WiLink chipsets combine wireless technologies > like BT, FM, GPS and WLAN onto a single chip. > > This Bluetooth driver works on top of the TI_ST shared transport > line discipline driver which also allows other drivers like > FM V4L2 and GPS character driver to make use of the same UART interface. > > Kconfig and Makefile modifications to enable the Bluetooth > driver for Texas Instrument's WiLink 7 chipset. > > Signed-off-by: Pavan Savoy > --- > drivers/bluetooth/Kconfig | 10 + > drivers/bluetooth/Makefile | 1 + > drivers/bluetooth/btwilink.c | 397 ++++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 408 insertions(+), 0 deletions(-) > create mode 100644 drivers/bluetooth/btwilink.c > > diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig > index 02deef4..8e0de9a 100644 > --- a/drivers/bluetooth/Kconfig > +++ b/drivers/bluetooth/Kconfig > @@ -219,4 +219,14 @@ config BT_ATH3K > Say Y here to compile support for "Atheros firmware download driver" > into the kernel or say M to compile it as module (ath3k). > > +config BT_WILINK > + tristate "Texas Instruments WiLink7 driver" > + depends on TI_ST > + help > + This enables the Bluetooth driver for Texas Instrument's BT/FM/GPS > + combo devices. This makes use of shared transport line discipline > + core driver to communicate with the BT core of the combo chip. > + > + Say Y here to compile support for Texas Instrument's WiLink7 driver > + into the kernel or say M to compile it as module. > endmenu > diff --git a/drivers/bluetooth/Makefile b/drivers/bluetooth/Makefile > index 71bdf13..f4460f4 100644 > --- a/drivers/bluetooth/Makefile > +++ b/drivers/bluetooth/Makefile > @@ -18,6 +18,7 @@ obj-$(CONFIG_BT_HCIBTSDIO) += btsdio.o > obj-$(CONFIG_BT_ATH3K) += ath3k.o > obj-$(CONFIG_BT_MRVL) += btmrvl.o > obj-$(CONFIG_BT_MRVL_SDIO) += btmrvl_sdio.o > +obj-$(CONFIG_BT_WILINK) += btwilink.o > > btmrvl-y := btmrvl_main.o > btmrvl-$(CONFIG_DEBUG_FS) += btmrvl_debugfs.o > diff --git a/drivers/bluetooth/btwilink.c b/drivers/bluetooth/btwilink.c > new file mode 100644 > index 0000000..79c70c2 > --- /dev/null > +++ b/drivers/bluetooth/btwilink.c > @@ -0,0 +1,397 @@ > +/* > + * Texas Instrument's Bluetooth Driver For Shared Transport. > + * > + * Bluetooth Driver acts as interface between HCI core and > + * TI Shared Transport Layer. > + * > + * Copyright (C) 2009-2010 Texas Instruments > + * Author: Raja Mani > + * Pavan Savoy > + * > + * 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. > + * > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * You should have received a copy of the GNU General Public License > + * along with this program; if not, write to the Free Software > + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > + * > + */ > +#define DEBUG > +#include > +#include > +#include > +#include > + > +#include > + > +/* Bluetooth Driver Version */ > +#define VERSION "1.0" > +#define MAX_BT_CHNL_IDS 3 > + > +/* Number of seconds to wait for registration completion > + * when ST returns PENDING status. > + */ > +#define BT_REGISTER_TIMEOUT 6000 /* 6 sec */ > + > +/** > + * struct ti_st - driver operation structure > + * @hdev: hci device pointer which binds to bt driver > + * @reg_status: ST registration callback status > + * @st_write: write function provided by the ST driver > + * to be used by the driver during send_frame. > + * @wait_reg_completion - completion sync between ti_st_open > + * and st_reg_completion_cb. > + */ > +struct ti_st { > + struct hci_dev *hdev; > + char reg_status; > + long (*st_write) (struct sk_buff *); > + struct completion wait_reg_completion; > +}; > + > +/* Increments HCI counters based on pocket ID (cmd,acl,sco) */ > +static inline void ti_st_tx_complete(struct ti_st *hst, int pkt_type) > +{ > + struct hci_dev *hdev = hst->hdev; > + > + /* Update HCI stat counters */ > + switch (pkt_type) { > + case HCI_COMMAND_PKT: > + hdev->stat.cmd_tx++; > + break; > + > + case HCI_ACLDATA_PKT: > + hdev->stat.acl_tx++; > + break; > + > + case HCI_SCODATA_PKT: > + hdev->stat.sco_tx++; > + break; > + } > +} > + > +/* ------- Interfaces to Shared Transport ------ */ > + > +/* Called by ST layer to indicate protocol registration completion > + * status.ti_st_open() function will wait for signal from this > + * API when st_register() function returns ST_PENDING. > + */ > +static void st_reg_completion_cb(void *priv_data, char data) > +{ > + struct ti_st *lhst = priv_data; > + > + /* Save registration status for use in ti_st_open() */ > + lhst->reg_status = data; > + /* complete the wait in ti_st_open() */ > + complete(&lhst->wait_reg_completion); > +} > + > +/* Called by Shared Transport layer when receive data is > + * available */ > +static long st_receive(void *priv_data, struct sk_buff *skb) > +{ > + struct ti_st *lhst = priv_data; > + int err; > + > + if (!skb) > + return -EFAULT; > + > + if (!lhst) { > + kfree_skb(skb); > + return -EFAULT; > + } > + > + skb->dev = (void *) lhst->hdev; > + > + /* Forward skb to HCI core layer */ > + err = hci_recv_frame(skb); > + if (err < 0) { > + BT_ERR("Unable to push skb to HCI core(%d)", err); > + return err; > + } > + > + lhst->hdev->stat.byte_rx += skb->len; > + > + return 0; > +} > + > +/* ------- Interfaces to HCI layer ------ */ > +/* protocol structure registered with shared transport */ > +static struct st_proto_s ti_st_proto[MAX_BT_CHNL_IDS] = { > + { > + .chnl_id = HCI_ACLDATA_PKT, /* ACL */ > + .hdr_len = sizeof(struct hci_acl_hdr), > + .offset_len_in_hdr = offsetof(struct hci_acl_hdr, dlen), > + .len_size = 2, /* sizeof(dlen) in struct hci_acl_hdr */ > + .reserve = 8, > + }, > + { > + .chnl_id = HCI_SCODATA_PKT, /* SCO */ > + .hdr_len = sizeof(struct hci_sco_hdr), > + .offset_len_in_hdr = offsetof(struct hci_sco_hdr, dlen), > + .len_size = 1, /* sizeof(dlen) in struct hci_sco_hdr */ > + .reserve = 8, > + }, > + { > + .chnl_id = HCI_EVENT_PKT, /* HCI Events */ > + .hdr_len = sizeof(struct hci_event_hdr), > + .offset_len_in_hdr = offsetof(struct hci_event_hdr, plen), > + .len_size = 1, /* sizeof(plen) in struct hci_event_hdr */ > + .reserve = 8, > + }, > +}; > + > +/* Called from HCI core to initialize the device */ > +static int ti_st_open(struct hci_dev *hdev) > +{ > + unsigned long timeleft; > + struct ti_st *hst; > + int err, i; > + > + BT_DBG("%s %p", hdev->name, hdev); > + > + if (test_and_set_bit(HCI_RUNNING, &hdev->flags)) > + return -EBUSY; > + > + /* provide contexts for callbacks from ST */ > + hst = hdev->driver_data; > + > + for (i = 0; i < MAX_BT_CHNL_IDS; i++) { > + ti_st_proto[i].priv_data = hst; > + ti_st_proto[i].max_frame_size = HCI_MAX_FRAME_SIZE; > + ti_st_proto[i].recv = st_receive; > + ti_st_proto[i].reg_complete_cb = st_reg_completion_cb; > + > + /* Prepare wait-for-completion handler */ > + init_completion(&hst->wait_reg_completion); > + > + err = st_register(&ti_st_proto[i]); > + if (!err) > + goto done_downloading_firmware; > + > + if (err != -EINPROGRESS) { > + clear_bit(HCI_RUNNING, &hdev->flags); > + BT_ERR("st_register failed %d", err); > + return err; > + } > + > + /* ST is busy with either protocol > + * registration or firmware download. > + */ > + > + /* Reset ST registration callback status flag, > + * this value will be updated in > + * st_reg_completion_cb() > + * function whenever it called from ST driver. > + */ > + hst->reg_status = -EINPROGRESS; > + > + BT_DBG("waiting for registration " > + "completion signal from ST"); > + timeleft = wait_for_completion_timeout > + (&hst->wait_reg_completion, > + msecs_to_jiffies(BT_REGISTER_TIMEOUT)); > + if (!timeleft) { > + clear_bit(HCI_RUNNING, &hdev->flags); > + BT_ERR("Timeout(%d sec),didn't get reg " > + "completion signal from ST", > + BT_REGISTER_TIMEOUT / 1000); > + return -ETIMEDOUT; > + } > + > + /* Is ST registration callback > + * called with ERROR status? */ > + if (hst->reg_status != 0) { > + clear_bit(HCI_RUNNING, &hdev->flags); > + BT_ERR("ST registration completed with invalid " > + "status %d", hst->reg_status); > + return -EAGAIN; > + } > + > +done_downloading_firmware: done_downloading_firmware is way too big, please use just "done". > + hst->st_write = ti_st_proto[i].write; > + if (!hst->st_write) { > + BT_ERR("undefined ST write function"); > + clear_bit(HCI_RUNNING, &hdev->flags); > + for (i = 0; i < MAX_BT_CHNL_IDS; i++) { > + /* Undo registration with ST */ > + err = st_unregister(&ti_st_proto[i]); > + if (err) > + BT_ERR("st_unregister() failed with " > + "error %d", err); > + hst->st_write = NULL; > + } > + return -EIO; > + } > + } > + return 0; > +} > + > +/* Close device */ > +static int ti_st_close(struct hci_dev *hdev) > +{ > + int err, i; > + struct ti_st *hst = hdev->driver_data; > + > + if (!test_and_clear_bit(HCI_RUNNING, &hdev->flags)) > + return 0; > + > + for (i = 0; i < MAX_BT_CHNL_IDS; i++) { > + err = st_unregister(&ti_st_proto[i]); > + if (err) > + BT_ERR("st_unregister(%d) failed with error %d", > + ti_st_proto[i].chnl_id, err); > + } > + > + hst->st_write = NULL; > + > + return err; > +} > + > +static int ti_st_send_frame(struct sk_buff *skb) > +{ > + struct hci_dev *hdev; > + struct ti_st *hst; > + long len; > + > + hdev = (struct hci_dev *)skb->dev; > + > + if (!test_bit(HCI_RUNNING, &hdev->flags)) > + return -EBUSY; > + > + hst = hdev->driver_data; > + > + /* Prepend skb with frame type */ > + memcpy(skb_push(skb, 1), &bt_cb(skb)->pkt_type, 1); > + > + BT_DBG("%s: type %d len %d", hdev->name, bt_cb(skb)->pkt_type, > + skb->len); > + > + /* Insert skb to shared transport layer's transmit queue. > + * Freeing skb memory is taken care in shared transport layer, > + * so don't free skb memory here. > + */ > + len = hst->st_write(skb); > + if (len < 0) { > + kfree_skb(skb); > + BT_ERR("ST write failed (%ld)", len); > + /* Try Again, would only fail if UART has gone bad */ > + return -EAGAIN; > + } > + > + /* ST accepted our skb. So, Go ahead and do rest */ > + hdev->stat.byte_tx += len; > + ti_st_tx_complete(hst, bt_cb(skb)->pkt_type); > + > + return 0; > +} > + > +static void ti_st_destruct(struct hci_dev *hdev) > +{ > + BT_DBG("%s", hdev->name); > + /* do nothing here, since platform remove > + * would free the hdev->driver_data > + */ > +} Then remove this function... > + > +static int bt_ti_probe(struct platform_device *pdev) > +{ > + static struct ti_st *hst; > + struct hci_dev *hdev; > + int err; > + > + hst = kzalloc(sizeof(struct ti_st), GFP_KERNEL); > + if (!hst) > + return -ENOMEM; > + > + /* Expose "hciX" device to user space */ > + hdev = hci_alloc_dev(); > + if (!hdev) { > + kfree(hst); > + return -ENOMEM; > + } > + > + BT_DBG("hdev %p", hdev); > + > + hst->hdev = hdev; > + hdev->bus = HCI_UART; > + hdev->driver_data = hst; > + hdev->open = ti_st_open; > + hdev->close = ti_st_close; > + hdev->flush = NULL; > + hdev->send = ti_st_send_frame; > + hdev->destruct = ti_st_destruct; ...and also the line that sets it. -- Gustavo F. Padovan http://profusion.mobi