Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6

9 files changed, 2514 insertions, 24 deletions

diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig
index 1164837bb781..652367aa6546 100644
--- a/drivers/bluetooth/Kconfig
+++ b/drivers/bluetooth/Kconfig
@@ -170,5 +170,30 @@ config BT_HCIVHCI
           Say Y here to compile support for virtual HCI devices into the
           kernel or say M to compile it as module (hci_vhci).
 
+config BT_MRVL
+        tristate "Marvell Bluetooth driver support"
+        help
+          The core driver to support Marvell Bluetooth devices.
+
+          This driver is required if you want to support
+          Marvell Bluetooth devices, such as 8688.
+
+          Say Y here to compile Marvell Bluetooth driver
+          into the kernel or say M to compile it as module.
+
+config BT_MRVL_SDIO
+        tristate "Marvell BT-over-SDIO driver"
+        depends on BT_MRVL && MMC
+        select FW_LOADER
+        help
+          The driver for Marvell Bluetooth chipsets with SDIO interface.
+
+          This driver is required if you want to use Marvell Bluetooth
+          devices with SDIO interface. Currently only SD8688 chipset is
+          supported.
+
+          Say Y here to compile support for Marvell BT-over-SDIO driver
+          into the kernel or say M to compile it as module.
+
 endmenu
 
diff --git a/drivers/bluetooth/Makefile b/drivers/bluetooth/Makefile
index 16930f93d1ca..b3f57d2d4eb0 100644
--- a/drivers/bluetooth/Makefile
+++ b/drivers/bluetooth/Makefile
@@ -15,6 +15,12 @@ obj-$(CONFIG_BT_HCIBTUART)	+= btuart_cs.o
 obj-$(CONFIG_BT_HCIBTUSB)       += btusb.o
 obj-$(CONFIG_BT_HCIBTSDIO)      += btsdio.o
 
+obj-$(CONFIG_BT_MRVL)           += btmrvl.o
+obj-$(CONFIG_BT_MRVL_SDIO)      += btmrvl_sdio.o
+
+btmrvl-y                        := btmrvl_main.o
+btmrvl-$(CONFIG_DEBUG_FS)       += btmrvl_debugfs.o
+
 hci_uart-y                              := hci_ldisc.o
 hci_uart-$(CONFIG_BT_HCIUART_H4)        += hci_h4.o
 hci_uart-$(CONFIG_BT_HCIUART_BCSP)      += hci_bcsp.o
