[v2,1/3] Bluetooth: Remove the cmd timeout count in btusb

Commit Message

Hsin-chen Chuang Jan. 8, 2025, 10:48 a.m. UTC

From: Hsin-chen Chuang <[e-mail]>

Remove the cmd timeout count in btusb since we only ever allow one
command in flight at a time. We should always reset after a single
command times out.

Signed-off-by: Hsin-chen Chuang <[e-mail]>
---

(no changes since v1)

 drivers/bluetooth/btusb.c | 10 ----------
 1 file changed, 10 deletions(-)

Comments

[e-mail] Jan. 8, 2025, 11:29 a.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=923327

---Test result---

Test Summary:
CheckPatch                    PENDING   0.30 seconds
GitLint                       PENDING   0.41 seconds
SubjectPrefix                 PASS      0.26 seconds
BuildKernel                   FAIL      22.31 seconds
CheckAllWarning               FAIL      25.19 seconds
CheckSparse                   FAIL      27.82 seconds
BuildKernel32                 FAIL      22.89 seconds
TestRunnerSetup               PASS      456.77 seconds
TestRunner_l2cap-tester       PASS      20.93 seconds
TestRunner_iso-tester         PASS      30.57 seconds
TestRunner_bnep-tester        PASS      4.89 seconds
TestRunner_mgmt-tester        PASS      120.06 seconds
TestRunner_rfcomm-tester      PASS      7.64 seconds
TestRunner_sco-tester         PASS      9.49 seconds
TestRunner_ioctl-tester       PASS      8.19 seconds
TestRunner_mesh-tester        PASS      6.05 seconds
TestRunner_smp-tester         PASS      6.99 seconds
TestRunner_userchan-tester    PASS      5.08 seconds
IncrementalBuild              PENDING   0.47 seconds

Details
##############################
Test: CheckPatch - PENDING
Desc: Run checkpatch.pl script
Output:

##############################
Test: GitLint - PENDING
Desc: Run gitlint
Output:

##############################
Test: BuildKernel - FAIL
Desc: Build Kernel for Bluetooth
Output:

drivers/bluetooth/btusb.c: In function ‘btusb_probe’:
drivers/bluetooth/btusb.c:3862:9: error: ‘struct hci_dev’ has no member named ‘cmd_timeout’; did you mean ‘cmd_timer’?
 3862 |   hdev->cmd_timeout = btusb_intel_reset;
      |         ^~~~~~~~~~~
      |         cmd_timer
drivers/bluetooth/btusb.c:3882:9: error: ‘struct hci_dev’ has no member named ‘cmd_timeout’; did you mean ‘cmd_timer’?
 3882 |   hdev->cmd_timeout = btmtk_reset_sync;
      |         ^~~~~~~~~~~
      |         cmd_timer
drivers/bluetooth/btusb.c:3914:9: error: ‘struct hci_dev’ has no member named ‘cmd_timeout’; did you mean ‘cmd_timer’?
 3914 |   hdev->cmd_timeout = btusb_qca_reset;
      |         ^~~~~~~~~~~
      |         cmd_timer
drivers/bluetooth/btusb.c:3928:9: error: ‘struct hci_dev’ has no member named ‘cmd_timeout’; did you mean ‘cmd_timer’?
 3928 |   hdev->cmd_timeout = btusb_qca_reset;
      |         ^~~~~~~~~~~
      |         cmd_timer
drivers/bluetooth/btusb.c:3947:9: error: ‘struct hci_dev’ has no member named ‘cmd_timeout’; did you mean ‘cmd_timer’?
 3947 |   hdev->cmd_timeout = btusb_rtl_reset;
      |         ^~~~~~~~~~~
      |         cmd_timer
make[4]: *** [scripts/Makefile.build:229: drivers/bluetooth/btusb.o] Error 1
make[4]: *** Waiting for unfinished jobs....
make[3]: *** [scripts/Makefile.build:478: drivers/bluetooth] Error 2
make[2]: *** [scripts/Makefile.build:478: drivers] Error 2
make[2]: *** Waiting for unfinished jobs....
make[1]: *** [/github/workspace/src/src/Makefile:1936: .] Error 2
make: *** [Makefile:224: __sub-make] Error 2
##############################
Test: CheckAllWarning - FAIL
Desc: Run linux kernel with all warning enabled
Output:

drivers/bluetooth/btusb.c: In function ‘btusb_probe’:
drivers/bluetooth/btusb.c:3862:9: error: ‘struct hci_dev’ has no member named ‘cmd_timeout’; did you mean ‘cmd_timer’?
 3862 |   hdev->cmd_timeout = btusb_intel_reset;
      |         ^~~~~~~~~~~
      |         cmd_timer
