Bluetooth: btmtk: move btusb_mtk_hci_wmt_sync to btmtk.c
authorChris Lu <chris.lu@mediatek.com>
Thu, 4 Jul 2024 06:01:13 +0000 (14:01 +0800)
committerLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
Mon, 15 Jul 2024 14:11:46 +0000 (10:11 -0400)
Move btusb_mtk_hci_wmt_sync from btusb.c to btmtk.c which holds
vendor specific stuff and would make btusb.c clean.

Add usb.h header to btmtksdio.c/btmtkuart.c for usb related element
defined in btmtk.h

Signed-off-by: Sean Wang <sean.wang@mediatek.com>
Signed-off-by: Chris Lu <chris.lu@mediatek.com>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
drivers/bluetooth/btmtk.c
drivers/bluetooth/btmtk.h
drivers/bluetooth/btmtksdio.c
drivers/bluetooth/btmtkuart.c
drivers/bluetooth/btusb.c

index 6489e4a63fb6ebd9cb711883f7b22f3cb49e240f..3443a0837a86ef4f4c2960a0071c895d9bfcee97 100644 (file)
@@ -4,6 +4,7 @@
  */
 #include <linux/module.h>
 #include <linux/firmware.h>
+#include <linux/usb.h>
 
 #include <net/bluetooth/bluetooth.h>
 #include <net/bluetooth/hci_core.h>
@@ -431,6 +432,270 @@ int btmtk_process_coredump(struct hci_dev *hdev, struct sk_buff *skb)
 }
 EXPORT_SYMBOL_GPL(btmtk_process_coredump);
 
