From: Sean Wang <sean.wang@mediatek.com>

Date: Fri, 13 May 2022 05:38:12 +0800

Subject: Bluetooth: btmtksdio: fix possible FW initialization failure

Patch-mainline: v5.19-rc1

Git-commit: 7469720563e01f479ec5afe06bd6f440f965d523

References: jsc#PED-1407

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>

Acked-by: Lee, Chun-Yi <jlee@suse.com>

---

 drivers/bluetooth/btmtksdio.c |   16 ++++++++--------

 1 file changed, 8 insertions(+), 8 deletions(-)

--- a/drivers/bluetooth/btmtksdio.c

+++ b/drivers/bluetooth/btmtksdio.c

@@ -864,6 +864,14 @@ static int mt79xx_setup(struct hci_dev *

 		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_de

 		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) {