[1/2] Bluetooth: btmtksdio: fix the reset takes too long

Commit Message

Sean Wang May 12, 2022, 9:38 p.m. UTC

From: Sean Wang <[e-mail]>

Sending WMT command during the reset in progress is invalid and would get
no response from firmware until the reset is complete, so we ignore the WMT
command here to resolve the issue which causes the whole reset process
taking too long.

Fixes: 8fafe702253d ("Bluetooth: mt7921s: support bluetooth reset mechanism")
Co-developed-by: Yake Yang <[e-mail]>
Signed-off-by: Yake Yang <[e-mail]>
Signed-off-by: Sean Wang <[e-mail]>
---
 drivers/bluetooth/btmtksdio.c | 5 +++++
 1 file changed, 5 insertions(+)

Comments

[e-mail] May 12, 2022, 10:01 p.m. UTC | #1

This is automated email and please do not reply to this email!

Dear submitter,

Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=641161

---Test result---

Test Summary:
CheckPatch                    PASS      3.34 seconds
GitLint                       PASS      2.14 seconds
SubjectPrefix                 PASS      1.72 seconds
BuildKernel                   PASS      30.44 seconds
BuildKernel32                 PASS      30.25 seconds
Incremental Build with patchesPASS      45.84 seconds
TestRunner: Setup             PASS      493.42 seconds
TestRunner: l2cap-tester      PASS      17.46 seconds
TestRunner: bnep-tester       PASS      6.12 seconds
TestRunner: mgmt-tester       PASS      106.15 seconds
TestRunner: rfcomm-tester     PASS      9.66 seconds
TestRunner: sco-tester        PASS      9.65 seconds
TestRunner: smp-tester        PASS      10.44 seconds
TestRunner: userchan-tester   PASS      7.15 seconds



---
Regards,
Linux Bluetooth

[e-mail] May 13, 2022, 11:21 a.m. UTC | #2

Hello:

This series was applied to bluetooth/bluetooth-next.git (master)
by Marcel Holtmann <[e-mail]>:

On Fri, 13 May 2022 05:38:11 +0800 you wrote:
> From: Sean Wang <[e-mail]>
> 
> Sending WMT command during the reset in progress is invalid and would get
> no response from firmware until the reset is complete, so we ignore the WMT
> command here to resolve the issue which causes the whole reset process
> taking too long.
> 
> [...]

Here is the summary with links:
  - [1/2] Bluetooth: btmtksdio: fix the reset takes too long
    https://git.kernel.org/bluetooth/bluetooth-next/c/baabb7f530e8
  - [2/2] Bluetooth: btmtksdio: fix possible FW initialization failure
    https://git.kernel.org/bluetooth/bluetooth-next/c/7469720563e0

You are awesome, thank you!

AngeloGioacchino Del Regno May 13, 2022, 2:41 p.m. UTC | #3

Il 12/05/22 23:38, [e-mail] ha scritto:
> From: Sean Wang <[e-mail]>
> 
> Sending WMT command during the reset in progress is invalid and would get
> no response from firmware until the reset is complete, so we ignore the WMT
> command here to resolve the issue which causes the whole reset process
> taking too long.
> 
> Fixes: 8fafe702253d ("Bluetooth: mt7921s: support bluetooth reset mechanism")
> Co-developed-by: Yake Yang <[e-mail]>
> Signed-off-by: Yake Yang <[e-mail]>
> Signed-off-by: Sean Wang <[e-mail]>

It may be too late but, in any case, for the entire series:

Tested-by: AngeloGioacchino Del Regno <[e-mail]>

Patch

diff --git a/drivers/bluetooth/btmtksdio.c b/drivers/bluetooth/btmtksdio.c
index 4ae6631a7c29..26e27fd79a21 100644
--- a/drivers/bluetooth/btmtksdio.c
+++ b/drivers/bluetooth/btmtksdio.c
@@ -1189,6 +1189,10 @@  static int btmtksdio_shutdown(struct hci_dev *hdev)
 	 */
 	pm_runtime_get_sync(bdev->dev);
 
+	/* wmt command only works until the reset is complete */
+	if (test_bit(BTMTKSDIO_HW_RESET_ACTIVE, &bdev->tx_state))
+		goto ignore_wmt_cmd;
+
 	/* Disable the device */
 	wmt_params.op = BTMTK_WMT_FUNC_CTRL;
 	wmt_params.flag = 0;
@@ -1202,6 +1206,7 @@  static int btmtksdio_shutdown(struct hci_dev *hdev)
 		return err;
 	}
 
+ignore_wmt_cmd:
 	pm_runtime_put_noidle(bdev->dev);
 	pm_runtime_disable(bdev->dev);