+static void btmtk_usb_wmt_recv(struct urb *urb)
+{
+       struct hci_dev *hdev = urb->context;
+       struct btmtk_data *data = hci_get_priv(hdev);
+       struct sk_buff *skb;
+       int err;
+
+       if (urb->status == 0 && urb->actual_length > 0) {
+               hdev->stat.byte_rx += urb->actual_length;
+
+               /* WMT event shouldn't be fragmented and the size should be
+                * less than HCI_WMT_MAX_EVENT_SIZE.
+                */
+               skb = bt_skb_alloc(HCI_WMT_MAX_EVENT_SIZE, GFP_ATOMIC);
+               if (!skb) {
+                       hdev->stat.err_rx++;
+                       kfree(urb->setup_packet);
+                       return;
+               }
+
+               hci_skb_pkt_type(skb) = HCI_EVENT_PKT;
+               skb_put_data(skb, urb->transfer_buffer, urb->actual_length);
+
+               /* When someone waits for the WMT event, the skb is being cloned
+                * and being processed the events from there then.
+                */
+               if (test_bit(BTMTK_TX_WAIT_VND_EVT, &data->flags)) {
+                       data->evt_skb = skb_clone(skb, GFP_ATOMIC);
+                       if (!data->evt_skb) {
+                               kfree_skb(skb);
+                               kfree(urb->setup_packet);
+                               return;
+                       }
+               }
+
+               err = hci_recv_frame(hdev, skb);
+               if (err < 0) {
+                       kfree_skb(data->evt_skb);
+                       data->evt_skb = NULL;
+                       kfree(urb->setup_packet);
+                       return;
+               }
+
+               if (test_and_clear_bit(BTMTK_TX_WAIT_VND_EVT,
+                                      &data->flags)) {
+                       /* Barrier to sync with other CPUs */
+                       smp_mb__after_atomic();
+                       wake_up_bit(&data->flags,
+                                   BTMTK_TX_WAIT_VND_EVT);
+               }
+               kfree(urb->setup_packet);
+               return;
+       } else if (urb->status == -ENOENT) {
+               /* Avoid suspend failed when usb_kill_urb */
+               return;
+       }
+
+       usb_mark_last_busy(data->udev);
+
+       /* The URB complete handler is still called with urb->actual_length = 0
+        * when the event is not available, so we should keep re-submitting
+        * URB until WMT event returns, Also, It's necessary to wait some time
+        * between the two consecutive control URBs to relax the target device
+        * to generate the event. Otherwise, the WMT event cannot return from
+        * the device successfully.
+        */
+       udelay(500);
+
+       usb_anchor_urb(urb, data->ctrl_anchor);
+       err = usb_submit_urb(urb, GFP_ATOMIC);
+       if (err < 0) {
+               kfree(urb->setup_packet);
+               /* -EPERM: urb is being killed;
+                * -ENODEV: device got disconnected
+                */
+               if (err != -EPERM && err != -ENODEV)
+                       bt_dev_err(hdev, "urb %p failed to resubmit (%d)",
+                                  urb, -err);
+               usb_unanchor_urb(urb);
+       }
+}
+
+static int btmtk_usb_submit_wmt_recv_urb(struct hci_dev *hdev)
+{
+       struct btmtk_data *data = hci_get_priv(hdev);
+       struct usb_ctrlrequest *dr;
+       unsigned char *buf;
+       int err, size = 64;
+       unsigned int pipe;
+       struct urb *urb;
+
+       urb = usb_alloc_urb(0, GFP_KERNEL);
+       if (!urb)
+               return -ENOMEM;
+
+       dr = kmalloc(sizeof(*dr), GFP_KERNEL);
+       if (!dr) {
+               usb_free_urb(urb);
+               return -ENOMEM;
+       }
+
+       dr->bRequestType = USB_TYPE_VENDOR | USB_DIR_IN;
+       dr->bRequest     = 1;
+       dr->wIndex       = cpu_to_le16(0);
+       dr->wValue       = cpu_to_le16(48);
+       dr->wLength      = cpu_to_le16(size);
+
+       buf = kmalloc(size, GFP_KERNEL);
+       if (!buf) {
+               kfree(dr);
+               usb_free_urb(urb);
+               return -ENOMEM;
+       }
+
+       pipe = usb_rcvctrlpipe(data->udev, 0);
+
+       usb_fill_control_urb(urb, data->udev, pipe, (void *)dr,
+                            buf, size, btmtk_usb_wmt_recv, hdev);
+
+       urb->transfer_flags |= URB_FREE_BUFFER;
+
+       usb_anchor_urb(urb, data->ctrl_anchor);
+       err = usb_submit_urb(urb, GFP_KERNEL);
+       if (err < 0) {
+               if (err != -EPERM && err != -ENODEV)
+                       bt_dev_err(hdev, "urb %p submission failed (%d)",
+                                  urb, -err);
+               usb_unanchor_urb(urb);
+       }
+
+       usb_free_urb(urb);
+
+       return err;
+}
+
+int btmtk_usb_hci_wmt_sync(struct hci_dev *hdev,
+                          struct btmtk_hci_wmt_params *wmt_params)
+{
+       struct btmtk_data *data = hci_get_priv(hdev);
+       struct btmtk_hci_wmt_evt_funcc *wmt_evt_funcc;
+       u32 hlen, status = BTMTK_WMT_INVALID;
+       struct btmtk_hci_wmt_evt *wmt_evt;
+       struct btmtk_hci_wmt_cmd *wc;
+       struct btmtk_wmt_hdr *hdr;
+       int err;
+
+       /* Send the WMT command and wait until the WMT event returns */
+       hlen = sizeof(*hdr) + wmt_params->dlen;
+       if (hlen > 255)
+               return -EINVAL;
+
+       wc = kzalloc(hlen, GFP_KERNEL);
+       if (!wc)
+               return -ENOMEM;
+
+       hdr = &wc->hdr;
+       hdr->dir = 1;
+       hdr->op = wmt_params->op;
+       hdr->dlen = cpu_to_le16(wmt_params->dlen + 1);
+       hdr->flag = wmt_params->flag;
+       memcpy(wc->data, wmt_params->data, wmt_params->dlen);
+
+       set_bit(BTMTK_TX_WAIT_VND_EVT, &data->flags);
+
+       /* WMT cmd/event doesn't follow up the generic HCI cmd/event handling,
+        * it needs constantly polling control pipe until the host received the
+        * WMT event, thus, we should require to specifically acquire PM counter
+        * on the USB to prevent the interface from entering auto suspended
+        * while WMT cmd/event in progress.
+        */
+       err = usb_autopm_get_interface(data->intf);
+       if (err < 0)
+               goto err_free_wc;
+
+       err = __hci_cmd_send(hdev, 0xfc6f, hlen, wc);
+
+       if (err < 0) {
+               clear_bit(BTMTK_TX_WAIT_VND_EVT, &data->flags);
+               usb_autopm_put_interface(data->intf);
+               goto err_free_wc;
+       }
+
+       /* Submit control IN URB on demand to process the WMT event */
+       err = btmtk_usb_submit_wmt_recv_urb(hdev);
+
+       usb_autopm_put_interface(data->intf);
+
+       if (err < 0)
+               goto err_free_wc;
+
+       /* The vendor specific WMT commands are all answered by a vendor
+        * specific event and will have the Command Status or Command
+        * Complete as with usual HCI command flow control.
+        *
+        * After sending the command, wait for BTUSB_TX_WAIT_VND_EVT
+        * state to be cleared. The driver specific event receive routine
+        * will clear that state and with that indicate completion of the
+        * WMT command.
+        */
+       err = wait_on_bit_timeout(&data->flags, BTMTK_TX_WAIT_VND_EVT,
+                                 TASK_INTERRUPTIBLE, HCI_INIT_TIMEOUT);
+       if (err == -EINTR) {
+               bt_dev_err(hdev, "Execution of wmt command interrupted");
+               clear_bit(BTMTK_TX_WAIT_VND_EVT, &data->flags);
+               goto err_free_wc;
+       }
+
+       if (err) {
+               bt_dev_err(hdev, "Execution of wmt command timed out");
+               clear_bit(BTMTK_TX_WAIT_VND_EVT, &data->flags);
+               err = -ETIMEDOUT;
+               goto err_free_wc;
+       }
+
+       if (data->evt_skb == NULL)
+               goto err_free_wc;
+
+       /* Parse and handle the return WMT event */
+       wmt_evt = (struct btmtk_hci_wmt_evt *)data->evt_skb->data;
+       if (wmt_evt->whdr.op != hdr->op) {
+               bt_dev_err(hdev, "Wrong op received %d expected %d",
+                          wmt_evt->whdr.op, hdr->op);
+               err = -EIO;
+               goto err_free_skb;
+       }
+
+       switch (wmt_evt->whdr.op) {
+       case BTMTK_WMT_SEMAPHORE:
+               if (wmt_evt->whdr.flag == 2)
+                       status = BTMTK_WMT_PATCH_UNDONE;
+               else
+                       status = BTMTK_WMT_PATCH_DONE;
+               break;
+       case BTMTK_WMT_FUNC_CTRL:
+               wmt_evt_funcc = (struct btmtk_hci_wmt_evt_funcc *)wmt_evt;
+               if (be16_to_cpu(wmt_evt_funcc->status) == 0x404)
+                       status = BTMTK_WMT_ON_DONE;
+               else if (be16_to_cpu(wmt_evt_funcc->status) == 0x420)
+                       status = BTMTK_WMT_ON_PROGRESS;
+               else
+                       status = BTMTK_WMT_ON_UNDONE;
+               break;
+       case BTMTK_WMT_PATCH_DWNLD:
+               if (wmt_evt->whdr.flag == 2)
+                       status = BTMTK_WMT_PATCH_DONE;
+               else if (wmt_evt->whdr.flag == 1)
+                       status = BTMTK_WMT_PATCH_PROGRESS;
+               else
+                       status = BTMTK_WMT_PATCH_UNDONE;
+               break;
+       }
+
+       if (wmt_params->status)
+               *wmt_params->status = status;
+
+err_free_skb:
+       kfree_skb(data->evt_skb);
+       data->evt_skb = NULL;
+err_free_wc:
+       kfree(wc);
+       return err;
+}
+EXPORT_SYMBOL_GPL(btmtk_usb_hci_wmt_sync);
+
 MODULE_AUTHOR("Sean Wang <sean.wang@mediatek.com>");
 MODULE_AUTHOR("Mark Chen <mark-yw.chen@mediatek.com>");
 MODULE_DESCRIPTION("Bluetooth support for MediaTek devices ver " VERSION);
