Skip to contentSkip to conversation

Bluetooth: btmtksdio: Add pmctrl handling for BT closed state during reset

PATCH Applied Chris Lu 3 participants 3 messages Sep 30, 2025 – Oct 3, 2025

Subsystems (2)
lore
Share & tools
lore

Chris Lu

author
#0 lore raw

PATCH 1/1 Bluetooth: btmtksdio: Add pmctrl handling for BT closed state during reset

This patch adds logic to handle power management control when the Bluetooth function is closed during the SDIO reset sequence.

Specifically, if BT is closed before reset, the driver enables the SDIO function and sets driver pmctrl. After reset, if BT remains closed, the driver sets firmware pmctrl and disables the SDIO function.

These changes ensure proper power management and device state consistency across the reset flow.

Fixes 8fafe702253d ("Bluetooth: mt7921s: support bluetooth reset mechanism")
---
 drivers/bluetooth/btmtksdio.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)
drivers/bluetooth/btmtksdio.c +12 -0
index 50abefba6d04..62db31bd6592 100644
@@ -1270,6 +1270,12 @@ static void btmtksdio_reset(struct hci_dev *hdev)
 
 	sdio_claim_host(bdev->func);
 
+	/* set drv_pmctrl if BT is closed before doing reset */
+	if (!test_bit(BTMTKSDIO_FUNC_ENABLED, &bdev->tx_state)) {
+		sdio_enable_func(bdev->func);
+		btmtksdio_drv_pmctrl(bdev);
+	}
+
 	sdio_writel(bdev->func, C_INT_EN_CLR, MTK_REG_CHLPCR, NULL);
 	skb_queue_purge(&bdev->txq);
 	cancel_work_sync(&bdev->txrx_work);
@@ -1285,6 +1291,12 @@ static void btmtksdio_reset(struct hci_dev *hdev)
 		goto err;
 	}
 
+	/* set fw_pmctrl back if BT is closed after doing reset */
+	if (!test_bit(BTMTKSDIO_FUNC_ENABLED, &bdev->tx_state)) {
+		btmtksdio_fw_pmctrl(bdev);
+		sdio_disable_func(bdev->func);
+	}
+
 	clear_bit(BTMTKSDIO_PATCH_ENABLED, &bdev->tx_state);
 err:
 	sdio_release_host(bdev->func);
Signature · 1 line
2.45.2
#1 lore raw
This patch was applied to bluetooth/bluetooth-next.git (master) by Luiz Augusto von Dentz <[email protected]>:

Hello:

This patch was applied to bluetooth/bluetooth-next.git (master) by Luiz Augusto von Dentz <[email protected]>:

Quoted 8 lines · On Tue, 30 Sep 2025 13:39:33 +0800 you wrote:

This patch adds logic to handle power management control when the Bluetooth function is closed during the SDIO reset sequence.

Specifically, if BT is closed before reset, the driver enables the SDIO function and sets driver pmctrl. After reset, if BT remains closed, the driver sets firmware pmctrl and disables the SDIO function.

[...]

Here is the summary with links:
- [v1] Bluetooth: btmtksdio: Add pmctrl handling for BT closed state during reset

    https://git.kernel.org/bluetooth/bluetooth-next/c/739892687cf5

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
#2 lore raw
In reply to Chris Lu

Dear Chris,

Thank you for your patch.

Am 30.09.25 um 07:39 schrieb Chris Lu:

Quoted 9 lines

This patch adds logic to handle power management control when the Bluetooth function is closed during the SDIO reset sequence.

Specifically, if BT is closed before reset, the driver enables the SDIO function and sets driver pmctrl. After reset, if BT remains closed, the driver sets firmware pmctrl and disables the SDIO function.

These changes ensure proper power management and device state consistency across the reset flow.

How can your patch be verified on a running system?

Kind regards,

Paul

Quoted 36 lines
Fixes 8fafe702253d ("Bluetooth: mt7921s: support bluetooth reset mechanism")
---
  drivers/bluetooth/btmtksdio.c | 12 ++++++++++++
  1 file changed, 12 insertions(+)
drivers/bluetooth/btmtksdio.c +12 -0
index 50abefba6d04..62db31bd6592 100644
@@ -1270,6 +1270,12 @@ static void btmtksdio_reset(struct hci_dev *hdev)
 
  	sdio_claim_host(bdev->func);
 
+	/* set drv_pmctrl if BT is closed before doing reset */
+	if (!test_bit(BTMTKSDIO_FUNC_ENABLED, &bdev->tx_state)) {
+		sdio_enable_func(bdev->func);
+		btmtksdio_drv_pmctrl(bdev);
+	}
+
  	sdio_writel(bdev->func, C_INT_EN_CLR, MTK_REG_CHLPCR, NULL);
  	skb_queue_purge(&bdev->txq);
  	cancel_work_sync(&bdev->txrx_work);
@@ -1285,6 +1291,12 @@ static void btmtksdio_reset(struct hci_dev *hdev)
  		goto err;
  	}
 
+	/* set fw_pmctrl back if BT is closed after doing reset */
+	if (!test_bit(BTMTKSDIO_FUNC_ENABLED, &bdev->tx_state)) {
+		btmtksdio_fw_pmctrl(bdev);
+		sdio_disable_func(bdev->func);
+	}
+
  	clear_bit(BTMTKSDIO_PATCH_ENABLED, &bdev->tx_state);
  err:
  	sdio_release_host(bdev->func);