diff options
| author | Hao Qin <[email protected]> | 2024-05-15 16:15:20 -0700 |
|---|---|---|
| committer | Luiz Augusto von Dentz <[email protected]> | 2024-07-14 21:33:27 -0400 |
| commit | ccfc8948d7e4d93cab341a99774b24586717d89a (patch) | |
| tree | 6854ae6231a4843ed2ac9b648da44463e15fcce2 | |
| parent | 4c0c28f2bbec0c51395fd1f13c697da67483964b (diff) | |
Bluetooth: btusb: mediatek: reset the controller before downloading the fw
Reset the controller before downloading the firmware to improve its
reliability. This includes situations like cold or warm reboots, ensuring
the controller is in its initial state before starting the firmware
download.
Co-developed-by: Sean Wang <[email protected]>
Signed-off-by: Sean Wang <[email protected]>
Co-developed-by: Chris Lu <[email protected]>
Signed-off-by: Chris Lu <[email protected]>
Signed-off-by: Hao Qin <[email protected]>
Signed-off-by: Luiz Augusto von Dentz <[email protected]>
| -rw-r--r-- | drivers/bluetooth/btusb.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 602456e94fdb..ddd5ca7596e5 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -3175,6 +3175,13 @@ static int btusb_mtk_setup(struct hci_dev *hdev) case 0x7922: case 0x7961: case 0x7925: + /* Reset the device to ensure it's in the initial state before + * downloading the firmware to ensure. + */ + + if (!test_bit(BTUSB_FIRMWARE_LOADED, &data->flags)) + btusb_mtk_subsys_reset(hdev, dev_id); + btmtk_fw_get_filename(fw_bin_name, sizeof(fw_bin_name), dev_id, fw_version, fw_flavor); @@ -3182,9 +3189,12 @@ static int btusb_mtk_setup(struct hci_dev *hdev) btusb_mtk_hci_wmt_sync); if (err < 0) { bt_dev_err(hdev, "Failed to set up firmware (%d)", err); + clear_bit(BTUSB_FIRMWARE_LOADED, &data->flags); return err; } + set_bit(BTUSB_FIRMWARE_LOADED, &data->flags); + /* It's Device EndPoint Reset Option Register */ btusb_mtk_uhw_reg_write(data, MTK_EP_RST_OPT, MTK_EP_RST_IN_OUT_OPT); |