Commit ccfc8948 authored by Hao Qin's avatar Hao Qin Committed by Luiz Augusto von Dentz

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: default avatarSean Wang <sean.wang@mediatek.com>
Signed-off-by: default avatarSean Wang <sean.wang@mediatek.com>
Co-developed-by: default avatarChris Lu <chris.lu@mediatek.com>
Signed-off-by: default avatarChris Lu <chris.lu@mediatek.com>
Signed-off-by: default avatarHao Qin <hao.qin@mediatek.com>
Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
parent 4c0c28f2
...@@ -3175,6 +3175,13 @@ static int btusb_mtk_setup(struct hci_dev *hdev) ...@@ -3175,6 +3175,13 @@ static int btusb_mtk_setup(struct hci_dev *hdev)
case 0x7922: case 0x7922:
case 0x7961: case 0x7961:
case 0x7925: 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, btmtk_fw_get_filename(fw_bin_name, sizeof(fw_bin_name), dev_id,
fw_version, fw_flavor); fw_version, fw_flavor);
...@@ -3182,9 +3189,12 @@ static int btusb_mtk_setup(struct hci_dev *hdev) ...@@ -3182,9 +3189,12 @@ static int btusb_mtk_setup(struct hci_dev *hdev)
btusb_mtk_hci_wmt_sync); btusb_mtk_hci_wmt_sync);
if (err < 0) { if (err < 0) {
bt_dev_err(hdev, "Failed to set up firmware (%d)", err); bt_dev_err(hdev, "Failed to set up firmware (%d)", err);
clear_bit(BTUSB_FIRMWARE_LOADED, &data->flags);
return err; return err;
} }
set_bit(BTUSB_FIRMWARE_LOADED, &data->flags);
/* It's Device EndPoint Reset Option Register */ /* It's Device EndPoint Reset Option Register */
btusb_mtk_uhw_reg_write(data, MTK_EP_RST_OPT, MTK_EP_RST_IN_OUT_OPT); btusb_mtk_uhw_reg_write(data, MTK_EP_RST_OPT, MTK_EP_RST_IN_OUT_OPT);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment