From: Seungyoun Ju <[email protected]>
Some of headset such as Samsung HS7000 randomly takes long time to
exit Sniff Mode. So SCO connection request might be failed
due to "Command Disallowed" and user space gets "EBUSY".
But it's not easy that user space expects when the connection
becomes active mode. So if kernel call hci_sco_setup() by
HCI_CONN_SCO_SETUP_PEND flag, overall SCO connection time could be
reduced compared to user space's retrial way.
2015-11-17 15:21:31.131227 > ACL data: handle 11 flags 0x02 dlen 19
L2CAP(d): cid 0x0040 len 15 [psm 0]
0000: 6b ff 15 03 41 54 2b 42 56 52 41 3d 31 0d f8 k...AT+BVRA=1..
2015-11-17 15:21:31.132436 < HCI Command: Exit Sniff Mode (0x02|0x0004) plen 2
handle 11
2015-11-17 15:21:31.182614 < ACL data: handle 11 flags 0x00 dlen 14
L2CAP(d): cid 0x0043 len 10 [psm 0]
0000: 69 ef 0d 0d 0a 4f 4b 0d 0a 3e i....OK..>
2015-11-17 15:21:31.184210 > HCI Event: Command Status (0x0f) plen 4
Exit Sniff Mode (0x02|0x0004) status 0x0c ncmd 1
Error: Command Disallowed
2015-11-17 15:21:31.491043 < ACL data: handle 11 flags 0x00 dlen 20
L2CAP(d): cid 0x0043 len 16 [psm 0]
0000: 69 ef 19 0d 0a 2b 42 56 52 41 3a 20 31 0d 0a 3e i....+BVRA: 1..>
2015-11-17 15:21:31.491502 < HCI Command: Exit Sniff Mode (0x02|0x0004) plen 2
handle 11
2015-11-17 15:21:31.492683 > HCI Event: Command Status (0x0f) plen 4
Exit Sniff Mode (0x02|0x0004) status 0x0c ncmd 1
Error: Command Disallowed
2015-11-17 15:21:31.605469 < HCI Command: Write Voice Setting (0x03|0x0026) plen 2
voice setting 0x0060
2015-11-17 15:21:31.606227 > HCI Event: Command Complete (0x0e) plen 4
Write Voice Setting (0x03|0x0026) ncmd 1
status 0x00
2015-11-17 15:21:31.612180 < HCI Command: Exit Sniff Mode (0x02|0x0004) plen 2
handle 11
2015-11-17 15:21:31.613193 > HCI Event: Command Status (0x0f) plen 4
Exit Sniff Mode (0x02|0x0004) status 0x0c ncmd 1
Error: Command Disallowed
2015-11-17 15:21:31.624963 > HCI Event: Mode Change (0x14) plen 6
status 0x00 handle 11 mode 0x00 interval 0
Mode: Active
2015-11-17 15:21:31.625373 < HCI Command: Setup Synchronous Connection (0x01|0x0028) plen 17
handle 11 voice setting 0x0060 ptype 0x038f
2015-11-17 15:21:31.626614 > HCI Event: Command Status (0x0f) plen 4
Setup Synchronous Connection (0x01|0x0028) status 0x00 ncmd 1
Signed-off-by: Seungyoun Ju <[email protected]>
Signed-off-by: Chan-yeol Park <[email protected]>
---
include/net/bluetooth/hci.h | 1 +
include/net/bluetooth/hci_core.h | 2 ++
net/bluetooth/hci_conn.c | 17 +++++++++++++++++
net/bluetooth/hci_event.c | 12 ++++++++----
4 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index 0205b80..bfc2ca4 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -263,6 +263,7 @@ enum {
#define HCI_INIT_TIMEOUT msecs_to_jiffies(10000) /* 10 seconds */
#define HCI_CMD_TIMEOUT msecs_to_jiffies(2000) /* 2 seconds */
#define HCI_ACL_TX_TIMEOUT msecs_to_jiffies(45000) /* 45 seconds */
+#define HCI_SCO_TIMEOUT msecs_to_jiffies(2000) /* 2 seconds */
#define HCI_AUTO_OFF_TIMEOUT msecs_to_jiffies(2000) /* 2 seconds */
#define HCI_POWER_OFF_TIMEOUT msecs_to_jiffies(5000) /* 5 seconds */
#define HCI_LE_CONN_TIMEOUT msecs_to_jiffies(20000) /* 20 seconds */
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 1878d0a..3788cb7 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -440,6 +440,7 @@ struct hci_conn {
__u8 passkey_entered;
__u16 disc_timeout;
__u16 conn_timeout;
+ __u16 sco_timeout;
__u16 setting;
__u16 le_conn_min_interval;
__u16 le_conn_max_interval;
@@ -470,6 +471,7 @@ struct hci_conn {
struct delayed_work disc_work;
struct delayed_work auto_accept_work;
struct delayed_work idle_work;
+ struct delayed_work sco_conn_timeout;
struct delayed_work le_conn_timeout;
struct work_struct le_scan_cleanup;
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index 85b82f7..4e6a24f 100644
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -487,6 +487,19 @@ static void le_conn_timeout(struct work_struct *work)
hci_abort_conn(conn, HCI_ERROR_REMOTE_USER_TERM);
}
+static void sco_conn_timeout(struct work_struct *work)
+{
+ struct hci_conn *conn = container_of(work, struct hci_conn,
+ sco_conn_timeout.work);
+
+ BT_DBG("");
+
+ if (test_and_clear_bit(HCI_CONN_SCO_SETUP_PEND, &conn->flags)) {
+ BT_ERR("Fail to exit sniff mode to setup SCO within timeout");
+ hci_sco_setup(conn, 0x0c);
+ }
+}
+
struct hci_conn *hci_conn_add(struct hci_dev *hdev, int type, bdaddr_t *dst,
u8 role)
{
@@ -515,6 +528,7 @@ struct hci_conn *hci_conn_add(struct hci_dev *hdev, int type, bdaddr_t *dst,
set_bit(HCI_CONN_POWER_SAVE, &conn->flags);
conn->disc_timeout = HCI_DISCONN_TIMEOUT;
+ conn->sco_timeout = HCI_SCO_TIMEOUT;
if (conn->role == HCI_ROLE_MASTER)
conn->out = true;
@@ -546,6 +560,7 @@ struct hci_conn *hci_conn_add(struct hci_dev *hdev, int type, bdaddr_t *dst,
INIT_DELAYED_WORK(&conn->disc_work, hci_conn_timeout);
INIT_DELAYED_WORK(&conn->auto_accept_work, hci_conn_auto_accept);
INIT_DELAYED_WORK(&conn->idle_work, hci_conn_idle);
+ INIT_DELAYED_WORK(&conn->sco_conn_timeout, sco_conn_timeout);
INIT_DELAYED_WORK(&conn->le_conn_timeout, le_conn_timeout);
INIT_WORK(&conn->le_scan_cleanup, le_scan_cleanup);
@@ -577,6 +592,8 @@ int hci_conn_del(struct hci_conn *conn)
if (sco)
sco->link = NULL;
+ cancel_delayed_work_sync(&conn->sco_conn_timeout);
+
/* Unacked frames */
hdev->acl_cnt += conn->sent;
} else if (conn->type == LE_LINK) {
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index d57c11c..42d223a 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -1840,6 +1840,7 @@ static void hci_cs_sniff_mode(struct hci_dev *hdev, __u8 status)
clear_bit(HCI_CONN_MODE_CHANGE_PEND, &conn->flags);
if (test_and_clear_bit(HCI_CONN_SCO_SETUP_PEND, &conn->flags))
+ cancel_delayed_work(&conn->sco_conn_timeout);
hci_sco_setup(conn, status);
}
@@ -1865,9 +1866,10 @@ static void hci_cs_exit_sniff_mode(struct hci_dev *hdev, __u8 status)
conn = hci_conn_hash_lookup_handle(hdev, __le16_to_cpu(cp->handle));
if (conn) {
clear_bit(HCI_CONN_MODE_CHANGE_PEND, &conn->flags);
-
- if (test_and_clear_bit(HCI_CONN_SCO_SETUP_PEND, &conn->flags))
- hci_sco_setup(conn, status);
+ if (test_bit(HCI_CONN_SCO_SETUP_PEND, &conn->flags))
+ queue_delayed_work(conn->hdev->workqueue,
+ &conn->sco_conn_timeout,
+ conn->sco_timeout);
}
hci_dev_unlock(hdev);
@@ -3335,8 +3337,10 @@ static void hci_mode_change_evt(struct hci_dev *hdev, struct sk_buff *skb)
clear_bit(HCI_CONN_POWER_SAVE, &conn->flags);
}
- if (test_and_clear_bit(HCI_CONN_SCO_SETUP_PEND, &conn->flags))
+ if (test_and_clear_bit(HCI_CONN_SCO_SETUP_PEND, &conn->flags)) {
+ cancel_delayed_work(&conn->sco_conn_timeout);
hci_sco_setup(conn, ev->status);
+ }
}
hci_dev_unlock(hdev);
--
2.5.0
It looks probable that braces are missing.
julia
On Tue, 17 Nov 2015, kbuild test robot wrote:
> CC: [email protected]
> In-Reply-To: <[email protected]>
> TO: Chan-yeol Park <[email protected]>
> CC: [email protected]
> CC:
>
> Hi Seungyoun,
>
> [auto build test WARNING on bluetooth-next/master]
> [also build test WARNING on v4.4-rc1 next-20151117]
>
> url: https://github.com/0day-ci/linux/commits/Chan-yeol-Park/Bluetooth-Wait-active-mode-to-establish-SCO-channel/20151117-192916
> base: https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git master
> :::::: branch date: 65 minutes ago
> :::::: commit date: 65 minutes ago
>
> >> net/bluetooth/hci_event.c:1843:3-48: code aligned with following code on line 1844
>
> git remote add linux-review https://github.com/0day-ci/linux
> git remote update linux-review
> git checkout fa3c6055bf2539f74a364206c18e4bc8fd0b6546
> vim +1843 net/bluetooth/hci_event.c
>
> 04837f64 Marcel Holtmann 2006-07-03 1837
> 04837f64 Marcel Holtmann 2006-07-03 1838 conn = hci_conn_hash_lookup_handle(hdev, __le16_to_cpu(cp->handle));
> e73439d8 Marcel Holtmann 2010-07-26 1839 if (conn) {
> 51a8efd7 Johan Hedberg 2012-01-16 1840 clear_bit(HCI_CONN_MODE_CHANGE_PEND, &conn->flags);
> 04837f64 Marcel Holtmann 2006-07-03 1841
> 51a8efd7 Johan Hedberg 2012-01-16 1842 if (test_and_clear_bit(HCI_CONN_SCO_SETUP_PEND, &conn->flags))
> fa3c6055 Seungyoun Ju 2015-11-17 @1843 cancel_delayed_work(&conn->sco_conn_timeout);
> e73439d8 Marcel Holtmann 2010-07-26 @1844 hci_sco_setup(conn, status);
> e73439d8 Marcel Holtmann 2010-07-26 1845 }
> e73439d8 Marcel Holtmann 2010-07-26 1846
> 04837f64 Marcel Holtmann 2006-07-03 1847 hci_dev_unlock(hdev);
>
> ---
> 0-DAY kernel test infrastructure Open Source Technology Center
> https://lists.01.org/pipermail/kbuild-all Intel Corporation
>
Hi Chan-yeol,
> Some of headset such as Samsung HS7000 randomly takes long time to
> exit Sniff Mode. So SCO connection request might be failed
> due to "Command Disallowed" and user space gets "EBUSY".
>
> But it's not easy that user space expects when the connection
> becomes active mode. So if kernel call hci_sco_setup() by
> HCI_CONN_SCO_SETUP_PEND flag, overall SCO connection time could be
> reduced compared to user space's retrial way.
>
> 2015-11-17 15:21:31.131227 > ACL data: handle 11 flags 0x02 dlen 19
> L2CAP(d): cid 0x0040 len 15 [psm 0]
> 0000: 6b ff 15 03 41 54 2b 42 56 52 41 3d 31 0d f8 k...AT+BVRA=1..
> 2015-11-17 15:21:31.132436 < HCI Command: Exit Sniff Mode (0x02|0x0004) plen 2
> handle 11
> 2015-11-17 15:21:31.182614 < ACL data: handle 11 flags 0x00 dlen 14
> L2CAP(d): cid 0x0043 len 10 [psm 0]
> 0000: 69 ef 0d 0d 0a 4f 4b 0d 0a 3e i....OK..>
> 2015-11-17 15:21:31.184210 > HCI Event: Command Status (0x0f) plen 4
> Exit Sniff Mode (0x02|0x0004) status 0x0c ncmd 1
> Error: Command Disallowed
> 2015-11-17 15:21:31.491043 < ACL data: handle 11 flags 0x00 dlen 20
> L2CAP(d): cid 0x0043 len 16 [psm 0]
> 0000: 69 ef 19 0d 0a 2b 42 56 52 41 3a 20 31 0d 0a 3e i....+BVRA: 1..>
> 2015-11-17 15:21:31.491502 < HCI Command: Exit Sniff Mode (0x02|0x0004) plen 2
> handle 11
> 2015-11-17 15:21:31.492683 > HCI Event: Command Status (0x0f) plen 4
> Exit Sniff Mode (0x02|0x0004) status 0x0c ncmd 1
> Error: Command Disallowed
> 2015-11-17 15:21:31.605469 < HCI Command: Write Voice Setting (0x03|0x0026) plen 2
> voice setting 0x0060
this is not standard kernel. We never executed the write voice setting command. Where is this coming from.
With that in mind, I think it is more important to understand why the exit sniff mode command is not allowed at this point. That is a specific error code. So getting the accompanying LMP trace for this would be important.
Regards
Marcel