mirror of
https://github.com/raspberrypi/linux.git
synced 2025-12-06 10:00:17 +00:00
Bluetooth: btusb: fix up firmware download sequence
[ Upstream commitf645125711] Data RAM on the device have to be powered on before starting to download the firmware. Fixes:a1c49c434e("Bluetooth: btusb: Add protocol support for MediaTek MT7668U USB devices") Co-developed-by: Mark Chen <Mark-YW.Chen@mediatek.com> Signed-off-by: Mark Chen <Mark-YW.Chen@mediatek.com> Signed-off-by: Sean Wang <sean.wang@mediatek.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
7cf5046487
commit
09731750e6
@@ -2826,7 +2826,7 @@ static int btusb_mtk_setup_firmware(struct hci_dev *hdev, const char *fwname)
|
|||||||
const u8 *fw_ptr;
|
const u8 *fw_ptr;
|
||||||
size_t fw_size;
|
size_t fw_size;
|
||||||
int err, dlen;
|
int err, dlen;
|
||||||
u8 flag;
|
u8 flag, param;
|
||||||
|
|
||||||
err = request_firmware(&fw, fwname, &hdev->dev);
|
err = request_firmware(&fw, fwname, &hdev->dev);
|
||||||
if (err < 0) {
|
if (err < 0) {
|
||||||
@@ -2834,6 +2834,20 @@ static int btusb_mtk_setup_firmware(struct hci_dev *hdev, const char *fwname)
|
|||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Power on data RAM the firmware relies on. */
|
||||||
|
param = 1;
|
||||||
|
wmt_params.op = BTMTK_WMT_FUNC_CTRL;
|
||||||
|
wmt_params.flag = 3;
|
||||||
|
wmt_params.dlen = sizeof(param);
|
||||||
|
wmt_params.data = ¶m;
|
||||||
|
wmt_params.status = NULL;
|
||||||
|
|
||||||
|
err = btusb_mtk_hci_wmt_sync(hdev, &wmt_params);
|
||||||
|
if (err < 0) {
|
||||||
|
bt_dev_err(hdev, "Failed to power on data RAM (%d)", err);
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
|
||||||
fw_ptr = fw->data;
|
fw_ptr = fw->data;
|
||||||
fw_size = fw->size;
|
fw_size = fw->size;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user