index dde6fbdeb2b3beda236175468f88b85437a6524f..3055b9728ae250f31ee9a80f535bf13041554151 100644 (file)
 #define MTK_COREDUMP_END_LEN           (sizeof(MTK_COREDUMP_END))
 #define MTK_COREDUMP_NUM               255
 
+/* UHW CR mapping */
+#define MTK_BT_MISC            0x70002510
+#define MTK_BT_SUBSYS_RST      0x70002610
+#define MTK_UDMA_INT_STA_BT    0x74000024
+#define MTK_UDMA_INT_STA_BT1   0x74000308
+#define MTK_BT_WDT_STATUS      0x740003A0
+#define MTK_EP_RST_OPT         0x74011890
+#define MTK_EP_RST_IN_OUT_OPT  0x00010001
+#define MTK_BT_RST_DONE                0x00000100
+#define MTK_BT_RESET_REG_CONNV3        0x70028610
+#define MTK_BT_READ_DEV_ID     0x70010200
+
 enum {
        BTMTK_WMT_PATCH_DWNLD = 0x1,
        BTMTK_WMT_TEST = 0x2,
@@ -126,6 +138,10 @@ struct btmtk_hci_wmt_params {
        u32 *status;
 };
 
+enum {
+       BTMTK_TX_WAIT_VND_EVT,
+};
+
 typedef int (*btmtk_reset_sync_func_t)(struct hci_dev *, void *);
 
 struct btmtk_coredump_info {
@@ -136,9 +152,15 @@ struct btmtk_coredump_info {
 };
 
 struct btmtk_data {
+       unsigned long flags;
        u32 dev_id;
        btmtk_reset_sync_func_t reset_sync;
        struct btmtk_coredump_info cd_info;
+
+       struct usb_device *udev;
+       struct usb_interface *intf;
+       struct usb_anchor *ctrl_anchor;
+       struct sk_buff *evt_skb;
 };
 
 typedef int (*wmt_cmd_sync_func_t)(struct hci_dev *,
@@ -163,6 +185,9 @@ int btmtk_process_coredump(struct hci_dev *hdev, struct sk_buff *skb);
 
 void btmtk_fw_get_filename(char *buf, size_t size, u32 dev_id, u32 fw_ver,
                           u32 fw_flavor);
+
+int btmtk_usb_hci_wmt_sync(struct hci_dev *hdev,
+                          struct btmtk_hci_wmt_params *wmt_params);
 #else
 
 static inline int btmtk_set_bdaddr(struct hci_dev *hdev,
@@ -202,4 +227,10 @@ static void btmtk_fw_get_filename(char *buf, size_t size, u32 dev_id,
                                  u32 fw_ver, u32 fw_flavor)
 {
 }
+
+static int btmtk_usb_hci_wmt_sync(struct hci_dev *hdev,
+                                 struct btmtk_hci_wmt_params *wmt_params)
+{
+       return -EOPNOTSUPP;
+}
 #endif
index b4e560a17aa68c95cff814c0b0e6f2c376c08441..39d6898497a40431171b58ba6d22a102f993ff60 100644 (file)
@@ -20,6 +20,7 @@
 #include <linux/of.h>
 #include <linux/pm_runtime.h>
 #include <linux/skbuff.h>
+#include <linux/usb.h>
 
 #include <linux/mmc/host.h>
 #include <linux/mmc/sdio_ids.h>
index e6bc4a73c9fc33ee7645ad903b991e4bf05e686c..aa87c3e788718feeb7999608aeb25be41c6ce3a0 100644 (file)
@@ -22,6 +22,7 @@
 #include <linux/regulator/consumer.h>
 #include <linux/serdev.h>
 #include <linux/skbuff.h>
+#include <linux/usb.h>
 
 #include <net/bluetooth/bluetooth.h>
 #include <net/bluetooth/hci_core.h>
index 96f2e9d2a449361e3fce4d09831f0fd6794639d4..0376d141d8fe22ea5a8336c50e78fd42165759a7 100644 (file)
@@ -2645,282 +2645,6 @@ static int btusb_recv_event_realtek(struct hci_dev *hdev, struct sk_buff *skb)
        return hci_recv_frame(hdev, skb);
 }
 
-/* UHW CR mapping */
-#define MTK_BT_MISC            0x70002510
-#define MTK_BT_SUBSYS_RST      0x70002610
-#define MTK_UDMA_INT_STA_BT    0x74000024
-#define MTK_UDMA_INT_STA_BT1   0x74000308
-#define MTK_BT_WDT_STATUS      0x740003A0
-#define MTK_EP_RST_OPT         0x74011890
-#define MTK_EP_RST_IN_OUT_OPT  0x00010001
-#define MTK_BT_RST_DONE                0x00000100
-#define MTK_BT_RESET_REG_CONNV3        0x70028610
-#define MTK_BT_READ_DEV_ID     0x70010200
-
-
-static void btusb_mtk_wmt_recv(struct urb *urb)
-{
-       struct hci_dev *hdev = urb->context;
-       struct btusb_data *data = hci_get_drvdata(hdev);
-       struct sk_buff *skb;
-       int err;
-
-       if (urb->status == 0 && urb->actual_length > 0) {
-               hdev->stat.byte_rx += urb->actual_length;
-
-               /* WMT event shouldn't be fragmented and the size should be
-                * less than HCI_WMT_MAX_EVENT_SIZE.
-                */
-               skb = bt_skb_alloc(HCI_WMT_MAX_EVENT_SIZE, GFP_ATOMIC);
-               if (!skb) {
-                       hdev->stat.err_rx++;
-                       kfree(urb->setup_packet);
-                       return;
-               }
-
-               hci_skb_pkt_type(skb) = HCI_EVENT_PKT;
-               skb_put_data(skb, urb->transfer_buffer, urb->actual_length);
-
-               /* When someone waits for the WMT event, the skb is being cloned
-                * and being processed the events from there then.
-                */
-               if (test_bit(BTUSB_TX_WAIT_VND_EVT, &data->flags)) {
-                       data->evt_skb = skb_clone(skb, GFP_ATOMIC);
-                       if (!data->evt_skb) {
-                               kfree_skb(skb);
-                               kfree(urb->setup_packet);
-                               return;
-                       }
-               }
-
-               err = hci_recv_frame(hdev, skb);
-               if (err < 0) {
-                       kfree_skb(data->evt_skb);
-                       data->evt_skb = NULL;
-                       kfree(urb->setup_packet);
-                       return;
-               }
-
-               if (test_and_clear_bit(BTUSB_TX_WAIT_VND_EVT,
-                                      &data->flags)) {
-                       /* Barrier to sync with other CPUs */
-                       smp_mb__after_atomic();
-                       wake_up_bit(&data->flags,
-                                   BTUSB_TX_WAIT_VND_EVT);
-               }
-               kfree(urb->setup_packet);
-               return;
-       } else if (urb->status == -ENOENT) {
-               /* Avoid suspend failed when usb_kill_urb */
-               return;
-       }
-
-       usb_mark_last_busy(data->udev);
-
-       /* The URB complete handler is still called with urb->actual_length = 0
-        * when the event is not available, so we should keep re-submitting
-        * URB until WMT event returns, Also, It's necessary to wait some time
-        * between the two consecutive control URBs to relax the target device
-        * to generate the event. Otherwise, the WMT event cannot return from
-        * the device successfully.
-        */
-       udelay(500);
-
-       usb_anchor_urb(urb, &data->ctrl_anchor);
-       err = usb_submit_urb(urb, GFP_ATOMIC);
-       if (err < 0) {
-               kfree(urb->setup_packet);
-               /* -EPERM: urb is being killed;
-                * -ENODEV: device got disconnected
-                */
-               if (err != -EPERM && err != -ENODEV)
-                       bt_dev_err(hdev, "urb %p failed to resubmit (%d)",
-                                  urb, -err);
-               usb_unanchor_urb(urb);
-       }
-}
-
-static int btusb_mtk_submit_wmt_recv_urb(struct hci_dev *hdev)
-{
-       struct btusb_data *data = hci_get_drvdata(hdev);
-       struct usb_ctrlrequest *dr;
-       unsigned char *buf;
-       int err, size = 64;
-       unsigned int pipe;
-       struct urb *urb;
-
-       urb = usb_alloc_urb(0, GFP_KERNEL);
-       if (!urb)
-               return -ENOMEM;
-
-       dr = kmalloc(sizeof(*dr), GFP_KERNEL);
-       if (!dr) {
-               usb_free_urb(urb);
-               return -ENOMEM;
-       }
-
-       dr->bRequestType = USB_TYPE_VENDOR | USB_DIR_IN;
-       dr->bRequest     = 1;
-       dr->wIndex       = cpu_to_le16(0);
-       dr->wValue       = cpu_to_le16(48);
-       dr->wLength      = cpu_to_le16(size);
-
-       buf = kmalloc(size, GFP_KERNEL);
-       if (!buf) {
-               kfree(dr);
-               usb_free_urb(urb);
-               return -ENOMEM;
-       }
-
-       pipe = usb_rcvctrlpipe(data->udev, 0);
-
-       usb_fill_control_urb(urb, data->udev, pipe, (void *)dr,
-                            buf, size, btusb_mtk_wmt_recv, hdev);
-
-       urb->transfer_flags |= URB_FREE_BUFFER;
-
-       usb_anchor_urb(urb, &data->ctrl_anchor);
-       err = usb_submit_urb(urb, GFP_KERNEL);
-       if (err < 0) {
-               if (err != -EPERM && err != -ENODEV)
-                       bt_dev_err(hdev, "urb %p submission failed (%d)",
-                                  urb, -err);
-               usb_unanchor_urb(urb);
-       }
-
-       usb_free_urb(urb);
-
-       return err;
-}
-
-static int btusb_mtk_hci_wmt_sync(struct hci_dev *hdev,
-                                 struct btmtk_hci_wmt_params *wmt_params)
-{
-       struct btusb_data *data = hci_get_drvdata(hdev);
-       struct btmtk_hci_wmt_evt_funcc *wmt_evt_funcc;
-       u32 hlen, status = BTMTK_WMT_INVALID;
-       struct btmtk_hci_wmt_evt *wmt_evt;
-       struct btmtk_hci_wmt_cmd *wc;
-       struct btmtk_wmt_hdr *hdr;
-       int err;
-
-       /* Send the WMT command and wait until the WMT event returns */
-       hlen = sizeof(*hdr) + wmt_params->dlen;
-       if (hlen > 255)
-               return -EINVAL;
-
-       wc = kzalloc(hlen, GFP_KERNEL);
-       if (!wc)
-               return -ENOMEM;
-
-       hdr = &wc->hdr;
-       hdr->dir = 1;
-       hdr->op = wmt_params->op;
-       hdr->dlen = cpu_to_le16(wmt_params->dlen + 1);
-       hdr->flag = wmt_params->flag;
-       memcpy(wc->data, wmt_params->data, wmt_params->dlen);
-
-       set_bit(BTUSB_TX_WAIT_VND_EVT, &data->flags);
-
-       /* WMT cmd/event doesn't follow up the generic HCI cmd/event handling,
-        * it needs constantly polling control pipe until the host received the
-        * WMT event, thus, we should require to specifically acquire PM counter
-        * on the USB to prevent the interface from entering auto suspended
-        * while WMT cmd/event in progress.
-        */
-       err = usb_autopm_get_interface(data->intf);
-       if (err < 0)
-               goto err_free_wc;
-
-       err = __hci_cmd_send(hdev, 0xfc6f, hlen, wc);
-
-       if (err < 0) {
-               clear_bit(BTUSB_TX_WAIT_VND_EVT, &data->flags);
-               usb_autopm_put_interface(data->intf);
-               goto err_free_wc;
-       }
-
-       /* Submit control IN URB on demand to process the WMT event */
-       err = btusb_mtk_submit_wmt_recv_urb(hdev);
-
-       usb_autopm_put_interface(data->intf);
-
-       if (err < 0)
-               goto err_free_wc;
-
-       /* The vendor specific WMT commands are all answered by a vendor
-        * specific event and will have the Command Status or Command
-        * Complete as with usual HCI command flow control.
-        *
-        * After sending the command, wait for BTUSB_TX_WAIT_VND_EVT
-        * state to be cleared. The driver specific event receive routine
-        * will clear that state and with that indicate completion of the
-        * WMT command.
-        */
-       err = wait_on_bit_timeout(&data->flags, BTUSB_TX_WAIT_VND_EVT,
-                                 TASK_INTERRUPTIBLE, HCI_INIT_TIMEOUT);
-       if (err == -EINTR) {
-               bt_dev_err(hdev, "Execution of wmt command interrupted");
-               clear_bit(BTUSB_TX_WAIT_VND_EVT, &data->flags);
-               goto err_free_wc;
-       }
-
-       if (err) {
-               bt_dev_err(hdev, "Execution of wmt command timed out");
-               clear_bit(BTUSB_TX_WAIT_VND_EVT, &data->flags);
-               err = -ETIMEDOUT;
-               goto err_free_wc;
-       }
-
-       if (data->evt_skb == NULL)
-               goto err_free_wc;
-
-       /* Parse and handle the return WMT event */
-       wmt_evt = (struct btmtk_hci_wmt_evt *)data->evt_skb->data;
-       if (wmt_evt->whdr.op != hdr->op) {
-               bt_dev_err(hdev, "Wrong op received %d expected %d",
-                          wmt_evt->whdr.op, hdr->op);
-               err = -EIO;
-               goto err_free_skb;
-       }
-
-       switch (wmt_evt->whdr.op) {
-       case BTMTK_WMT_SEMAPHORE:
-               if (wmt_evt->whdr.flag == 2)
-                       status = BTMTK_WMT_PATCH_UNDONE;
-               else
-                       status = BTMTK_WMT_PATCH_DONE;
-               break;
-       case BTMTK_WMT_FUNC_CTRL:
-               wmt_evt_funcc = (struct btmtk_hci_wmt_evt_funcc *)wmt_evt;
-               if (be16_to_cpu(wmt_evt_funcc->status) == 0x404)
-                       status = BTMTK_WMT_ON_DONE;
-               else if (be16_to_cpu(wmt_evt_funcc->status) == 0x420)
-                       status = BTMTK_WMT_ON_PROGRESS;
-               else
-                       status = BTMTK_WMT_ON_UNDONE;
-               break;
-       case BTMTK_WMT_PATCH_DWNLD:
-               if (wmt_evt->whdr.flag == 2)
-                       status = BTMTK_WMT_PATCH_DONE;
-               else if (wmt_evt->whdr.flag == 1)
-                       status = BTMTK_WMT_PATCH_PROGRESS;
-               else
-                       status = BTMTK_WMT_PATCH_UNDONE;
-               break;
-       }
-
-       if (wmt_params->status)
-               *wmt_params->status = status;
-
-err_free_skb:
-       kfree_skb(data->evt_skb);
-       data->evt_skb = NULL;
-err_free_wc:
-       kfree(wc);
-       return err;
-}
-
 static int btusb_mtk_func_query(struct hci_dev *hdev)
 {
        struct btmtk_hci_wmt_params wmt_params;
@@ -2934,7 +2658,7 @@ static int btusb_mtk_func_query(struct hci_dev *hdev)
        wmt_params.data = &param;
        wmt_params.status = &status;
 
-       err = btusb_mtk_hci_wmt_sync(hdev, &wmt_params);
+       err = btmtk_usb_hci_wmt_sync(hdev, &wmt_params);
        if (err < 0) {
                bt_dev_err(hdev, "Failed to query function status (%d)", err);
                return err;
@@ -3255,7 +2979,7 @@ static int btusb_mtk_setup(struct hci_dev *hdev)
                                      fw_version, fw_flavor);
 
                err = btmtk_setup_firmware_79xx(hdev, fw_bin_name,
-                                               btusb_mtk_hci_wmt_sync);
+                                               btmtk_usb_hci_wmt_sync);
                if (err < 0) {
                        bt_dev_err(hdev, "Failed to set up firmware (%d)", err);
                        clear_bit(BTUSB_FIRMWARE_LOADED, &data->flags);
@@ -3275,7 +2999,7 @@ static int btusb_mtk_setup(struct hci_dev *hdev)
                wmt_params.data = &param;
                wmt_params.status = NULL;
 
-               err = btusb_mtk_hci_wmt_sync(hdev, &wmt_params);
+               err = btmtk_usb_hci_wmt_sync(hdev, &wmt_params);
                if (err < 0) {
                        bt_dev_err(hdev, "Failed to send wmt func ctrl (%d)", err);
                        return err;
@@ -3297,7 +3021,7 @@ static int btusb_mtk_setup(struct hci_dev *hdev)
        wmt_params.data = NULL;
        wmt_params.status = &status;
 
-       err = btusb_mtk_hci_wmt_sync(hdev, &wmt_params);
+       err = btmtk_usb_hci_wmt_sync(hdev, &wmt_params);
        if (err < 0) {
                bt_dev_err(hdev, "Failed to query firmware status (%d)", err);
                return err;
@@ -3310,7 +3034,7 @@ static int btusb_mtk_setup(struct hci_dev *hdev)
 
        /* Setup a firmware which the device definitely requires */
        err = btmtk_setup_firmware(hdev, fwname,
-                                  btusb_mtk_hci_wmt_sync);
+                                  btmtk_usb_hci_wmt_sync);
        if (err < 0)
                return err;
 
@@ -3339,7 +3063,7 @@ ignore_setup_fw:
        wmt_params.data = &param;
        wmt_params.status = NULL;
 
-       err = btusb_mtk_hci_wmt_sync(hdev, &wmt_params);
+       err = btmtk_usb_hci_wmt_sync(hdev, &wmt_params);
        if (err < 0) {
                bt_dev_err(hdev, "Failed to send wmt func ctrl (%d)", err);
                return err;
@@ -3385,7 +3109,7 @@ static int btusb_mtk_shutdown(struct hci_dev *hdev)
        wmt_params.data = &param;
        wmt_params.status = NULL;
 
-       err = btusb_mtk_hci_wmt_sync(hdev, &wmt_params);
+       err = btmtk_usb_hci_wmt_sync(hdev, &wmt_params);
        if (err < 0) {
                bt_dev_err(hdev, "Failed to send wmt func ctrl (%d)", err);
                return err;