Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next

5 files changed, 106 insertions, 30 deletions

diff --git a/drivers/bluetooth/btmrvl_drv.h b/drivers/bluetooth/btmrvl_drv.h
index 7399303d7d99..dc79f88f8717 100644
--- a/drivers/bluetooth/btmrvl_drv.h
+++ b/drivers/bluetooth/btmrvl_drv.h
@@ -59,6 +59,8 @@ struct btmrvl_device {
 };
 
 struct btmrvl_adapter {
+        void *hw_regs_buf;
+        u8 *hw_regs;
         u32 int_count;
         struct sk_buff_head tx_queue;
         u8 psmode;
@@ -140,7 +142,7 @@ void btmrvl_interrupt(struct btmrvl_private *priv);
 bool 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_send_module_cfg_cmd(struct btmrvl_private *priv, u8 subcmd);
 int btmrvl_send_hscfg_cmd(struct btmrvl_private *priv);
 int btmrvl_enable_ps(struct btmrvl_private *priv);
 int btmrvl_prepare_command(struct btmrvl_private *priv);
diff --git a/drivers/bluetooth/btmrvl_main.c b/drivers/bluetooth/btmrvl_main.c
index 2c4997ce2484..e9dbddb0b8f1 100644
--- a/drivers/bluetooth/btmrvl_main.c
+++ b/drivers/bluetooth/btmrvl_main.c
@@ -24,6 +24,7 @@
 #include <net/bluetooth/hci_core.h>
 
 #include "btmrvl_drv.h"
+#include "btmrvl_sdio.h"
 
 #define VERSION "1.0"
 
@@ -201,7 +202,7 @@ static int btmrvl_send_sync_cmd(struct btmrvl_private *priv, u16 opcode,
         return 0;
 }
 
-int btmrvl_send_module_cfg_cmd(struct btmrvl_private *priv, int subcmd)
+int btmrvl_send_module_cfg_cmd(struct btmrvl_private *priv, u8 subcmd)
 {
         int ret;
 
@@ -337,10 +338,25 @@ static int btmrvl_tx_pkt(struct btmrvl_private *priv, struct sk_buff *skb)
 
 static void btmrvl_init_adapter(struct btmrvl_private *priv)
 {
+        int buf_size;
+
         skb_queue_head_init(&priv->adapter->tx_queue);
 
         priv->adapter->ps_state = PS_AWAKE;
 
+        buf_size = ALIGN_SZ(SDIO_BLOCK_SIZE, BTSDIO_DMA_ALIGN);
+        priv->adapter->hw_regs_buf = kzalloc(buf_size, GFP_KERNEL);
+        if (!priv->adapter->hw_regs_buf) {
+                priv->adapter->hw_regs = NULL;
+                BT_ERR("Unable to allocate buffer for hw_regs.");
+        } else {
+                priv->adapter->hw_regs =
+                        (u8 *)ALIGN_ADDR(priv->adapter->hw_regs_buf,
+                                         BTSDIO_DMA_ALIGN);
+                BT_DBG("hw_regs_buf=%p hw_regs=%p",
+                       priv->adapter->hw_regs_buf, priv->adapter->hw_regs);
+        }
+
         init_waitqueue_head(&priv->adapter->cmd_wait_q);
 }
 
@@ -348,6 +364,7 @@ static void btmrvl_free_adapter(struct btmrvl_private *priv)
 {
         skb_queue_purge(&priv->adapter->tx_queue);
 
+        kfree(priv->adapter->hw_regs_buf);
         kfree(priv->adapter);
 
         priv->adapter = NULL;
diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c
index 1b52c9f5230d..9dedca516ff5 100644
--- a/drivers/bluetooth/btmrvl_sdio.c
+++ b/drivers/bluetooth/btmrvl_sdio.c
@@ -64,6 +64,7 @@ static const struct btmrvl_sdio_card_reg btmrvl_reg_8688 = {
         .io_port_0 = 0x00,
         .io_port_1 = 0x01,
         .io_port_2 = 0x02,
+        .int_read_to_clear = false,
 };
 static const struct btmrvl_sdio_card_reg btmrvl_reg_87xx = {
         .cfg = 0x00,
@@ -80,6 +81,7 @@ static const struct btmrvl_sdio_card_reg btmrvl_reg_87xx = {
         .io_port_0 = 0x78,
         .io_port_1 = 0x79,
         .io_port_2 = 0x7a,
+        .int_read_to_clear = false,
 };
 
 static const struct btmrvl_sdio_card_reg btmrvl_reg_88xx = {
@@ -97,6 +99,9 @@ static const struct btmrvl_sdio_card_reg btmrvl_reg_88xx = {
         .io_port_0 = 0xd8,
         .io_port_1 = 0xd9,
         .io_port_2 = 0xda,
+        .int_read_to_clear = true,
+        .host_int_rsr = 0x01,
+        .card_misc_cfg = 0xcc,
 };
 
 static const struct btmrvl_sdio_device btmrvl_sdio_sd8688 = {
@@ -667,46 +672,78 @@ static int btmrvl_sdio_process_int_status(struct btmrvl_private *priv)
         return 0;
 }
 
-static void btmrvl_sdio_interrupt(struct sdio_func *func)
+static int btmrvl_sdio_read_to_clear(struct btmrvl_sdio_card *card, u8 *ireg)
 {
-        struct btmrvl_private *priv;
-        struct btmrvl_sdio_card *card;
-        ulong flags;
-        u8 ireg = 0;
+        struct btmrvl_adapter *adapter = card->priv->adapter;
         int ret;
 
-        card = sdio_get_drvdata(func);
-        if (!card || !card->priv) {
-                BT_ERR("sbi_interrupt(%p) card or priv is "
-                                "NULL, card=%p\n", func, card);
-                return;
+        ret = sdio_readsb(card->func, adapter->hw_regs, 0, SDIO_BLOCK_SIZE);
+        if (ret) {
+                BT_ERR("sdio_readsb: read int hw_regs failed: %d", ret);
+                return ret;
         }
 
-        priv = card->priv;
+        *ireg = adapter->hw_regs[card->reg->host_intstatus];
+        BT_DBG("hw_regs[%#x]=%#x", card->reg->host_intstatus, *ireg);
+
+        return 0;
+}
 
-        ireg = sdio_readb(card->func, card->reg->host_intstatus, &ret);
+static int btmrvl_sdio_write_to_clear(struct btmrvl_sdio_card *card, u8 *ireg)
+{
+        int ret;
+
+        *ireg = sdio_readb(card->func, card->reg->host_intstatus, &ret);
         if (ret) {
-                BT_ERR("sdio_readb: read int status register failed");
-                return;
+                BT_ERR("sdio_readb: read int status failed: %d", ret);
+                return ret;
         }
 
-        if (ireg != 0) {
+        if (*ireg) {
                 /*
                  * DN_LD_HOST_INT_STATUS and/or UP_LD_HOST_INT_STATUS
                  * Clear the interrupt status register and re-enable the
                  * interrupt.
                  */
-                BT_DBG("ireg = 0x%x", ireg);
+                BT_DBG("int_status = 0x%x", *ireg);
 
-                sdio_writeb(card->func, ~(ireg) & (DN_LD_HOST_INT_STATUS |
-                                        UP_LD_HOST_INT_STATUS),
-                                card->reg->host_intstatus, &ret);
+                sdio_writeb(card->func, ~(*ireg) & (DN_LD_HOST_INT_STATUS |
+                                                    UP_LD_HOST_INT_STATUS),
+                            card->reg->host_intstatus, &ret);
                 if (ret) {
-                        BT_ERR("sdio_writeb: clear int status register failed");
-                        return;
+                        BT_ERR("sdio_writeb: clear int status failed: %d", ret);
+                        return ret;
                 }
         }
 
+        return 0;
+}
+
+static void btmrvl_sdio_interrupt(struct sdio_func *func)
+{
+        struct btmrvl_private *priv;
+        struct btmrvl_sdio_card *card;
+        ulong flags;
+        u8 ireg = 0;
+        int ret;
+
+        card = sdio_get_drvdata(func);
+        if (!card || !card->priv) {
+                BT_ERR("sbi_interrupt(%p) card or priv is "
+                                "NULL, card=%p\n", func, card);
+                return;
+        }
+
+        priv = card->priv;
+
+        if (card->reg->int_read_to_clear)
+                ret = btmrvl_sdio_read_to_clear(card, &ireg);
+        else
+                ret = btmrvl_sdio_write_to_clear(card, &ireg);
+
+        if (ret)
+                return;
+
         spin_lock_irqsave(&priv->driver_lock, flags);
         sdio_ireg |= ireg;
         spin_unlock_irqrestore(&priv->driver_lock, flags);
@@ -777,6 +814,30 @@ static int btmrvl_sdio_register_dev(struct btmrvl_sdio_card *card)
 
         BT_DBG("SDIO FUNC%d IO port: 0x%x", func->num, card->ioport);
 
+        if (card->reg->int_read_to_clear) {
+                reg = sdio_readb(func, card->reg->host_int_rsr, &ret);
+                if (ret < 0) {
+                        ret = -EIO;
+                        goto release_irq;
+                }
+                sdio_writeb(func, reg | 0x3f, card->reg->host_int_rsr, &ret);
+                if (ret < 0) {
+                        ret = -EIO;
+                        goto release_irq;
+                }
+
+                reg = sdio_readb(func, card->reg->card_misc_cfg, &ret);
+                if (ret < 0) {
+                        ret = -EIO;
+                        goto release_irq;
+                }
+                sdio_writeb(func, reg | 0x10, card->reg->card_misc_cfg, &ret);
+                if (ret < 0) {
+                        ret = -EIO;
+                        goto release_irq;
+                }
+        }
+
         sdio_set_drvdata(func, card);
 
         sdio_release_host(func);
diff --git a/drivers/bluetooth/btmrvl_sdio.h b/drivers/bluetooth/btmrvl_sdio.h
index 43d35a609ca9..d4dd3b0fa53d 100644
--- a/drivers/bluetooth/btmrvl_sdio.h
+++ b/drivers/bluetooth/btmrvl_sdio.h
@@ -78,6 +78,9 @@ struct btmrvl_sdio_card_reg {
         u8 io_port_0;
         u8 io_port_1;
         u8 io_port_2;
+        bool int_read_to_clear;
+        u8 host_int_rsr;
+        u8 card_misc_cfg;
 };
 
 struct btmrvl_sdio_card {
diff --git a/drivers/bluetooth/hci_h4.c b/drivers/bluetooth/hci_h4.c
index 7048a583fe51..66db9a803373 100644
--- a/drivers/bluetooth/hci_h4.c
+++ b/drivers/bluetooth/hci_h4.c
@@ -55,13 +55,6 @@ struct h4_struct {
         struct sk_buff_head txq;
 };
 
-/* H4 receiver States */
-#define H4_W4_PACKET_TYPE       0
-#define H4_W4_EVENT_HDR         1
-#define H4_W4_ACL_HDR           2
-#define H4_W4_SCO_HDR           3
-#define H4_W4_DATA              4
-
 /* Initialize protocol */
 static int h4_open(struct hci_uart *hu)
 {