Skip to content

Commit 48c1330

Browse files
Mark Chenholtmann
authored andcommitted
Bluetooth: btusb: Fine-tune mt7663 mechanism.
Fine-tune read register for mt7663/mt7921. For mediatek chip spcific wmt protocol, we add more delay to send EP0 In-Token. Signed-off-by: Mark Chen <[email protected]> Signed-off-by: Marcel Holtmann <[email protected]>
1 parent 1bb0c66 commit 48c1330

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

drivers/bluetooth/btusb.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3139,6 +3139,7 @@ enum {
31393139
enum {
31403140
BTMTK_WMT_INVALID,
31413141
BTMTK_WMT_PATCH_UNDONE,
3142+
BTMTK_WMT_PATCH_PROGRESS,
31423143
BTMTK_WMT_PATCH_DONE,
31433144
BTMTK_WMT_ON_UNDONE,
31443145
BTMTK_WMT_ON_DONE,
@@ -3154,7 +3155,7 @@ struct btmtk_wmt_hdr {
31543155

31553156
struct btmtk_hci_wmt_cmd {
31563157
struct btmtk_wmt_hdr hdr;
3157-
u8 data[256];
3158+
u8 data[1000];
31583159
} __packed;
31593160

31603161
struct btmtk_hci_wmt_evt {
@@ -3253,7 +3254,7 @@ static void btusb_mtk_wmt_recv(struct urb *urb)
32533254
* to generate the event. Otherwise, the WMT event cannot return from
32543255
* the device successfully.
32553256
*/
3256-
udelay(100);
3257+
udelay(500);
32573258

32583259
usb_anchor_urb(urb, &data->ctrl_anchor);
32593260
err = usb_submit_urb(urb, GFP_ATOMIC);
@@ -3556,9 +3557,9 @@ static int btusb_mtk_reg_read(struct btusb_data *data, u32 reg, u32 *val)
35563557
return err;
35573558
}
35583559

3559-
static int btusb_mtk_id_get(struct btusb_data *data, u32 *id)
3560+
static int btusb_mtk_id_get(struct btusb_data *data, u32 reg, u32 *id)
35603561
{
3561-
return btusb_mtk_reg_read(data, 0x80000008, id);
3562+
return btusb_mtk_reg_read(data, reg, id);
35623563
}
35633564

35643565
static int btusb_mtk_setup(struct hci_dev *hdev)
@@ -3576,7 +3577,7 @@ static int btusb_mtk_setup(struct hci_dev *hdev)
35763577

35773578
calltime = ktime_get();
35783579

3579-
err = btusb_mtk_id_get(data, &dev_id);
3580+
err = btusb_mtk_id_get(data, 0x80000008, &dev_id);
35803581
if (err < 0) {
35813582
bt_dev_err(hdev, "Failed to get device id (%d)", err);
35823583
return err;

0 commit comments

Comments
 (0)