drivers/bluetooth/btusb.c:3882:9: error: ‘struct hci_dev’ has no member named ‘cmd_timeout’; did you mean ‘cmd_timer’?
 3882 |   hdev->cmd_timeout = btmtk_reset_sync;
      |         ^~~~~~~~~~~
      |         cmd_timer
drivers/bluetooth/btusb.c:3914:9: error: ‘struct hci_dev’ has no member named ‘cmd_timeout’; did you mean ‘cmd_timer’?
 3914 |   hdev->cmd_timeout = btusb_qca_reset;
      |         ^~~~~~~~~~~
      |         cmd_timer
drivers/bluetooth/btusb.c:3928:9: error: ‘struct hci_dev’ has no member named ‘cmd_timeout’; did you mean ‘cmd_timer’?
 3928 |   hdev->cmd_timeout = btusb_qca_reset;
      |         ^~~~~~~~~~~
      |         cmd_timer
drivers/bluetooth/btusb.c:3947:9: error: ‘struct hci_dev’ has no member named ‘cmd_timeout’; did you mean ‘cmd_timer’?
 3947 |   hdev->cmd_timeout = btusb_rtl_reset;
      |         ^~~~~~~~~~~
      |         cmd_timer
make[4]: *** [scripts/Makefile.build:229: drivers/bluetooth/btusb.o] Error 1
make[4]: *** Waiting for unfinished jobs....
make[3]: *** [scripts/Makefile.build:478: drivers/bluetooth] Error 2
make[2]: *** [scripts/Makefile.build:478: drivers] Error 2
make[1]: *** [/github/workspace/src/src/Makefile:1936: .] Error 2
make: *** [Makefile:224: __sub-make] Error 2
##############################
Test: CheckSparse - FAIL
Desc: Run sparse tool with linux kernel
Output:

net/bluetooth/af_bluetooth.c:245:25: warning: context imbalance in 'bt_accept_enqueue' - different lock contexts for basic block
net/bluetooth/hci_core.c:60:1: warning: symbol 'hci_cb_list_lock' was not declared. Should it be static?
net/bluetooth/hci_event.c: note: in included file (through include/net/bluetooth/hci_core.h):
./include/net/bluetooth/hci.h:2615:47: warning: array of flexible structures
./include/net/bluetooth/hci.h:2701:43: warning: array of flexible structures
net/bluetooth/hci_codec.c: note: in included file:
./include/net/bluetooth/hci_core.h:147:35: warning: array of flexible structures
net/bluetooth/sco.c: note: in included file:
./include/net/bluetooth/hci_core.h:147:35: warning: array of flexible structures
drivers/bluetooth/hci_ag6xx.c:257:24: warning: restricted __le32 degrades to integer
drivers/bluetooth/hci_mrvl.c:170:23: warning: restricted __le16 degrades to integer
drivers/bluetooth/hci_mrvl.c:203:23: warning: restricted __le16 degrades to integer
drivers/bluetooth/btusb.c: In function ‘btusb_probe’:
drivers/bluetooth/btusb.c:3862:9: error: ‘struct hci_dev’ has no member named ‘cmd_timeout’; did you mean ‘cmd_timer’?
 3862 |   hdev->cmd_timeout = btusb_intel_reset;
      |         ^~~~~~~~~~~
      |         cmd_timer
drivers/bluetooth/btusb.c:3882:9: error: ‘struct hci_dev’ has no member named ‘cmd_timeout’; did you mean ‘cmd_timer’?
 3882 |   hdev->cmd_timeout = btmtk_reset_sync;
      |         ^~~~~~~~~~~
      |         cmd_timer
drivers/bluetooth/btusb.c:3914:9: error: ‘struct hci_dev’ has no member named ‘cmd_timeout’; did you mean ‘cmd_timer’?
 3914 |   hdev->cmd_timeout = btusb_qca_reset;
      |         ^~~~~~~~~~~
      |         cmd_timer
drivers/bluetooth/btusb.c:3928:9: error: ‘struct hci_dev’ has no member named ‘cmd_timeout’; did you mean ‘cmd_timer’?
 3928 |   hdev->cmd_timeout = btusb_qca_reset;
      |         ^~~~~~~~~~~
      |         cmd_timer
drivers/bluetooth/btusb.c:3947:9: error: ‘struct hci_dev’ has no member named ‘cmd_timeout’; did you mean ‘cmd_timer’?
 3947 |   hdev->cmd_timeout = btusb_rtl_reset;
      |         ^~~~~~~~~~~
      |         cmd_timer
