Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux
[linux-2.6-block.git] / drivers / bluetooth / hci_qca.c
index e30c979535b1dae8df06b4a4a158730bc83a9ba8..4b57e15f9c7a7a844ebcd2b09f992ed4c8ac26a0 100644 (file)
@@ -25,7 +25,7 @@
 #include <linux/gpio/consumer.h>
 #include <linux/mod_devicetable.h>
 #include <linux/module.h>
-#include <linux/of_device.h>
+#include <linux/of.h>
 #include <linux/acpi.h>
 #include <linux/platform_device.h>
 #include <linux/regulator/consumer.h>
@@ -117,9 +117,7 @@ enum qca_memdump_states {
        QCA_MEMDUMP_TIMEOUT,
 };
 
-struct qca_memdump_data {
-       char *memdump_buf_head;
-       char *memdump_buf_tail;
+struct qca_memdump_info {
        u32 current_seq_no;
        u32 received_dump;
        u32 ram_dump_size;
@@ -160,13 +158,15 @@ struct qca_data {
        struct work_struct ws_tx_vote_off;
        struct work_struct ctrl_memdump_evt;
        struct delayed_work ctrl_memdump_timeout;
-       struct qca_memdump_data *qca_memdump;
+       struct qca_memdump_info *qca_memdump;
        unsigned long flags;
        struct completion drop_ev_comp;
        wait_queue_head_t suspend_wait_q;
        enum qca_memdump_states memdump_state;
        struct mutex hci_memdump_lock;
 
+       u16 fw_version;
+       u16 controller_id;
        /* For debugging purpose */
        u64 ibs_sent_wacks;
        u64 ibs_sent_slps;
@@ -233,6 +233,7 @@ static void qca_regulator_disable(struct qca_serdev *qcadev);
 static void qca_power_shutdown(struct hci_uart *hu);
 static int qca_power_off(struct hci_dev *hdev);
 static void qca_controller_memdump(struct work_struct *work);
+static void qca_dmp_hdr(struct hci_dev *hdev, struct sk_buff *skb);
 
 static enum qca_btsoc_type qca_soc_type(struct hci_uart *hu)
 {
@@ -606,9 +607,18 @@ static int qca_open(struct hci_uart *hu)
        if (hu->serdev) {
                qcadev = serdev_device_get_drvdata(hu->serdev);
 
-               if (qca_is_wcn399x(qcadev->btsoc_type) ||
-                   qca_is_wcn6750(qcadev->btsoc_type))
+               switch (qcadev->btsoc_type) {
+               case QCA_WCN3988:
+               case QCA_WCN3990:
+               case QCA_WCN3991:
+               case QCA_WCN3998:
+               case QCA_WCN6750:
                        hu->init_speed = qcadev->init_speed;
+                       break;
+
+               default:
+                       break;
+               }
 
                if (qcadev->oper_speed)
                        hu->oper_speed = qcadev->oper_speed;
@@ -980,6 +990,28 @@ static int qca_recv_acl_data(struct hci_dev *hdev, struct sk_buff *skb)
        return hci_recv_frame(hdev, skb);
 }
 
+static void qca_dmp_hdr(struct hci_dev *hdev, struct sk_buff *skb)
+{
+       struct hci_uart *hu = hci_get_drvdata(hdev);
+       struct qca_data *qca = hu->priv;
+       char buf[80];
+
+       snprintf(buf, sizeof(buf), "Controller Name: 0x%x\n",
+               qca->controller_id);
+       skb_put_data(skb, buf, strlen(buf));
+
+       snprintf(buf, sizeof(buf), "Firmware Version: 0x%x\n",
+               qca->fw_version);
+       skb_put_data(skb, buf, strlen(buf));
+
+       snprintf(buf, sizeof(buf), "Vendor:Qualcomm\n");
+       skb_put_data(skb, buf, strlen(buf));
+
+       snprintf(buf, sizeof(buf), "Driver: %s\n",
+               hu->serdev->dev.driver->name);
+       skb_put_data(skb, buf, strlen(buf));
+}
+
 static void qca_controller_memdump(struct work_struct *work)
 {
        struct qca_data *qca = container_of(work, struct qca_data,
@@ -987,13 +1019,11 @@ static void qca_controller_memdump(struct work_struct *work)
        struct hci_uart *hu = qca->hu;
        struct sk_buff *skb;
        struct qca_memdump_event_hdr *cmd_hdr;
-       struct qca_memdump_data *qca_memdump = qca->qca_memdump;
+       struct qca_memdump_info *qca_memdump = qca->qca_memdump;
        struct qca_dump_size *dump;
-       char *memdump_buf;
-       char nullBuff[QCA_DUMP_PACKET_SIZE] = { 0 };
        u16 seq_no;
-       u32 dump_size;
        u32 rx_size;
+       int ret = 0;
        enum qca_btsoc_type soc_type = qca_soc_type(hu);
 
        while ((skb = skb_dequeue(&qca->rx_memdump_q))) {
@@ -1009,7 +1039,7 @@ static void qca_controller_memdump(struct work_struct *work)
                }
 
                if (!qca_memdump) {
-                       qca_memdump = kzalloc(sizeof(struct qca_memdump_data),
+                       qca_memdump = kzalloc(sizeof(struct qca_memdump_info),
                                              GFP_ATOMIC);
                        if (!qca_memdump) {
                                mutex_unlock(&qca->hci_memdump_lock);
@@ -1035,44 +1065,49 @@ static void qca_controller_memdump(struct work_struct *work)
                        set_bit(QCA_IBS_DISABLED, &qca->flags);
                        set_bit(QCA_MEMDUMP_COLLECTION, &qca->flags);
                        dump = (void *) skb->data;
-                       dump_size = __le32_to_cpu(dump->dump_size);
-                       if (!(dump_size)) {
+                       qca_memdump->ram_dump_size = __le32_to_cpu(dump->dump_size);
+                       if (!(qca_memdump->ram_dump_size)) {
                                bt_dev_err(hu->hdev, "Rx invalid memdump size");
                                kfree(qca_memdump);
                                kfree_skb(skb);
-                               qca->qca_memdump = NULL;
                                mutex_unlock(&qca->hci_memdump_lock);
                                return;
                        }
 
-                       bt_dev_info(hu->hdev, "QCA collecting dump of size:%u",
-                                   dump_size);
                        queue_delayed_work(qca->workqueue,
                                           &qca->ctrl_memdump_timeout,
-                                          msecs_to_jiffies(MEMDUMP_TIMEOUT_MS)
-                                         );
-
-                       skb_pull(skb, sizeof(dump_size));
-                       memdump_buf = vmalloc(dump_size);
-                       qca_memdump->ram_dump_size = dump_size;
-                       qca_memdump->memdump_buf_head = memdump_buf;
-                       qca_memdump->memdump_buf_tail = memdump_buf;
-               }
+                                          msecs_to_jiffies(MEMDUMP_TIMEOUT_MS));
+                       skb_pull(skb, sizeof(qca_memdump->ram_dump_size));
+                       qca_memdump->current_seq_no = 0;
+                       qca_memdump->received_dump = 0;
+                       ret = hci_devcd_init(hu->hdev, qca_memdump->ram_dump_size);
+                       bt_dev_info(hu->hdev, "hci_devcd_init Return:%d",
+                                   ret);
+                       if (ret < 0) {
+                               kfree(qca->qca_memdump);
+                               qca->qca_memdump = NULL;
+                               qca->memdump_state = QCA_MEMDUMP_COLLECTED;
+                               cancel_delayed_work(&qca->ctrl_memdump_timeout);
+                               clear_bit(QCA_MEMDUMP_COLLECTION, &qca->flags);
+                               mutex_unlock(&qca->hci_memdump_lock);
+                               return;
+                       }
 
-               memdump_buf = qca_memdump->memdump_buf_tail;
+                       bt_dev_info(hu->hdev, "QCA collecting dump of size:%u",
+                                   qca_memdump->ram_dump_size);
+
+               }
 
                /* If sequence no 0 is missed then there is no point in
                 * accepting the other sequences.
                 */
-               if (!memdump_buf) {
+               if (!test_bit(QCA_MEMDUMP_COLLECTION, &qca->flags)) {
                        bt_dev_err(hu->hdev, "QCA: Discarding other packets");
                        kfree(qca_memdump);
                        kfree_skb(skb);
-                       qca->qca_memdump = NULL;
                        mutex_unlock(&qca->hci_memdump_lock);
                        return;
                }
-
                /* There could be chance of missing some packets from
                 * the controller. In such cases let us store the dummy
                 * packets in the buffer.
@@ -1082,8 +1117,8 @@ static void qca_controller_memdump(struct work_struct *work)
                 * bits, so skip this checking for missing packet.
                 */
                while ((seq_no > qca_memdump->current_seq_no + 1) &&
-                      (soc_type != QCA_QCA6390) &&
-                      seq_no != QCA_LAST_SEQUENCE_NUM) {
+                       (soc_type != QCA_QCA6390) &&
+                       seq_no != QCA_LAST_SEQUENCE_NUM) {
                        bt_dev_err(hu->hdev, "QCA controller missed packet:%d",
                                   qca_memdump->current_seq_no);
                        rx_size = qca_memdump->received_dump;
@@ -1094,43 +1129,38 @@ static void qca_controller_memdump(struct work_struct *work)
                                           qca_memdump->received_dump);
                                break;
                        }
-                       memcpy(memdump_buf, nullBuff, QCA_DUMP_PACKET_SIZE);
-                       memdump_buf = memdump_buf + QCA_DUMP_PACKET_SIZE;
+                       hci_devcd_append_pattern(hu->hdev, 0x00,
+                               QCA_DUMP_PACKET_SIZE);
                        qca_memdump->received_dump += QCA_DUMP_PACKET_SIZE;
                        qca_memdump->current_seq_no++;
                }
 
-               rx_size = qca_memdump->received_dump + skb->len;
+               rx_size = qca_memdump->received_dump  + skb->len;
                if (rx_size <= qca_memdump->ram_dump_size) {
                        if ((seq_no != QCA_LAST_SEQUENCE_NUM) &&
-                           (seq_no != qca_memdump->current_seq_no))
+                           (seq_no != qca_memdump->current_seq_no)) {
                                bt_dev_err(hu->hdev,
                                           "QCA memdump unexpected packet %d",
                                           seq_no);
+                       }
                        bt_dev_dbg(hu->hdev,
                                   "QCA memdump packet %d with length %d",
                                   seq_no, skb->len);
-                       memcpy(memdump_buf, (unsigned char *)skb->data,
-                              skb->len);
-                       memdump_buf = memdump_buf + skb->len;
-                       qca_memdump->memdump_buf_tail = memdump_buf;
-                       qca_memdump->current_seq_no = seq_no + 1;
-                       qca_memdump->received_dump += skb->len;
+                       hci_devcd_append(hu->hdev, skb);
+                       qca_memdump->current_seq_no += 1;
+                       qca_memdump->received_dump = rx_size;
                } else {
                        bt_dev_err(hu->hdev,
-                                  "QCA memdump received %d, no space for packet %d",
-                                  qca_memdump->received_dump, seq_no);
+                                  "QCA memdump received no space for packet %d",
+                                   qca_memdump->current_seq_no);
                }
-               qca->qca_memdump = qca_memdump;
-               kfree_skb(skb);
+
                if (seq_no == QCA_LAST_SEQUENCE_NUM) {
                        bt_dev_info(hu->hdev,
-                                   "QCA memdump Done, received %d, total %d",
-                                   qca_memdump->received_dump,
-                                   qca_memdump->ram_dump_size);
-                       memdump_buf = qca_memdump->memdump_buf_head;
-                       dev_coredumpv(&hu->serdev->dev, memdump_buf,
-                                     qca_memdump->received_dump, GFP_KERNEL);
+                               "QCA memdump Done, received %d, total %d",
+                               qca_memdump->received_dump,
+                               qca_memdump->ram_dump_size);
+                       hci_devcd_complete(hu->hdev);
                        cancel_delayed_work(&qca->ctrl_memdump_timeout);
                        kfree(qca->qca_memdump);
                        qca->qca_memdump = NULL;
@@ -1320,12 +1350,20 @@ static int qca_set_baudrate(struct hci_dev *hdev, uint8_t baudrate)
                      msecs_to_jiffies(CMD_TRANS_TIMEOUT_MS));
 
        /* Give the controller time to process the request */
-       if (qca_is_wcn399x(qca_soc_type(hu)) ||
-           qca_is_wcn6750(qca_soc_type(hu)) ||
-           qca_is_wcn6855(qca_soc_type(hu)))
+       switch (qca_soc_type(hu)) {
+       case QCA_WCN3988:
+       case QCA_WCN3990:
+       case QCA_WCN3991:
+       case QCA_WCN3998:
+       case QCA_WCN6750:
+       case QCA_WCN6855:
+       case QCA_WCN7850:
                usleep_range(1000, 10000);
-       else
+               break;
+
+       default:
                msleep(300);
+       }
 
        return 0;
 }
@@ -1398,13 +1436,20 @@ static unsigned int qca_get_speed(struct hci_uart *hu,
 
 static int qca_check_speeds(struct hci_uart *hu)
 {
-       if (qca_is_wcn399x(qca_soc_type(hu)) ||
-           qca_is_wcn6750(qca_soc_type(hu)) ||
-           qca_is_wcn6855(qca_soc_type(hu))) {
+       switch (qca_soc_type(hu)) {
+       case QCA_WCN3988:
+       case QCA_WCN3990:
+       case QCA_WCN3991:
+       case QCA_WCN3998:
+       case QCA_WCN6750:
+       case QCA_WCN6855:
+       case QCA_WCN7850:
                if (!qca_get_speed(hu, QCA_INIT_SPEED) &&
                    !qca_get_speed(hu, QCA_OPER_SPEED))
                        return -EINVAL;
-       } else {
+               break;
+
+       default:
                if (!qca_get_speed(hu, QCA_INIT_SPEED) ||
                    !qca_get_speed(hu, QCA_OPER_SPEED))
                        return -EINVAL;
@@ -1433,14 +1478,29 @@ static int qca_set_speed(struct hci_uart *hu, enum qca_speed_type speed_type)
                /* Disable flow control for wcn3990 to deassert RTS while
                 * changing the baudrate of chip and host.
                 */
-               if (qca_is_wcn399x(soc_type) ||
-                   qca_is_wcn6750(soc_type) ||
-                   qca_is_wcn6855(soc_type))
+               switch (soc_type) {
+               case QCA_WCN3988:
+               case QCA_WCN3990:
+               case QCA_WCN3991:
+               case QCA_WCN3998:
+               case QCA_WCN6750:
+               case QCA_WCN6855:
+               case QCA_WCN7850:
                        hci_uart_set_flow_control(hu, true);
+                       break;
 
-               if (soc_type == QCA_WCN3990) {
+               default:
+                       break;
+               }
+
+               switch (soc_type) {
+               case QCA_WCN3990:
                        reinit_completion(&qca->drop_ev_comp);
                        set_bit(QCA_DROP_VENDOR_EVENT, &qca->flags);
+                       break;
+
+               default:
+                       break;
                }
 
                qca_baudrate = qca_get_baudrate_value(speed);
@@ -1452,12 +1512,23 @@ static int qca_set_speed(struct hci_uart *hu, enum qca_speed_type speed_type)
                host_set_baudrate(hu, speed);
 
 error:
-               if (qca_is_wcn399x(soc_type) ||
-                   qca_is_wcn6750(soc_type) ||
-                   qca_is_wcn6855(soc_type))
+               switch (soc_type) {
+               case QCA_WCN3988:
+               case QCA_WCN3990:
+               case QCA_WCN3991:
+               case QCA_WCN3998:
+               case QCA_WCN6750:
+               case QCA_WCN6855:
+               case QCA_WCN7850:
                        hci_uart_set_flow_control(hu, false);
+                       break;
+
+               default:
+                       break;
+               }
 
-               if (soc_type == QCA_WCN3990) {
+               switch (soc_type) {
+               case QCA_WCN3990:
                        /* Wait for the controller to send the vendor event
                         * for the baudrate change command.
                         */
@@ -1469,6 +1540,10 @@ error:
                        }
 
                        clear_bit(QCA_DROP_VENDOR_EVENT, &qca->flags);
+                       break;
+
+               default:
+                       break;
                }
        }
 
@@ -1541,8 +1616,8 @@ static void qca_hw_error(struct hci_dev *hdev, u8 code)
        mutex_lock(&qca->hci_memdump_lock);
        if (qca->memdump_state != QCA_MEMDUMP_COLLECTED) {
                bt_dev_err(hu->hdev, "clearing allocated memory due to memdump timeout");
+               hci_devcd_abort(hu->hdev);
                if (qca->qca_memdump) {
-                       vfree(qca->qca_memdump->memdump_buf_head);
                        kfree(qca->qca_memdump);
                        qca->qca_memdump = NULL;
                }
@@ -1630,12 +1705,20 @@ static int qca_regulator_init(struct hci_uart *hu)
                }
        }
 
-       if (qca_is_wcn399x(soc_type)) {
+       switch (soc_type) {
+       case QCA_WCN3988:
+       case QCA_WCN3990:
+       case QCA_WCN3991:
+       case QCA_WCN3998:
                /* Forcefully enable wcn399x to enter in to boot mode. */
                host_set_baudrate(hu, 2400);
                ret = qca_send_power_pulse(hu, false);
                if (ret)
                        return ret;
+               break;
+
+       default:
+               break;
        }
 
        /* For wcn6750 need to enable gpio bt_en */
@@ -1652,10 +1735,18 @@ static int qca_regulator_init(struct hci_uart *hu)
 
        qca_set_speed(hu, QCA_INIT_SPEED);
 
-       if (qca_is_wcn399x(soc_type)) {
+       switch (soc_type) {
+       case QCA_WCN3988:
+       case QCA_WCN3990:
+       case QCA_WCN3991:
+       case QCA_WCN3998:
                ret = qca_send_power_pulse(hu, true);
                if (ret)
                        return ret;
+               break;
+
+       default:
+               break;
        }
 
        /* Now the device is in ready state to communicate with host.
@@ -1689,11 +1780,18 @@ static int qca_power_on(struct hci_dev *hdev)
        if (!hu->serdev)
                return 0;
 
-       if (qca_is_wcn399x(soc_type) ||
-           qca_is_wcn6750(soc_type) ||
-           qca_is_wcn6855(soc_type)) {
+       switch (soc_type) {
+       case QCA_WCN3988:
+       case QCA_WCN3990:
+       case QCA_WCN3991:
+       case QCA_WCN3998:
+       case QCA_WCN6750:
+       case QCA_WCN6855:
+       case QCA_WCN7850:
                ret = qca_regulator_init(hu);
-       } else {
+               break;
+
+       default:
                qcadev = serdev_device_get_drvdata(hu->serdev);
                if (qcadev->bt_en) {
                        gpiod_set_value_cansleep(qcadev->bt_en, 1);
@@ -1706,6 +1804,17 @@ static int qca_power_on(struct hci_dev *hdev)
        return ret;
 }
 
+static void hci_coredump_qca(struct hci_dev *hdev)
+{
+       static const u8 param[] = { 0x26 };
+       struct sk_buff *skb;
+
+       skb = __hci_cmd_sync(hdev, 0xfc0c, 1, param, HCI_CMD_TIMEOUT);
+       if (IS_ERR(skb))
+               bt_dev_err(hdev, "%s: trigger crash failed (%ld)", __func__, PTR_ERR(skb));
+       kfree_skb(skb);
+}
+
 static int qca_setup(struct hci_uart *hu)
 {
        struct hci_dev *hdev = hu->hdev;
@@ -1716,6 +1825,7 @@ static int qca_setup(struct hci_uart *hu)
        const char *firmware_name = qca_get_firmware_name(hu);
        int ret;
        struct qca_btsoc_version ver;
+       const char *soc_name;
 
        ret = qca_check_speeds(hu);
        if (ret)
@@ -1730,10 +1840,30 @@ static int qca_setup(struct hci_uart *hu)
         */
        set_bit(HCI_QUIRK_SIMULTANEOUS_DISCOVERY, &hdev->quirks);
 
-       bt_dev_info(hdev, "setting up %s",
-               qca_is_wcn399x(soc_type) ? "wcn399x" :
-               (soc_type == QCA_WCN6750) ? "wcn6750" :
-               (soc_type == QCA_WCN6855) ? "wcn6855" : "ROME/QCA6390");
+       switch (soc_type) {
+       case QCA_WCN3988:
+       case QCA_WCN3990:
+       case QCA_WCN3991:
+       case QCA_WCN3998:
+               soc_name = "wcn399x";
+               break;
+
+       case QCA_WCN6750:
+               soc_name = "wcn6750";
+               break;
+
+       case QCA_WCN6855:
+               soc_name = "wcn6855";
+               break;
+
+       case QCA_WCN7850:
+               soc_name = "wcn7850";
+               break;
+
+       default:
+               soc_name = "ROME/QCA6390";
+       }
+       bt_dev_info(hdev, "setting up %s", soc_name);
 
        qca->memdump_state = QCA_MEMDUMP_IDLE;
 
@@ -1744,16 +1874,23 @@ retry:
 
        clear_bit(QCA_SSR_TRIGGERED, &qca->flags);
 
-       if (qca_is_wcn399x(soc_type) ||
-           qca_is_wcn6750(soc_type) ||
-           qca_is_wcn6855(soc_type)) {
+       switch (soc_type) {
+       case QCA_WCN3988:
+       case QCA_WCN3990:
+       case QCA_WCN3991:
+       case QCA_WCN3998:
+       case QCA_WCN6750:
+       case QCA_WCN6855:
+       case QCA_WCN7850:
                set_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks);
                hci_set_aosp_capable(hdev);
 
                ret = qca_read_soc_version(hdev, &ver, soc_type);
                if (ret)
                        goto out;
-       } else {
+               break;
+
+       default:
                qca_set_speed(hu, QCA_INIT_SPEED);
        }
 
@@ -1767,9 +1904,17 @@ retry:
                qca_baudrate = qca_get_baudrate_value(speed);
        }
 
-       if (!(qca_is_wcn399x(soc_type) ||
-             qca_is_wcn6750(soc_type) ||
-             qca_is_wcn6855(soc_type))) {
+       switch (soc_type) {
+       case QCA_WCN3988:
+       case QCA_WCN3990:
+       case QCA_WCN3991:
+       case QCA_WCN3998:
+       case QCA_WCN6750:
+       case QCA_WCN6855:
+       case QCA_WCN7850:
+               break;
+
+       default:
                /* Get QCA version information */
                ret = qca_read_soc_version(hdev, &ver, soc_type);
                if (ret)
@@ -1820,6 +1965,9 @@ out:
                hu->hdev->set_bdaddr = qca_set_bdaddr_rome;
        else
                hu->hdev->set_bdaddr = qca_set_bdaddr;
+       qca->fw_version = le16_to_cpu(ver.patch_ver);
+       qca->controller_id = le16_to_cpu(ver.rom_ver);
+       hci_devcd_register(hdev, hci_coredump_qca, qca_dmp_hdr, NULL);
 
        return ret;
 }
@@ -1839,6 +1987,17 @@ static const struct hci_uart_proto qca_proto = {
        .dequeue        = qca_dequeue,
 };
 
+static const struct qca_device_data qca_soc_data_wcn3988 __maybe_unused = {
+       .soc_type = QCA_WCN3988,
+       .vregs = (struct qca_vreg []) {
+               { "vddio", 15000  },
+               { "vddxo", 80000  },
+               { "vddrf", 300000 },
+               { "vddch0", 450000 },
+       },
+       .num_vregs = 4,
+};
+
 static const struct qca_device_data qca_soc_data_wcn3990 __maybe_unused = {
        .soc_type = QCA_WCN3990,
        .vregs = (struct qca_vreg []) {
@@ -1909,6 +2068,20 @@ static const struct qca_device_data qca_soc_data_wcn6855 __maybe_unused = {
        .capabilities = QCA_CAP_WIDEBAND_SPEECH | QCA_CAP_VALID_LE_STATES,
 };
 
+static const struct qca_device_data qca_soc_data_wcn7850 __maybe_unused = {
+       .soc_type = QCA_WCN7850,
+       .vregs = (struct qca_vreg []) {
+               { "vddio", 5000 },
+               { "vddaon", 26000 },
+               { "vdddig", 126000 },
+               { "vddrfa0p8", 102000 },
+               { "vddrfa1p2", 257000 },
+               { "vddrfa1p9", 302000 },
+       },
+       .num_vregs = 6,
+       .capabilities = QCA_CAP_WIDEBAND_SPEECH | QCA_CAP_VALID_LE_STATES,
+};
+
 static void qca_power_shutdown(struct hci_uart *hu)
 {
        struct qca_serdev *qcadev;
@@ -1934,11 +2107,18 @@ static void qca_power_shutdown(struct hci_uart *hu)
 
        qcadev = serdev_device_get_drvdata(hu->serdev);
 
-       if (qca_is_wcn399x(soc_type)) {
+       switch (soc_type) {
+       case QCA_WCN3988:
+       case QCA_WCN3990:
+       case QCA_WCN3991:
+       case QCA_WCN3998:
                host_set_baudrate(hu, 2400);
                qca_send_power_pulse(hu, false);
                qca_regulator_disable(qcadev);
-       } else if (soc_type == QCA_WCN6750 || soc_type == QCA_WCN6855) {
+               break;
+
+       case QCA_WCN6750:
+       case QCA_WCN6855:
                gpiod_set_value_cansleep(qcadev->bt_en, 0);
                msleep(100);
                qca_regulator_disable(qcadev);
@@ -1946,7 +2126,9 @@ static void qca_power_shutdown(struct hci_uart *hu)
                        sw_ctrl_state = gpiod_get_value_cansleep(qcadev->sw_ctrl);
                        bt_dev_dbg(hu->hdev, "SW_CTRL is %d", sw_ctrl_state);
                }
-       } else if (qcadev->bt_en) {
+               break;
+
+       default:
                gpiod_set_value_cansleep(qcadev->bt_en, 0);
        }
 
@@ -2071,11 +2253,19 @@ static int qca_serdev_probe(struct serdev_device *serdev)
        if (!qcadev->oper_speed)
                BT_DBG("UART will pick default operating speed");
 
-       if (data &&
-           (qca_is_wcn399x(data->soc_type) ||
-            qca_is_wcn6750(data->soc_type) ||
-            qca_is_wcn6855(data->soc_type))) {
+       if (data)
                qcadev->btsoc_type = data->soc_type;
+       else
+               qcadev->btsoc_type = QCA_ROME;
+
+       switch (qcadev->btsoc_type) {
+       case QCA_WCN3988:
+       case QCA_WCN3990:
+       case QCA_WCN3991:
+       case QCA_WCN3998:
+       case QCA_WCN6750:
+       case QCA_WCN6855:
+       case QCA_WCN7850:
                qcadev->bt_power = devm_kzalloc(&serdev->dev,
                                                sizeof(struct qca_power),
                                                GFP_KERNEL);
@@ -2105,7 +2295,8 @@ static int qca_serdev_probe(struct serdev_device *serdev)
                                               GPIOD_IN);
                if (IS_ERR_OR_NULL(qcadev->sw_ctrl) &&
                    (data->soc_type == QCA_WCN6750 ||
-                    data->soc_type == QCA_WCN6855))
+                    data->soc_type == QCA_WCN6855 ||
+                    data->soc_type == QCA_WCN7850))
                        dev_warn(&serdev->dev, "failed to acquire SW_CTRL gpio\n");
 
                qcadev->susclk = devm_clk_get_optional(&serdev->dev, NULL);
@@ -2119,12 +2310,9 @@ static int qca_serdev_probe(struct serdev_device *serdev)
                        BT_ERR("wcn3990 serdev registration failed");
                        return err;
                }
-       } else {
-               if (data)
-                       qcadev->btsoc_type = data->soc_type;
-               else
-                       qcadev->btsoc_type = QCA_ROME;
+               break;
 
+       default:
                qcadev->bt_en = devm_gpiod_get_optional(&serdev->dev, "enable",
                                               GPIOD_OUT_LOW);
                if (IS_ERR_OR_NULL(qcadev->bt_en)) {
@@ -2180,13 +2368,24 @@ static void qca_serdev_remove(struct serdev_device *serdev)
        struct qca_serdev *qcadev = serdev_device_get_drvdata(serdev);
        struct qca_power *power = qcadev->bt_power;
 
-       if ((qca_is_wcn399x(qcadev->btsoc_type) ||
-            qca_is_wcn6750(qcadev->btsoc_type) ||
-            qca_is_wcn6855(qcadev->btsoc_type)) &&
-           power->vregs_on)
-               qca_power_shutdown(&qcadev->serdev_hu);
-       else if (qcadev->susclk)
-               clk_disable_unprepare(qcadev->susclk);
+       switch (qcadev->btsoc_type) {
+       case QCA_WCN3988:
+       case QCA_WCN3990:
+       case QCA_WCN3991:
+       case QCA_WCN3998:
+       case QCA_WCN6750:
+       case QCA_WCN6855:
+       case QCA_WCN7850:
+               if (power->vregs_on) {
+                       qca_power_shutdown(&qcadev->serdev_hu);
+                       break;
+               }
+               fallthrough;
+
+       default:
+               if (qcadev->susclk)
+                       clk_disable_unprepare(qcadev->susclk);
+       }
 
        hci_uart_unregister_device(&qcadev->serdev_hu);
 }
@@ -2363,11 +2562,13 @@ static const struct of_device_id qca_bluetooth_of_match[] = {
        { .compatible = "qcom,qca6174-bt" },
        { .compatible = "qcom,qca6390-bt", .data = &qca_soc_data_qca6390},
        { .compatible = "qcom,qca9377-bt" },
+       { .compatible = "qcom,wcn3988-bt", .data = &qca_soc_data_wcn3988},
        { .compatible = "qcom,wcn3990-bt", .data = &qca_soc_data_wcn3990},
        { .compatible = "qcom,wcn3991-bt", .data = &qca_soc_data_wcn3991},
        { .compatible = "qcom,wcn3998-bt", .data = &qca_soc_data_wcn3998},
        { .compatible = "qcom,wcn6750-bt", .data = &qca_soc_data_wcn6750},
        { .compatible = "qcom,wcn6855-bt", .data = &qca_soc_data_wcn6855},
+       { .compatible = "qcom,wcn7850-bt", .data = &qca_soc_data_wcn7850},
        { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, qca_bluetooth_of_match);
@@ -2384,6 +2585,18 @@ static const struct acpi_device_id qca_bluetooth_acpi_match[] = {
 MODULE_DEVICE_TABLE(acpi, qca_bluetooth_acpi_match);
 #endif
 
+#ifdef CONFIG_DEV_COREDUMP
+static void hciqca_coredump(struct device *dev)
+{
+       struct serdev_device *serdev = to_serdev_device(dev);
+       struct qca_serdev *qcadev = serdev_device_get_drvdata(serdev);
+       struct hci_uart *hu = &qcadev->serdev_hu;
+       struct hci_dev  *hdev = hu->hdev;
+
+       if (hdev->dump.coredump)
+               hdev->dump.coredump(hdev);
+}
+#endif
 
 static struct serdev_device_driver qca_serdev_driver = {
        .probe = qca_serdev_probe,
@@ -2394,6 +2607,9 @@ static struct serdev_device_driver qca_serdev_driver = {
                .acpi_match_table = ACPI_PTR(qca_bluetooth_acpi_match),
                .shutdown = qca_serdev_shutdown,
                .pm = &qca_pm_ops,
+#ifdef CONFIG_DEV_COREDUMP
+               .coredump = hciqca_coredump,
+#endif
        },
 };