Commit 0ea9fd001a14 ("Bluetooth: Shutdown controller after workqueues
are flushed or cancelled") introduced a regression that makes mtkbtsdio
driver stops working:
[ 36.593956] Bluetooth: hci0: Firmware already downloaded
[ 46.814613] Bluetooth: hci0: Execution of wmt command timed out
[ 46.814619] Bluetooth: hci0: Failed to send wmt func ctrl (-110)
The shutdown callback depends on the result of hdev->rx_work, so we
should call it before flushing rx_work:
-> btmtksdio_shutdown()
-> mtk_hci_wmt_sync()
-> __hci_cmd_send()
-> wait for BTMTKSDIO_TX_WAIT_VND_EVT gets cleared
-> btmtksdio_recv_event()
-> hci_recv_frame()
-> queue_work(hdev->workqueue, &hdev->rx_work)
-> clears BTMTKSDIO_TX_WAIT_VND_EVT
So move the shutdown callback before flushing TX/RX queue to resolve the
issue.
Reported-and-tested-by: Mattijs Korpershoek <redacted>
Tested-by: Hsin-Yi Wang <redacted>
Cc: Guenter Roeck <linux@roeck-us.net>
Fixes: 0ea9fd001a14 ("Bluetooth: Shutdown controller after workqueues are flushed or cancelled")
Signed-off-by: Kai-Heng Feng <redacted>
---
net/bluetooth/hci_core.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
@@ -1735,6 +1735,14 @@ int hci_dev_do_close(struct hci_dev *hdev)hci_leds_update_powered(hdev,false);+if(!hci_dev_test_flag(hdev,HCI_UNREGISTER)&&+!hci_dev_test_flag(hdev,HCI_USER_CHANNEL)&&+test_bit(HCI_UP,&hdev->flags)){+/* Execute vendor specific shutdown routine */+if(hdev->shutdown)+hdev->shutdown(hdev);+}+/* Flush RX and TX works */flush_work(&hdev->tx_work);flush_work(&hdev->rx_work);
@@ -1798,14 +1806,6 @@ int hci_dev_do_close(struct hci_dev *hdev)clear_bit(HCI_INIT,&hdev->flags);}-if(!hci_dev_test_flag(hdev,HCI_UNREGISTER)&&-!hci_dev_test_flag(hdev,HCI_USER_CHANNEL)&&-test_bit(HCI_UP,&hdev->flags)){-/* Execute vendor specific shutdown routine */-if(hdev->shutdown)-hdev->shutdown(hdev);-}-/* flush cmd work */flush_work(&hdev->cmd_work);
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=528639
---Test result---
Test Summary:
CheckPatch FAIL 0.56 seconds
GitLint FAIL 0.13 seconds
BuildKernel PASS 630.13 seconds
TestRunner: Setup PASS 401.12 seconds
TestRunner: l2cap-tester PASS 2.88 seconds
TestRunner: bnep-tester PASS 2.08 seconds
TestRunner: mgmt-tester PASS 32.17 seconds
TestRunner: rfcomm-tester PASS 2.44 seconds
TestRunner: sco-tester PASS 2.28 seconds
TestRunner: smp-tester FAIL 2.40 seconds
TestRunner: userchan-tester PASS 2.21 seconds
Details
##############################
Test: CheckPatch - FAIL - 0.56 seconds
Run checkpatch.pl script with rule in .checkpatch.conf
Bluetooth: Move shutdown callback before flushing tx and rx queue
WARNING: Unknown commit id '0ea9fd001a14', maybe rebased or not pulled?
#7:
Commit 0ea9fd001a14 ("Bluetooth: Shutdown controller after workqueues
WARNING: Unknown commit id '0ea9fd001a14', maybe rebased or not pulled?
#32:
Fixes: 0ea9fd001a14 ("Bluetooth: Shutdown controller after workqueues are flushed or cancelled")
total: 0 errors, 2 warnings, 0 checks, 28 lines checked
NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or --fix-inplace.
"[PATCH] Bluetooth: Move shutdown callback before flushing tx and rx" has style problems, please review.
NOTE: If any of the errors are false positives, please report
them to the maintainer, see CHECKPATCH in MAINTAINERS.
##############################
Test: GitLint - FAIL - 0.13 seconds
Run gitlint with rule in .gitlint
Bluetooth: Move shutdown callback before flushing tx and rx queue
28: B1 Line exceeds max length (96>80): "Fixes: 0ea9fd001a14 ("Bluetooth: Shutdown controller after workqueues are flushed or cancelled")"
##############################
Test: BuildKernel - PASS - 630.13 seconds
Build Kernel with minimal configuration supports Bluetooth
##############################
Test: TestRunner: Setup - PASS - 401.12 seconds
Setup environment for running Test Runner
##############################
Test: TestRunner: l2cap-tester - PASS - 2.88 seconds
Run test-runner with l2cap-tester
Total: 40, Passed: 40 (100.0%), Failed: 0, Not Run: 0
##############################
Test: TestRunner: bnep-tester - PASS - 2.08 seconds
Run test-runner with bnep-tester
Total: 1, Passed: 1 (100.0%), Failed: 0, Not Run: 0
##############################
Test: TestRunner: mgmt-tester - PASS - 32.17 seconds
Run test-runner with mgmt-tester
Total: 448, Passed: 445 (99.3%), Failed: 0, Not Run: 3
##############################
Test: TestRunner: rfcomm-tester - PASS - 2.44 seconds
Run test-runner with rfcomm-tester
Total: 9, Passed: 9 (100.0%), Failed: 0, Not Run: 0
##############################
Test: TestRunner: sco-tester - PASS - 2.28 seconds
Run test-runner with sco-tester
Total: 8, Passed: 8 (100.0%), Failed: 0, Not Run: 0
##############################
Test: TestRunner: smp-tester - FAIL - 2.40 seconds
Run test-runner with smp-tester
Total: 8, Passed: 7 (87.5%), Failed: 1, Not Run: 0
Failed Test Cases
SMP Client - SC Request 2 Failed 0.024 seconds
##############################
Test: TestRunner: userchan-tester - PASS - 2.21 seconds
Run test-runner with userchan-tester
Total: 3, Passed: 3 (100.0%), Failed: 0, Not Run: 0
---
Regards,
Linux Bluetooth
From: Hsin-Yi Wang <hidden> Date: 2021-08-10 04:11:07
On Tue, Aug 10, 2021 at 1:44 AM Kai-Heng Feng
[off-list ref] wrote:
Commit 0ea9fd001a14 ("Bluetooth: Shutdown controller after workqueues
are flushed or cancelled") introduced a regression that makes mtkbtsdio
driver stops working:
[ 36.593956] Bluetooth: hci0: Firmware already downloaded
[ 46.814613] Bluetooth: hci0: Execution of wmt command timed out
[ 46.814619] Bluetooth: hci0: Failed to send wmt func ctrl (-110)
The shutdown callback depends on the result of hdev->rx_work, so we
should call it before flushing rx_work:
-> btmtksdio_shutdown()
-> mtk_hci_wmt_sync()
-> __hci_cmd_send()
-> wait for BTMTKSDIO_TX_WAIT_VND_EVT gets cleared
-> btmtksdio_recv_event()
-> hci_recv_frame()
-> queue_work(hdev->workqueue, &hdev->rx_work)
-> clears BTMTKSDIO_TX_WAIT_VND_EVT
So move the shutdown callback before flushing TX/RX queue to resolve the
issue.
Reported-and-tested-by: Mattijs Korpershoek <redacted>
Tested-by: Hsin-Yi Wang <redacted>
Hello,
Sorry for confusion, but the version I tested is this one:
https://lkml.org/lkml/2021/8/4/486 (shutdown is prior to the
test_and_clear HCI_UP)
I tested this version and still see the error I've seen before.
@@ -1735,6 +1735,14 @@ int hci_dev_do_close(struct hci_dev *hdev)hci_leds_update_powered(hdev,false);+if(!hci_dev_test_flag(hdev,HCI_UNREGISTER)&&+!hci_dev_test_flag(hdev,HCI_USER_CHANNEL)&&+test_bit(HCI_UP,&hdev->flags)){+/* Execute vendor specific shutdown routine */+if(hdev->shutdown)+hdev->shutdown(hdev);+}+/* Flush RX and TX works */flush_work(&hdev->tx_work);flush_work(&hdev->rx_work);
@@ -1798,14 +1806,6 @@ int hci_dev_do_close(struct hci_dev *hdev)clear_bit(HCI_INIT,&hdev->flags);}-if(!hci_dev_test_flag(hdev,HCI_UNREGISTER)&&-!hci_dev_test_flag(hdev,HCI_USER_CHANNEL)&&-test_bit(HCI_UP,&hdev->flags)){-/* Execute vendor specific shutdown routine */-if(hdev->shutdown)-hdev->shutdown(hdev);-}-/* flush cmd work */flush_work(&hdev->cmd_work);--
On Tue, Aug 10, 2021 at 12:10 PM Hsin-Yi Wang [off-list ref] wrote:
On Tue, Aug 10, 2021 at 1:44 AM Kai-Heng Feng
[off-list ref] wrote:
quoted
Commit 0ea9fd001a14 ("Bluetooth: Shutdown controller after workqueues
are flushed or cancelled") introduced a regression that makes mtkbtsdio
driver stops working:
[ 36.593956] Bluetooth: hci0: Firmware already downloaded
[ 46.814613] Bluetooth: hci0: Execution of wmt command timed out
[ 46.814619] Bluetooth: hci0: Failed to send wmt func ctrl (-110)
The shutdown callback depends on the result of hdev->rx_work, so we
should call it before flushing rx_work:
-> btmtksdio_shutdown()
-> mtk_hci_wmt_sync()
-> __hci_cmd_send()
-> wait for BTMTKSDIO_TX_WAIT_VND_EVT gets cleared
-> btmtksdio_recv_event()
-> hci_recv_frame()
-> queue_work(hdev->workqueue, &hdev->rx_work)
-> clears BTMTKSDIO_TX_WAIT_VND_EVT
So move the shutdown callback before flushing TX/RX queue to resolve the
issue.
Reported-and-tested-by: Mattijs Korpershoek <redacted>
Tested-by: Hsin-Yi Wang <redacted>
Hello,
Sorry for confusion, but the version I tested is this one:
https://lkml.org/lkml/2021/8/4/486 (shutdown is prior to the
test_and_clear HCI_UP)
I tested this version and still see the error I've seen before.
Ah, sorry for causing your trouble, I am the one who got confused :(
HCI_UP is obviously required for hci_req_sync() to work.
Let me resend one, and sorry again!
Kai-Heng
@@ -1735,6 +1735,14 @@ int hci_dev_do_close(struct hci_dev *hdev)hci_leds_update_powered(hdev,false);+if(!hci_dev_test_flag(hdev,HCI_UNREGISTER)&&+!hci_dev_test_flag(hdev,HCI_USER_CHANNEL)&&+test_bit(HCI_UP,&hdev->flags)){+/* Execute vendor specific shutdown routine */+if(hdev->shutdown)+hdev->shutdown(hdev);+}+/* Flush RX and TX works */flush_work(&hdev->tx_work);flush_work(&hdev->rx_work);
@@ -1798,14 +1806,6 @@ int hci_dev_do_close(struct hci_dev *hdev)clear_bit(HCI_INIT,&hdev->flags);}-if(!hci_dev_test_flag(hdev,HCI_UNREGISTER)&&-!hci_dev_test_flag(hdev,HCI_USER_CHANNEL)&&-test_bit(HCI_UP,&hdev->flags)){-/* Execute vendor specific shutdown routine */-if(hdev->shutdown)-hdev->shutdown(hdev);-}-/* flush cmd work */flush_work(&hdev->cmd_work);--