Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 7bdb8a5cf17f66614a9897645efcd4ccc27535ee

Authored by Szymon Janc
Committed by Gustavo F. Padovan
1 parent 6be6b11f00
Exists in master and in 38 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

Bluetooth: Don't use cmd_timer to timeout HCI reset command 

No command should be send before Command Complete event for HCI
reset is received. This fix regression introduced by commit
6bd32326cda(Bluetooth: Use proper timer for hci command timout)
for chips whose reset command takes longer to complete (e.g. CSR)
resulting in next command being send before HCI reset completed.

Signed-off-by: Szymon Janc <szymon@janc.net.pl>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>

Showing 1 changed file with 4 additions and 2 deletions Side-by-side Diff

net/bluetooth/hci_core.c
Diff comments   View file @ 7bdb8a5
... ... @@ -1209,7 +1209,6 @@
1209 1209  
1210 1210 BT_ERR("%s command tx timeout", hdev->name);
1211 1211 atomic_set(&hdev->cmd_cnt, 1);
1212   - clear_bit(HCI_RESET, &hdev->flags);
1213 1212 tasklet_schedule(&hdev->cmd_task);
1214 1213 }
1215 1214  
... ... @@ -2408,7 +2407,10 @@
2408 2407 if (hdev->sent_cmd) {
2409 2408 atomic_dec(&hdev->cmd_cnt);
2410 2409 hci_send_frame(skb);
2411   - mod_timer(&hdev->cmd_timer,
  2410 + if (test_bit(HCI_RESET, &hdev->flags))
  2411 + del_timer(&hdev->cmd_timer);
  2412 + else
  2413 + mod_timer(&hdev->cmd_timer,
2412 2414 jiffies + msecs_to_jiffies(HCI_CMD_TIMEOUT));
2413 2415 } else {
2414 2416 skb_queue_head(&hdev->cmd_q, skb);