Bluetooth: btmtksdio: fix up firmware download sequence

[ Upstream commit 737cd06072a72e8984e41af8e5919338d0c5bf2b ]

Data RAM on the device have to be powered on before starting to download
the firmware.

Fixes: 9aebfd4a2200 ("Bluetooth: mediatek: add support for MediaTek MT7663S and MT7668S SDIO 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>

diff --git a/drivers/bluetooth/btmtksdio.c b/drivers/bluetooth/btmtksdio.c
index 8133382884537048cd6352243fbf702ef9ea001d..b7de7cb8cca9073c4b2c8ccbcf907cb2c10b168c 100644 (file)
--- a/drivers/bluetooth/btmtksdio.c
+++ b/drivers/bluetooth/btmtksdio.c
@@ -684,7 +684,7 @@ static int mtk_setup_firmware(struct hci_dev *hdev, const char *fwname)
        const u8 *fw_ptr;
        size_t fw_size;
        int err, dlen;
-       u8 flag;
+       u8 flag, param;
 
        err = request_firmware(&fw, fwname, &hdev->dev);
        if (err < 0) {
@@ -692,6 +692,20 @@ static int mtk_setup_firmware(struct hci_dev *hdev, const char *fwname)
                return err;
        }
 
+       /* Power on data RAM the firmware relies on. */
+       param = 1;
+       wmt_params.op = MTK_WMT_FUNC_CTRL;
+       wmt_params.flag = 3;
+       wmt_params.dlen = sizeof(param);
+       wmt_params.data = &param;
+       wmt_params.status = NULL;
+
+       err = 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_size = fw->size;