Bluetooth: btmtksdio: handle runtime pm only when sdio_func is available

Runtime pm ops is not aware the sdio_func status that is probably
being disabled by btmtksdio_close. Thus, we are only able to access the
sdio_func for the runtime pm operations only when the sdio_func is
available.

Fixes: 7f3c563c575e7 ("Bluetooth: btmtksdio: Add runtime PM support to SDIO based Bluetooth")
Co-developed-by: Mark-yw Chen <mark-yw.chen@mediatek.com>
Signed-off-by: Mark-yw Chen <mark-yw.chen@mediatek.com>
Signed-off-by: Sean Wang <sean.wang@mediatek.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/drivers/bluetooth/btmtksdio.c b/drivers/bluetooth/btmtksdio.c
index d9cf0c492e292e27e2a9e2cf8919e28f8bf2e50d..fc6317e519e9d7ad76130a0fb4a823d2eb73e2c9 100644 (file)
--- a/drivers/bluetooth/btmtksdio.c
+++ b/drivers/bluetooth/btmtksdio.c
@@ -99,6 +99,7 @@ MODULE_DEVICE_TABLE(sdio, btmtksdio_table);
 
 #define BTMTKSDIO_TX_WAIT_VND_EVT      1
 #define BTMTKSDIO_HW_TX_READY          2
+#define BTMTKSDIO_FUNC_ENABLED         3
 
 struct mtkbtsdio_hdr {
        __le16  len;
@@ -539,6 +540,8 @@ static int btmtksdio_open(struct hci_dev *hdev)
        if (err < 0)
                goto err_release_host;
 
+       set_bit(BTMTKSDIO_FUNC_ENABLED, &bdev->tx_state);
+
        /* Get ownership from the device */
        sdio_writel(bdev->func, C_FW_OWN_REQ_CLR, MTK_REG_CHLPCR, &err);
        if (err < 0)
@@ -640,6 +643,7 @@ static int btmtksdio_close(struct hci_dev *hdev)
        if (err < 0)
                bt_dev_err(bdev->hdev, "Cannot return ownership to device");
 
+       clear_bit(BTMTKSDIO_FUNC_ENABLED, &bdev->tx_state);
        sdio_disable_func(bdev->func);
 
        sdio_release_host(bdev->func);
@@ -1058,6 +1062,9 @@ static int btmtksdio_runtime_suspend(struct device *dev)
        if (!bdev)
                return 0;
 
+       if (!test_bit(BTMTKSDIO_FUNC_ENABLED, &bdev->tx_state))
+               return 0;
+
        sdio_claim_host(bdev->func);
 
        sdio_writel(bdev->func, C_FW_OWN_REQ_SET, MTK_REG_CHLPCR, &err);
@@ -1085,6 +1092,9 @@ static int btmtksdio_runtime_resume(struct device *dev)
        if (!bdev)
                return 0;
 
+       if (!test_bit(BTMTKSDIO_FUNC_ENABLED, &bdev->tx_state))
+               return 0;
+
        sdio_claim_host(bdev->func);
 
        sdio_writel(bdev->func, C_FW_OWN_REQ_CLR, MTK_REG_CHLPCR, &err);