Message ID | 20250215015558.1043074-1-quic_shuaz@quicinc.com |
---|---|
State | New |
Headers | show |
Series | [v1] Bluetooth: hci_qca: fix SSR unable to wake up bug | expand |
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=934242 ---Test result--- Test Summary: CheckPatch PENDING 0.30 seconds GitLint PENDING 0.16 seconds SubjectPrefix PASS 0.12 seconds BuildKernel PASS 24.21 seconds CheckAllWarning PASS 26.38 seconds CheckSparse PASS 29.73 seconds BuildKernel32 PASS 23.69 seconds TestRunnerSetup PASS 428.11 seconds TestRunner_l2cap-tester PASS 21.04 seconds TestRunner_iso-tester FAIL 148.83 seconds TestRunner_bnep-tester PASS 4.84 seconds TestRunner_mgmt-tester FAIL 126.25 seconds TestRunner_rfcomm-tester PASS 7.86 seconds TestRunner_sco-tester PASS 9.54 seconds TestRunner_ioctl-tester PASS 8.36 seconds TestRunner_mesh-tester FAIL 6.23 seconds TestRunner_smp-tester PASS 7.16 seconds TestRunner_userchan-tester PASS 5.11 seconds IncrementalBuild PENDING 0.36 seconds Details ############################## Test: CheckPatch - PENDING Desc: Run checkpatch.pl script Output: ############################## Test: GitLint - PENDING Desc: Run gitlint Output: ############################## Test: TestRunner_iso-tester - FAIL Desc: Run iso-tester with test-runner Output: Total: 125, Passed: 108 (86.4%), Failed: 13, Not Run: 4 Failed Test Cases ISO Connect2 CIG 0x01 - Success Timed out 2.688 seconds ISO Defer Connect2 CIG 0x01 - Success Timed out 2.278 seconds ISO Connected2 Suspend - Success Timed out 2.738 seconds ISO AC 6(ii) - Success Timed out 1.902 seconds ISO AC 7(ii) - Success Timed out 2.505 seconds ISO AC 8(ii) - Success Timed out 2.518 seconds ISO AC 9(ii) - Success Timed out 2.522 seconds ISO AC 11(ii) - Success Timed out 2.512 seconds ISO AC 1 + 2 - Success Timed out 1.968 seconds ISO AC 1 + 2 CIG 0x01/0x02 - Success Timed out 2.001 seconds ISO Reconnect AC 6(i) - Success Timed out 2.027 seconds ISO Reconnect AC 6(ii) - Success Timed out 1.996 seconds ISO AC 6(ii) CIS 0xEF/auto - Success Timed out 1.996 seconds ############################## Test: TestRunner_mgmt-tester - FAIL Desc: Run mgmt-tester with test-runner Output: Total: 490, Passed: 485 (99.0%), Failed: 1, Not Run: 4 Failed Test Cases LL Privacy - Add Device 2 (2 Devices to AL) Failed 0.170 seconds ############################## Test: TestRunner_mesh-tester - FAIL Desc: Run mesh-tester with test-runner Output: Total: 10, Passed: 9 (90.0%), Failed: 1, Not Run: 0 Failed Test Cases Mesh - Send cancel - 2 Failed 0.107 seconds ############################## Test: IncrementalBuild - PENDING Desc: Incremental build with the patches in the series Output: --- Regards, Linux Bluetooth
diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c index 0ac2168f1..7d63886b9 100644 --- a/drivers/bluetooth/hci_qca.c +++ b/drivers/bluetooth/hci_qca.c @@ -1104,6 +1104,7 @@ static void qca_controller_memdump(struct work_struct *work) cancel_delayed_work(&qca->ctrl_memdump_timeout); clear_bit(QCA_MEMDUMP_COLLECTION, &qca->flags); clear_bit(QCA_IBS_DISABLED, &qca->flags); + wake_up_bit(&qca->flags, QCA_MEMDUMP_COLLECTION); mutex_unlock(&qca->hci_memdump_lock); return; } @@ -1181,6 +1182,7 @@ static void qca_controller_memdump(struct work_struct *work) qca->qca_memdump = NULL; qca->memdump_state = QCA_MEMDUMP_COLLECTED; clear_bit(QCA_MEMDUMP_COLLECTION, &qca->flags); + wake_up_bit(&qca->flags, QCA_MEMDUMP_COLLECTION); } mutex_unlock(&qca->hci_memdump_lock); @@ -1596,7 +1598,7 @@ static void qca_wait_for_dump_collection(struct hci_dev *hdev) struct qca_data *qca = hu->priv; wait_on_bit_timeout(&qca->flags, QCA_MEMDUMP_COLLECTION, - TASK_UNINTERRUPTIBLE, MEMDUMP_TIMEOUT_MS); + TASK_UNINTERRUPTIBLE, msecs_to_jiffies(MEMDUMP_TIMEOUT_MS)); clear_bit(QCA_MEMDUMP_COLLECTION, &qca->flags); }
1、During SSR data collection period, the processing of hw_error events must wait until SSR data Collected or the timeout before it can proceed. The wake_up_bit function has been added to address the issue where hw_error events could only be processed after the timeout. 2、The timeout unit has been changed from jiffies to milliseconds (ms). Signed-off-by: Shuai Zhang <quic_shuaz@quicinc.com> --- drivers/bluetooth/hci_qca.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)