diff --git a/drivers/bluetooth/btmrvl_debugfs.c b/drivers/bluetooth/btmrvl_debugfs.c
new file mode 100644
index 000000000000..4617bd12f63b
--- /dev/null
+++ b/drivers/bluetooth/btmrvl_debugfs.c
@@ -0,0 +1,432 @@
+/**
+ * Marvell Bluetooth driver: debugfs related functions
+ *
+ * Copyright (C) 2009, Marvell International Ltd.
+ *
+ * This software file (the "File") is distributed by Marvell International
+ * Ltd. under the terms of the GNU General Public License Version 2, June 1991
+ * (the "License").  You may use, redistribute and/or modify this File in
+ * accordance with the terms and conditions of the License, a copy of which
+ * is available by writing to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
+ * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ *
+ * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
+ * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about
+ * this warranty disclaimer.
+ **/
+
+#include <linux/debugfs.h>
+
+#include <net/bluetooth/bluetooth.h>
+#include <net/bluetooth/hci_core.h>
+
+#include "btmrvl_drv.h"
+
+struct btmrvl_debugfs_data {
+        struct dentry *root_dir, *config_dir, *status_dir;
+
+        /* config */
+        struct dentry *drvdbg;
+        struct dentry *psmode;
+        struct dentry *pscmd;
+        struct dentry *hsmode;
+        struct dentry *hscmd;
+        struct dentry *gpiogap;
+        struct dentry *hscfgcmd;
+
+        /* status */
+        struct dentry *curpsmode;
+        struct dentry *hsstate;
+        struct dentry *psstate;
+        struct dentry *txdnldready;
+};
+
+static int btmrvl_open_generic(struct inode *inode, struct file *file)
+{
+        file->private_data = inode->i_private;
+        return 0;
+}
+
+static ssize_t btmrvl_hscfgcmd_write(struct file *file,
+                        const char __user *ubuf, size_t count, loff_t *ppos)
+{
+        struct btmrvl_private *priv = file->private_data;
+        char buf[16];
+        long result, ret;
+
+        memset(buf, 0, sizeof(buf));
+
+        if (copy_from_user(&buf, ubuf, min_t(size_t, sizeof(buf) - 1, count)))
+                return -EFAULT;
+
+        ret = strict_strtol(buf, 10, &result);
+
+        priv->btmrvl_dev.hscfgcmd = result;
+
+        if (priv->btmrvl_dev.hscfgcmd) {
+                btmrvl_prepare_command(priv);
+                wake_up_interruptible(&priv->main_thread.wait_q);
+        }
+
+        return count;
+}
+
+static ssize_t btmrvl_hscfgcmd_read(struct file *file, char __user *userbuf,
+                                                size_t count, loff_t *ppos)
+{
+        struct btmrvl_private *priv = file->private_data;
+        char buf[16];
+        int ret;
+
+        ret = snprintf(buf, sizeof(buf) - 1, "%d\n",
+                                                priv->btmrvl_dev.hscfgcmd);
+
+        return simple_read_from_buffer(userbuf, count, ppos, buf, ret);
+}
+
+static const struct file_operations btmrvl_hscfgcmd_fops = {
+        .read   = btmrvl_hscfgcmd_read,
+        .write  = btmrvl_hscfgcmd_write,
+        .open   = btmrvl_open_generic,
+};
+
+static ssize_t btmrvl_psmode_write(struct file *file, const char __user *ubuf,
+                                                size_t count, loff_t *ppos)
+{
+        struct btmrvl_private *priv = file->private_data;
+        char buf[16];
+        long result, ret;
+
+        memset(buf, 0, sizeof(buf));
+
+        if (copy_from_user(&buf, ubuf, min_t(size_t, sizeof(buf) - 1, count)))
+                return -EFAULT;
+
+        ret = strict_strtol(buf, 10, &result);
+
+        priv->btmrvl_dev.psmode = result;
+
+        return count;
+}
+
+static ssize_t btmrvl_psmode_read(struct file *file, char __user *userbuf,
+                                                size_t count, loff_t *ppos)
+{
+        struct btmrvl_private *priv = file->private_data;
+        char buf[16];
+        int ret;
+
+        ret = snprintf(buf, sizeof(buf) - 1, "%d\n",
+                                                priv->btmrvl_dev.psmode);
+
+        return simple_read_from_buffer(userbuf, count, ppos, buf, ret);
+}
+
+static const struct file_operations btmrvl_psmode_fops = {
+        .read   = btmrvl_psmode_read,
+        .write  = btmrvl_psmode_write,
+        .open   = btmrvl_open_generic,
+};
+
+static ssize_t btmrvl_pscmd_write(struct file *file, const char __user *ubuf,
+                                                size_t count, loff_t *ppos)
+{
+        struct btmrvl_private *priv = file->private_data;
+        char buf[16];
+        long result, ret;
+
+        memset(buf, 0, sizeof(buf));
+
+        if (copy_from_user(&buf, ubuf, min_t(size_t, sizeof(buf) - 1, count)))
+                return -EFAULT;
+
+        ret = strict_strtol(buf, 10, &result);
+
+        priv->btmrvl_dev.pscmd = result;
+
+        if (priv->btmrvl_dev.pscmd) {
+                btmrvl_prepare_command(priv);
+                wake_up_interruptible(&priv->main_thread.wait_q);
+        }
+
+        return count;
+
+}
+
+static ssize_t btmrvl_pscmd_read(struct file *file, char __user *userbuf,
+                                                size_t count, loff_t *ppos)
+{
+        struct btmrvl_private *priv = file->private_data;
+        char buf[16];
+        int ret;
+
+        ret = snprintf(buf, sizeof(buf) - 1, "%d\n", priv->btmrvl_dev.pscmd);
+
+        return simple_read_from_buffer(userbuf, count, ppos, buf, ret);
+}
+
+static const struct file_operations btmrvl_pscmd_fops = {
+        .read = btmrvl_pscmd_read,
+        .write = btmrvl_pscmd_write,
+        .open = btmrvl_open_generic,
+};
+
+static ssize_t btmrvl_gpiogap_write(struct file *file, const char __user *ubuf,
+                                                size_t count, loff_t *ppos)
+{
+        struct btmrvl_private *priv = file->private_data;
+        char buf[16];
+        long result, ret;
+
+        memset(buf, 0, sizeof(buf));
+
+        if (copy_from_user(&buf, ubuf, min_t(size_t, sizeof(buf) - 1, count)))
+                return -EFAULT;
+
+        ret = strict_strtol(buf, 16, &result);
+
+        priv->btmrvl_dev.gpio_gap = result;
+
+        return count;
+}
+
+static ssize_t btmrvl_gpiogap_read(struct file *file, char __user *userbuf,
+                                                size_t count, loff_t *ppos)
+{
+        struct btmrvl_private *priv = file->private_data;
+        char buf[16];
+        int ret;
+
+        ret = snprintf(buf, sizeof(buf) - 1, "0x%x\n",
+                                                priv->btmrvl_dev.gpio_gap);
+
+        return simple_read_from_buffer(userbuf, count, ppos, buf, ret);
+}
+
+static const struct file_operations btmrvl_gpiogap_fops = {
+        .read   = btmrvl_gpiogap_read,
+        .write  = btmrvl_gpiogap_write,
+        .open   = btmrvl_open_generic,
+};
+
+static ssize_t btmrvl_hscmd_write(struct file *file, const char __user *ubuf,
+                                                size_t count, loff_t *ppos)
+{
+        struct btmrvl_private *priv = (struct btmrvl_private *) file->private_data;
+        char buf[16];
+        long result, ret;
+
+        memset(buf, 0, sizeof(buf));
+
+        if (copy_from_user(&buf, ubuf, min_t(size_t, sizeof(buf) - 1, count)))
+                return -EFAULT;
+
+        ret = strict_strtol(buf, 10, &result);
+
+        priv->btmrvl_dev.hscmd = result;
+        if (priv->btmrvl_dev.hscmd) {
+                btmrvl_prepare_command(priv);
+                wake_up_interruptible(&priv->main_thread.wait_q);
+        }
+
+        return count;
+}
+
+static ssize_t btmrvl_hscmd_read(struct file *file, char __user *userbuf,
+                                                size_t count, loff_t *ppos)
+{
+        struct btmrvl_private *priv = file->private_data;
+        char buf[16];
+        int ret;
+
+        ret = snprintf(buf, sizeof(buf) - 1, "%d\n", priv->btmrvl_dev.hscmd);
+
+        return simple_read_from_buffer(userbuf, count, ppos, buf, ret);
+}
+
+static const struct file_operations btmrvl_hscmd_fops = {
+        .read   = btmrvl_hscmd_read,
+        .write  = btmrvl_hscmd_write,
+        .open   = btmrvl_open_generic,
+};
+
+static ssize_t btmrvl_hsmode_write(struct file *file, const char __user *ubuf,
+                                                size_t count, loff_t *ppos)
+{
+        struct btmrvl_private *priv = file->private_data;
+        char buf[16];
+        long result, ret;
+
+        memset(buf, 0, sizeof(buf));
+
+        if (copy_from_user(&buf, ubuf, min_t(size_t, sizeof(buf) - 1, count)))
+                return -EFAULT;
+
+        ret = strict_strtol(buf, 10, &result);
+
+        priv->btmrvl_dev.hsmode = result;
+
+        return count;
+}
+
+static ssize_t btmrvl_hsmode_read(struct file *file, char __user * userbuf,
+                                                size_t count, loff_t *ppos)
+{
+        struct btmrvl_private *priv = file->private_data;
+        char buf[16];
+        int ret;
+
+        ret = snprintf(buf, sizeof(buf) - 1, "%d\n", priv->btmrvl_dev.hsmode);
+
+        return simple_read_from_buffer(userbuf, count, ppos, buf, ret);
+}
+
+static const struct file_operations btmrvl_hsmode_fops = {
+        .read   = btmrvl_hsmode_read,
+        .write  = btmrvl_hsmode_write,
+        .open   = btmrvl_open_generic,
+};
+
+static ssize_t btmrvl_curpsmode_read(struct file *file, char __user *userbuf,
+                                                size_t count, loff_t *ppos)
+{
+        struct btmrvl_private *priv = file->private_data;
+        char buf[16];
+        int ret;
+
+        ret = snprintf(buf, sizeof(buf) - 1, "%d\n", priv->adapter->psmode);
+
+        return simple_read_from_buffer(userbuf, count, ppos, buf, ret);
+}
+
+static const struct file_operations btmrvl_curpsmode_fops = {
+        .read   = btmrvl_curpsmode_read,
+        .open   = btmrvl_open_generic,
+};
+
+static ssize_t btmrvl_psstate_read(struct file *file, char __user * userbuf,
+                                                size_t count, loff_t *ppos)
+{
+        struct btmrvl_private *priv = file->private_data;
+        char buf[16];
+        int ret;
+
+        ret = snprintf(buf, sizeof(buf) - 1, "%d\n", priv->adapter->ps_state);
+
+        return simple_read_from_buffer(userbuf, count, ppos, buf, ret);
+}
+
+static const struct file_operations btmrvl_psstate_fops = {
+        .read   = btmrvl_psstate_read,
+        .open   = btmrvl_open_generic,
+};
+
+static ssize_t btmrvl_hsstate_read(struct file *file, char __user *userbuf,
+                                                size_t count, loff_t *ppos)
+{
+        struct btmrvl_private *priv = file->private_data;
+        char buf[16];
+        int ret;
+
+        ret = snprintf(buf, sizeof(buf) - 1, "%d\n", priv->adapter->hs_state);
+
+        return simple_read_from_buffer(userbuf, count, ppos, buf, ret);
+}
+
+static const struct file_operations btmrvl_hsstate_fops = {
+        .read   = btmrvl_hsstate_read,
+        .open   = btmrvl_open_generic,
+};
+
+static ssize_t btmrvl_txdnldready_read(struct file *file, char __user *userbuf,
+                                                size_t count, loff_t *ppos)
+{
+        struct btmrvl_private *priv = file->private_data;
+        char buf[16];
+        int ret;
+
+        ret = snprintf(buf, sizeof(buf) - 1, "%d\n",
+                                        priv->btmrvl_dev.tx_dnld_rdy);
+
+        return simple_read_from_buffer(userbuf, count, ppos, buf, ret);
+}
+
+static const struct file_operations btmrvl_txdnldready_fops = {
+        .read   = btmrvl_txdnldready_read,
+        .open   = btmrvl_open_generic,
+};
+
+void btmrvl_debugfs_init(struct hci_dev *hdev)
+{
+        struct btmrvl_private *priv = hdev->driver_data;
+        struct btmrvl_debugfs_data *dbg;
+
+        dbg = kzalloc(sizeof(*dbg), GFP_KERNEL);
+        priv->debugfs_data = dbg;
+
+        if (!dbg) {
+                BT_ERR("Can not allocate memory for btmrvl_debugfs_data.");
+                return;
+        }
+
+        dbg->root_dir = debugfs_create_dir("btmrvl", NULL);
+
+        dbg->config_dir = debugfs_create_dir("config", dbg->root_dir);
+
+        dbg->psmode = debugfs_create_file("psmode", 0644, dbg->config_dir,
+                                hdev->driver_data, &btmrvl_psmode_fops);
+        dbg->pscmd = debugfs_create_file("pscmd", 0644, dbg->config_dir,
+                                hdev->driver_data, &btmrvl_pscmd_fops);
+        dbg->gpiogap = debugfs_create_file("gpiogap", 0644, dbg->config_dir,
+                                hdev->driver_data, &btmrvl_gpiogap_fops);
+        dbg->hsmode =  debugfs_create_file("hsmode", 0644, dbg->config_dir,
+                                hdev->driver_data, &btmrvl_hsmode_fops);
+        dbg->hscmd = debugfs_create_file("hscmd", 0644, dbg->config_dir,
+                                hdev->driver_data, &btmrvl_hscmd_fops);
+        dbg->hscfgcmd = debugfs_create_file("hscfgcmd", 0644, dbg->config_dir,
+                                hdev->driver_data, &btmrvl_hscfgcmd_fops);
+
+        dbg->status_dir = debugfs_create_dir("status", dbg->root_dir);
+        dbg->curpsmode = debugfs_create_file("curpsmode", 0444,
+                                                dbg->status_dir,
+                                                hdev->driver_data,
+                                                &btmrvl_curpsmode_fops);
+        dbg->psstate = debugfs_create_file("psstate", 0444, dbg->status_dir,
+                                hdev->driver_data, &btmrvl_psstate_fops);
+        dbg->hsstate = debugfs_create_file("hsstate", 0444, dbg->status_dir,
+                                hdev->driver_data, &btmrvl_hsstate_fops);
+        dbg->txdnldready = debugfs_create_file("txdnldready", 0444,
+                                                dbg->status_dir,
+                                                hdev->driver_data,
+                                                &btmrvl_txdnldready_fops);
+}
+
+void btmrvl_debugfs_remove(struct hci_dev *hdev)
+{
+        struct btmrvl_private *priv = hdev->driver_data;
+        struct btmrvl_debugfs_data *dbg = priv->debugfs_data;
+
+        if (!dbg)
+                return;
+
+        debugfs_remove(dbg->psmode);
+        debugfs_remove(dbg->pscmd);
+        debugfs_remove(dbg->gpiogap);
+        debugfs_remove(dbg->hsmode);
+        debugfs_remove(dbg->hscmd);
+        debugfs_remove(dbg->hscfgcmd);
+        debugfs_remove(dbg->config_dir);
+
+        debugfs_remove(dbg->curpsmode);
+        debugfs_remove(dbg->psstate);
+        debugfs_remove(dbg->hsstate);
+        debugfs_remove(dbg->txdnldready);
+        debugfs_remove(dbg->status_dir);
+
+        debugfs_remove(dbg->root_dir);
+
+        kfree(dbg);
+}
diff --git a/drivers/bluetooth/btmrvl_drv.h b/drivers/bluetooth/btmrvl_drv.h
new file mode 100644
index 000000000000..411c7a77082d
--- /dev/null
+++ b/drivers/bluetooth/btmrvl_drv.h
@@ -0,0 +1,139 @@
+/*
+ * Marvell Bluetooth driver: global definitions & declarations
+ *
+ * Copyright (C) 2009, Marvell International Ltd.
+ *
+ * This software file (the "File") is distributed by Marvell International
+ * Ltd. under the terms of the GNU General Public License Version 2, June 1991
+ * (the "License").  You may use, redistribute and/or modify this File in
+ * accordance with the terms and conditions of the License, a copy of which
+ * is available by writing to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
+ * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ *
+ * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
+ * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about
+ * this warranty disclaimer.
+ *
+ */
+
+#include <linux/kthread.h>
+#include <linux/bitops.h>
+#include <net/bluetooth/bluetooth.h>
+
+#define BTM_HEADER_LEN                  4
+#define BTM_UPLD_SIZE                   2312
+
+/* Time to wait until Host Sleep state change in millisecond */
+#define WAIT_UNTIL_HS_STATE_CHANGED     5000
+/* Time to wait for command response in millisecond */
+#define WAIT_UNTIL_CMD_RESP             5000
+
+struct btmrvl_thread {
+        struct task_struct *task;
+        wait_queue_head_t wait_q;
+        void *priv;
+};
+
+struct btmrvl_device {
+        void *card;
+        struct hci_dev *hcidev;
+
+        u8 tx_dnld_rdy;
+
+        u8 psmode;
+        u8 pscmd;
+        u8 hsmode;
+        u8 hscmd;
+
+        /* Low byte is gap, high byte is GPIO */
+        u16 gpio_gap;
+
+        u8 hscfgcmd;
+        u8 sendcmdflag;
+};
+
+struct btmrvl_adapter {
+        u32 int_count;
+        struct sk_buff_head tx_queue;
+        u8 psmode;
+        u8 ps_state;
+        u8 hs_state;
+        u8 wakeup_tries;
+        wait_queue_head_t cmd_wait_q;
+        u8 cmd_complete;
+};
+
+struct btmrvl_private {
+        struct btmrvl_device btmrvl_dev;
+        struct btmrvl_adapter *adapter;
+        struct btmrvl_thread main_thread;
+        int (*hw_host_to_card) (struct btmrvl_private *priv,
+                                u8 *payload, u16 nb);
+        int (*hw_wakeup_firmware) (struct btmrvl_private *priv);
+        spinlock_t driver_lock;         /* spinlock used by driver */
+#ifdef CONFIG_DEBUG_FS
+        void *debugfs_data;
+#endif
+};
+
+#define MRVL_VENDOR_PKT                 0xFE
+
+/* Bluetooth commands  */
+#define BT_CMD_AUTO_SLEEP_MODE          0x23
+#define BT_CMD_HOST_SLEEP_CONFIG        0x59
+#define BT_CMD_HOST_SLEEP_ENABLE        0x5A
+#define BT_CMD_MODULE_CFG_REQ           0x5B
+
+/* Sub-commands: Module Bringup/Shutdown Request */
+#define MODULE_BRINGUP_REQ              0xF1
+#define MODULE_SHUTDOWN_REQ             0xF2
+
+#define BT_EVENT_POWER_STATE            0x20
+
+/* Bluetooth Power States */
+#define BT_PS_ENABLE                    0x02
+#define BT_PS_DISABLE                   0x03
+#define BT_PS_SLEEP                     0x01
+
+#define OGF                             0x3F
+
+/* Host Sleep states */
+#define HS_ACTIVATED                    0x01
+#define HS_DEACTIVATED                  0x00
+
+/* Power Save modes */
+#define PS_SLEEP                        0x01
+#define PS_AWAKE                        0x00
+
+struct btmrvl_cmd {
+        __le16 ocf_ogf;
+        u8 length;
+        u8 data[4];
+} __attribute__ ((packed));
+
+struct btmrvl_event {
+        u8 ec;          /* event counter */
+        u8 length;
+        u8 data[4];
+} __attribute__ ((packed));
+
+/* Prototype of global function */
+
+struct btmrvl_private *btmrvl_add_card(void *card);
+int btmrvl_remove_card(struct btmrvl_private *priv);
+
+void btmrvl_interrupt(struct btmrvl_private *priv);
+
+void btmrvl_check_evtpkt(struct btmrvl_private *priv, struct sk_buff *skb);
+int btmrvl_process_event(struct btmrvl_private *priv, struct sk_buff *skb);
+
+int btmrvl_send_module_cfg_cmd(struct btmrvl_private *priv, int subcmd);
+int btmrvl_prepare_command(struct btmrvl_private *priv);
+
+#ifdef CONFIG_DEBUG_FS
+void btmrvl_debugfs_init(struct hci_dev *hdev);
+void btmrvl_debugfs_remove(struct hci_dev *hdev);
+#endif
diff --git a/drivers/bluetooth/btmrvl_main.c b/drivers/bluetooth/btmrvl_main.c
new file mode 100644
index 000000000000..e605563b4eaa
--- /dev/null
+++ b/drivers/bluetooth/btmrvl_main.c
@@ -0,0 +1,624 @@
+/**
+ * Marvell Bluetooth driver
+ *
+ * Copyright (C) 2009, Marvell International Ltd.
+ *
+ * This software file (the "File") is distributed by Marvell International
+ * Ltd. under the terms of the GNU General Public License Version 2, June 1991
+ * (the "License").  You may use, redistribute and/or modify this File in
+ * accordance with the terms and conditions of the License, a copy of which
+ * is available by writing to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
+ * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ *
+ * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
+ * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about
+ * this warranty disclaimer.
+ **/
+
+#include <net/bluetooth/bluetooth.h>
+#include <net/bluetooth/hci_core.h>
+
+#include "btmrvl_drv.h"
+
+#define VERSION "1.0"
+
+/*
+ * This function is called by interface specific interrupt handler.
+ * It updates Power Save & Host Sleep states, and wakes up the main
+ * thread.
+ */
+void btmrvl_interrupt(struct btmrvl_private *priv)
+{
+        priv->adapter->ps_state = PS_AWAKE;
+
+        priv->adapter->wakeup_tries = 0;
+
+        priv->adapter->int_count++;
+
+        wake_up_interruptible(&priv->main_thread.wait_q);
+}
+EXPORT_SYMBOL_GPL(btmrvl_interrupt);
+
+void btmrvl_check_evtpkt(struct btmrvl_private *priv, struct sk_buff *skb)
+{
+        struct hci_event_hdr *hdr = (void *) skb->data;
+        struct hci_ev_cmd_complete *ec;
+        u16 opcode, ocf;
+
+        if (hdr->evt == HCI_EV_CMD_COMPLETE) {
+                ec = (void *) (skb->data + HCI_EVENT_HDR_SIZE);
+                opcode = __le16_to_cpu(ec->opcode);
+                ocf = hci_opcode_ocf(opcode);
+                if (ocf == BT_CMD_MODULE_CFG_REQ &&
+                                        priv->btmrvl_dev.sendcmdflag) {
+                        priv->btmrvl_dev.sendcmdflag = false;
+                        priv->adapter->cmd_complete = true;
+                        wake_up_interruptible(&priv->adapter->cmd_wait_q);
+                }
+        }
+}
+EXPORT_SYMBOL_GPL(btmrvl_check_evtpkt);
+
+int btmrvl_process_event(struct btmrvl_private *priv, struct sk_buff *skb)
+{
+        struct btmrvl_adapter *adapter = priv->adapter;
+        struct btmrvl_event *event;
+        u8 ret = 0;
+
+        event = (struct btmrvl_event *) skb->data;
+        if (event->ec != 0xff) {
+                BT_DBG("Not Marvell Event=%x", event->ec);
+                ret = -EINVAL;
+                goto exit;
+        }
+
+        switch (event->data[0]) {
+        case BT_CMD_AUTO_SLEEP_MODE:
+                if (!event->data[2]) {
+                        if (event->data[1] == BT_PS_ENABLE)
+                                adapter->psmode = 1;
+                        else
+                                adapter->psmode = 0;
+                        BT_DBG("PS Mode:%s",
+                                (adapter->psmode) ? "Enable" : "Disable");
+                } else {
+                        BT_DBG("PS Mode command failed");
+                }
+                break;
+
+        case BT_CMD_HOST_SLEEP_CONFIG:
+                if (!event->data[3])
+                        BT_DBG("gpio=%x, gap=%x", event->data[1],
+                                                        event->data[2]);
+                else
+                        BT_DBG("HSCFG command failed");
+                break;
+
+        case BT_CMD_HOST_SLEEP_ENABLE:
+                if (!event->data[1]) {
+                        adapter->hs_state = HS_ACTIVATED;
+                        if (adapter->psmode)
+                                adapter->ps_state = PS_SLEEP;
+                        wake_up_interruptible(&adapter->cmd_wait_q);
+                        BT_DBG("HS ACTIVATED!");
+                } else {
+                        BT_DBG("HS Enable failed");
+                }
+                break;
+
+        case BT_CMD_MODULE_CFG_REQ:
+                if (priv->btmrvl_dev.sendcmdflag &&
+                                event->data[1] == MODULE_BRINGUP_REQ) {
+                        BT_DBG("EVENT:%s", (event->data[2]) ?
+                                "Bring-up failed" : "Bring-up succeed");
+                } else if (priv->btmrvl_dev.sendcmdflag &&
+                                event->data[1] == MODULE_SHUTDOWN_REQ) {
+                        BT_DBG("EVENT:%s", (event->data[2]) ?
+                                "Shutdown failed" : "Shutdown succeed");
+                } else {
+                        BT_DBG("BT_CMD_MODULE_CFG_REQ resp for APP");
+                        ret = -EINVAL;
+                }
+                break;
+
+        case BT_EVENT_POWER_STATE:
+                if (event->data[1] == BT_PS_SLEEP)
+                        adapter->ps_state = PS_SLEEP;
+                BT_DBG("EVENT:%s",
+                        (adapter->ps_state) ? "PS_SLEEP" : "PS_AWAKE");
+                break;
+
+        default:
+                BT_DBG("Unknown Event=%d", event->data[0]);
+                ret = -EINVAL;
+                break;
+        }
+
+exit:
+        if (!ret)
+                kfree_skb(skb);
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(btmrvl_process_event);
+
+int btmrvl_send_module_cfg_cmd(struct btmrvl_private *priv, int subcmd)
+{
+        struct sk_buff *skb;
+        struct btmrvl_cmd *cmd;
+        int ret = 0;
+
+        skb = bt_skb_alloc(sizeof(*cmd), GFP_ATOMIC);
+        if (skb == NULL) {
+                BT_ERR("No free skb");
+                return -ENOMEM;
+        }
+
+        cmd = (struct btmrvl_cmd *) skb_put(skb, sizeof(*cmd));
+        cmd->ocf_ogf = cpu_to_le16(hci_opcode_pack(OGF, BT_CMD_MODULE_CFG_REQ));
+        cmd->length = 1;
+        cmd->data[0] = subcmd;
+
+        bt_cb(skb)->pkt_type = MRVL_VENDOR_PKT;
+
+        skb->dev = (void *) priv->btmrvl_dev.hcidev;
+        skb_queue_head(&priv->adapter->tx_queue, skb);
+
+        priv->btmrvl_dev.sendcmdflag = true;
+
+        priv->adapter->cmd_complete = false;
+
+        BT_DBG("Queue module cfg Command");
+
+        wake_up_interruptible(&priv->main_thread.wait_q);
+
+        if (!wait_event_interruptible_timeout(priv->adapter->cmd_wait_q,
+                                priv->adapter->cmd_complete,
+                                msecs_to_jiffies(WAIT_UNTIL_CMD_RESP))) {
+                ret = -ETIMEDOUT;
+                BT_ERR("module_cfg_cmd(%x): timeout: %d",
+                                        subcmd, priv->btmrvl_dev.sendcmdflag);
+        }
+
+        BT_DBG("module cfg Command done");
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(btmrvl_send_module_cfg_cmd);
+
+static int btmrvl_enable_hs(struct btmrvl_private *priv)
+{
+        struct sk_buff *skb;
+        struct btmrvl_cmd *cmd;
+        int ret = 0;
+
+        skb = bt_skb_alloc(sizeof(*cmd), GFP_ATOMIC);
+        if (skb == NULL) {
+                BT_ERR("No free skb");
+                return -ENOMEM;
+        }
+
+        cmd = (struct btmrvl_cmd *) skb_put(skb, sizeof(*cmd));
+        cmd->ocf_ogf = cpu_to_le16(hci_opcode_pack(OGF, BT_CMD_HOST_SLEEP_ENABLE));
+        cmd->length = 0;
+
+        bt_cb(skb)->pkt_type = MRVL_VENDOR_PKT;
+
+        skb->dev = (void *) priv->btmrvl_dev.hcidev;
+        skb_queue_head(&priv->adapter->tx_queue, skb);
+
+        BT_DBG("Queue hs enable Command");
+
+        wake_up_interruptible(&priv->main_thread.wait_q);
+
+        if (!wait_event_interruptible_timeout(priv->adapter->cmd_wait_q,
+                        priv->adapter->hs_state,
+                        msecs_to_jiffies(WAIT_UNTIL_HS_STATE_CHANGED))) {
+                ret = -ETIMEDOUT;
+                BT_ERR("timeout: %d, %d,%d", priv->adapter->hs_state,
+                                                priv->adapter->ps_state,
+                                                priv->adapter->wakeup_tries);
+        }
+
+        return ret;
+}
+
+int btmrvl_prepare_command(struct btmrvl_private *priv)
+{
+        struct sk_buff *skb = NULL;
+        struct btmrvl_cmd *cmd;
+        int ret = 0;
+
+        if (priv->btmrvl_dev.hscfgcmd) {
+                priv->btmrvl_dev.hscfgcmd = 0;
+
+                skb = bt_skb_alloc(sizeof(*cmd), GFP_ATOMIC);
+                if (skb == NULL) {
+                        BT_ERR("No free skb");
+                        return -ENOMEM;
+                }
+
+                cmd = (struct btmrvl_cmd *) skb_put(skb, sizeof(*cmd));
+                cmd->ocf_ogf = cpu_to_le16(hci_opcode_pack(OGF, BT_CMD_HOST_SLEEP_CONFIG));
+                cmd->length = 2;
+                cmd->data[0] = (priv->btmrvl_dev.gpio_gap & 0xff00) >> 8;
+                cmd->data[1] = (u8) (priv->btmrvl_dev.gpio_gap & 0x00ff);
+
+                bt_cb(skb)->pkt_type = MRVL_VENDOR_PKT;
+
+                skb->dev = (void *) priv->btmrvl_dev.hcidev;
+                skb_queue_head(&priv->adapter->tx_queue, skb);
+
+                BT_DBG("Queue HSCFG Command, gpio=0x%x, gap=0x%x",
+                                                cmd->data[0], cmd->data[1]);
+        }
+
+        if (priv->btmrvl_dev.pscmd) {
+                priv->btmrvl_dev.pscmd = 0;
+
+                skb = bt_skb_alloc(sizeof(*cmd), GFP_ATOMIC);
+                if (skb == NULL) {
+                        BT_ERR("No free skb");
+                        return -ENOMEM;
+                }
+
+                cmd = (struct btmrvl_cmd *) skb_put(skb, sizeof(*cmd));
+                cmd->ocf_ogf = cpu_to_le16(hci_opcode_pack(OGF, BT_CMD_AUTO_SLEEP_MODE));
+                cmd->length = 1;
+
+                if (priv->btmrvl_dev.psmode)
+                        cmd->data[0] = BT_PS_ENABLE;
+                else
+                        cmd->data[0] = BT_PS_DISABLE;
+
+                bt_cb(skb)->pkt_type = MRVL_VENDOR_PKT;
+
+                skb->dev = (void *) priv->btmrvl_dev.hcidev;
+                skb_queue_head(&priv->adapter->tx_queue, skb);
+
+                BT_DBG("Queue PSMODE Command:%d", cmd->data[0]);
+        }
+
+        if (priv->btmrvl_dev.hscmd) {
+                priv->btmrvl_dev.hscmd = 0;
+
+                if (priv->btmrvl_dev.hsmode) {
+                        ret = btmrvl_enable_hs(priv);
+                } else {
+                        ret = priv->hw_wakeup_firmware(priv);
+                        priv->adapter->hs_state = HS_DEACTIVATED;
+                }
+        }
+
+        return ret;
+}
+
+static int btmrvl_tx_pkt(struct btmrvl_private *priv, struct sk_buff *skb)
+{
+        int ret = 0;
+
+        if (!skb || !skb->data)
+                return -EINVAL;
+
+        if (!skb->len || ((skb->len + BTM_HEADER_LEN) > BTM_UPLD_SIZE)) {
+                BT_ERR("Tx Error: Bad skb length %d : %d",
+                                                skb->len, BTM_UPLD_SIZE);
+                return -EINVAL;
+        }
+
+        if (skb_headroom(skb) < BTM_HEADER_LEN) {
+                struct sk_buff *tmp = skb;
+
+                skb = skb_realloc_headroom(skb, BTM_HEADER_LEN);
+                if (!skb) {
+                        BT_ERR("Tx Error: realloc_headroom failed %d",
+                                BTM_HEADER_LEN);
+                        skb = tmp;
+                        return -EINVAL;
+                }
+
+                kfree_skb(tmp);
+        }
+
+        skb_push(skb, BTM_HEADER_LEN);
+
+        /* header type: byte[3]
+         * HCI_COMMAND = 1, ACL_DATA = 2, SCO_DATA = 3, 0xFE = Vendor
+         * header length: byte[2][1][0]
+         */
+
+        skb->data[0] = (skb->len & 0x0000ff);
+        skb->data[1] = (skb->len & 0x00ff00) >> 8;
+        skb->data[2] = (skb->len & 0xff0000) >> 16;
+        skb->data[3] = bt_cb(skb)->pkt_type;
+
+        if (priv->hw_host_to_card)
+                ret = priv->hw_host_to_card(priv, skb->data, skb->len);
+
+        return ret;
+}
+
+static void btmrvl_init_adapter(struct btmrvl_private *priv)
+{
+        skb_queue_head_init(&priv->adapter->tx_queue);
+
+        priv->adapter->ps_state = PS_AWAKE;
+
+        init_waitqueue_head(&priv->adapter->cmd_wait_q);
+}
+
+static void btmrvl_free_adapter(struct btmrvl_private *priv)
+{
+        skb_queue_purge(&priv->adapter->tx_queue);
+
+        kfree(priv->adapter);
+
+        priv->adapter = NULL;
+}
+
+static int btmrvl_ioctl(struct hci_dev *hdev,
+                                unsigned int cmd, unsigned long arg)
+{
+        return -ENOIOCTLCMD;
+}
+
+static void btmrvl_destruct(struct hci_dev *hdev)
+{
+}
+
+static int btmrvl_send_frame(struct sk_buff *skb)
+{
+        struct hci_dev *hdev = (struct hci_dev *) skb->dev;
+        struct btmrvl_private *priv = NULL;
+
+        BT_DBG("type=%d, len=%d", skb->pkt_type, skb->len);
+
+        if (!hdev || !hdev->driver_data) {
+                BT_ERR("Frame for unknown HCI device");
+                return -ENODEV;
+        }
+
+        priv = (struct btmrvl_private *) hdev->driver_data;
+        if (!test_bit(HCI_RUNNING, &hdev->flags)) {
+                BT_ERR("Failed testing HCI_RUNING, flags=%lx", hdev->flags);
+                print_hex_dump_bytes("data: ", DUMP_PREFIX_OFFSET,
+                                                        skb->data, skb->len);
+                return -EBUSY;
+        }
+
+        switch (bt_cb(skb)->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;
+        }
+
+        skb_queue_tail(&priv->adapter->tx_queue, skb);
+
+        wake_up_interruptible(&priv->main_thread.wait_q);
+
+        return 0;
+}
+
+static int btmrvl_flush(struct hci_dev *hdev)
+{
+        struct btmrvl_private *priv = hdev->driver_data;
+
+        skb_queue_purge(&priv->adapter->tx_queue);
+
+        return 0;
+}
+
+static int btmrvl_close(struct hci_dev *hdev)
+{
+        struct btmrvl_private *priv = hdev->driver_data;
+
+        if (!test_and_clear_bit(HCI_RUNNING, &hdev->flags))
+                return 0;
+
+        skb_queue_purge(&priv->adapter->tx_queue);
+
+        return 0;
+}
+
+static int btmrvl_open(struct hci_dev *hdev)
+{
+        set_bit(HCI_RUNNING, &hdev->flags);
+
+        return 0;
+}
+
+/*
+ * This function handles the event generated by firmware, rx data
+ * received from firmware, and tx data sent from kernel.
+ */
+static int btmrvl_service_main_thread(void *data)
+{
+        struct btmrvl_thread *thread = data;
+        struct btmrvl_private *priv = thread->priv;
+        struct btmrvl_adapter *adapter = priv->adapter;
+        wait_queue_t wait;
+        struct sk_buff *skb;
+        ulong flags;
+
+        init_waitqueue_entry(&wait, current);
+
+        current->flags |= PF_NOFREEZE;
+
+        for (;;) {
+                add_wait_queue(&thread->wait_q, &wait);
+
+                set_current_state(TASK_INTERRUPTIBLE);
+
+                if (adapter->wakeup_tries ||
+                                ((!adapter->int_count) &&
+                                (!priv->btmrvl_dev.tx_dnld_rdy ||
+                                skb_queue_empty(&adapter->tx_queue)))) {
+                        BT_DBG("main_thread is sleeping...");
+                        schedule();
+                }
+
+                set_current_state(TASK_RUNNING);
+
+                remove_wait_queue(&thread->wait_q, &wait);
+
+                BT_DBG("main_thread woke up");
+
+                if (kthread_should_stop()) {
+                        BT_DBG("main_thread: break from main thread");
+                        break;
+                }
+
+                spin_lock_irqsave(&priv->driver_lock, flags);
+                if (adapter->int_count) {
+                        adapter->int_count = 0;
+                } else if (adapter->ps_state == PS_SLEEP &&
+                                        !skb_queue_empty(&adapter->tx_queue)) {
+                        spin_unlock_irqrestore(&priv->driver_lock, flags);
+                        adapter->wakeup_tries++;
+                        priv->hw_wakeup_firmware(priv);
+                        continue;
+                }
+                spin_unlock_irqrestore(&priv->driver_lock, flags);
+
+                if (adapter->ps_state == PS_SLEEP)
+                        continue;
+
+                if (!priv->btmrvl_dev.tx_dnld_rdy)
+                        continue;
+
+                skb = skb_dequeue(&adapter->tx_queue);
+                if (skb) {
+                        if (btmrvl_tx_pkt(priv, skb))
+                                priv->btmrvl_dev.hcidev->stat.err_tx++;
+                        else
+                                priv->btmrvl_dev.hcidev->stat.byte_tx += skb->len;
+
+                        kfree_skb(skb);
+                }
+        }
+
+        return 0;
+}
+
+struct btmrvl_private *btmrvl_add_card(void *card)
+{
+        struct hci_dev *hdev = NULL;
+        struct btmrvl_private *priv;
+        int ret;
+
+        priv = kzalloc(sizeof(*priv), GFP_KERNEL);
+        if (!priv) {
+                BT_ERR("Can not allocate priv");
+                goto err_priv;
+        }
+
+        priv->adapter = kzalloc(sizeof(*priv->adapter), GFP_KERNEL);
+        if (!priv->adapter) {
+                BT_ERR("Allocate buffer for btmrvl_adapter failed!");
+                goto err_adapter;
+        }
+
+        btmrvl_init_adapter(priv);
+
+        hdev = hci_alloc_dev();
+        if (!hdev) {
+                BT_ERR("Can not allocate HCI device");
+                goto err_hdev;
+        }
+
+        BT_DBG("Starting kthread...");
+        priv->main_thread.priv = priv;
+        spin_lock_init(&priv->driver_lock);
+
+        init_waitqueue_head(&priv->main_thread.wait_q);
+        priv->main_thread.task = kthread_run(btmrvl_service_main_thread,
+                                &priv->main_thread, "btmrvl_main_service");
+
+        priv->btmrvl_dev.hcidev = hdev;
+        priv->btmrvl_dev.card = card;
+
+        hdev->driver_data = priv;
+
+        priv->btmrvl_dev.tx_dnld_rdy = true;
+
+        hdev->type = HCI_SDIO;
+        hdev->open = btmrvl_open;
+        hdev->close = btmrvl_close;
+        hdev->flush = btmrvl_flush;
+        hdev->send = btmrvl_send_frame;
+        hdev->destruct = btmrvl_destruct;
+        hdev->ioctl = btmrvl_ioctl;
+        hdev->owner = THIS_MODULE;
+
+        ret = hci_register_dev(hdev);
+        if (ret < 0) {
+                BT_ERR("Can not register HCI device");
+                goto err_hci_register_dev;
+        }
+
+#ifdef CONFIG_DEBUG_FS
+        btmrvl_debugfs_init(hdev);
+#endif
+
+        return priv;
+
+err_hci_register_dev:
+        /* Stop the thread servicing the interrupts */
+        kthread_stop(priv->main_thread.task);
+
+        hci_free_dev(hdev);
+
+err_hdev:
+        btmrvl_free_adapter(priv);
+
+err_adapter:
+        kfree(priv);
+
+err_priv:
+        return NULL;
+}
+EXPORT_SYMBOL_GPL(btmrvl_add_card);
+
+int btmrvl_remove_card(struct btmrvl_private *priv)
+{
+        struct hci_dev *hdev;
+
+        hdev = priv->btmrvl_dev.hcidev;
+
+        wake_up_interruptible(&priv->adapter->cmd_wait_q);
+
+        kthread_stop(priv->main_thread.task);
+
+#ifdef CONFIG_DEBUG_FS
+        btmrvl_debugfs_remove(hdev);
+#endif
+
+        hci_unregister_dev(hdev);
+
+        hci_free_dev(hdev);
+
+        priv->btmrvl_dev.hcidev = NULL;
+
+        btmrvl_free_adapter(priv);
+
+        kfree(priv);
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(btmrvl_remove_card);
+
+MODULE_AUTHOR("Marvell International Ltd.");
+MODULE_DESCRIPTION("Marvell Bluetooth driver ver " VERSION);
+MODULE_VERSION(VERSION);
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c
new file mode 100644
index 000000000000..5b33b85790f2
--- /dev/null
+++ b/drivers/bluetooth/btmrvl_sdio.c
@@ -0,0 +1,1003 @@
+/**
+ * Marvell BT-over-SDIO driver: SDIO interface related functions.
+ *
+ * Copyright (C) 2009, Marvell International Ltd.
+ *
+ * This software file (the "File") is distributed by Marvell International
+ * Ltd. under the terms of the GNU General Public License Version 2, June 1991
+ * (the "License").  You may use, redistribute and/or modify this File in
+ * accordance with the terms and conditions of the License, a copy of which
+ * is available by writing to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
+ * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ *
+ * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
+ * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about
+ * this warranty disclaimer.
+ **/
+
+#include <linux/firmware.h>
+
+#include <linux/mmc/sdio_ids.h>
+#include <linux/mmc/sdio_func.h>
+
+#include <net/bluetooth/bluetooth.h>
+#include <net/bluetooth/hci_core.h>
+
+#include "btmrvl_drv.h"
+#include "btmrvl_sdio.h"
+
+#define VERSION "1.0"
+
+/* The btmrvl_sdio_remove() callback function is called
+ * when user removes this module from kernel space or ejects
+ * the card from the slot. The driver handles these 2 cases
+ * differently.
+ * If the user is removing the module, a MODULE_SHUTDOWN_REQ
+ * command is sent to firmware and interrupt will be disabled.
+ * If the card is removed, there is no need to send command
+ * or disable interrupt.
+ *
+ * The variable 'user_rmmod' is used to distinguish these two
+ * scenarios. This flag is initialized as FALSE in case the card
+ * is removed, and will be set to TRUE for module removal when
+ * module_exit function is called.
+ */
+static u8 user_rmmod;
+
+static const struct btmrvl_sdio_device btmrvl_sdio_sd6888 = {
+        .helper         = "sd8688_helper.bin",
+        .firmware       = "sd8688.bin",
+};
+
+static const struct sdio_device_id btmrvl_sdio_ids[] = {
+        /* Marvell SD8688 Bluetooth device */
+        { SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, 0x9105),
+                        .driver_data = (unsigned long) &btmrvl_sdio_sd6888 },
+
+        { }     /* Terminating entry */
+};
+
+MODULE_DEVICE_TABLE(sdio, btmrvl_sdio_ids);
+
+static int btmrvl_sdio_get_rx_unit(struct btmrvl_sdio_card *card)
+{
+        u8 reg;
+        int ret;
+
+        reg = sdio_readb(card->func, CARD_RX_UNIT_REG, &ret);
+        if (!ret)
+                card->rx_unit = reg;
+
+        return ret;
+}
+
+static int btmrvl_sdio_read_fw_status(struct btmrvl_sdio_card *card, u16 *dat)
+{
+        u8 fws0, fws1;
+        int ret;
+
+        *dat = 0;
+
+        fws0 = sdio_readb(card->func, CARD_FW_STATUS0_REG, &ret);
+
+        if (!ret)
+                fws1 = sdio_readb(card->func, CARD_FW_STATUS1_REG, &ret);
+
+        if (ret)
+                return -EIO;
+
+        *dat = (((u16) fws1) << 8) | fws0;
+
+        return 0;
+}
+
+static int btmrvl_sdio_read_rx_len(struct btmrvl_sdio_card *card, u16 *dat)
+{
+        u8 reg;
+        int ret;
+
+        reg = sdio_readb(card->func, CARD_RX_LEN_REG, &ret);
+        if (!ret)
+                *dat = (u16) reg << card->rx_unit;
+
+        return ret;
+}
+
+static int btmrvl_sdio_enable_host_int_mask(struct btmrvl_sdio_card *card,
+                                                                u8 mask)
+{
+        int ret;
+
+        sdio_writeb(card->func, mask, HOST_INT_MASK_REG, &ret);
+        if (ret) {
+                BT_ERR("Unable to enable the host interrupt!");
+                ret = -EIO;
+        }
+
+        return ret;
+}
+
+static int btmrvl_sdio_disable_host_int_mask(struct btmrvl_sdio_card *card,
+                                                                u8 mask)
+{
+        u8 host_int_mask;
+        int ret;
+
+        host_int_mask = sdio_readb(card->func, HOST_INT_MASK_REG, &ret);
+        if (ret)
+                return -EIO;
+
+        host_int_mask &= ~mask;
+
+        sdio_writeb(card->func, host_int_mask, HOST_INT_MASK_REG, &ret);
+        if (ret < 0) {
+                BT_ERR("Unable to disable the host interrupt!");
+                return -EIO;
+        }
+
+        return 0;
+}
+
+static int btmrvl_sdio_poll_card_status(struct btmrvl_sdio_card *card, u8 bits)
+{
+        unsigned int tries;
+        u8 status;
+        int ret;
+
+        for (tries = 0; tries < MAX_POLL_TRIES * 1000; tries++) {
+                status = sdio_readb(card->func, CARD_STATUS_REG, &ret);
+                if (ret)
+                        goto failed;
+                if ((status & bits) == bits)
+                        return ret;
+
+                udelay(1);
+        }
+
+        ret = -ETIMEDOUT;
+
+failed:
+        BT_ERR("FAILED! ret=%d", ret);
+
+        return ret;
+}
+
+static int btmrvl_sdio_verify_fw_download(struct btmrvl_sdio_card *card,
+                                                                int pollnum)
+{
+        int ret = -ETIMEDOUT;
+        u16 firmwarestat;
+        unsigned int tries;
+
+         /* Wait for firmware to become ready */
+        for (tries = 0; tries < pollnum; tries++) {
+                if (btmrvl_sdio_read_fw_status(card, &firmwarestat) < 0)
+                        continue;
+
+                if (firmwarestat == FIRMWARE_READY) {
+                        ret = 0;
+                        break;
+                } else {
+                        msleep(10);
+                }
+        }
+
+        return ret;
+}
+
+static int btmrvl_sdio_download_helper(struct btmrvl_sdio_card *card)
+{
+        const struct firmware *fw_helper = NULL;
+        const u8 *helper = NULL;
+        int ret;
+        void *tmphlprbuf = NULL;
+        int tmphlprbufsz, hlprblknow, helperlen;
+        u8 *helperbuf;
+        u32 tx_len;
+
+        ret = request_firmware(&fw_helper, card->helper,
+                                                &card->func->dev);
+        if ((ret < 0) || !fw_helper) {
+                BT_ERR("request_firmware(helper) failed, error code = %d",
+                                                                        ret);
+                ret = -ENOENT;
+                goto done;
+        }
+
+        helper = fw_helper->data;
+        helperlen = fw_helper->size;
+
+        BT_DBG("Downloading helper image (%d bytes), block size %d bytes",
+                                                helperlen, SDIO_BLOCK_SIZE);
+
+        tmphlprbufsz = ALIGN_SZ(BTM_UPLD_SIZE, BTSDIO_DMA_ALIGN);
+
+        tmphlprbuf = kmalloc(tmphlprbufsz, GFP_KERNEL);
+        if (!tmphlprbuf) {
+                BT_ERR("Unable to allocate buffer for helper."
+                        " Terminating download");
+                ret = -ENOMEM;
+                goto done;
+        }
+
+        memset(tmphlprbuf, 0, tmphlprbufsz);
+
+        helperbuf = (u8 *) ALIGN_ADDR(tmphlprbuf, BTSDIO_DMA_ALIGN);
+
+        /* Perform helper data transfer */
+        tx_len = (FIRMWARE_TRANSFER_NBLOCK * SDIO_BLOCK_SIZE)
+                        - SDIO_HEADER_LEN;
+        hlprblknow = 0;
+
+        do {
+                ret = btmrvl_sdio_poll_card_status(card,
+                                            CARD_IO_READY | DN_LD_CARD_RDY);
+                if (ret < 0) {
+                        BT_ERR("Helper download poll status timeout @ %d",
+                                hlprblknow);
+                        goto done;
+                }
+
+                /* Check if there is more data? */
+                if (hlprblknow >= helperlen)
+                        break;
+
+                if (helperlen - hlprblknow < tx_len)
+                        tx_len = helperlen - hlprblknow;
+
+                /* Little-endian */
+                helperbuf[0] = ((tx_len & 0x000000ff) >> 0);
+                helperbuf[1] = ((tx_len & 0x0000ff00) >> 8);
+                helperbuf[2] = ((tx_len & 0x00ff0000) >> 16);
+                helperbuf[3] = ((tx_len & 0xff000000) >> 24);
+
+                memcpy(&helperbuf[SDIO_HEADER_LEN], &helper[hlprblknow],
+                                tx_len);
+
+                /* Now send the data */
+                ret = sdio_writesb(card->func, card->ioport, helperbuf,
+                                FIRMWARE_TRANSFER_NBLOCK * SDIO_BLOCK_SIZE);
+                if (ret < 0) {
+                        BT_ERR("IO error during helper download @ %d",
+                                hlprblknow);
+                        goto done;
+                }
+
+                hlprblknow += tx_len;
+        } while (true);
+
+        BT_DBG("Transferring helper image EOF block");
+
+        memset(helperbuf, 0x0, SDIO_BLOCK_SIZE);
+
+        ret = sdio_writesb(card->func, card->ioport, helperbuf,
+                                                        SDIO_BLOCK_SIZE);
+        if (ret < 0) {
+                BT_ERR("IO error in writing helper image EOF block");
+                goto done;
+        }
+
+        ret = 0;
+
+done:
+        kfree(tmphlprbuf);
+        if (fw_helper)
+                release_firmware(fw_helper);
+
+        return ret;
+}
+
+static int btmrvl_sdio_download_fw_w_helper(struct btmrvl_sdio_card *card)
+{
+        const struct firmware *fw_firmware = NULL;
+        const u8 *firmware = NULL;
+        int firmwarelen, tmpfwbufsz, ret;
+        unsigned int tries, offset;
+        u8 base0, base1;
+        void *tmpfwbuf = NULL;
+        u8 *fwbuf;
+        u16 len;
+        int txlen = 0, tx_blocks = 0, count = 0;
+
+        ret = request_firmware(&fw_firmware, card->firmware,
+                                                        &card->func->dev);
+        if ((ret < 0) || !fw_firmware) {
+                BT_ERR("request_firmware(firmware) failed, error code = %d",
+                                                                        ret);
+                ret = -ENOENT;
+                goto done;
+        }
+
+        firmware = fw_firmware->data;
+        firmwarelen = fw_firmware->size;
+
+        BT_DBG("Downloading FW image (%d bytes)", firmwarelen);
+
+        tmpfwbufsz = ALIGN_SZ(BTM_UPLD_SIZE, BTSDIO_DMA_ALIGN);
+        tmpfwbuf = kmalloc(tmpfwbufsz, GFP_KERNEL);
+        if (!tmpfwbuf) {
+                BT_ERR("Unable to allocate buffer for firmware."
+                       " Terminating download");
+                ret = -ENOMEM;
+                goto done;
+        }
+
+        memset(tmpfwbuf, 0, tmpfwbufsz);
+
+        /* Ensure aligned firmware buffer */
+        fwbuf = (u8 *) ALIGN_ADDR(tmpfwbuf, BTSDIO_DMA_ALIGN);
+
+        /* Perform firmware data transfer */
+        offset = 0;
+        do {
+                ret = btmrvl_sdio_poll_card_status(card,
+                                        CARD_IO_READY | DN_LD_CARD_RDY);
+                if (ret < 0) {
+                        BT_ERR("FW download with helper poll status"
+                                                " timeout @ %d", offset);
+                        goto done;
+                }
+
+                /* Check if there is more data ? */
+                if (offset >= firmwarelen)
+                        break;
+
+                for (tries = 0; tries < MAX_POLL_TRIES; tries++) {
+                        base0 = sdio_readb(card->func,
+                                        SQ_READ_BASE_ADDRESS_A0_REG, &ret);
+                        if (ret) {
+                                BT_ERR("BASE0 register read failed:"
+                                        " base0 = 0x%04X(%d)."
+                                        " Terminating download",
+                                        base0, base0);
+                                ret = -EIO;
+                                goto done;
+                        }
+                        base1 = sdio_readb(card->func,
+                                        SQ_READ_BASE_ADDRESS_A1_REG, &ret);
+                        if (ret) {
+                                BT_ERR("BASE1 register read failed:"
+                                        " base1 = 0x%04X(%d)."
+                                        " Terminating download",
+                                        base1, base1);
+                                ret = -EIO;
+                                goto done;
+                        }
+
+                        len = (((u16) base1) << 8) | base0;
+                        if (len)
+                                break;
+
+                        udelay(10);
+                }
+
+                if (!len)
+                        break;
+                else if (len > BTM_UPLD_SIZE) {
+                        BT_ERR("FW download failure @%d, invalid length %d",
+                                                                offset, len);
+                        ret = -EINVAL;
+                        goto done;
+                }
+
+                txlen = len;
+
+                if (len & BIT(0)) {
+                        count++;
+                        if (count > MAX_WRITE_IOMEM_RETRY) {
+                                BT_ERR("FW download failure @%d, "
+                                        "over max retry count", offset);
+                                ret = -EIO;
+                                goto done;
+                        }
+                        BT_ERR("FW CRC error indicated by the helper: "
+                                "len = 0x%04X, txlen = %d", len, txlen);
+                        len &= ~BIT(0);
+                        /* Set txlen to 0 so as to resend from same offset */
+                        txlen = 0;
+                } else {
+                        count = 0;
+
+                        /* Last block ? */
+                        if (firmwarelen - offset < txlen)
+                                txlen = firmwarelen - offset;
+
+                        tx_blocks =
+                            (txlen + SDIO_BLOCK_SIZE - 1) / SDIO_BLOCK_SIZE;
+
+                        memcpy(fwbuf, &firmware[offset], txlen);
+                }
+
+                ret = sdio_writesb(card->func, card->ioport, fwbuf,
+                                        tx_blocks * SDIO_BLOCK_SIZE);
+
+                if (ret < 0) {
+                        BT_ERR("FW download, writesb(%d) failed @%d",
+                                                        count, offset);
+                        sdio_writeb(card->func, HOST_CMD53_FIN, CONFIG_REG,
+                                                                        &ret);
+                        if (ret)
+                                BT_ERR("writeb failed (CFG)");
+                }
+
+                offset += txlen;
+        } while (true);
+
+        BT_DBG("FW download over, size %d bytes", offset);
+
+        ret = 0;
+
+done:
+        kfree(tmpfwbuf);
+
+        if (fw_firmware)
+                release_firmware(fw_firmware);
+
+        return ret;
+}
+
+static int btmrvl_sdio_card_to_host(struct btmrvl_private *priv)
+{
+        u16 buf_len = 0;
+        int ret, buf_block_len, blksz;
+        struct sk_buff *skb = NULL;
+        u32 type;
+        u8 *payload = NULL;
+        struct hci_dev *hdev = priv->btmrvl_dev.hcidev;
+        struct btmrvl_sdio_card *card = priv->btmrvl_dev.card;
+
+        if (!card || !card->func) {
+                BT_ERR("card or function is NULL!");
+                ret = -EINVAL;
+                goto exit;
+        }
+
+        /* Read the length of data to be transferred */
+        ret = btmrvl_sdio_read_rx_len(card, &buf_len);
+        if (ret < 0) {
+                BT_ERR("read rx_len failed");
+                ret = -EIO;
+                goto exit;
+        }
+
+        blksz = SDIO_BLOCK_SIZE;
+        buf_block_len = (buf_len + blksz - 1) / blksz;
+
+        if (buf_len <= SDIO_HEADER_LEN
+                        || (buf_block_len * blksz) > ALLOC_BUF_SIZE) {
+                BT_ERR("invalid packet length: %d", buf_len);
+                ret = -EINVAL;
+                goto exit;
+        }
+
+        /* Allocate buffer */
+        skb = bt_skb_alloc(buf_block_len * blksz + BTSDIO_DMA_ALIGN,
+                                                                GFP_ATOMIC);
+        if (skb == NULL) {
+                BT_ERR("No free skb");
+                goto exit;
+        }
+
+        if ((unsigned long) skb->data & (BTSDIO_DMA_ALIGN - 1)) {
+                skb_put(skb, (unsigned long) skb->data &
+                                        (BTSDIO_DMA_ALIGN - 1));
+                skb_pull(skb, (unsigned long) skb->data &
+                                        (BTSDIO_DMA_ALIGN - 1));
+        }
+
+        payload = skb->data;
+
+        ret = sdio_readsb(card->func, payload, card->ioport,
+                          buf_block_len * blksz);
+        if (ret < 0) {
+                BT_ERR("readsb failed: %d", ret);
+                ret = -EIO;
+                goto exit;
+        }
+
+        /* This is SDIO specific header length: byte[2][1][0], type: byte[3]
+         * (HCI_COMMAND = 1, ACL_DATA = 2, SCO_DATA = 3, 0xFE = Vendor)
+         */
+
+        buf_len = payload[0];
+        buf_len |= (u16) payload[1] << 8;
+        type = payload[3];
+
+        switch (type) {
+        case HCI_ACLDATA_PKT:
+        case HCI_SCODATA_PKT:
+        case HCI_EVENT_PKT:
+                bt_cb(skb)->pkt_type = type;
+                skb->dev = (void *)hdev;
+                skb_put(skb, buf_len);
+                skb_pull(skb, SDIO_HEADER_LEN);
+
+                if (type == HCI_EVENT_PKT)
+                        btmrvl_check_evtpkt(priv, skb);
+
+                hci_recv_frame(skb);
+                hdev->stat.byte_rx += buf_len;
+                break;
+
+        case MRVL_VENDOR_PKT:
+                bt_cb(skb)->pkt_type = HCI_VENDOR_PKT;
+                skb->dev = (void *)hdev;
+                skb_put(skb, buf_len);
+                skb_pull(skb, SDIO_HEADER_LEN);
+
+                if (btmrvl_process_event(priv, skb))
+                        hci_recv_frame(skb);
+
+                hdev->stat.byte_rx += buf_len;
+                break;
+
+        default:
+                BT_ERR("Unknow packet type:%d", type);
+                print_hex_dump_bytes("", DUMP_PREFIX_OFFSET, payload,
+                                                blksz * buf_block_len);
+
+                kfree_skb(skb);
+                skb = NULL;
+                break;
+        }
+
+exit:
+        if (ret) {
+                hdev->stat.err_rx++;
+                if (skb)
+                        kfree_skb(skb);
+        }
+
+        return ret;
+}
+
+static int btmrvl_sdio_get_int_status(struct btmrvl_private *priv, u8 * ireg)
+{
+        int ret;
+        u8 sdio_ireg = 0;
+        struct btmrvl_sdio_card *card = priv->btmrvl_dev.card;
+
+        *ireg = 0;
+
+        sdio_ireg = sdio_readb(card->func, HOST_INTSTATUS_REG, &ret);
+        if (ret) {
+                BT_ERR("sdio_readb: read int status register failed");
+                ret = -EIO;
+                goto done;
+        }
+
+        if (sdio_ireg != 0) {
+                /*
+                 * DN_LD_HOST_INT_STATUS and/or UP_LD_HOST_INT_STATUS
+                 * Clear the interrupt status register and re-enable the
+                 * interrupt.
+                 */
+                BT_DBG("sdio_ireg = 0x%x", sdio_ireg);
+
+                sdio_writeb(card->func, ~(sdio_ireg) & (DN_LD_HOST_INT_STATUS |
+                                                        UP_LD_HOST_INT_STATUS),
+                            HOST_INTSTATUS_REG, &ret);
+                if (ret) {
+                        BT_ERR("sdio_writeb: clear int status register "
+                                "failed");
+                        ret = -EIO;
+                        goto done;
+                }
+        }
+
+        if (sdio_ireg & DN_LD_HOST_INT_STATUS) {
+                if (priv->btmrvl_dev.tx_dnld_rdy)
+                        BT_DBG("tx_done already received: "
+                                " int_status=0x%x", sdio_ireg);
+                else
+                        priv->btmrvl_dev.tx_dnld_rdy = true;
+        }
+
+        if (sdio_ireg & UP_LD_HOST_INT_STATUS)
+                btmrvl_sdio_card_to_host(priv);
+
+        *ireg = sdio_ireg;
+
+        ret = 0;
+
+done:
+        return ret;
+}
+
+static void btmrvl_sdio_interrupt(struct sdio_func *func)
+{
+        struct btmrvl_private *priv;
+        struct hci_dev *hcidev;
+        struct btmrvl_sdio_card *card;
+        u8 ireg = 0;
+
+        card = sdio_get_drvdata(func);
+        if (card && card->priv) {
+                priv = card->priv;
+                hcidev = priv->btmrvl_dev.hcidev;
+
+                if (btmrvl_sdio_get_int_status(priv, &ireg))
+                        BT_ERR("reading HOST_INT_STATUS_REG failed");
+                else
+                        BT_DBG("HOST_INT_STATUS_REG %#x", ireg);
+
+                btmrvl_interrupt(priv);
+        }
+}
+
+static int btmrvl_sdio_register_dev(struct btmrvl_sdio_card *card)
+{
+        struct sdio_func *func;
+        u8 reg;
+        int ret = 0;
+
+        if (!card || !card->func) {
+                BT_ERR("Error: card or function is NULL!");
+                ret = -EINVAL;
+                goto failed;
+        }
+
+        func = card->func;
+
+        sdio_claim_host(func);
+
+        ret = sdio_enable_func(func);
+        if (ret) {
+                BT_ERR("sdio_enable_func() failed: ret=%d", ret);
+                ret = -EIO;
+                goto release_host;
+        }
+
+        ret = sdio_claim_irq(func, btmrvl_sdio_interrupt);
+        if (ret) {
+                BT_ERR("sdio_claim_irq failed: ret=%d", ret);
+                ret = -EIO;
+                goto disable_func;
+        }
+
+        ret = sdio_set_block_size(card->func, SDIO_BLOCK_SIZE);
+        if (ret) {
+                BT_ERR("cannot set SDIO block size");
+                ret = -EIO;
+                goto release_irq;
+        }
+
+        reg = sdio_readb(func, IO_PORT_0_REG, &ret);
+        if (ret < 0) {
+                ret = -EIO;
+                goto release_irq;
+        }
+
+        card->ioport = reg;
+
+        reg = sdio_readb(func, IO_PORT_1_REG, &ret);
+        if (ret < 0) {
+                ret = -EIO;
+                goto release_irq;
+        }
+
+        card->ioport |= (reg << 8);
+
+        reg = sdio_readb(func, IO_PORT_2_REG, &ret);
+        if (ret < 0) {
+                ret = -EIO;
+                goto release_irq;
+        }
+
+        card->ioport |= (reg << 16);
+
+        BT_DBG("SDIO FUNC%d IO port: 0x%x", func->num, card->ioport);
+
+        sdio_set_drvdata(func, card);
+
+        sdio_release_host(func);
+
+        return 0;
+
+release_irq:
+        sdio_release_irq(func);
+
+disable_func:
+        sdio_disable_func(func);
+
+release_host:
+        sdio_release_host(func);
+
+failed:
+        return ret;
+}
+
+static int btmrvl_sdio_unregister_dev(struct btmrvl_sdio_card *card)
+{
+        if (card && card->func) {
+                sdio_claim_host(card->func);
+                sdio_release_irq(card->func);
+                sdio_disable_func(card->func);
+                sdio_release_host(card->func);
+                sdio_set_drvdata(card->func, NULL);
+        }
+
+        return 0;
+}
+
+static int btmrvl_sdio_enable_host_int(struct btmrvl_sdio_card *card)
+{
+        int ret;
+
+        if (!card || !card->func)
+                return -EINVAL;
+
+        sdio_claim_host(card->func);
+
+        ret = btmrvl_sdio_enable_host_int_mask(card, HIM_ENABLE);
+
+        btmrvl_sdio_get_rx_unit(card);
+
+        sdio_release_host(card->func);
+
+        return ret;
+}
+
+static int btmrvl_sdio_disable_host_int(struct btmrvl_sdio_card *card)
+{
+        int ret;
+
+        if (!card || !card->func)
+                return -EINVAL;
+
+        sdio_claim_host(card->func);
+
+        ret = btmrvl_sdio_disable_host_int_mask(card, HIM_DISABLE);
+
+        sdio_release_host(card->func);
+
+        return ret;
+}
+
+static int btmrvl_sdio_host_to_card(struct btmrvl_private *priv,
+                                u8 *payload, u16 nb)
+{
+        struct btmrvl_sdio_card *card = priv->btmrvl_dev.card;
+        int ret = 0;
+        int buf_block_len;
+        int blksz;
+        int i = 0;
+        u8 *buf = NULL;
+        void *tmpbuf = NULL;
+        int tmpbufsz;
+
+        if (!card || !card->func) {
+                BT_ERR("card or function is NULL!");
+                return -EINVAL;
+        }
+
+        buf = payload;
+        if ((unsigned long) payload & (BTSDIO_DMA_ALIGN - 1)) {
+                tmpbufsz = ALIGN_SZ(nb, BTSDIO_DMA_ALIGN);
+                tmpbuf = kzalloc(tmpbufsz, GFP_KERNEL);
+                if (!tmpbuf)
+                        return -ENOMEM;
+                buf = (u8 *) ALIGN_ADDR(tmpbuf, BTSDIO_DMA_ALIGN);
+                memcpy(buf, payload, nb);
+        }
+
+        blksz = SDIO_BLOCK_SIZE;
+        buf_block_len = (nb + blksz - 1) / blksz;
+
+        sdio_claim_host(card->func);
+
+        do {
+                /* Transfer data to card */
+                ret = sdio_writesb(card->func, card->ioport, buf,
+                                   buf_block_len * blksz);
+                if (ret < 0) {
+                        i++;
+                        BT_ERR("i=%d writesb failed: %d", i, ret);
+                        print_hex_dump_bytes("", DUMP_PREFIX_OFFSET,
+                                                payload, nb);
+                        ret = -EIO;
+                        if (i > MAX_WRITE_IOMEM_RETRY)
+                                goto exit;
+                }
+        } while (ret);
+
+        priv->btmrvl_dev.tx_dnld_rdy = false;
+
+exit:
+        sdio_release_host(card->func);
+
+        return ret;
+}
+
+static int btmrvl_sdio_download_fw(struct btmrvl_sdio_card *card)
+{
+        int ret = 0;
+
+        if (!card || !card->func) {
+                BT_ERR("card or function is NULL!");
+                return -EINVAL;
+        }
+        sdio_claim_host(card->func);
+
+        if (!btmrvl_sdio_verify_fw_download(card, 1)) {
+                BT_DBG("Firmware already downloaded!");
+                goto done;
+        }
+
+        ret = btmrvl_sdio_download_helper(card);
+        if (ret) {
+                BT_ERR("Failed to download helper!");
+                ret = -EIO;
+                goto done;
+        }
+
+        if (btmrvl_sdio_download_fw_w_helper(card)) {
+                BT_ERR("Failed to download firmware!");
+                ret = -EIO;
+                goto done;
+        }
+
+        if (btmrvl_sdio_verify_fw_download(card, MAX_POLL_TRIES)) {
+                BT_ERR("FW failed to be active in time!");
+                ret = -ETIMEDOUT;
+                goto done;
+        }
+
+done:
+        sdio_release_host(card->func);
+
+        return ret;
+}
+
+static int btmrvl_sdio_wakeup_fw(struct btmrvl_private *priv)
+{
+        struct btmrvl_sdio_card *card = priv->btmrvl_dev.card;
+        int ret = 0;
+
+        if (!card || !card->func) {
+                BT_ERR("card or function is NULL!");
+                return -EINVAL;
+        }
+
+        sdio_claim_host(card->func);
+
+        sdio_writeb(card->func, HOST_POWER_UP, CONFIG_REG, &ret);
+
+        sdio_release_host(card->func);
+
+        BT_DBG("wake up firmware");
+
+        return ret;
+}
+
+static int btmrvl_sdio_probe(struct sdio_func *func,
+                                        const struct sdio_device_id *id)
+{
+        int ret = 0;
+        struct btmrvl_private *priv = NULL;
+        struct btmrvl_sdio_card *card = NULL;
+
+        BT_INFO("vendor=0x%x, device=0x%x, class=%d, fn=%d",
+                        id->vendor, id->device, id->class, func->num);
+
+        card = kzalloc(sizeof(*card), GFP_KERNEL);
+        if (!card) {
+                ret = -ENOMEM;
+                goto done;
+        }
+
+        card->func = func;
+
+        if (id->driver_data) {
+                struct btmrvl_sdio_device *data = (void *) id->driver_data;
+                card->helper   = data->helper;
+                card->firmware = data->firmware;
+        }
+
+        if (btmrvl_sdio_register_dev(card) < 0) {
+                BT_ERR("Failed to register BT device!");
+                ret = -ENODEV;
+                goto free_card;
+        }
+
+        /* Disable the interrupts on the card */
+        btmrvl_sdio_disable_host_int(card);
+
+        if (btmrvl_sdio_download_fw(card)) {
+                BT_ERR("Downloading firmware failed!");
+                ret = -ENODEV;
+                goto unreg_dev;
+        }
+
+        msleep(100);
+
+        btmrvl_sdio_enable_host_int(card);
+
+        priv = btmrvl_add_card(card);
+        if (!priv) {
+                BT_ERR("Initializing card failed!");
+                ret = -ENODEV;
+                goto disable_host_int;
+        }
+
+        card->priv = priv;
+
+        /* Initialize the interface specific function pointers */
+        priv->hw_host_to_card = btmrvl_sdio_host_to_card;
+        priv->hw_wakeup_firmware = btmrvl_sdio_wakeup_fw;
+
+        btmrvl_send_module_cfg_cmd(priv, MODULE_BRINGUP_REQ);
+
+        return 0;
+
+disable_host_int:
+        btmrvl_sdio_disable_host_int(card);
+unreg_dev:
+        btmrvl_sdio_unregister_dev(card);
+free_card:
+        kfree(card);
+done:
+        return ret;
+}
+
+static void btmrvl_sdio_remove(struct sdio_func *func)
+{
+        struct btmrvl_sdio_card *card;
+
+        if (func) {
+                card = sdio_get_drvdata(func);
+                if (card) {
+                        /* Send SHUTDOWN command & disable interrupt
+                         * if user removes the module.
+                         */
+                        if (user_rmmod) {
+                                btmrvl_send_module_cfg_cmd(card->priv,
+                                                        MODULE_SHUTDOWN_REQ);
+                                btmrvl_sdio_disable_host_int(card);
+                        }
+                        BT_DBG("unregester dev");
+                        btmrvl_sdio_unregister_dev(card);
+                        btmrvl_remove_card(card->priv);
+                        kfree(card);
+                }
+        }
+}
+
+static struct sdio_driver bt_mrvl_sdio = {
+        .name           = "btmrvl_sdio",
+        .id_table       = btmrvl_sdio_ids,
+        .probe          = btmrvl_sdio_probe,
+        .remove         = btmrvl_sdio_remove,
+};
+
+static int btmrvl_sdio_init_module(void)
+{
+        if (sdio_register_driver(&bt_mrvl_sdio) != 0) {
+                BT_ERR("SDIO Driver Registration Failed");
+                return -ENODEV;
+        }
+
+        /* Clear the flag in case user removes the card. */
+        user_rmmod = 0;
+
+        return 0;
+}
+
+static void btmrvl_sdio_exit_module(void)
+{
+        /* Set the flag as user is removing this module. */
+        user_rmmod = 1;
+
+        sdio_unregister_driver(&bt_mrvl_sdio);
+}
+
+module_init(btmrvl_sdio_init_module);
+module_exit(btmrvl_sdio_exit_module);
+
+MODULE_AUTHOR("Marvell International Ltd.");
+MODULE_DESCRIPTION("Marvell BT-over-SDIO driver ver " VERSION);
+MODULE_VERSION(VERSION);
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/bluetooth/btmrvl_sdio.h b/drivers/bluetooth/btmrvl_sdio.h
new file mode 100644
index 000000000000..27329f107e5a
--- /dev/null
+++ b/drivers/bluetooth/btmrvl_sdio.h
@@ -0,0 +1,108 @@
+/**
+ * Marvell BT-over-SDIO driver: SDIO interface related definitions
+ *
+ * Copyright (C) 2009, Marvell International Ltd.
+ *
+ * This software file (the "File") is distributed by Marvell International
+ * Ltd. under the terms of the GNU General Public License Version 2, June 1991
+ * (the "License").  You may use, redistribute and/or modify this File in
+ * accordance with the terms and conditions of the License, a copy of which
+ * is available by writing to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
+ * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ *
+ * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
+ * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about
+ * this warranty disclaimer.
+ *
+ **/
+
+#define SDIO_HEADER_LEN                 4
+
+/* SD block size can not bigger than 64 due to buf size limit in firmware */
+/* define SD block size for data Tx/Rx */
+#define SDIO_BLOCK_SIZE                 64
+
+/* Number of blocks for firmware transfer */
+#define FIRMWARE_TRANSFER_NBLOCK        2
+
+/* This is for firmware specific length */
+#define FW_EXTRA_LEN                    36
+
+#define MRVDRV_SIZE_OF_CMD_BUFFER       (2 * 1024)
+
+#define MRVDRV_BT_RX_PACKET_BUFFER_SIZE \
+        (HCI_MAX_FRAME_SIZE + FW_EXTRA_LEN)
+
+#define ALLOC_BUF_SIZE  (((max_t (int, MRVDRV_BT_RX_PACKET_BUFFER_SIZE, \
+                        MRVDRV_SIZE_OF_CMD_BUFFER) + SDIO_HEADER_LEN \
+                        + SDIO_BLOCK_SIZE - 1) / SDIO_BLOCK_SIZE) \
+                        * SDIO_BLOCK_SIZE)
+
+/* The number of times to try when polling for status */
+#define MAX_POLL_TRIES                  100
+
+/* Max retry number of CMD53 write */
+#define MAX_WRITE_IOMEM_RETRY           2
+
+/* Host Control Registers */
+#define IO_PORT_0_REG                   0x00
+#define IO_PORT_1_REG                   0x01
+#define IO_PORT_2_REG                   0x02
+
+#define CONFIG_REG                      0x03
+#define HOST_POWER_UP                   BIT(1)
+#define HOST_CMD53_FIN                  BIT(2)
+
+#define HOST_INT_MASK_REG               0x04
+#define HIM_DISABLE                     0xff
+#define HIM_ENABLE                      (BIT(0) | BIT(1))
+
+#define HOST_INTSTATUS_REG              0x05
+#define UP_LD_HOST_INT_STATUS           BIT(0)
+#define DN_LD_HOST_INT_STATUS           BIT(1)
+
+/* Card Control Registers */
+#define SQ_READ_BASE_ADDRESS_A0_REG     0x10
+#define SQ_READ_BASE_ADDRESS_A1_REG     0x11
+
+#define CARD_STATUS_REG                 0x20
+#define DN_LD_CARD_RDY                  BIT(0)
+#define CARD_IO_READY                   BIT(3)
+
+#define CARD_FW_STATUS0_REG             0x40
+#define CARD_FW_STATUS1_REG             0x41
+#define FIRMWARE_READY                  0xfedc
+
+#define CARD_RX_LEN_REG                 0x42
+#define CARD_RX_UNIT_REG                0x43
+
+
+struct btmrvl_sdio_card {
+        struct sdio_func *func;
+        u32 ioport;
+        const char *helper;
+        const char *firmware;
+        u8 rx_unit;
+        struct btmrvl_private *priv;
+};
+
+struct btmrvl_sdio_device {
+        const char *helper;
+        const char *firmware;
+};
+
+
+/* Platform specific DMA alignment */
+#define BTSDIO_DMA_ALIGN                8
+
+/* Macros for Data Alignment : size */
+#define ALIGN_SZ(p, a)  \
+        (((p) + ((a) - 1)) & ~((a) - 1))
+
+/* Macros for Data Alignment : address */
+#define ALIGN_ADDR(p, a)        \
+        ((((unsigned long)(p)) + (((unsigned long)(a)) - 1)) & \
+                                        ~(((unsigned long)(a)) - 1))
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index e70c57ee4221..7ba91aa3fe8b 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -35,7 +35,7 @@
 #include <net/bluetooth/bluetooth.h>
 #include <net/bluetooth/hci_core.h>
 