make[4]: *** [scripts/Makefile.build:229: drivers/bluetooth/btusb.o] Error 1
make[4]: *** Waiting for unfinished jobs....
make[3]: *** [scripts/Makefile.build:478: drivers/bluetooth] Error 2
make[2]: *** [scripts/Makefile.build:478: drivers] Error 2
make[1]: *** [/github/workspace/src/src/Makefile:1936: .] Error 2
make: *** [Makefile:224: __sub-make] Error 2
##############################
Test: BuildKernel32 - FAIL
Desc: Build 32bit Kernel for Bluetooth
Output:

drivers/bluetooth/btusb.c: In function ‘btusb_probe’:
drivers/bluetooth/btusb.c:3862:9: error: ‘struct hci_dev’ has no member named ‘cmd_timeout’; did you mean ‘cmd_timer’?
 3862 |   hdev->cmd_timeout = btusb_intel_reset;
      |         ^~~~~~~~~~~
      |         cmd_timer
drivers/bluetooth/btusb.c:3882:9: error: ‘struct hci_dev’ has no member named ‘cmd_timeout’; did you mean ‘cmd_timer’?
 3882 |   hdev->cmd_timeout = btmtk_reset_sync;
      |         ^~~~~~~~~~~
      |         cmd_timer
drivers/bluetooth/btusb.c:3914:9: error: ‘struct hci_dev’ has no member named ‘cmd_timeout’; did you mean ‘cmd_timer’?
 3914 |   hdev->cmd_timeout = btusb_qca_reset;
      |         ^~~~~~~~~~~
      |         cmd_timer
drivers/bluetooth/btusb.c:3928:9: error: ‘struct hci_dev’ has no member named ‘cmd_timeout’; did you mean ‘cmd_timer’?
 3928 |   hdev->cmd_timeout = btusb_qca_reset;
      |         ^~~~~~~~~~~
      |         cmd_timer
drivers/bluetooth/btusb.c:3947:9: error: ‘struct hci_dev’ has no member named ‘cmd_timeout’; did you mean ‘cmd_timer’?
 3947 |   hdev->cmd_timeout = btusb_rtl_reset;
      |         ^~~~~~~~~~~
      |         cmd_timer
make[4]: *** [scripts/Makefile.build:229: drivers/bluetooth/btusb.o] Error 1
make[4]: *** Waiting for unfinished jobs....
make[3]: *** [scripts/Makefile.build:478: drivers/bluetooth] Error 2
make[2]: *** [scripts/Makefile.build:478: drivers] Error 2
make[2]: *** Waiting for unfinished jobs....
make[1]: *** [/github/workspace/src/src/Makefile:1936: .] Error 2
make: *** [Makefile:224: __sub-make] Error 2
##############################
Test: IncrementalBuild - PENDING
Desc: Incremental build with the patches in the series
Output:



---
Regards,
Linux Bluetooth

Patch

diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index de0b4d99fcbf..916e9ec7bc85 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -881,7 +881,6 @@  struct btusb_data {
 	int (*disconnect)(struct hci_dev *hdev);
 
 	int oob_wake_irq;   /* irq for out-of-band wake-on-bt */
-	unsigned cmd_timeout_cnt;
 
 	struct qca_dump_info qca_dump;
 };
@@ -914,9 +913,6 @@  static void btusb_intel_cmd_timeout(struct hci_dev *hdev)
 	struct gpio_desc *reset_gpio = data->reset_gpio;
 	struct btintel_data *intel_data = hci_get_priv(hdev);
 
-	if (++data->cmd_timeout_cnt < 5)
-		return;
-
 	if (intel_data->acpi_reset_method) {
 		if (test_and_set_bit(INTEL_ACPI_RESET_ACTIVE, intel_data->flags)) {
 			bt_dev_err(hdev, "acpi: last reset failed ? Not resetting again");
@@ -999,9 +995,6 @@  static void btusb_rtl_cmd_timeout(struct hci_dev *hdev)
 
 	btusb_rtl_alloc_devcoredump(hdev, &hdr, NULL, 0);
 
-	if (++data->cmd_timeout_cnt < 5)
-		return;
-
 	if (!reset_gpio) {
 		btusb_reset(hdev);
 		return;
@@ -1046,9 +1039,6 @@  static void btusb_qca_cmd_timeout(struct hci_dev *hdev)
 		return;
 	}
 
-	if (++data->cmd_timeout_cnt < 5)
-		return;
-
 	if (reset_gpio) {
 		bt_dev_err(hdev, "Reset qca device via bt_en gpio");