Bluetooth: btmtksdio: fix possible FW initialization failure

[ Upstream commit 7469720563e01f479ec5afe06bd6f440f965d523 ]

According to FW advised sequence, mt7921s need to re-acquire privilege
immediately after the firmware download is complete before normal running.
Otherwise, it is still possible the bus may be stuck in an abnormal status
that causes FW initialization failure in the current driver.

Fixes: 752aea58489f ("Bluetooth: mt7921s: fix bus hang with wrong privilege")
Co-developed-by: Yake Yang <yake.yang@mediatek.com>
Signed-off-by: Yake Yang <yake.yang@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 4ae6631a7c2959cdcf8ed459d1733f6a015db5c3..5d13c1f61bd36544c08ee0c0b29d4ec740f938c1 100644 (file)
--- a/drivers/bluetooth/btmtksdio.c
+++ b/drivers/bluetooth/btmtksdio.c
@@ -864,6 +864,14 @@ static int mt79xx_setup(struct hci_dev *hdev, const char *fwname)
                return err;
        }
 
+       err = btmtksdio_fw_pmctrl(bdev);
+       if (err < 0)
+               return err;
+
+       err = btmtksdio_drv_pmctrl(bdev);
+       if (err < 0)
+               return err;
+
        /* Enable Bluetooth protocol */
        wmt_params.op = BTMTK_WMT_FUNC_CTRL;
        wmt_params.flag = 0;
@@ -1109,14 +1117,6 @@ static int btmtksdio_setup(struct hci_dev *hdev)
                if (err < 0)
                        return err;
 
-               err = btmtksdio_fw_pmctrl(bdev);
-               if (err < 0)
-                       return err;
-
-               err = btmtksdio_drv_pmctrl(bdev);
-               if (err < 0)
-                       return err;
-
                /* Enable SCO over I2S/PCM */
                err = btmtksdio_sco_setting(hdev);
                if (err < 0) {