-#define VERSION "0.5"
+#define VERSION "0.6"
 
 static int ignore_dga;
 static int ignore_csr;
@@ -145,6 +145,7 @@ static struct usb_device_id blacklist_table[] = {
 #define BTUSB_INTR_RUNNING      0
 #define BTUSB_BULK_RUNNING      1
 #define BTUSB_ISOC_RUNNING      2
+#define BTUSB_SUSPENDING        3
 
 struct btusb_data {
         struct hci_dev       *hdev;
@@ -157,11 +158,15 @@ struct btusb_data {
         unsigned long flags;
 
         struct work_struct work;
+        struct work_struct waker;
 
         struct usb_anchor tx_anchor;
         struct usb_anchor intr_anchor;
         struct usb_anchor bulk_anchor;
         struct usb_anchor isoc_anchor;
+        struct usb_anchor deferred;
+        int tx_in_flight;
+        spinlock_t txlock;
 
         struct usb_endpoint_descriptor *intr_ep;
         struct usb_endpoint_descriptor *bulk_tx_ep;
@@ -174,8 +179,23 @@ struct btusb_data {
         unsigned int sco_num;
         int isoc_altsetting;
         int suspend_count;
+        int did_iso_resume:1;
 };
 
+static int inc_tx(struct btusb_data *data)
+{
+        unsigned long flags;
+        int rv;
+
+        spin_lock_irqsave(&data->txlock, flags);
+        rv = test_bit(BTUSB_SUSPENDING, &data->flags);
+        if (!rv)
+                data->tx_in_flight++;
+        spin_unlock_irqrestore(&data->txlock, flags);
+
+        return rv;
+}
+
 static void btusb_intr_complete(struct urb *urb)
 {
         struct hci_dev *hdev = urb->context;
@@ -202,6 +222,7 @@ static void btusb_intr_complete(struct urb *urb)
         if (!test_bit(BTUSB_INTR_RUNNING, &data->flags))
                 return;
 
+        usb_mark_last_busy(data->udev);
         usb_anchor_urb(urb, &data->intr_anchor);
 
         err = usb_submit_urb(urb, GFP_ATOMIC);
@@ -301,7 +322,7 @@ static int btusb_submit_bulk_urb(struct hci_dev *hdev, gfp_t mem_flags)
         struct urb *urb;
         unsigned char *buf;
         unsigned int pipe;
-        int err, size;
+        int err, size = HCI_MAX_FRAME_SIZE;
 
         BT_DBG("%s", hdev->name);
 
@@ -312,8 +333,6 @@ static int btusb_submit_bulk_urb(struct hci_dev *hdev, gfp_t mem_flags)
         if (!urb)
                 return -ENOMEM;
 
-        size = le16_to_cpu(data->bulk_rx_ep->wMaxPacketSize);
-
         buf = kmalloc(size, mem_flags);
         if (!buf) {
                 usb_free_urb(urb);
@@ -327,6 +346,7 @@ static int btusb_submit_bulk_urb(struct hci_dev *hdev, gfp_t mem_flags)
 
         urb->transfer_flags |= URB_FREE_BUFFER;
 
+        usb_mark_last_busy(data->udev);
         usb_anchor_urb(urb, &data->bulk_anchor);
 
         err = usb_submit_urb(urb, mem_flags);
@@ -465,6 +485,33 @@ static void btusb_tx_complete(struct urb *urb)
 {
         struct sk_buff *skb = urb->context;
         struct hci_dev *hdev = (struct hci_dev *) skb->dev;
+        struct btusb_data *data = hdev->driver_data;
+
+        BT_DBG("%s urb %p status %d count %d", hdev->name,
+                                        urb, urb->status, urb->actual_length);
+
+        if (!test_bit(HCI_RUNNING, &hdev->flags))
+                goto done;
+
+        if (!urb->status)
+                hdev->stat.byte_tx += urb->transfer_buffer_length;
+        else
+                hdev->stat.err_tx++;
+
+done:
+        spin_lock(&data->txlock);
+        data->tx_in_flight--;
+        spin_unlock(&data->txlock);
+
+        kfree(urb->setup_packet);
+
+        kfree_skb(skb);
+}
+
+static void btusb_isoc_tx_complete(struct urb *urb)
+{
+        struct sk_buff *skb = urb->context;
+        struct hci_dev *hdev = (struct hci_dev *) skb->dev;
 
         BT_DBG("%s urb %p status %d count %d", hdev->name,
                                         urb, urb->status, urb->actual_length);
@@ -490,11 +537,17 @@ static int btusb_open(struct hci_dev *hdev)
 
         BT_DBG("%s", hdev->name);
 
+        err = usb_autopm_get_interface(data->intf);
+        if (err < 0)
+                return err;
+
+        data->intf->needs_remote_wakeup = 1;
+
         if (test_and_set_bit(HCI_RUNNING, &hdev->flags))
-                return 0;
+                goto done;
 
         if (test_and_set_bit(BTUSB_INTR_RUNNING, &data->flags))
-                return 0;
+                goto done;
 
         err = btusb_submit_intr_urb(hdev, GFP_KERNEL);
         if (err < 0)
@@ -509,17 +562,28 @@ static int btusb_open(struct hci_dev *hdev)
         set_bit(BTUSB_BULK_RUNNING, &data->flags);
         btusb_submit_bulk_urb(hdev, GFP_KERNEL);
 
+done:
+        usb_autopm_put_interface(data->intf);
         return 0;
 
 failed:
         clear_bit(BTUSB_INTR_RUNNING, &data->flags);
         clear_bit(HCI_RUNNING, &hdev->flags);
+        usb_autopm_put_interface(data->intf);
         return err;
 }
 
+static void btusb_stop_traffic(struct btusb_data *data)
+{
+        usb_kill_anchored_urbs(&data->intr_anchor);
+        usb_kill_anchored_urbs(&data->bulk_anchor);
+        usb_kill_anchored_urbs(&data->isoc_anchor);
+}
+
 static int btusb_close(struct hci_dev *hdev)
 {
         struct btusb_data *data = hdev->driver_data;
+        int err;
 
         BT_DBG("%s", hdev->name);
 
@@ -529,13 +593,16 @@ static int btusb_close(struct hci_dev *hdev)
         cancel_work_sync(&data->work);
 
         clear_bit(BTUSB_ISOC_RUNNING, &data->flags);
-        usb_kill_anchored_urbs(&data->isoc_anchor);
-
         clear_bit(BTUSB_BULK_RUNNING, &data->flags);
-        usb_kill_anchored_urbs(&data->bulk_anchor);
-
         clear_bit(BTUSB_INTR_RUNNING, &data->flags);
-        usb_kill_anchored_urbs(&data->intr_anchor);
+
+        btusb_stop_traffic(data);
+        err = usb_autopm_get_interface(data->intf);
+        if (err < 0)
+                return 0;
+
+        data->intf->needs_remote_wakeup = 0;
+        usb_autopm_put_interface(data->intf);
 
         return 0;
 }
@@ -622,7 +689,7 @@ static int btusb_send_frame(struct sk_buff *skb)
                 urb->dev      = data->udev;
                 urb->pipe     = pipe;
                 urb->context  = skb;
-                urb->complete = btusb_tx_complete;
+                urb->complete = btusb_isoc_tx_complete;
                 urb->interval = data->isoc_tx_ep->bInterval;
 
                 urb->transfer_flags  = URB_ISO_ASAP;
@@ -633,12 +700,21 @@ static int btusb_send_frame(struct sk_buff *skb)
                                 le16_to_cpu(data->isoc_tx_ep->wMaxPacketSize));
 
                 hdev->stat.sco_tx++;
-                break;
+                goto skip_waking;
 
         default:
                 return -EILSEQ;
         }
 
+        err = inc_tx(data);
+        if (err) {
+                usb_anchor_urb(urb, &data->deferred);
+                schedule_work(&data->waker);
+                err = 0;
+                goto done;
+        }
+
+skip_waking:
         usb_anchor_urb(urb, &data->tx_anchor);
 
         err = usb_submit_urb(urb, GFP_ATOMIC);
@@ -646,10 +722,13 @@ static int btusb_send_frame(struct sk_buff *skb)
                 BT_ERR("%s urb %p submission failed", hdev->name, urb);
                 kfree(urb->setup_packet);
                 usb_unanchor_urb(urb);
+        } else {
+                usb_mark_last_busy(data->udev);
         }
 
         usb_free_urb(urb);
 
+done:
         return err;
 }
 
@@ -721,8 +800,19 @@ static void btusb_work(struct work_struct *work)
 {
         struct btusb_data *data = container_of(work, struct btusb_data, work);
         struct hci_dev *hdev = data->hdev;
+        int err;
 
         if (hdev->conn_hash.sco_num > 0) {
+                if (!data->did_iso_resume) {
+                        err = usb_autopm_get_interface(data->isoc);
+                        if (err < 0) {
+                                clear_bit(BTUSB_ISOC_RUNNING, &data->flags);
+                                usb_kill_anchored_urbs(&data->isoc_anchor);
+                                return;
+                        }
+
+                        data->did_iso_resume = 1;
+                }
                 if (data->isoc_altsetting != 2) {
                         clear_bit(BTUSB_ISOC_RUNNING, &data->flags);
                         usb_kill_anchored_urbs(&data->isoc_anchor);
@@ -742,9 +832,25 @@ static void btusb_work(struct work_struct *work)
                 usb_kill_anchored_urbs(&data->isoc_anchor);
 
                 __set_isoc_interface(hdev, 0);
+                if (data->did_iso_resume) {
+                        data->did_iso_resume = 0;
+                        usb_autopm_put_interface(data->isoc);
+                }
         }
 }
 
+static void btusb_waker(struct work_struct *work)
+{
+        struct btusb_data *data = container_of(work, struct btusb_data, waker);
+        int err;
+
+        err = usb_autopm_get_interface(data->intf);
+        if (err < 0)
+                return;
+
+        usb_autopm_put_interface(data->intf);
+}
+
 static int btusb_probe(struct usb_interface *intf,
                                 const struct usb_device_id *id)
 {
@@ -814,11 +920,14 @@ static int btusb_probe(struct usb_interface *intf,
         spin_lock_init(&data->lock);
 
         INIT_WORK(&data->work, btusb_work);
+        INIT_WORK(&data->waker, btusb_waker);
+        spin_lock_init(&data->txlock);
 
         init_usb_anchor(&data->tx_anchor);
         init_usb_anchor(&data->intr_anchor);
         init_usb_anchor(&data->bulk_anchor);
         init_usb_anchor(&data->isoc_anchor);
+        init_usb_anchor(&data->deferred);
 
         hdev = hci_alloc_dev();
         if (!hdev) {
@@ -943,6 +1052,7 @@ static void btusb_disconnect(struct usb_interface *intf)
         hci_free_dev(hdev);
 }
 
+#ifdef CONFIG_PM
 static int btusb_suspend(struct usb_interface *intf, pm_message_t message)
 {
         struct btusb_data *data = usb_get_intfdata(intf);
@@ -952,22 +1062,44 @@ static int btusb_suspend(struct usb_interface *intf, pm_message_t message)
         if (data->suspend_count++)
                 return 0;
 
+        spin_lock_irq(&data->txlock);
+        if (!(interface_to_usbdev(intf)->auto_pm && data->tx_in_flight)) {
+                set_bit(BTUSB_SUSPENDING, &data->flags);
+                spin_unlock_irq(&data->txlock);
+        } else {
+                spin_unlock_irq(&data->txlock);
+                data->suspend_count--;
+                return -EBUSY;
+        }
+
         cancel_work_sync(&data->work);
 
+        btusb_stop_traffic(data);
         usb_kill_anchored_urbs(&data->tx_anchor);
 
-        usb_kill_anchored_urbs(&data->isoc_anchor);
-        usb_kill_anchored_urbs(&data->bulk_anchor);
-        usb_kill_anchored_urbs(&data->intr_anchor);
-
         return 0;
 }
 
+static void play_deferred(struct btusb_data *data)
+{
+        struct urb *urb;
+        int err;
+
+        while ((urb = usb_get_from_anchor(&data->deferred))) {
+                err = usb_submit_urb(urb, GFP_ATOMIC);
+                if (err < 0)
+                        break;
+
+                data->tx_in_flight++;
+        }
+        usb_scuttle_anchored_urbs(&data->deferred);
+}
+
 static int btusb_resume(struct usb_interface *intf)
 {
         struct btusb_data *data = usb_get_intfdata(intf);
         struct hci_dev *hdev = data->hdev;
-        int err;
+        int err = 0;
 
         BT_DBG("intf %p", intf);
 
@@ -975,13 +1107,13 @@ static int btusb_resume(struct usb_interface *intf)
                 return 0;
 
         if (!test_bit(HCI_RUNNING, &hdev->flags))
-                return 0;
+                goto done;
 
         if (test_bit(BTUSB_INTR_RUNNING, &data->flags)) {
                 err = btusb_submit_intr_urb(hdev, GFP_NOIO);
                 if (err < 0) {
                         clear_bit(BTUSB_INTR_RUNNING, &data->flags);
-                        return err;
+                        goto failed;
                 }
         }
 
@@ -989,9 +1121,10 @@ static int btusb_resume(struct usb_interface *intf)
                 err = btusb_submit_bulk_urb(hdev, GFP_NOIO);
                 if (err < 0) {
                         clear_bit(BTUSB_BULK_RUNNING, &data->flags);
-                        return err;
-                } else
-                        btusb_submit_bulk_urb(hdev, GFP_NOIO);
+                        goto failed;
+                }
+
+                btusb_submit_bulk_urb(hdev, GFP_NOIO);
         }
 
         if (test_bit(BTUSB_ISOC_RUNNING, &data->flags)) {
@@ -1001,16 +1134,35 @@ static int btusb_resume(struct usb_interface *intf)
                         btusb_submit_isoc_urb(hdev, GFP_NOIO);
         }
 
+        spin_lock_irq(&data->txlock);
+        play_deferred(data);
+        clear_bit(BTUSB_SUSPENDING, &data->flags);
+        spin_unlock_irq(&data->txlock);
+        schedule_work(&data->work);
+
         return 0;
+
+failed:
+        usb_scuttle_anchored_urbs(&data->deferred);
+done:
+        spin_lock_irq(&data->txlock);
+        clear_bit(BTUSB_SUSPENDING, &data->flags);
+        spin_unlock_irq(&data->txlock);
+
+        return err;
 }
+#endif
 
 static struct usb_driver btusb_driver = {
         .name           = "btusb",
         .probe          = btusb_probe,
         .disconnect     = btusb_disconnect,
+#ifdef CONFIG_PM
         .suspend        = btusb_suspend,
         .resume         = btusb_resume,
+#endif
         .id_table       = btusb_table,
+        .supports_autosuspend = 1,
 };
 
 static int __init btusb_init(void)
diff --git a/drivers/bluetooth/hci_bcsp.c b/drivers/bluetooth/hci_bcsp.c
index 894b2cb11ea6..40aec0fb8596 100644
--- a/drivers/bluetooth/hci_bcsp.c
+++ b/drivers/bluetooth/hci_bcsp.c
@@ -373,8 +373,9 @@ static void bcsp_pkt_cull(struct bcsp_struct *bcsp)
 
         i = 0;
         skb_queue_walk_safe(&bcsp->unack, skb, tmp) {
-                if (i++ >= pkts_to_be_removed)
+                if (i >= pkts_to_be_removed)
                         break;
+                i++;
 
                 __skb_unlink(skb, &bcsp->unack);
                 kfree_skb(skb);