Initial Contribution
msm-2.6.38: tag AU_LINUX_ANDROID_GINGERBREAD.02.03.04.00.142
Signed-off-by: Bryan Huntsman <bryanh@codeaurora.org>
diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig
index 11b41fd..ea1c27a 100644
--- a/drivers/bluetooth/Kconfig
+++ b/drivers/bluetooth/Kconfig
@@ -2,6 +2,16 @@
menu "Bluetooth device drivers"
depends on BT
+config BT_HCISMD
+ tristate "HCI SMD driver"
+ help
+ Bluetooth HCI SMD driver.
+ This driver is required if you want to use Bluetoth device with
+ SMD interface.
+
+ Say Y here to compile support for Bluetooth USB devices into the
+ kernel or say M to compile is as a module (hci_smd).
+
config BT_HCIBTUSB
tristate "HCI USB driver"
depends on USB
@@ -81,6 +91,17 @@
Say Y here to compile support for HCILL protocol.
+config BT_HCIUART_IBS
+ bool "HCI_IBS protocol support"
+ depends on BT_HCIUART
+ default n
+ help
+ HCI_IBS (HCI In-Band Sleep) is a serial protocol for communication
+ between Bluetooth device and host. This protocol is required for
+ UART clock control for some Qualcomm Bluetooth devices.
+
+ Say Y here to compile support for HCI_IBS protocol.
+
config BT_HCIBCM203X
tristate "HCI BCM203x USB driver"
depends on USB
@@ -104,6 +125,14 @@
Say Y here to compile support for HCI BPA10x devices into the
kernel or say M to compile it as module (bpa10x).
+config BT_MSM_SLEEP
+ tristate "MSM Bluesleep driver"
+ depends on BT && SERIAL_MSM_HS
+ default n
+ help
+ Bluetooth MSM bluesleep driver.
+ This driver provides support for BTS sleep.
+
config BT_HCIBFUSB
tristate "HCI BlueFRITZ! USB driver"
depends on USB
@@ -207,6 +236,14 @@
Say Y here to compile support for Marvell BT-over-SDIO driver
into the kernel or say M to compile it as module.
+config MSM_BT_POWER
+ tristate "MSM Bluetooth Power Control"
+ depends on ARCH_MSM && RFKILL
+ default m
+ help
+ Provides a parameter to switch on/off power from PMIC
+ to Bluetooth device.
+
config BT_ATH3K
tristate "Atheros firmware download driver"
depends on BT_HCIBTUSB
diff --git a/drivers/bluetooth/Makefile b/drivers/bluetooth/Makefile
index f4460f4..a20a056 100644
--- a/drivers/bluetooth/Makefile
+++ b/drivers/bluetooth/Makefile
@@ -2,6 +2,7 @@
# Makefile for the Linux Bluetooth HCI device drivers.
#
+obj-$(CONFIG_BT_HCISMD) += hci_smd.o
obj-$(CONFIG_BT_HCIVHCI) += hci_vhci.o
obj-$(CONFIG_BT_HCIUART) += hci_uart.o
obj-$(CONFIG_BT_HCIBCM203X) += bcm203x.o
@@ -28,4 +29,8 @@
hci_uart-$(CONFIG_BT_HCIUART_BCSP) += hci_bcsp.o
hci_uart-$(CONFIG_BT_HCIUART_LL) += hci_ll.o
hci_uart-$(CONFIG_BT_HCIUART_ATH3K) += hci_ath.o
+hci_uart-$(CONFIG_BT_HCIUART_IBS) += hci_ibs.o
hci_uart-objs := $(hci_uart-y)
+obj-$(CONFIG_BT_MSM_SLEEP) += msm_bt_sleep.o
+msm_bt_sleep-objs := bluesleep.o
+obj-$(CONFIG_MSM_BT_POWER) += bluetooth-power.o
diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c
index a585473..695d441 100644
--- a/drivers/bluetooth/ath3k.c
+++ b/drivers/bluetooth/ath3k.c
@@ -62,7 +62,6 @@
/* Atheros AR3011 with sflash firmware*/
{ USB_DEVICE(0x0CF3, 0x3002) },
- { USB_DEVICE(0x13d3, 0x3304) },
/* Atheros AR9285 Malbec with sflash firmware */
{ USB_DEVICE(0x03F0, 0x311D) },
@@ -375,11 +374,6 @@
/* load patch and sysconfig files for AR3012 */
if (id->driver_info & BTUSB_ATH3012) {
-
- /* New firmware with patch and sysconfig files already loaded */
- if (le16_to_cpu(udev->descriptor.bcdDevice) > 0x0001)
- return -ENODEV;
-
ret = ath3k_load_patch(udev);
if (ret < 0) {
BT_ERR("Loading patch file failed");
diff --git a/drivers/bluetooth/bluecard_cs.c b/drivers/bluetooth/bluecard_cs.c
index aed1904..4104b7f 100644
--- a/drivers/bluetooth/bluecard_cs.c
+++ b/drivers/bluetooth/bluecard_cs.c
@@ -930,7 +930,7 @@
pcmcia_disable_device(link);
}
-static const struct pcmcia_device_id bluecard_ids[] = {
+static struct pcmcia_device_id bluecard_ids[] = {
PCMCIA_DEVICE_PROD_ID12("BlueCard", "LSE041", 0xbaf16fbf, 0x657cc15e),
PCMCIA_DEVICE_PROD_ID12("BTCFCARD", "LSE139", 0xe3987764, 0x2524b59c),
PCMCIA_DEVICE_PROD_ID12("WSS", "LSE039", 0x0a0736ec, 0x24e6dfab),
diff --git a/drivers/bluetooth/bluesleep.c b/drivers/bluetooth/bluesleep.c
new file mode 100644
index 0000000..0d11141
--- /dev/null
+++ b/drivers/bluetooth/bluesleep.c
@@ -0,0 +1,757 @@
+/*
+
+ 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.
+
+ 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
+
+ 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.
+
+
+ Copyright (C) 2006-2007 - Motorola
+ Copyright (c) 2008-2010, Code Aurora Forum. All rights reserved.
+
+ Date Author Comment
+ ----------- -------------- --------------------------------
+ 2006-Apr-28 Motorola The kernel module for running the Bluetooth(R)
+ Sleep-Mode Protocol from the Host side
+ 2006-Sep-08 Motorola Added workqueue for handling sleep work.
+ 2007-Jan-24 Motorola Added mbm_handle_ioi() call to ISR.
+
+*/
+
+#include <linux/module.h> /* kernel module definitions */
+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/kernel.h>
+#include <linux/notifier.h>
+#include <linux/proc_fs.h>
+#include <linux/spinlock.h>
+#include <linux/timer.h>
+#include <linux/uaccess.h>
+#include <linux/version.h>
+#include <linux/workqueue.h>
+#include <linux/platform_device.h>
+
+#include <linux/irq.h>
+#include <linux/param.h>
+#include <linux/bitops.h>
+#include <linux/termios.h>
+#include <mach/gpio.h>
+#include <mach/msm_serial_hs.h>
+
+#include <net/bluetooth/bluetooth.h>
+#include <net/bluetooth/hci_core.h> /* event notifications */
+#include "hci_uart.h"
+
+#define BT_SLEEP_DBG
+#ifndef BT_SLEEP_DBG
+#define BT_DBG(fmt, arg...)
+#endif
+/*
+ * Defines
+ */
+
+#define VERSION "1.1"
+#define PROC_DIR "bluetooth/sleep"
+
+struct bluesleep_info {
+ unsigned host_wake;
+ unsigned ext_wake;
+ unsigned host_wake_irq;
+ struct uart_port *uport;
+};
+
+/* work function */
+static void bluesleep_sleep_work(struct work_struct *work);
+
+/* work queue */
+DECLARE_DELAYED_WORK(sleep_workqueue, bluesleep_sleep_work);
+
+/* Macros for handling sleep work */
+#define bluesleep_rx_busy() schedule_delayed_work(&sleep_workqueue, 0)
+#define bluesleep_tx_busy() schedule_delayed_work(&sleep_workqueue, 0)
+#define bluesleep_rx_idle() schedule_delayed_work(&sleep_workqueue, 0)
+#define bluesleep_tx_idle() schedule_delayed_work(&sleep_workqueue, 0)
+
+/* 1 second timeout */
+#define TX_TIMER_INTERVAL 1
+
+/* state variable names and bit positions */
+#define BT_PROTO 0x01
+#define BT_TXDATA 0x02
+#define BT_ASLEEP 0x04
+
+/* global pointer to a single hci device. */
+static struct hci_dev *bluesleep_hdev;
+
+static struct bluesleep_info *bsi;
+
+/* module usage */
+static atomic_t open_count = ATOMIC_INIT(1);
+
+/*
+ * Local function prototypes
+ */
+
+static int bluesleep_hci_event(struct notifier_block *this,
+ unsigned long event, void *data);
+
+/*
+ * Global variables
+ */
+
+/** Global state flags */
+static unsigned long flags;
+
+/** Tasklet to respond to change in hostwake line */
+static struct tasklet_struct hostwake_task;
+
+/** Transmission timer */
+static struct timer_list tx_timer;
+
+/** Lock for state transitions */
+static spinlock_t rw_lock;
+
+/** Notifier block for HCI events */
+struct notifier_block hci_event_nblock = {
+ .notifier_call = bluesleep_hci_event,
+};
+
+struct proc_dir_entry *bluetooth_dir, *sleep_dir;
+
+/*
+ * Local functions
+ */
+
+static void hsuart_power(int on)
+{
+ if (on) {
+ msm_hs_request_clock_on(bsi->uport);
+ msm_hs_set_mctrl(bsi->uport, TIOCM_RTS);
+ } else {
+ msm_hs_set_mctrl(bsi->uport, 0);
+ msm_hs_request_clock_off(bsi->uport);
+ }
+}
+
+
+/**
+ * @return 1 if the Host can go to sleep, 0 otherwise.
+ */
+static inline int bluesleep_can_sleep(void)
+{
+ /* check if MSM_WAKE_BT_GPIO and BT_WAKE_MSM_GPIO are both deasserted */
+ return gpio_get_value(bsi->ext_wake) &&
+ gpio_get_value(bsi->host_wake) &&
+ (bsi->uport != NULL);
+}
+
+void bluesleep_sleep_wakeup(void)
+{
+ if (test_bit(BT_ASLEEP, &flags)) {
+ BT_DBG("waking up...");
+ /* Start the timer */
+ mod_timer(&tx_timer, jiffies + (TX_TIMER_INTERVAL * HZ));
+ gpio_set_value(bsi->ext_wake, 0);
+ clear_bit(BT_ASLEEP, &flags);
+ /*Activating UART */
+ hsuart_power(1);
+ }
+}
+
+/**
+ * @brief@ main sleep work handling function which update the flags
+ * and activate and deactivate UART ,check FIFO.
+ */
+static void bluesleep_sleep_work(struct work_struct *work)
+{
+ if (bluesleep_can_sleep()) {
+ /* already asleep, this is an error case */
+ if (test_bit(BT_ASLEEP, &flags)) {
+ BT_DBG("already asleep");
+ return;
+ }
+
+ if (msm_hs_tx_empty(bsi->uport)) {
+ BT_DBG("going to sleep...");
+ set_bit(BT_ASLEEP, &flags);
+ /*Deactivating UART */
+ hsuart_power(0);
+ } else {
+
+ mod_timer(&tx_timer, jiffies + (TX_TIMER_INTERVAL * HZ));
+ return;
+ }
+ } else {
+ bluesleep_sleep_wakeup();
+ }
+}
+
+/**
+ * A tasklet function that runs in tasklet context and reads the value
+ * of the HOST_WAKE GPIO pin and further defer the work.
+ * @param data Not used.
+ */
+static void bluesleep_hostwake_task(unsigned long data)
+{
+ BT_DBG("hostwake line change");
+
+ spin_lock(&rw_lock);
+
+ if (gpio_get_value(bsi->host_wake))
+ bluesleep_rx_busy();
+ else
+ bluesleep_rx_idle();
+
+ spin_unlock(&rw_lock);
+}
+
+/**
+ * Handles proper timer action when outgoing data is delivered to the
+ * HCI line discipline. Sets BT_TXDATA.
+ */
+static void bluesleep_outgoing_data(void)
+{
+ unsigned long irq_flags;
+
+ spin_lock_irqsave(&rw_lock, irq_flags);
+
+ /* log data passing by */
+ set_bit(BT_TXDATA, &flags);
+
+ /* if the tx side is sleeping... */
+ if (gpio_get_value(bsi->ext_wake)) {
+
+ BT_DBG("tx was sleeping");
+ bluesleep_sleep_wakeup();
+ }
+
+ spin_unlock_irqrestore(&rw_lock, irq_flags);
+}
+
+/**
+ * Handles HCI device events.
+ * @param this Not used.
+ * @param event The event that occurred.
+ * @param data The HCI device associated with the event.
+ * @return <code>NOTIFY_DONE</code>.
+ */
+static int bluesleep_hci_event(struct notifier_block *this,
+ unsigned long event, void *data)
+{
+ struct hci_dev *hdev = (struct hci_dev *) data;
+ struct hci_uart *hu;
+ struct uart_state *state;
+
+ if (!hdev)
+ return NOTIFY_DONE;
+
+ switch (event) {
+ case HCI_DEV_REG:
+ if (!bluesleep_hdev) {
+ bluesleep_hdev = hdev;
+ hu = (struct hci_uart *) hdev->driver_data;
+ state = (struct uart_state *) hu->tty->driver_data;
+ bsi->uport = state->uart_port;
+ }
+ break;
+ case HCI_DEV_UNREG:
+ bluesleep_hdev = NULL;
+ bsi->uport = NULL;
+ break;
+ case HCI_DEV_WRITE:
+ bluesleep_outgoing_data();
+ break;
+ }
+
+ return NOTIFY_DONE;
+}
+
+/**
+ * Handles transmission timer expiration.
+ * @param data Not used.
+ */
+static void bluesleep_tx_timer_expire(unsigned long data)
+{
+ unsigned long irq_flags;
+
+ spin_lock_irqsave(&rw_lock, irq_flags);
+
+ BT_DBG("Tx timer expired");
+
+ /* were we silent during the last timeout? */
+ if (!test_bit(BT_TXDATA, &flags)) {
+ BT_DBG("Tx has been idle");
+ gpio_set_value(bsi->ext_wake, 1);
+ bluesleep_tx_idle();
+ } else {
+ BT_DBG("Tx data during last period");
+ mod_timer(&tx_timer, jiffies + (TX_TIMER_INTERVAL*HZ));
+ }
+
+ /* clear the incoming data flag */
+ clear_bit(BT_TXDATA, &flags);
+
+ spin_unlock_irqrestore(&rw_lock, irq_flags);
+}
+
+/**
+ * Schedules a tasklet to run when receiving an interrupt on the
+ * <code>HOST_WAKE</code> GPIO pin.
+ * @param irq Not used.
+ * @param dev_id Not used.
+ */
+static irqreturn_t bluesleep_hostwake_isr(int irq, void *dev_id)
+{
+ /* schedule a tasklet to handle the change in the host wake line */
+ tasklet_schedule(&hostwake_task);
+ return IRQ_HANDLED;
+}
+
+/**
+ * Starts the Sleep-Mode Protocol on the Host.
+ * @return On success, 0. On error, -1, and <code>errno</code> is set
+ * appropriately.
+ */
+static int bluesleep_start(void)
+{
+ int retval;
+ unsigned long irq_flags;
+
+ spin_lock_irqsave(&rw_lock, irq_flags);
+
+ if (test_bit(BT_PROTO, &flags)) {
+ spin_unlock_irqrestore(&rw_lock, irq_flags);
+ return 0;
+ }
+
+ spin_unlock_irqrestore(&rw_lock, irq_flags);
+
+ if (!atomic_dec_and_test(&open_count)) {
+ atomic_inc(&open_count);
+ return -EBUSY;
+ }
+
+ /* start the timer */
+
+ mod_timer(&tx_timer, jiffies + (TX_TIMER_INTERVAL*HZ));
+
+ /* assert BT_WAKE */
+ gpio_set_value(bsi->ext_wake, 0);
+ retval = request_irq(bsi->host_wake_irq, bluesleep_hostwake_isr,
+ IRQF_DISABLED | IRQF_TRIGGER_FALLING,
+ "bluetooth hostwake", NULL);
+ if (retval < 0) {
+ BT_ERR("Couldn't acquire BT_HOST_WAKE IRQ");
+ goto fail;
+ }
+
+ retval = enable_irq_wake(bsi->host_wake_irq);
+ if (retval < 0) {
+ BT_ERR("Couldn't enable BT_HOST_WAKE as wakeup interrupt");
+ free_irq(bsi->host_wake_irq, NULL);
+ goto fail;
+ }
+
+ set_bit(BT_PROTO, &flags);
+ return 0;
+fail:
+ del_timer(&tx_timer);
+ atomic_inc(&open_count);
+
+ return retval;
+}
+
+/**
+ * Stops the Sleep-Mode Protocol on the Host.
+ */
+static void bluesleep_stop(void)
+{
+ unsigned long irq_flags;
+
+ spin_lock_irqsave(&rw_lock, irq_flags);
+
+ if (!test_bit(BT_PROTO, &flags)) {
+ spin_unlock_irqrestore(&rw_lock, irq_flags);
+ return;
+ }
+
+ /* assert BT_WAKE */
+ gpio_set_value(bsi->ext_wake, 0);
+ del_timer(&tx_timer);
+ clear_bit(BT_PROTO, &flags);
+
+ if (test_bit(BT_ASLEEP, &flags)) {
+ clear_bit(BT_ASLEEP, &flags);
+ hsuart_power(1);
+ }
+
+ atomic_inc(&open_count);
+
+ spin_unlock_irqrestore(&rw_lock, irq_flags);
+ if (disable_irq_wake(bsi->host_wake_irq))
+ BT_ERR("Couldn't disable hostwake IRQ wakeup mode\n");
+ free_irq(bsi->host_wake_irq, NULL);
+}
+/**
+ * Read the <code>BT_WAKE</code> GPIO pin value via the proc interface.
+ * When this function returns, <code>page</code> will contain a 1 if the
+ * pin is high, 0 otherwise.
+ * @param page Buffer for writing data.
+ * @param start Not used.
+ * @param offset Not used.
+ * @param count Not used.
+ * @param eof Whether or not there is more data to be read.
+ * @param data Not used.
+ * @return The number of bytes written.
+ */
+static int bluepower_read_proc_btwake(char *page, char **start, off_t offset,
+ int count, int *eof, void *data)
+{
+ *eof = 1;
+ return sprintf(page, "btwake:%u\n", gpio_get_value(bsi->ext_wake));
+}
+
+/**
+ * Write the <code>BT_WAKE</code> GPIO pin value via the proc interface.
+ * @param file Not used.
+ * @param buffer The buffer to read from.
+ * @param count The number of bytes to be written.
+ * @param data Not used.
+ * @return On success, the number of bytes written. On error, -1, and
+ * <code>errno</code> is set appropriately.
+ */
+static int bluepower_write_proc_btwake(struct file *file, const char *buffer,
+ unsigned long count, void *data)
+{
+ char *buf;
+
+ if (count < 1)
+ return -EINVAL;
+
+ buf = kmalloc(count, GFP_KERNEL);
+ if (!buf)
+ return -ENOMEM;
+
+ if (copy_from_user(buf, buffer, count)) {
+ kfree(buf);
+ return -EFAULT;
+ }
+
+ if (buf[0] == '0') {
+ gpio_set_value(bsi->ext_wake, 0);
+ } else if (buf[0] == '1') {
+ gpio_set_value(bsi->ext_wake, 1);
+ } else {
+ kfree(buf);
+ return -EINVAL;
+ }
+
+ kfree(buf);
+ return count;
+}
+
+/**
+ * Read the <code>BT_HOST_WAKE</code> GPIO pin value via the proc interface.
+ * When this function returns, <code>page</code> will contain a 1 if the pin
+ * is high, 0 otherwise.
+ * @param page Buffer for writing data.
+ * @param start Not used.
+ * @param offset Not used.
+ * @param count Not used.
+ * @param eof Whether or not there is more data to be read.
+ * @param data Not used.
+ * @return The number of bytes written.
+ */
+static int bluepower_read_proc_hostwake(char *page, char **start, off_t offset,
+ int count, int *eof, void *data)
+{
+ *eof = 1;
+ return sprintf(page, "hostwake: %u \n", gpio_get_value(bsi->host_wake));
+}
+
+
+/**
+ * Read the low-power status of the Host via the proc interface.
+ * When this function returns, <code>page</code> contains a 1 if the Host
+ * is asleep, 0 otherwise.
+ * @param page Buffer for writing data.
+ * @param start Not used.
+ * @param offset Not used.
+ * @param count Not used.
+ * @param eof Whether or not there is more data to be read.
+ * @param data Not used.
+ * @return The number of bytes written.
+ */
+static int bluesleep_read_proc_asleep(char *page, char **start, off_t offset,
+ int count, int *eof, void *data)
+{
+ unsigned int asleep;
+
+ asleep = test_bit(BT_ASLEEP, &flags) ? 1 : 0;
+ *eof = 1;
+ return sprintf(page, "asleep: %u\n", asleep);
+}
+
+/**
+ * Read the low-power protocol being used by the Host via the proc interface.
+ * When this function returns, <code>page</code> will contain a 1 if the Host
+ * is using the Sleep Mode Protocol, 0 otherwise.
+ * @param page Buffer for writing data.
+ * @param start Not used.
+ * @param offset Not used.
+ * @param count Not used.
+ * @param eof Whether or not there is more data to be read.
+ * @param data Not used.
+ * @return The number of bytes written.
+ */
+static int bluesleep_read_proc_proto(char *page, char **start, off_t offset,
+ int count, int *eof, void *data)
+{
+ unsigned int proto;
+
+ proto = test_bit(BT_PROTO, &flags) ? 1 : 0;
+ *eof = 1;
+ return sprintf(page, "proto: %u\n", proto);
+}
+
+/**
+ * Modify the low-power protocol used by the Host via the proc interface.
+ * @param file Not used.
+ * @param buffer The buffer to read from.
+ * @param count The number of bytes to be written.
+ * @param data Not used.
+ * @return On success, the number of bytes written. On error, -1, and
+ * <code>errno</code> is set appropriately.
+ */
+static int bluesleep_write_proc_proto(struct file *file, const char *buffer,
+ unsigned long count, void *data)
+{
+ char proto;
+
+ if (count < 1)
+ return -EINVAL;
+
+ if (copy_from_user(&proto, buffer, 1))
+ return -EFAULT;
+
+ if (proto == '0')
+ bluesleep_stop();
+ else
+ bluesleep_start();
+
+ /* claim that we wrote everything */
+ return count;
+}
+
+static int __init bluesleep_probe(struct platform_device *pdev)
+{
+ int ret;
+ struct resource *res;
+
+ bsi = kzalloc(sizeof(struct bluesleep_info), GFP_KERNEL);
+ if (!bsi)
+ return -ENOMEM;
+
+ res = platform_get_resource_byname(pdev, IORESOURCE_IO,
+ "gpio_host_wake");
+ if (!res) {
+ BT_ERR("couldn't find host_wake gpio\n");
+ ret = -ENODEV;
+ goto free_bsi;
+ }
+ bsi->host_wake = res->start;
+
+ ret = gpio_request(bsi->host_wake, "bt_host_wake");
+ if (ret)
+ goto free_bsi;
+ ret = gpio_direction_input(bsi->host_wake);
+ if (ret)
+ goto free_bt_host_wake;
+
+ res = platform_get_resource_byname(pdev, IORESOURCE_IO,
+ "gpio_ext_wake");
+ if (!res) {
+ BT_ERR("couldn't find ext_wake gpio\n");
+ ret = -ENODEV;
+ goto free_bt_host_wake;
+ }
+ bsi->ext_wake = res->start;
+
+ ret = gpio_request(bsi->ext_wake, "bt_ext_wake");
+ if (ret)
+ goto free_bt_host_wake;
+ /* assert bt wake */
+ ret = gpio_direction_output(bsi->ext_wake, 0);
+ if (ret)
+ goto free_bt_ext_wake;
+
+ bsi->host_wake_irq = platform_get_irq_byname(pdev, "host_wake");
+ if (bsi->host_wake_irq < 0) {
+ BT_ERR("couldn't find host_wake irq\n");
+ ret = -ENODEV;
+ goto free_bt_ext_wake;
+ }
+
+
+ return 0;
+
+free_bt_ext_wake:
+ gpio_free(bsi->ext_wake);
+free_bt_host_wake:
+ gpio_free(bsi->host_wake);
+free_bsi:
+ kfree(bsi);
+ return ret;
+}
+
+static int bluesleep_remove(struct platform_device *pdev)
+{
+ /* assert bt wake */
+ gpio_set_value(bsi->ext_wake, 0);
+ if (test_bit(BT_PROTO, &flags)) {
+ if (disable_irq_wake(bsi->host_wake_irq))
+ BT_ERR("Couldn't disable hostwake IRQ wakeup mode \n");
+ free_irq(bsi->host_wake_irq, NULL);
+ del_timer(&tx_timer);
+ if (test_bit(BT_ASLEEP, &flags))
+ hsuart_power(1);
+ }
+
+ gpio_free(bsi->host_wake);
+ gpio_free(bsi->ext_wake);
+ kfree(bsi);
+ return 0;
+}
+
+static struct platform_driver bluesleep_driver = {
+ .remove = bluesleep_remove,
+ .driver = {
+ .name = "bluesleep",
+ .owner = THIS_MODULE,
+ },
+};
+/**
+ * Initializes the module.
+ * @return On success, 0. On error, -1, and <code>errno</code> is set
+ * appropriately.
+ */
+static int __init bluesleep_init(void)
+{
+ int retval;
+ struct proc_dir_entry *ent;
+
+ BT_INFO("MSM Sleep Mode Driver Ver %s", VERSION);
+
+ retval = platform_driver_probe(&bluesleep_driver, bluesleep_probe);
+ if (retval)
+ return retval;
+
+ bluesleep_hdev = NULL;
+
+ bluetooth_dir = proc_mkdir("bluetooth", NULL);
+ if (bluetooth_dir == NULL) {
+ BT_ERR("Unable to create /proc/bluetooth directory");
+ return -ENOMEM;
+ }
+
+ sleep_dir = proc_mkdir("sleep", bluetooth_dir);
+ if (sleep_dir == NULL) {
+ BT_ERR("Unable to create /proc/%s directory", PROC_DIR);
+ return -ENOMEM;
+ }
+
+ /* Creating read/write "btwake" entry */
+ ent = create_proc_entry("btwake", 0, sleep_dir);
+ if (ent == NULL) {
+ BT_ERR("Unable to create /proc/%s/btwake entry", PROC_DIR);
+ retval = -ENOMEM;
+ goto fail;
+ }
+ ent->read_proc = bluepower_read_proc_btwake;
+ ent->write_proc = bluepower_write_proc_btwake;
+
+ /* read only proc entries */
+ if (create_proc_read_entry("hostwake", 0, sleep_dir,
+ bluepower_read_proc_hostwake, NULL) == NULL) {
+ BT_ERR("Unable to create /proc/%s/hostwake entry", PROC_DIR);
+ retval = -ENOMEM;
+ goto fail;
+ }
+
+ /* read/write proc entries */
+ ent = create_proc_entry("proto", 0, sleep_dir);
+ if (ent == NULL) {
+ BT_ERR("Unable to create /proc/%s/proto entry", PROC_DIR);
+ retval = -ENOMEM;
+ goto fail;
+ }
+ ent->read_proc = bluesleep_read_proc_proto;
+ ent->write_proc = bluesleep_write_proc_proto;
+
+ /* read only proc entries */
+ if (create_proc_read_entry("asleep", 0,
+ sleep_dir, bluesleep_read_proc_asleep, NULL) == NULL) {
+ BT_ERR("Unable to create /proc/%s/asleep entry", PROC_DIR);
+ retval = -ENOMEM;
+ goto fail;
+ }
+
+ flags = 0; /* clear all status bits */
+
+ /* Initialize spinlock. */
+ spin_lock_init(&rw_lock);
+
+ /* Initialize timer */
+ init_timer(&tx_timer);
+ tx_timer.function = bluesleep_tx_timer_expire;
+ tx_timer.data = 0;
+
+ /* initialize host wake tasklet */
+ tasklet_init(&hostwake_task, bluesleep_hostwake_task, 0);
+
+ hci_register_notifier(&hci_event_nblock);
+
+ return 0;
+
+fail:
+ remove_proc_entry("asleep", sleep_dir);
+ remove_proc_entry("proto", sleep_dir);
+ remove_proc_entry("hostwake", sleep_dir);
+ remove_proc_entry("btwake", sleep_dir);
+ remove_proc_entry("sleep", bluetooth_dir);
+ remove_proc_entry("bluetooth", 0);
+ return retval;
+}
+
+/**
+ * Cleans up the module.
+ */
+static void __exit bluesleep_exit(void)
+{
+ hci_unregister_notifier(&hci_event_nblock);
+ platform_driver_unregister(&bluesleep_driver);
+
+ remove_proc_entry("asleep", sleep_dir);
+ remove_proc_entry("proto", sleep_dir);
+ remove_proc_entry("hostwake", sleep_dir);
+ remove_proc_entry("btwake", sleep_dir);
+ remove_proc_entry("sleep", bluetooth_dir);
+ remove_proc_entry("bluetooth", 0);
+}
+
+module_init(bluesleep_init);
+module_exit(bluesleep_exit);
+
+MODULE_DESCRIPTION("Bluetooth Sleep Mode Driver ver %s " VERSION);
+#ifdef MODULE_LICENSE
+MODULE_LICENSE("GPL");
+#endif
diff --git a/drivers/bluetooth/bluetooth-power.c b/drivers/bluetooth/bluetooth-power.c
new file mode 100644
index 0000000..3bf49d1
--- /dev/null
+++ b/drivers/bluetooth/bluetooth-power.c
@@ -0,0 +1,138 @@
+/* Copyright (c) 2009-2010, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only 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.
+ */
+/*
+ * Bluetooth Power Switch Module
+ * controls power to external Bluetooth device
+ * with interface to power management device
+ */
+
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/platform_device.h>
+#include <linux/rfkill.h>
+
+static bool previous;
+
+static int bluetooth_toggle_radio(void *data, bool blocked)
+{
+ int ret = 0;
+ int (*power_control)(int enable);
+
+ power_control = data;
+ if (previous != blocked)
+ ret = (*power_control)(!blocked);
+ if (!ret)
+ previous = blocked;
+ return ret;
+}
+
+static const struct rfkill_ops bluetooth_power_rfkill_ops = {
+ .set_block = bluetooth_toggle_radio,
+};
+
+static int bluetooth_power_rfkill_probe(struct platform_device *pdev)
+{
+ struct rfkill *rfkill;
+ int ret;
+
+ rfkill = rfkill_alloc("bt_power", &pdev->dev, RFKILL_TYPE_BLUETOOTH,
+ &bluetooth_power_rfkill_ops,
+ pdev->dev.platform_data);
+
+ if (!rfkill) {
+ dev_err(&pdev->dev, "rfkill allocate failed\n");
+ return -ENOMEM;
+ }
+
+ /* force Bluetooth off during init to allow for user control */
+ rfkill_init_sw_state(rfkill, 1);
+ previous = 1;
+
+ ret = rfkill_register(rfkill);
+ if (ret) {
+ dev_err(&pdev->dev, "rfkill register failed=%d\n", ret);
+ rfkill_destroy(rfkill);
+ return ret;
+ }
+
+ platform_set_drvdata(pdev, rfkill);
+
+ return 0;
+}
+
+static void bluetooth_power_rfkill_remove(struct platform_device *pdev)
+{
+ struct rfkill *rfkill;
+
+ dev_dbg(&pdev->dev, "%s\n", __func__);
+
+ rfkill = platform_get_drvdata(pdev);
+ if (rfkill)
+ rfkill_unregister(rfkill);
+ rfkill_destroy(rfkill);
+ platform_set_drvdata(pdev, NULL);
+}
+
+static int __devinit bt_power_probe(struct platform_device *pdev)
+{
+ int ret = 0;
+
+ dev_dbg(&pdev->dev, "%s\n", __func__);
+
+ if (!pdev->dev.platform_data) {
+ dev_err(&pdev->dev, "platform data not initialized\n");
+ return -ENOSYS;
+ }
+
+ ret = bluetooth_power_rfkill_probe(pdev);
+
+ return ret;
+}
+
+static int __devexit bt_power_remove(struct platform_device *pdev)
+{
+ dev_dbg(&pdev->dev, "%s\n", __func__);
+
+ bluetooth_power_rfkill_remove(pdev);
+
+ return 0;
+}
+
+static struct platform_driver bt_power_driver = {
+ .probe = bt_power_probe,
+ .remove = __devexit_p(bt_power_remove),
+ .driver = {
+ .name = "bt_power",
+ .owner = THIS_MODULE,
+ },
+};
+
+static int __init bluetooth_power_init(void)
+{
+ int ret;
+
+ ret = platform_driver_register(&bt_power_driver);
+ return ret;
+}
+
+static void __exit bluetooth_power_exit(void)
+{
+ platform_driver_unregister(&bt_power_driver);
+}
+
+MODULE_LICENSE("GPL v2");
+MODULE_DESCRIPTION("MSM Bluetooth power control driver");
+MODULE_VERSION("1.40");
+
+module_init(bluetooth_power_init);
+module_exit(bluetooth_power_exit);
diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c
index 4fc0194..0c8a655 100644
--- a/drivers/bluetooth/bt3c_cs.c
+++ b/drivers/bluetooth/bt3c_cs.c
@@ -761,7 +761,7 @@
}
-static const struct pcmcia_device_id bt3c_ids[] = {
+static struct pcmcia_device_id bt3c_ids[] = {
PCMCIA_DEVICE_PROD_ID13("3COM", "Bluetooth PC Card", 0xefce0a31, 0xd4ce9b02),
PCMCIA_DEVICE_NULL
};
diff --git a/drivers/bluetooth/btmrvl_debugfs.c b/drivers/bluetooth/btmrvl_debugfs.c
index 8ecf4c6..fd6305b 100644
--- a/drivers/bluetooth/btmrvl_debugfs.c
+++ b/drivers/bluetooth/btmrvl_debugfs.c
@@ -64,8 +64,6 @@
return -EFAULT;
ret = strict_strtol(buf, 10, &result);
- if (ret)
- return ret;
priv->btmrvl_dev.hscfgcmd = result;
@@ -110,8 +108,6 @@
return -EFAULT;
ret = strict_strtol(buf, 10, &result);
- if (ret)
- return ret;
priv->btmrvl_dev.psmode = result;
@@ -151,8 +147,6 @@
return -EFAULT;
ret = strict_strtol(buf, 10, &result);
- if (ret)
- return ret;
priv->btmrvl_dev.pscmd = result;
@@ -197,8 +191,6 @@
return -EFAULT;
ret = strict_strtol(buf, 16, &result);
- if (ret)
- return ret;
priv->btmrvl_dev.gpio_gap = result;
@@ -238,8 +230,6 @@
return -EFAULT;
ret = strict_strtol(buf, 10, &result);
- if (ret)
- return ret;
priv->btmrvl_dev.hscmd = result;
if (priv->btmrvl_dev.hscmd) {
@@ -282,8 +272,6 @@
return -EFAULT;
ret = strict_strtol(buf, 10, &result);
- if (ret)
- return ret;
priv->btmrvl_dev.hsmode = result;
diff --git a/drivers/bluetooth/btuart_cs.c b/drivers/bluetooth/btuart_cs.c
index 526b618..f8a0708 100644
--- a/drivers/bluetooth/btuart_cs.c
+++ b/drivers/bluetooth/btuart_cs.c
@@ -689,7 +689,7 @@
pcmcia_disable_device(link);
}
-static const struct pcmcia_device_id btuart_ids[] = {
+static struct pcmcia_device_id btuart_ids[] = {
/* don't use this driver. Use serial_cs + hci_uart instead */
PCMCIA_DEVICE_NULL
};
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 91d13a9..14776e5 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -54,7 +54,6 @@
#define BTUSB_BCM92035 0x10
#define BTUSB_BROKEN_ISOC 0x20
#define BTUSB_WRONG_SCO_MTU 0x40
-#define BTUSB_ATH3012 0x80
static struct usb_device_id btusb_table[] = {
/* Generic Bluetooth USB device */
@@ -105,13 +104,12 @@
/* Atheros 3011 with sflash firmware */
{ USB_DEVICE(0x0cf3, 0x3002), .driver_info = BTUSB_IGNORE },
- { USB_DEVICE(0x13d3, 0x3304), .driver_info = BTUSB_IGNORE },
/* Atheros AR9285 Malbec with sflash firmware */
{ USB_DEVICE(0x03f0, 0x311d), .driver_info = BTUSB_IGNORE },
/* Atheros 3012 with sflash firmware */
- { USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 },
+ { USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_IGNORE },
/* Atheros AR5BBU12 with sflash firmware */
{ USB_DEVICE(0x0489, 0xe02c), .driver_info = BTUSB_IGNORE },
@@ -438,7 +436,7 @@
}
}
-static inline void __fill_isoc_descriptor(struct urb *urb, int len, int mtu)
+static void inline __fill_isoc_descriptor(struct urb *urb, int len, int mtu)
{
int i, offset = 0;
@@ -786,7 +784,7 @@
}
}
-static inline int __set_isoc_interface(struct hci_dev *hdev, int altsetting)
+static int inline __set_isoc_interface(struct hci_dev *hdev, int altsetting)
{
struct btusb_data *data = hdev->driver_data;
struct usb_interface *intf = data->isoc;
@@ -915,15 +913,6 @@
if (ignore_sniffer && id->driver_info & BTUSB_SNIFFER)
return -ENODEV;
- if (id->driver_info & BTUSB_ATH3012) {
- struct usb_device *udev = interface_to_usbdev(intf);
-
- /* Old firmware would otherwise let ath3k driver load
- * patch and sysconfig files */
- if (le16_to_cpu(udev->descriptor.bcdDevice) <= 0x0001)
- return -ENODEV;
- }
-
data = kzalloc(sizeof(*data), GFP_KERNEL);
if (!data)
return -ENOMEM;
diff --git a/drivers/bluetooth/dtl1_cs.c b/drivers/bluetooth/dtl1_cs.c
index 5e4c2de..26ee0cf 100644
--- a/drivers/bluetooth/dtl1_cs.c
+++ b/drivers/bluetooth/dtl1_cs.c
@@ -636,7 +636,7 @@
}
-static const struct pcmcia_device_id dtl1_ids[] = {
+static struct pcmcia_device_id dtl1_ids[] = {
PCMCIA_DEVICE_PROD_ID12("Nokia Mobile Phones", "DTL-1", 0xe1bfdd64, 0xe168480d),
PCMCIA_DEVICE_PROD_ID12("Nokia Mobile Phones", "DTL-4", 0xe1bfdd64, 0x9102bc82),
PCMCIA_DEVICE_PROD_ID12("Socket", "CF", 0xb38bcc2e, 0x44ebf863),
diff --git a/drivers/bluetooth/hci_ibs.c b/drivers/bluetooth/hci_ibs.c
new file mode 100644
index 0000000..2a6f3f8
--- /dev/null
+++ b/drivers/bluetooth/hci_ibs.c
@@ -0,0 +1,820 @@
+/*
+ * Qualcomm's Bluetooth Software In-Band Sleep UART protocol
+ *
+ * HCI_IBS (HCI In-Band Sleep) is Qualcomm's power management
+ * protocol extension to H4.
+ *
+ * Copyright (C) 2007 Texas Instruments, Inc.
+ * Copyright (c) 2010, Code Aurora Forum. All rights reserved.
+ *
+ * Acknowledgements:
+ * This file is based on hci_ll.c, which was...
+ * Written by Ohad Ben-Cohen <ohad@bencohen.org>
+ * which was in turn based on hci_h4.c, which was written
+ * by Maxim Krasnyansky and Marcel Holtmann.
+ *
+ * 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
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+
+#include <linux/init.h>
+#include <linux/sched.h>
+#include <linux/types.h>
+#include <linux/fcntl.h>
+#include <linux/interrupt.h>
+#include <linux/ptrace.h>
+#include <linux/poll.h>
+
+#include <linux/slab.h>
+#include <linux/tty.h>
+#include <linux/errno.h>
+#include <linux/string.h>
+#include <linux/signal.h>
+#include <linux/ioctl.h>
+#include <linux/timer.h>
+#include <linux/skbuff.h>
+#include <linux/serial_core.h>
+
+#ifdef CONFIG_SERIAL_MSM_HS
+#include <mach/msm_serial_hs.h>
+#endif
+
+#include <net/bluetooth/bluetooth.h>
+#include <net/bluetooth/hci_core.h>
+
+#include "hci_uart.h"
+
+/* HCI_IBS protocol messages */
+#define HCI_IBS_SLEEP_IND 0xFE
+#define HCI_IBS_WAKE_IND 0xFD
+#define HCI_IBS_WAKE_ACK 0xFC
+
+/* HCI_IBS receiver States */
+#define HCI_IBS_W4_PACKET_TYPE 0
+#define HCI_IBS_W4_EVENT_HDR 1
+#define HCI_IBS_W4_ACL_HDR 2
+#define HCI_IBS_W4_SCO_HDR 3
+#define HCI_IBS_W4_DATA 4
+
+/* HCI_IBS transmit side sleep protocol states */
+enum tx_ibs_states_e {
+ HCI_IBS_TX_ASLEEP,
+ HCI_IBS_TX_WAKING,
+ HCI_IBS_TX_AWAKE,
+};
+
+/* HCI_IBS receive side sleep protocol states */
+enum rx_states_e {
+ HCI_IBS_RX_ASLEEP,
+ HCI_IBS_RX_AWAKE,
+};
+
+/* HCI_IBS transmit and receive side clock state vote */
+enum hci_ibs_clock_state_vote_e {
+ HCI_IBS_VOTE_STATS_UPDATE,
+ HCI_IBS_TX_VOTE_CLOCK_ON,
+ HCI_IBS_TX_VOTE_CLOCK_OFF,
+ HCI_IBS_RX_VOTE_CLOCK_ON,
+ HCI_IBS_RX_VOTE_CLOCK_OFF,
+};
+
+static unsigned long wake_retrans = 1;
+static unsigned long tx_idle_delay = (HZ * 2);
+
+struct hci_ibs_cmd {
+ u8 cmd;
+} __attribute__((packed));
+
+struct ibs_struct {
+ unsigned long rx_state;
+ unsigned long rx_count;
+ struct sk_buff *rx_skb;
+ struct sk_buff_head txq;
+ struct sk_buff_head tx_wait_q; /* HCI_IBS wait queue */
+ spinlock_t hci_ibs_lock; /* HCI_IBS state lock */
+ unsigned long tx_ibs_state; /* HCI_IBS transmit side power state */
+ unsigned long rx_ibs_state; /* HCI_IBS receive side power state */
+ unsigned long tx_vote; /* clock must be on for TX */
+ unsigned long rx_vote; /* clock must be on for RX */
+ struct timer_list tx_idle_timer;
+ struct timer_list wake_retrans_timer;
+ /* debug */
+ unsigned long ibs_sent_wacks;
+ unsigned long ibs_sent_slps;
+ unsigned long ibs_sent_wakes;
+ unsigned long ibs_recv_wacks;
+ unsigned long ibs_recv_slps;
+ unsigned long ibs_recv_wakes;
+ unsigned long vote_last_jif;
+ unsigned long vote_on_ticks;
+ unsigned long vote_off_ticks;
+ unsigned long tx_votes_on;
+ unsigned long rx_votes_on;
+ unsigned long tx_votes_off;
+ unsigned long rx_votes_off;
+ unsigned long votes_on;
+ unsigned long votes_off;
+};
+
+#ifdef CONFIG_SERIAL_MSM_HS
+static void __ibs_msm_serial_clock_on(struct tty_struct *tty)
+{
+ struct uart_state *state = tty->driver_data;
+ struct uart_port *port = state->uart_port;
+
+ msm_hs_request_clock_on(port);
+}
+
+static void __ibs_msm_serial_clock_request_off(struct tty_struct *tty)
+{
+ struct uart_state *state = tty->driver_data;
+ struct uart_port *port = state->uart_port;
+
+ msm_hs_request_clock_off(port);
+}
+#else
+static inline void __ibs_msm_serial_clock_on(struct tty_struct *tty) {}
+static inline void __ibs_msm_serial_clock_request_off(struct tty_struct *tty) {}
+#endif
+
+/* clock_vote needs to be called with the ibs lock held */
+static void ibs_msm_serial_clock_vote(unsigned long vote, struct hci_uart *hu)
+{
+ struct ibs_struct *ibs = hu->priv;
+
+ unsigned long old_vote = (ibs->tx_vote | ibs->rx_vote);
+ unsigned long new_vote;
+
+ switch (vote) {
+ default: /* error */
+ BT_ERR("voting irregularity");
+ return;
+ case HCI_IBS_VOTE_STATS_UPDATE:
+ if (old_vote)
+ ibs->vote_off_ticks += (jiffies - ibs->vote_last_jif);
+ else
+ ibs->vote_on_ticks += (jiffies - ibs->vote_last_jif);
+ return;
+ case HCI_IBS_TX_VOTE_CLOCK_ON:
+ ibs->tx_vote = 1;
+ ibs->tx_votes_on++;
+ new_vote = 1;
+ break;
+ case HCI_IBS_RX_VOTE_CLOCK_ON:
+ ibs->rx_vote = 1;
+ ibs->rx_votes_on++;
+ new_vote = 1;
+ break;
+ case HCI_IBS_TX_VOTE_CLOCK_OFF:
+ ibs->tx_vote = 0;
+ ibs->tx_votes_off++;
+ new_vote = ibs->rx_vote | ibs->tx_vote;
+ break;
+ case HCI_IBS_RX_VOTE_CLOCK_OFF:
+ ibs->rx_vote = 0;
+ ibs->rx_votes_off++;
+ new_vote = ibs->rx_vote | ibs->tx_vote;
+ break;
+ }
+ if (new_vote != old_vote) {
+ if (new_vote)
+ __ibs_msm_serial_clock_on(hu->tty);
+ else
+ __ibs_msm_serial_clock_request_off(hu->tty);
+
+ BT_DBG("HCIUART_IBS: vote msm_serial_hs clock %lu(%lu)",
+ new_vote, vote);
+ /* debug */
+ if (new_vote) {
+ ibs->votes_on++;
+ ibs->vote_off_ticks += (jiffies - ibs->vote_last_jif);
+ } else {
+ ibs->votes_off++;
+ ibs->vote_on_ticks += (jiffies - ibs->vote_last_jif);
+ }
+ ibs->vote_last_jif = jiffies;
+ }
+}
+
+/*
+ * Builds and sends an HCI_IBS command packet.
+ * These are very simple packets with only 1 cmd byte
+ */
+static int send_hci_ibs_cmd(u8 cmd, struct hci_uart *hu)
+{
+ int err = 0;
+ struct sk_buff *skb = NULL;
+ struct ibs_struct *ibs = hu->priv;
+ struct hci_ibs_cmd *hci_ibs_packet;
+
+ BT_DBG("hu %p cmd 0x%x", hu, cmd);
+
+ /* allocate packet */
+ skb = bt_skb_alloc(1, GFP_ATOMIC);
+ if (!skb) {
+ BT_ERR("cannot allocate memory for HCI_IBS packet");
+ err = -ENOMEM;
+ goto out;
+ }
+
+ /* prepare packet */
+ hci_ibs_packet = (struct hci_ibs_cmd *) skb_put(skb, 1);
+ hci_ibs_packet->cmd = cmd;
+ skb->dev = (void *) hu->hdev;
+
+ /* send packet */
+ skb_queue_tail(&ibs->txq, skb);
+out:
+ return err;
+}
+
+static void hci_ibs_tx_idle_timeout(unsigned long arg)
+{
+ struct hci_uart *hu = (struct hci_uart *) arg;
+ struct ibs_struct *ibs = hu->priv;
+ unsigned long flags;
+ unsigned long vote_tx_sleep = 0;
+
+ BT_DBG("hu %p idle timeout in %lu state", hu, ibs->tx_ibs_state);
+
+ spin_lock_irqsave_nested(&ibs->hci_ibs_lock,
+ flags, SINGLE_DEPTH_NESTING);
+
+ switch (ibs->tx_ibs_state) {
+ default:
+ case HCI_IBS_TX_ASLEEP:
+ case HCI_IBS_TX_WAKING:
+ BT_ERR("spurrious timeout in tx state %ld", ibs->tx_ibs_state);
+ goto out;
+ case HCI_IBS_TX_AWAKE: /* TX_IDLE, go to SLEEP */
+ if (send_hci_ibs_cmd(HCI_IBS_SLEEP_IND, hu) < 0) {
+ BT_ERR("cannot send SLEEP to device");
+ goto out;
+ }
+ ibs->tx_ibs_state = HCI_IBS_TX_ASLEEP;
+ ibs->ibs_sent_slps++; /* debug */
+ vote_tx_sleep = 1;
+ break;
+ }
+
+ spin_unlock_irqrestore(&ibs->hci_ibs_lock, flags);
+
+ hci_uart_tx_wakeup(hu); /* run HCI tx handling unlocked */
+
+ if (!vote_tx_sleep)
+ return;
+ /* now that message queued to tty driver, vote for tty clocks off */
+ /* It is up to the tty driver to pend the clocks off until tx done. */
+
+ spin_lock_irqsave_nested(&ibs->hci_ibs_lock,
+ flags, SINGLE_DEPTH_NESTING);
+ ibs_msm_serial_clock_vote(HCI_IBS_TX_VOTE_CLOCK_OFF, hu);
+out:
+ spin_unlock_irqrestore(&ibs->hci_ibs_lock, flags);
+}
+
+static void hci_ibs_wake_retrans_timeout(unsigned long arg)
+{
+ struct hci_uart *hu = (struct hci_uart *) arg;
+ struct ibs_struct *ibs = hu->priv;
+ unsigned long flags;
+ unsigned long retransmit = 0;
+
+ BT_DBG("hu %p wake retransmit timeout in %lu state",
+ hu, ibs->tx_ibs_state);
+
+ spin_lock_irqsave_nested(&ibs->hci_ibs_lock,
+ flags, SINGLE_DEPTH_NESTING);
+
+ switch (ibs->tx_ibs_state) {
+ default:
+ case HCI_IBS_TX_ASLEEP:
+ case HCI_IBS_TX_AWAKE:
+ BT_ERR("spurrious timeout tx state %ld", ibs->tx_ibs_state);
+ goto out;
+ case HCI_IBS_TX_WAKING: /* No WAKE_ACK, retransmit WAKE */
+ retransmit = 1;
+ if (send_hci_ibs_cmd(HCI_IBS_WAKE_IND, hu) < 0) {
+ BT_ERR("cannot acknowledge device wake up");
+ goto out;
+ }
+ ibs->ibs_sent_wakes++; /* debug */
+ mod_timer(&ibs->wake_retrans_timer, jiffies + wake_retrans);
+ break;
+ }
+out:
+ spin_unlock_irqrestore(&ibs->hci_ibs_lock, flags);
+ if (retransmit)
+ hci_uart_tx_wakeup(hu);
+}
+
+/* Initialize protocol */
+static int ibs_open(struct hci_uart *hu)
+{
+ struct ibs_struct *ibs;
+
+ BT_DBG("hu %p", hu);
+
+ ibs = kzalloc(sizeof(*ibs), GFP_ATOMIC);
+ if (!ibs)
+ return -ENOMEM;
+
+ skb_queue_head_init(&ibs->txq);
+ skb_queue_head_init(&ibs->tx_wait_q);
+ spin_lock_init(&ibs->hci_ibs_lock);
+
+ /* Assume we start with both sides asleep -- extra wakes OK */
+ ibs->tx_ibs_state = HCI_IBS_TX_ASLEEP;
+ ibs->rx_ibs_state = HCI_IBS_RX_ASLEEP;
+ /* clocks actually on, but we start votes off */
+ ibs->tx_vote = 0;
+ ibs->rx_vote = 0;
+
+ /* debug */
+ ibs->ibs_sent_wacks = 0;
+ ibs->ibs_sent_slps = 0;
+ ibs->ibs_sent_wakes = 0;
+ ibs->ibs_recv_wacks = 0;
+ ibs->ibs_recv_slps = 0;
+ ibs->ibs_recv_wakes = 0;
+ ibs->vote_last_jif = jiffies;
+ ibs->vote_on_ticks = 0;
+ ibs->vote_off_ticks = 0;
+ ibs->votes_on = 0;
+ ibs->votes_off = 0;
+ ibs->tx_votes_on = 0;
+ ibs->tx_votes_off = 0;
+ ibs->rx_votes_on = 0;
+ ibs->rx_votes_off = 0;
+
+ hu->priv = ibs;
+
+ init_timer(&ibs->wake_retrans_timer);
+ ibs->wake_retrans_timer.function = hci_ibs_wake_retrans_timeout;
+ ibs->wake_retrans_timer.data = (u_long) hu;
+
+ init_timer(&ibs->tx_idle_timer);
+ ibs->tx_idle_timer.function = hci_ibs_tx_idle_timeout;
+ ibs->tx_idle_timer.data = (u_long) hu;
+
+ BT_INFO("HCI_IBS open, tx_idle_delay=%lu, wake_retrans=%lu",
+ tx_idle_delay, wake_retrans);
+
+ return 0;
+}
+
+void ibs_log_local_stats(struct ibs_struct *ibs)
+{
+ BT_INFO("HCI_IBS stats: tx_idle_delay=%lu, wake_retrans=%lu",
+ tx_idle_delay, wake_retrans);
+
+ BT_INFO("HCI_IBS stats: tx_ibs_state=%lu, rx_ibs_state=%lu",
+ ibs->tx_ibs_state, ibs->rx_ibs_state);
+ BT_INFO("HCI_IBS stats: sent: sleep=%lu, wake=%lu, wake_ack=%lu",
+ ibs->ibs_sent_slps, ibs->ibs_sent_wakes, ibs->ibs_sent_wacks);
+ BT_INFO("HCI_IBS stats: recv: sleep=%lu, wake=%lu, wake_ack=%lu",
+ ibs->ibs_recv_slps, ibs->ibs_recv_wakes, ibs->ibs_recv_wacks);
+
+ BT_INFO("HCI_IBS stats: queues: txq=%s, txwaitq=%s",
+ skb_queue_empty(&(ibs->txq)) ? "empty" : "full",
+ skb_queue_empty(&(ibs->tx_wait_q)) ? "empty" : "full");
+
+ BT_INFO("HCI_IBS stats: vote state: tx=%lu, rx=%lu",
+ ibs->tx_vote, ibs->rx_vote);
+ BT_INFO("HCI_IBS stats: tx votes cast: on=%lu, off=%lu",
+ ibs->tx_votes_on, ibs->tx_votes_off);
+ BT_INFO("HCI_IBS stats: rx votes cast: on=%lu, off=%lu",
+ ibs->rx_votes_on, ibs->rx_votes_off);
+ BT_INFO("HCI_IBS stats: msm_clock votes cast: on=%lu, off=%lu",
+ ibs->votes_on, ibs->votes_off);
+ BT_INFO("HCI_IBS stats: vote ticks: on=%lu, off=%lu",
+ ibs->vote_on_ticks, ibs->vote_off_ticks);
+}
+
+/* Flush protocol data */
+static int ibs_flush(struct hci_uart *hu)
+{
+ struct ibs_struct *ibs = hu->priv;
+
+ BT_DBG("hu %p", hu);
+
+ skb_queue_purge(&ibs->tx_wait_q);
+ skb_queue_purge(&ibs->txq);
+
+ return 0;
+}
+
+/* Close protocol */
+static int ibs_close(struct hci_uart *hu)
+{
+ struct ibs_struct *ibs = hu->priv;
+
+ BT_DBG("hu %p", hu);
+
+ ibs_msm_serial_clock_vote(HCI_IBS_VOTE_STATS_UPDATE, hu);
+ ibs_log_local_stats(ibs);
+
+ skb_queue_purge(&ibs->tx_wait_q);
+ skb_queue_purge(&ibs->txq);
+ del_timer(&ibs->tx_idle_timer);
+ del_timer(&ibs->wake_retrans_timer);
+
+ kfree_skb(ibs->rx_skb);
+
+ hu->priv = NULL;
+
+ kfree(ibs);
+
+ return 0;
+}
+
+/*
+ * Called upon a wake-up-indication from the device
+ */
+static void ibs_device_want_to_wakeup(struct hci_uart *hu)
+{
+ unsigned long flags;
+ struct ibs_struct *ibs = hu->priv;
+
+ BT_DBG("hu %p", hu);
+
+ /* lock hci_ibs state */
+ spin_lock_irqsave(&ibs->hci_ibs_lock, flags);
+
+ /* debug */
+ ibs->ibs_recv_wakes++;
+
+ switch (ibs->rx_ibs_state) {
+ case HCI_IBS_RX_ASLEEP:
+ /* Make sure clock is on - we may have turned clock off since
+ * receiving the wake up indicator
+ */
+ ibs_msm_serial_clock_vote(HCI_IBS_RX_VOTE_CLOCK_ON, hu);
+ ibs->rx_ibs_state = HCI_IBS_RX_AWAKE;
+ /* deliberate fall-through */
+ case HCI_IBS_RX_AWAKE:
+ /* Always acknowledge device wake up,
+ * sending IBS message doesn't count as TX ON.
+ */
+ if (send_hci_ibs_cmd(HCI_IBS_WAKE_ACK, hu) < 0) {
+ BT_ERR("cannot acknowledge device wake up");
+ goto out;
+ }
+ ibs->ibs_sent_wacks++; /* debug */
+ break;
+ default:
+ /* any other state is illegal */
+ BT_ERR("received HCI_IBS_WAKE_IND in rx state %ld",
+ ibs->rx_ibs_state);
+ break;
+ }
+
+out:
+ spin_unlock_irqrestore(&ibs->hci_ibs_lock, flags);
+
+ /* actually send the packets */
+ hci_uart_tx_wakeup(hu);
+}
+
+/*
+ * Called upon a sleep-indication from the device
+ */
+static void ibs_device_want_to_sleep(struct hci_uart *hu)
+{
+ unsigned long flags;
+ struct ibs_struct *ibs = hu->priv;
+
+ BT_DBG("hu %p", hu);
+
+ /* lock hci_ibs state */
+ spin_lock_irqsave(&ibs->hci_ibs_lock, flags);
+
+ /* debug */
+ ibs->ibs_recv_slps++;
+
+ switch (ibs->rx_ibs_state) {
+ case HCI_IBS_RX_AWAKE:
+ /* update state */
+ ibs->rx_ibs_state = HCI_IBS_RX_ASLEEP;
+ ibs_msm_serial_clock_vote(HCI_IBS_RX_VOTE_CLOCK_OFF, hu);
+ break;
+ case HCI_IBS_RX_ASLEEP:
+ /* deliberate fall-through */
+ default:
+ /* any other state is illegal */
+ BT_ERR("received HCI_IBS_SLEEP_IND in rx state %ld",
+ ibs->rx_ibs_state);
+ break;
+ }
+
+ spin_unlock_irqrestore(&ibs->hci_ibs_lock, flags);
+}
+
+/*
+ * Called upon wake-up-acknowledgement from the device
+ */
+static void ibs_device_woke_up(struct hci_uart *hu)
+{
+ unsigned long flags;
+ struct ibs_struct *ibs = hu->priv;
+ struct sk_buff *skb = NULL;
+
+ BT_DBG("hu %p", hu);
+
+ /* lock hci_ibs state */
+ spin_lock_irqsave(&ibs->hci_ibs_lock, flags);
+
+ /* debug */
+ ibs->ibs_recv_wacks++;
+
+ switch (ibs->tx_ibs_state) {
+ case HCI_IBS_TX_ASLEEP:
+ /* This could be spurrious rx wake on the BT chip.
+ * Send it another SLEEP othwise it will stay awake. */
+ default:
+ BT_ERR("received HCI_IBS_WAKE_ACK in tx state %ld",
+ ibs->tx_ibs_state);
+ break;
+ case HCI_IBS_TX_AWAKE:
+ /* expect one if we send 2 WAKEs */
+ BT_DBG("received HCI_IBS_WAKE_ACK in tx state %ld",
+ ibs->tx_ibs_state);
+ break;
+ case HCI_IBS_TX_WAKING:
+ /* send pending packets */
+ while ((skb = skb_dequeue(&ibs->tx_wait_q)))
+ skb_queue_tail(&ibs->txq, skb);
+ /* switch timers and change state to HCI_IBS_TX_AWAKE */
+ del_timer(&ibs->wake_retrans_timer);
+ mod_timer(&ibs->tx_idle_timer, jiffies + tx_idle_delay);
+ ibs->tx_ibs_state = HCI_IBS_TX_AWAKE;
+ }
+
+ spin_unlock_irqrestore(&ibs->hci_ibs_lock, flags);
+
+ /* actually send the packets */
+ hci_uart_tx_wakeup(hu);
+}
+
+/* Enqueue frame for transmittion (padding, crc, etc) */
+/* may be called from two simultaneous tasklets */
+static int ibs_enqueue(struct hci_uart *hu, struct sk_buff *skb)
+{
+ unsigned long flags = 0;
+ struct ibs_struct *ibs = hu->priv;
+
+ BT_DBG("hu %p skb %p", hu, skb);
+
+ /* Prepend skb with frame type */
+ memcpy(skb_push(skb, 1), &bt_cb(skb)->pkt_type, 1);
+
+ /* lock hci_ibs state */
+ spin_lock_irqsave(&ibs->hci_ibs_lock, flags);
+
+ /* act according to current state */
+ switch (ibs->tx_ibs_state) {
+ case HCI_IBS_TX_AWAKE:
+ BT_DBG("device awake, sending normally");
+ skb_queue_tail(&ibs->txq, skb);
+ mod_timer(&ibs->tx_idle_timer, jiffies + tx_idle_delay);
+ break;
+
+ case HCI_IBS_TX_ASLEEP:
+ BT_DBG("device asleep, waking up and queueing packet");
+ ibs_msm_serial_clock_vote(HCI_IBS_TX_VOTE_CLOCK_ON, hu);
+ /* save packet for later */
+ skb_queue_tail(&ibs->tx_wait_q, skb);
+ /* awake device */
+ if (send_hci_ibs_cmd(HCI_IBS_WAKE_IND, hu) < 0) {
+ BT_ERR("cannot send WAKE to device");
+ break;
+ }
+ ibs->ibs_sent_wakes++; /* debug */
+
+ /* start retransmit timer */
+ mod_timer(&ibs->wake_retrans_timer, jiffies + wake_retrans);
+
+ ibs->tx_ibs_state = HCI_IBS_TX_WAKING;
+ break;
+
+ case HCI_IBS_TX_WAKING:
+ BT_DBG("device waking up, queueing packet");
+ /* transient state; just keep packet for later */
+ skb_queue_tail(&ibs->tx_wait_q, skb);
+ break;
+
+ default:
+ BT_ERR("illegal tx state: %ld (losing packet)",
+ ibs->tx_ibs_state);
+ kfree_skb(skb);
+ break;
+ }
+
+ spin_unlock_irqrestore(&ibs->hci_ibs_lock, flags);
+
+ return 0;
+}
+
+static inline int ibs_check_data_len(struct ibs_struct *ibs, int len)
+{
+ register int room = skb_tailroom(ibs->rx_skb);
+
+ BT_DBG("len %d room %d", len, room);
+
+ if (!len) {
+ hci_recv_frame(ibs->rx_skb);
+ } else if (len > room) {
+ BT_ERR("Data length is too large");
+ kfree_skb(ibs->rx_skb);
+ } else {
+ ibs->rx_state = HCI_IBS_W4_DATA;
+ ibs->rx_count = len;
+ return len;
+ }
+
+ ibs->rx_state = HCI_IBS_W4_PACKET_TYPE;
+ ibs->rx_skb = NULL;
+ ibs->rx_count = 0;
+
+ return 0;
+}
+
+/* Recv data */
+static int ibs_recv(struct hci_uart *hu, void *data, int count)
+{
+ struct ibs_struct *ibs = hu->priv;
+ register char *ptr;
+ struct hci_event_hdr *eh;
+ struct hci_acl_hdr *ah;
+ struct hci_sco_hdr *sh;
+ register int len, type, dlen;
+
+ BT_DBG("hu %p count %d rx_state %ld rx_count %ld",
+ hu, count, ibs->rx_state, ibs->rx_count);
+
+ ptr = data;
+ while (count) {
+ if (ibs->rx_count) {
+ len = min_t(unsigned int, ibs->rx_count, count);
+ memcpy(skb_put(ibs->rx_skb, len), ptr, len);
+ ibs->rx_count -= len; count -= len; ptr += len;
+
+ if (ibs->rx_count)
+ continue;
+
+ switch (ibs->rx_state) {
+ case HCI_IBS_W4_DATA:
+ BT_DBG("Complete data");
+ hci_recv_frame(ibs->rx_skb);
+
+ ibs->rx_state = HCI_IBS_W4_PACKET_TYPE;
+ ibs->rx_skb = NULL;
+ continue;
+
+ case HCI_IBS_W4_EVENT_HDR:
+ eh = (struct hci_event_hdr *) ibs->rx_skb->data;
+
+ BT_DBG("Event header: evt 0x%2.2x plen %d",
+ eh->evt, eh->plen);
+
+ ibs_check_data_len(ibs, eh->plen);
+ continue;
+
+ case HCI_IBS_W4_ACL_HDR:
+ ah = (struct hci_acl_hdr *) ibs->rx_skb->data;
+ dlen = __le16_to_cpu(ah->dlen);
+
+ BT_DBG("ACL header: dlen %d", dlen);
+
+ ibs_check_data_len(ibs, dlen);
+ continue;
+
+ case HCI_IBS_W4_SCO_HDR:
+ sh = (struct hci_sco_hdr *) ibs->rx_skb->data;
+
+ BT_DBG("SCO header: dlen %d", sh->dlen);
+
+ ibs_check_data_len(ibs, sh->dlen);
+ continue;
+ }
+ }
+
+ /* HCI_IBS_W4_PACKET_TYPE */
+ switch (*ptr) {
+ case HCI_EVENT_PKT:
+ BT_DBG("Event packet");
+ ibs->rx_state = HCI_IBS_W4_EVENT_HDR;
+ ibs->rx_count = HCI_EVENT_HDR_SIZE;
+ type = HCI_EVENT_PKT;
+ break;
+
+ case HCI_ACLDATA_PKT:
+ BT_DBG("ACL packet");
+ ibs->rx_state = HCI_IBS_W4_ACL_HDR;
+ ibs->rx_count = HCI_ACL_HDR_SIZE;
+ type = HCI_ACLDATA_PKT;
+ break;
+
+ case HCI_SCODATA_PKT:
+ BT_DBG("SCO packet");
+ ibs->rx_state = HCI_IBS_W4_SCO_HDR;
+ ibs->rx_count = HCI_SCO_HDR_SIZE;
+ type = HCI_SCODATA_PKT;
+ break;
+
+ /* HCI_IBS signals */
+ case HCI_IBS_SLEEP_IND:
+ BT_DBG("HCI_IBS_SLEEP_IND packet");
+ ibs_device_want_to_sleep(hu);
+ ptr++; count--;
+ continue;
+
+ case HCI_IBS_WAKE_IND:
+ BT_DBG("HCI_IBS_WAKE_IND packet");
+ ibs_device_want_to_wakeup(hu);
+ ptr++; count--;
+ continue;
+
+ case HCI_IBS_WAKE_ACK:
+ BT_DBG("HCI_IBS_WAKE_ACK packet");
+ ibs_device_woke_up(hu);
+ ptr++; count--;
+ continue;
+
+ default:
+ BT_ERR("Unknown HCI packet type %2.2x", (__u8)*ptr);
+ hu->hdev->stat.err_rx++;
+ ptr++; count--;
+ continue;
+ };
+
+ ptr++; count--;
+
+ /* Allocate packet */
+ ibs->rx_skb = bt_skb_alloc(HCI_MAX_FRAME_SIZE, GFP_ATOMIC);
+ if (!ibs->rx_skb) {
+ BT_ERR("Can't allocate mem for new packet");
+ ibs->rx_state = HCI_IBS_W4_PACKET_TYPE;
+ ibs->rx_count = 0;
+ return 0;
+ }
+
+ ibs->rx_skb->dev = (void *) hu->hdev;
+ bt_cb(ibs->rx_skb)->pkt_type = type;
+ }
+
+ return count;
+}
+
+static struct sk_buff *ibs_dequeue(struct hci_uart *hu)
+{
+ struct ibs_struct *ibs = hu->priv;
+ return skb_dequeue(&ibs->txq);
+}
+
+static struct hci_uart_proto ibs_p = {
+ .id = HCI_UART_IBS,
+ .open = ibs_open,
+ .close = ibs_close,
+ .recv = ibs_recv,
+ .enqueue = ibs_enqueue,
+ .dequeue = ibs_dequeue,
+ .flush = ibs_flush,
+};
+
+int ibs_init(void)
+{
+ int err = hci_uart_register_proto(&ibs_p);
+
+ if (!err)
+ BT_INFO("HCI_IBS protocol initialized");
+ else
+ BT_ERR("HCI_IBS protocol registration failed");
+
+ return err;
+}
+
+int ibs_deinit(void)
+{
+ return hci_uart_unregister_proto(&ibs_p);
+}
+
+module_param(wake_retrans, ulong, 0644);
+MODULE_PARM_DESC(wake_retrans, "Delay (1/HZ) to retransmit WAKE_IND");
+
+module_param(tx_idle_delay, ulong, 0644);
+MODULE_PARM_DESC(tx_idle_delay, "Delay (1/HZ) since last tx for SLEEP_IND");
diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c
index 48ad2a7..b07af02 100644
--- a/drivers/bluetooth/hci_ldisc.c
+++ b/drivers/bluetooth/hci_ldisc.c
@@ -2,9 +2,9 @@
*
* Bluetooth HCI UART driver
*
- * Copyright (C) 2000-2001 Qualcomm Incorporated
* Copyright (C) 2002-2003 Maxim Krasnyansky <maxk@qualcomm.com>
* Copyright (C) 2004-2005 Marcel Holtmann <marcel@holtmann.org>
+ * Copyright (c) 2000-2001, 2010-2011, Code Aurora Forum. All rights reserved.
*
*
* This program is free software; you can redistribute it and/or modify
@@ -359,6 +359,7 @@
*/
static void hci_uart_tty_receive(struct tty_struct *tty, const u8 *data, char *flags, int count)
{
+ int ret;
struct hci_uart *hu = (void *)tty->disc_data;
if (!hu || tty != hu->tty)
@@ -368,8 +369,9 @@
return;
spin_lock(&hu->rx_lock);
- hu->proto->recv(hu, (void *) data, count);
- hu->hdev->stat.byte_rx += count;
+ ret = hu->proto->recv(hu, (void *) data, count);
+ if (ret > 0)
+ hu->hdev->stat.byte_rx += count;
spin_unlock(&hu->rx_lock);
tty_unthrottle(tty);
@@ -468,11 +470,18 @@
switch (cmd) {
case HCIUARTSETPROTO:
- if (!test_and_set_bit(HCI_UART_PROTO_SET, &hu->flags)) {
+ if (!test_and_set_bit(HCI_UART_PROTO_SET_IN_PROGRESS,
+ &hu->flags) && !test_bit(HCI_UART_PROTO_SET,
+ &hu->flags)) {
err = hci_uart_set_proto(hu, arg);
if (err) {
- clear_bit(HCI_UART_PROTO_SET, &hu->flags);
+ clear_bit(HCI_UART_PROTO_SET_IN_PROGRESS,
+ &hu->flags);
return err;
+ } else {
+ set_bit(HCI_UART_PROTO_SET, &hu->flags);
+ clear_bit(HCI_UART_PROTO_SET_IN_PROGRESS,
+ &hu->flags);
}
} else
return -EBUSY;
@@ -565,6 +574,9 @@
#ifdef CONFIG_BT_HCIUART_ATH3K
ath_init();
#endif
+#ifdef CONFIG_BT_HCIUART_IBS
+ ibs_init();
+#endif
return 0;
}
@@ -585,6 +597,9 @@
#ifdef CONFIG_BT_HCIUART_ATH3K
ath_deinit();
#endif
+#ifdef CONFIG_BT_HCIUART_IBS
+ ibs_deinit();
+#endif
/* Release tty registration of line discipline */
if ((err = tty_unregister_ldisc(N_HCI)))
diff --git a/drivers/bluetooth/hci_ll.c b/drivers/bluetooth/hci_ll.c
index 7e4b435..38595e7 100644
--- a/drivers/bluetooth/hci_ll.c
+++ b/drivers/bluetooth/hci_ll.c
@@ -207,7 +207,7 @@
/*
* This state means that both the host and the BRF chip
* have simultaneously sent a wake-up-indication packet.
- * Traditionally, in this case, receiving a wake-up-indication
+ * Traditionaly, in this case, receiving a wake-up-indication
* was enough and an additional wake-up-ack wasn't needed.
* This has changed with the BRF6350, which does require an
* explicit wake-up-ack. Other BRF versions, which do not
diff --git a/drivers/bluetooth/hci_smd.c b/drivers/bluetooth/hci_smd.c
new file mode 100644
index 0000000..7132c7c
--- /dev/null
+++ b/drivers/bluetooth/hci_smd.c
@@ -0,0 +1,305 @@
+/*
+ * HCI_SMD (HCI Shared Memory Driver) is Qualcomm's Shared memory driver
+ * for the BT HCI protocol.
+ *
+ * Copyright (c) 2000-2001, 2011 Code Aurora Forum. All rights reserved.
+ * Copyright (C) 2002-2003 Maxim Krasnyansky <maxk@qualcomm.com>
+ * Copyright (C) 2004-2006 Marcel Holtmann <marcel@holtmann.org>
+ *
+ * This file is based on drivers/bluetooth/hci_vhci.c
+ *
+ * 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.
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/errno.h>
+#include <linux/string.h>
+#include <linux/skbuff.h>
+#include <net/bluetooth/bluetooth.h>
+#include <net/bluetooth/hci_core.h>
+#include <net/bluetooth/hci.h>
+#include <mach/msm_smd.h>
+
+#define EVENT_CHANNEL "APPS_RIVA_BT_CMD"
+#define DATA_CHANNEL "APPS_RIVA_BT_ACL"
+
+struct hci_smd_data {
+ struct hci_dev *hdev;
+
+ struct smd_channel *event_channel;
+ struct smd_channel *data_channel;
+};
+struct hci_smd_data hs;
+
+static int hci_smd_open(struct hci_dev *hdev)
+{
+ set_bit(HCI_RUNNING, &hdev->flags);
+ return 0;
+}
+
+
+static int hci_smd_close(struct hci_dev *hdev)
+{
+ if (!test_and_clear_bit(HCI_RUNNING, &hdev->flags))
+ return 0;
+ else
+ return -EPERM;
+}
+
+
+static void hci_smd_destruct(struct hci_dev *hdev)
+{
+ kfree(hdev->driver_data);
+}
+
+static void hci_smd_recv_data(unsigned long arg)
+{
+ int len;
+ int rc;
+ struct sk_buff *skb;
+ unsigned char *buf;
+ struct hci_smd_data *hsmd = &hs;
+
+ len = smd_read_avail(hsmd->data_channel);
+
+ while (len > 0) {
+ skb = bt_skb_alloc(len, GFP_KERNEL);
+ if (!skb) {
+ BT_ERR("Error in allocating socket buffer\n");
+ return;
+ }
+
+ buf = kmalloc(len, GFP_KERNEL);
+ if (!buf) {
+ BT_ERR("Error in allocating buffer\n");
+ kfree_skb(skb);
+ return;
+ }
+
+ rc = smd_read_from_cb(hsmd->data_channel, (void *)buf, len);
+ if (rc < len) {
+ BT_ERR("Error in reading from the channel");
+ return;
+ }
+
+ memcpy(skb_put(skb, len), buf, len);
+ skb->dev = (void *)hsmd->hdev;
+ bt_cb(skb)->pkt_type = HCI_ACLDATA_PKT;
+
+ skb_orphan(skb);
+
+ rc = hci_recv_frame(skb);
+ if (rc < 0) {
+ BT_ERR("Error in passing the packet to HCI Layer");
+ return;
+ }
+
+ kfree(buf);
+ len = smd_read_avail(hsmd->data_channel);
+ }
+}
+
+static void hci_smd_recv_event(unsigned long arg)
+{
+ int len;
+ int rc;
+ struct sk_buff *skb;
+ unsigned char *buf;
+ struct hci_smd_data *hsmd = &hs;
+
+ len = smd_read_avail(hsmd->event_channel);
+ if (len > HCI_MAX_FRAME_SIZE) {
+ BT_ERR("Frame larger than the allowed size");
+ return;
+ }
+
+ while (len > 0) {
+ skb = bt_skb_alloc(len, GFP_KERNEL);
+ if (!skb)
+ return;
+
+ buf = kmalloc(len, GFP_KERNEL);
+ if (!buf) {
+ kfree_skb(skb);
+ return;
+ }
+
+ rc = smd_read_from_cb(hsmd->event_channel, (void *)buf, len);
+
+ memcpy(skb_put(skb, len), buf, len);
+ skb->dev = (void *)hsmd->hdev;
+ bt_cb(skb)->pkt_type = HCI_EVENT_PKT;
+
+ skb_orphan(skb);
+
+ rc = hci_recv_frame(skb);
+ if (rc < 0) {
+ BT_ERR("Error in passing the packet to HCI Layer");
+ return;
+ }
+
+ kfree(buf);
+ len = smd_read_avail(hsmd->event_channel);
+ }
+}
+
+static int hci_smd_send_frame(struct sk_buff *skb)
+{
+ int len;
+
+ switch (bt_cb(skb)->pkt_type) {
+ case HCI_COMMAND_PKT:
+ len = smd_write(hs.event_channel, skb->data, skb->len);
+ if (len < skb->len) {
+ BT_ERR("Failed to write Command %d", len);
+ return -ENODEV;
+ }
+ break;
+ case HCI_ACLDATA_PKT:
+ case HCI_SCODATA_PKT:
+ len = smd_write(hs.data_channel, skb->data, skb->len);
+ if (len < skb->len) {
+ BT_ERR("Failed to write Data %d", len);
+ return -ENODEV;
+ }
+ break;
+ default:
+ BT_ERR("Uknown packet type\n");
+ return -ENODEV;
+ break;
+ }
+ return 0;
+}
+
+
+static void hci_smd_notify_event(void *data, unsigned int event)
+{
+ struct hci_dev *hdev = hs.hdev;
+
+ if (!hdev) {
+ BT_ERR("Frame for unknown HCI device (hdev=NULL)");
+ return;
+ }
+
+ switch (event) {
+ case SMD_EVENT_DATA:
+ hci_smd_recv_event(event);
+ break;
+ case SMD_EVENT_OPEN:
+ hci_smd_open(hdev);
+ break;
+ case SMD_EVENT_CLOSE:
+ hci_smd_close(hdev);
+ break;
+ default:
+ break;
+ }
+}
+
+static void hci_smd_notify_data(void *data, unsigned int event)
+{
+ struct hci_dev *hdev = hs.hdev;
+ if (!hdev) {
+ BT_ERR("HCI device (hdev=NULL)");
+ return;
+ }
+
+ switch (event) {
+ case SMD_EVENT_DATA:
+ hci_smd_recv_data(event);
+ break;
+ case SMD_EVENT_OPEN:
+ hci_smd_open(hdev);
+ break;
+ case SMD_EVENT_CLOSE:
+ hci_smd_close(hdev);
+ break;
+ default:
+ break;
+ }
+
+}
+
+static int hci_smd_register_dev(struct hci_smd_data *hsmd)
+{
+ struct hci_dev *hdev;
+ int rc;
+
+ /* Initialize and register HCI device */
+ hdev = hci_alloc_dev();
+ if (!hdev) {
+ BT_ERR("Can't allocate HCI device");
+ return -ENOMEM;
+ }
+
+ hsmd->hdev = hdev;
+ hdev->bus = HCI_SMD;
+ hdev->driver_data = hsmd;
+ hdev->open = hci_smd_open;
+ hdev->close = hci_smd_close;
+ hdev->send = hci_smd_send_frame;
+ hdev->destruct = hci_smd_destruct;
+ hdev->owner = THIS_MODULE;
+
+ /* Open the SMD Channel and device and register the callback function */
+ rc = smd_named_open_on_edge(EVENT_CHANNEL, SMD_APPS_WCNSS,
+ &hsmd->event_channel, hdev, hci_smd_notify_event);
+ if (rc < 0) {
+ BT_ERR("Cannot open the command channel");
+ hci_free_dev(hdev);
+ return -ENODEV;
+ }
+
+ rc = smd_named_open_on_edge(DATA_CHANNEL, SMD_APPS_WCNSS,
+ &hsmd->data_channel, hdev, hci_smd_notify_data);
+ if (rc < 0) {
+ BT_ERR("Failed to open the Data channel\n");
+ hci_free_dev(hdev);
+ return -ENODEV;
+ }
+
+ /* Disable the read interrupts on the channel */
+ smd_disable_read_intr(hsmd->event_channel);
+ smd_disable_read_intr(hsmd->data_channel);
+
+ if (hci_register_dev(hdev) < 0) {
+ BT_ERR("Can't register HCI device");
+ hci_free_dev(hdev);
+ return -ENODEV;
+ }
+
+ return 0;
+}
+
+static void hci_smd_deregister(void)
+{
+ smd_close(hs.event_channel);
+ hs.event_channel = 0;
+ smd_close(hs.data_channel);
+ hs.data_channel = 0;
+}
+
+static int hci_smd_init(void)
+{
+ return hci_smd_register_dev(&hs);
+}
+module_init(hci_smd_init);
+
+static void __exit hci_smd_exit(void)
+{
+ hci_smd_deregister();
+}
+module_exit(hci_smd_exit);
+
+MODULE_AUTHOR("Ankur Nandwani <ankurn@codeaurora.org>");
+MODULE_DESCRIPTION("Bluetooth SMD driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/bluetooth/hci_uart.h b/drivers/bluetooth/hci_uart.h
index 99fb352..dc48239 100644
--- a/drivers/bluetooth/hci_uart.h
+++ b/drivers/bluetooth/hci_uart.h
@@ -2,9 +2,9 @@
*
* Bluetooth HCI UART driver
*
- * Copyright (C) 2000-2001 Qualcomm Incorporated
* Copyright (C) 2002-2003 Maxim Krasnyansky <maxk@qualcomm.com>
* Copyright (C) 2004-2005 Marcel Holtmann <marcel@holtmann.org>
+ * Copyright (c) 2000-2001, 2010, Code Aurora Forum. All rights reserved.
*
*
* This program is free software; you can redistribute it and/or modify
@@ -35,14 +35,15 @@
#define HCIUARTGETFLAGS _IOR('U', 204, int)
/* UART protocols */
-#define HCI_UART_MAX_PROTO 6
+#define HCI_UART_MAX_PROTO 7
#define HCI_UART_H4 0
#define HCI_UART_BCSP 1
#define HCI_UART_3WIRE 2
#define HCI_UART_H4DS 3
#define HCI_UART_LL 4
-#define HCI_UART_ATH3K 5
+#define HCI_UART_IBS 5
+#define HCI_UART_ATH3K 6
#define HCI_UART_RAW_DEVICE 0
@@ -73,7 +74,8 @@
};
/* HCI_UART proto flag bits */
-#define HCI_UART_PROTO_SET 0
+#define HCI_UART_PROTO_SET 0
+#define HCI_UART_PROTO_SET_IN_PROGRESS 1
/* TX states */
#define HCI_UART_SENDING 1
@@ -102,3 +104,8 @@
int ath_init(void);
int ath_deinit(void);
#endif
+
+#ifdef CONFIG_BT_HCIUART_IBS
+int ibs_init(void);
+int ibs_deinit(void);
+#endif