Commit 74697205 authored May 13, 2022 by Sean Wang Committed by Marcel Holtmann May 13, 2022

Bluetooth: btmtksdio: fix possible FW initialization failure

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: 752aea58 ("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>

parent 0fab6361

drivers/bluetooth/btmtksdio.c

+8 −8

Original line number	Diff line number	Diff line
		@@ -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) {