Bluetooth: mt7921s: fix bus hang with wrong privilege

[ Upstream commit 752aea58489fd42f5c54dc50cb098d19e486ae61 ]

According to chip hw flow, mt7921s need to re-acquire privilege
again before normal running. Otherwise, the bus may be stuck in
an abnormal status.

Fixes: c603bf1f94d0 ("Bluetooth: btmtksdio: add MT7921s Bluetooth support")
Co-developed-by: Sean Wang <sean.wang@mediatek.com>
Signed-off-by: Sean Wang <sean.wang@mediatek.com>
Signed-off-by: Mark Chen <mark-yw.chen@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 d4e2541a48735a2b3250e51f90910a9c8355661f..c05578b52d33dfdcfcfd9f4a0e429d6ec2478c9a 100644 (file)
--- a/drivers/bluetooth/btmtksdio.c
+++ b/drivers/bluetooth/btmtksdio.c
@@ -872,6 +872,15 @@ static int btmtksdio_setup(struct hci_dev *hdev)
                err = mt79xx_setup(hdev, fwname);
                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;
+
                break;
        case 0x7663:
        case 0x7668: