Bluetooth 5.2 initial support
Subsystems (2)
Luiz Augusto von Dentz
maintainercover Bluetooth 5.2 initial support
From: Luiz Augusto von Dentz <[email protected]>
This introduces the initial support for Bluetooth 5.2 features:
* ISO channels:
+ CIS/Unicast support
+ ISO socket family with QoS support
- BIS/Broadcast not yet supported
* L2CAP Enhanced Credit Based Flow Control Mode
+ Support all new procedures
+ New L2CAP socket mode
- Initiating multiple connections at once does not map to any existing socket APIs
* Monitor:
+ ISO packets support
* Drivers:
+ H4/USB ISO packets support
* Emulator:
+ CIS/Unicast emulation support
- BIS/Broadcast emulation not yet supported
* Userspace support to follow once Kernel changes are merged.
Bluetooth 5.2 spec:
https://www.bluetooth.org/docman/handlers/downloaddoc.ashx?doc_id=478726
Luiz Augusto von Dentz (10):
Bluetooth: Add definitions for CIS connections
Bluetooth: Add initial implementation of CIS connections
Bluetooth: L2CAP: Add definitions for Enhanced Credit Based Mode
Bluetooth: L2CAP: Add initial code for Enhanced Credit Based Mode
Bluetooth: hci_vhci: Add support for ISO packets
Bluetooth: monitor: Add support for ISO packets
Bluetooth: Make use of __check_timeout on hci_sched_le
Bluetooth: hci_h4: Add support for ISO packets
Bluetooth: btusb: Add support for ISO packets
Bluetooth: btusb: Detect if an ACL packet is in fact an ISO packet
drivers/bluetooth/btusb.c | 21 + drivers/bluetooth/hci_h4.c | 1 + drivers/bluetooth/hci_uart.h | 7 + drivers/bluetooth/hci_vhci.c | 1 + include/net/bluetooth/bluetooth.h | 24 + include/net/bluetooth/hci.h | 157 ++++ include/net/bluetooth/hci_core.h | 56 +- include/net/bluetooth/hci_mon.h | 2 + include/net/bluetooth/hci_sock.h | 2 + include/net/bluetooth/iso.h | 36 + include/net/bluetooth/l2cap.h | 48 + net/bluetooth/Kconfig | 1 + net/bluetooth/Makefile | 1 + net/bluetooth/af_bluetooth.c | 12 +- net/bluetooth/hci_conn.c | 169 ++++ net/bluetooth/hci_core.c | 254 ++++-- net/bluetooth/hci_event.c | 230 +++++ net/bluetooth/hci_sock.c | 6 + net/bluetooth/iso.c | 1393 +++++++++++++++++++++++++++++ net/bluetooth/l2cap_core.c | 498 ++++++++++- net/bluetooth/l2cap_sock.c | 39 +- 21 files changed, 2866 insertions(+), 92 deletions(-) create mode 100644 include/net/bluetooth/iso.h create mode 100644 net/bluetooth/iso.c
Signature · 1 line
2.21.0
Luiz Augusto von Dentz
maintainerPATCH 1/10 Bluetooth: Add definitions for CIS connections
From: Luiz Augusto von Dentz <[email protected]>
These adds the HCI definitions for handling CIS connections along with ISO data packets.
--- include/net/bluetooth/hci.h | 157 ++++++++++++++++++++++++++++++++++++ 1 file changed, 157 insertions(+)
include/net/bluetooth/hci.h +157 -0
@@ -27,6 +27,7 @@#define HCI_MAX_ACL_SIZE 1024#define HCI_MAX_SCO_SIZE 255 +#define HCI_MAX_ISO_SIZE 251#define HCI_MAX_EVENT_SIZE 260#define HCI_MAX_FRAME_SIZE (HCI_MAX_ACL_SIZE + 4)
@@ -303,6 +304,7 @@ enum {#define HCI_ACLDATA_PKT 0x02#define HCI_SCODATA_PKT 0x03#define HCI_EVENT_PKT 0x04 +#define HCI_ISODATA_PKT 0x05#define HCI_DIAG_PKT 0xf0#define HCI_VENDOR_PKT 0xff
@@ -352,6 +354,15 @@ enum {#define ACL_ACTIVE_BCAST 0x04#define ACL_PICO_BCAST 0x08 +/* ISO PB flags */ +#define ISO_START 0x00 +#define ISO_CONT 0x01 +#define ISO_SINGLE 0x02 +#define ISO_END 0x03 + +/* ISO TS flags */ +#define ISO_TS 0x01 +/* Baseband links */ #define SCO_LINK 0x00#define ACL_LINK 0x01
@@ -359,6 +370,7 @@ enum {/* Low Energy links do not have defined link type. Use invented one */ #define LE_LINK 0x80#define AMP_LINK 0x81 +#define ISO_LINK 0x82#define INVALID_LINK 0xff/* LMP features */
@@ -440,6 +452,8 @@ enum {#define HCI_LE_PHY_2M 0x01#define HCI_LE_PHY_CODED 0x08#define HCI_LE_CHAN_SEL_ALG2 0x40 +#define HCI_LE_CIS_MASTER 0x10 +#define HCI_LE_CIS_SLAVE 0x20/* Connection modes */ #define HCI_CM_ACTIVE 0x0000
@@ -1718,6 +1732,86 @@ struct hci_cp_le_set_adv_set_rand_addr {bdaddr_t bdaddr; } __packed; +#define HCI_OP_LE_READ_BUFFER_SIZE_V2 0x2060 +struct hci_rp_le_read_buffer_size_v2 { +__u8 status; +__u16 acl_mtu; +__u8 acl_max_pkt; +__u16 iso_mtu; +__u8 iso_max_pkt; +} __attribute__ ((packed)); + +#define HCI_OP_LE_READ_ISO_TX_SYNC 0x2061 +struct hci_cp_le_read_iso_tx_sync { +__u16 handle; +} __attribute__ ((packed)); + +struct hci_rp_le_read_iso_tx_sync { +__u8 status; +__u16 handle; +__u16 seq; +__u32 timestamp; +__u8 offset[3 ]; +} __attribute__ ((packed)); + +#define HCI_OP_LE_SET_CIG_PARAMS 0x2062 +struct hci_cis_params { +__u8 cis_id; +__u16 m_sdu; +__u16 s_sdu; +__u8 m_phy; +__u8 s_phy; +__u8 m_rtn; +__u8 s_rtn; +} __packed; + +struct hci_cp_le_set_cig_params { +__u8 cig_id; +__u8 m_interval[3 ]; +__u8 s_interval[3 ]; +__u8 sca; +__u8 packing; +__u8 framing; +__u16 m_latency; +__u16 s_latency; +__u8 num_cis; +struct hci_cis_params cis[0 ]; +} __packed; + +struct hci_rp_le_set_cig_params { +__u8 status; +__u8 cig_id; +__u8 num_handles; +__u16 handle[0 ]; +} __packed; + +#define HCI_OP_LE_CREATE_CIS 0x2064 +struct hci_cis { +__u16 cis_handle; +__u16 acl_handle; +} __packed; + +struct hci_cp_le_create_cis { +__u8 num_cis; +struct hci_cis cis[0 ]; +} __packed; + +#define HCI_OP_LE_REMOVE_CIG 0x2065 +struct hci_cp_le_remove_cig { +__u8 cig_id; +} __packed; + +#define HCI_OP_LE_ACCEPT_CIS 0x2066 +struct hci_cp_le_accept_cis { +__u16 handle; +} __packed; + +#define HCI_OP_LE_REJECT_CIS 0x2067 +struct hci_cp_le_reject_cis { +__u16 handle; +__u8 reason; +} __packed; +/* ---- HCI Events ---- */ #define HCI_EV_INQUIRY_COMPLETE 0x01
@@ -2234,6 +2328,34 @@ struct hci_evt_le_ext_adv_set_term {__u8 num_evts; } __packed; +#define HCI_EVT_LE_CIS_ESTABLISHED 0x19 +struct hci_evt_le_cis_established { +__u8 status; +__u16 handle; +__u8 cig_sync_delay[3 ]; +__u8 cis_sync_delay[3 ]; +__u8 m_latency[3 ]; +__u8 s_latency[3 ]; +__u8 m_phy; +__u8 s_phy; +__u8 nse; +__u8 m_bn; +__u8 s_bn; +__u8 m_ft; +__u8 s_ft; +__u16 m_mtu; +__u16 s_mtu; +__u16 interval; +} __packed; + +#define HCI_EVT_LE_CIS_REQ 0x1a +struct hci_evt_le_cis_req { +__u16 acl_handle; +__u16 cis_handle; +__u8 cig_id; +__u8 cis_id; +} __packed; +#define HCI_EV_VENDOR 0xff/* Internal events generated by Bluetooth stack */
@@ -2262,6 +2384,7 @@ struct hci_ev_si_security {#define HCI_EVENT_HDR_SIZE 2#define HCI_ACL_HDR_SIZE 4#define HCI_SCO_HDR_SIZE 3 +#define HCI_ISO_HDR_SIZE 4struct hci_command_hdr {__le16 opcode;/* OCF & OGF */
@@ -2283,6 +2406,30 @@ struct hci_sco_hdr {__u8 dlen; } __packed; +struct hci_iso_hdr { +__le16 handle; +__le16 dlen; +__u8 data[0 ]; +} __packed; + +/* ISO data packet status flags */ +#define HCI_ISO_STATUS_VALID 0x00 +#define HCI_ISO_STATUS_INVALID 0x01 +#define HCI_ISO_STATUS_NOP 0x02 + +#define HCI_ISO_DATA_HDR_SIZE 4 +struct hci_iso_data_hdr { +__le16 sn; +__le16 slen; +}; + +#define HCI_ISO_TS_DATA_HDR_SIZE 8 +struct hci_iso_ts_data_hdr { +__le32 ts; +__le16 sn; +__le16 slen; +}; +static inline struct hci_event_hdr *hci_event_hdr (const struct sk_buff *skb) {return (struct hci_event_hdr *) skb->data;
@@ -2308,4 +2455,14 @@ static inline struct hci_sco_hdr *hci_sco_hdr(const struct sk_buff *skb)#define hci_handle (h) (h & 0x0fff)#define hci_flags (h) (h >> 12) +/* ISO handle and flags pack/unpack */ +#define hci_iso_flags_pb (f) (f & 0x0003) +#define hci_iso_flags_ts (f) ((f >> 2) & 0x0001) +#define hci_iso_flags_pack (pb, ts) ((pb & 0x03) | ((ts & 0x01) << 2)) + +/* ISO data length and flags pack/unpack */ +#define hci_iso_data_len_pack (h, f) ((__u16) ((h) | ((f) << 14))) +#define hci_iso_data_len (h) ((h) & 0x3fff) +#define hci_iso_data_flags (h) ((h) >> 14) +#endif /* __HCI_H */
Signature · 1 line
2.21.0
Luiz Augusto von Dentz
maintainerPATCH 2/10 Bluetooth: Add initial implementation of CIS connections
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
This adds the initial implementation of CIS connections along with a new socket type BTPROTO_ISO to make use of it.
--- include/net/bluetooth/bluetooth.h | 24 + include/net/bluetooth/hci_core.h | 56 +- include/net/bluetooth/hci_sock.h | 2 + include/net/bluetooth/iso.h | 36 + net/bluetooth/Kconfig | 1 + net/bluetooth/Makefile | 1 + net/bluetooth/af_bluetooth.c | 12 +- net/bluetooth/hci_conn.c | 169 ++++ net/bluetooth/hci_core.c | 243 ++++- net/bluetooth/hci_event.c | 230 +++++ net/bluetooth/iso.c | 1393 +++++++++++++++++++++++++++++ 11 files changed, 2115 insertions(+), 52 deletions(-) create mode 100644 include/net/bluetooth/iso.h create mode 100644 net/bluetooth/iso.c
include/net/bluetooth/bluetooth.h +24 -0
@@ -53,6 +53,8 @@#define BTPROTO_CMTP 5#define BTPROTO_HIDP 6#define BTPROTO_AVDTP 7 +#define BTPROTO_ISO 8 +#define BTPROTO_LAST BTPROTO_ISO#define SOL_HCI 0#define SOL_L2CAP 6
@@ -122,6 +124,25 @@ struct bt_voice {#define BT_SNDMTU 12#define BT_RCVMTU 13 +#define BT_ISO_IN_QOS 15 +#define BT_ISO_OUT_QOS 16 +struct bt_iso_qos { +__u8 sca; +__u8 packing; +__u8 framing; +__u32 interval; +__u16 latency; +__u16 mtu; +__u8 phy; +__u8 rtn; +}; + +#define BT_ISO_PHY_1M 0x01 +#define BT_ISO_PHY_2M 0x02 +#define BT_ISO_PHY_CODED 0x04 +#define BT_ISO_PHY_ANY (BT_ISO_PHY_1M | BT_ISO_PHY_2M | \ + BT_ISO_PHY_CODED) + __printf(1, 2)void bt_info (const char *fmt, ...);__printf (1 ,2 )
@@ -410,6 +431,9 @@ static inline void sco_exit(void) }#endif +int iso_init (void ); +void iso_exit (void ); +int mgmt_init (void );void mgmt_exit (void );
include/net/bluetooth/hci_core.h +55 -1
147 lines not on this page · raw message
include/net/bluetooth/hci_sock.h +2 -0
@@ -124,6 +124,8 @@ struct hci_dev_info {__u16 acl_pkts;__u16 sco_mtu;__u16 sco_pkts; +__u16 iso_mtu; +__u16 iso_pkts;struct hci_dev_stats stat; };
include/net/bluetooth/iso.h new file +36 -0
@@ -0,0 +1,36 @@ +/* +BlueZ - Bluetooth protocol stack for Linux +Copyright (C) 2019 Intel Corporation + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License version 2 as +published by the Free Software Foundation; + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. +IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY +CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, +COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS +SOFTWARE IS DISCLAIMED. +*/ + +#ifndef __ISO_H +#define __ISO_H + +/* ISO defaults */ +#define ISO_DEFAULT_MTU 251 + +/* ISO socket address */ +struct sockaddr_iso { +sa_family_t iso_family; +bdaddr_t iso_bdaddr; +__u8 iso_bdaddr_type; +}; + +#endif /* __ISO_H */
net/bluetooth/Kconfig +1 -0
@@ -29,6 +29,7 @@ menuconfig BT SCO audio links L2CAP (Logical Link Control and Adaptation Protocol) SMP (Security Manager Protocol) on LE (Low Energy) links + ISO isochronous links HCI Device drivers (Interface to the hardware) RFCOMM Module (RFCOMM Protocol) BNEP Module (Bluetooth Network Encapsulation Protocol)
net/bluetooth/Makefile +1 -0
@@ -17,6 +17,7 @@ bluetooth-y := af_bluetooth.o hci_core.o hci_conn.o hci_event.o mgmt.o \ ecdh_helper.o hci_request.o mgmt_util.o bluetooth-$(CONFIG_BT_BREDR) += sco.o +bluetooth-$(CONFIG_BT_LE) += iso.o bluetooth-$(CONFIG_BT_HS) += a2mp.o amp.o bluetooth-$(CONFIG_BT_LEDS) += leds.o bluetooth-$(CONFIG_BT_DEBUGFS) += hci_debugfs.o
net/bluetooth/af_bluetooth.c +10 -2
@@ -38,7 +38,7 @@#include "selftest.h" /* Bluetooth sockets */ -#define BT_MAX_PROTO 8 +#define BT_MAX_PROTO BTPROTO_LAST + 1static const struct net_proto_family *bt_proto[BT_MAX_PROTO ];static DEFINE_RWLOCK (bt_proto_lock);
@@ -52,6 +52,7 @@ static const char *const bt_key_strings[BT_MAX_PROTO] = {"sk_lock-AF_BLUETOOTH-BTPROTO_CMTP" ,"sk_lock-AF_BLUETOOTH-BTPROTO_HIDP" ,"sk_lock-AF_BLUETOOTH-BTPROTO_AVDTP" , + "sk_lock-AF_BLUETOOTH-BTPROTO_ISO", };static struct lock_class_key bt_slock_key[BT_MAX_PROTO ];
@@ -64,6 +65,7 @@ static const char *const bt_slock_key_strings[BT_MAX_PROTO] = {"slock-AF_BLUETOOTH-BTPROTO_CMTP" ,"slock-AF_BLUETOOTH-BTPROTO_HIDP" ,"slock-AF_BLUETOOTH-BTPROTO_AVDTP" , + "slock-AF_BLUETOOTH-BTPROTO_ISO", };void bt_sock_reclassify_lock (struct sock *sk,int proto)
@@ -755,12 +757,18 @@ static int __init bt_init(void)if (err) goto cleanup_cap; - err =mgmt_init (); + err =iso_init ();if (err) goto cleanup_sco; + err =mgmt_init (); +if (err) + goto cleanup_iso; +return 0 ; +cleanup_iso: +iso_exit (); cleanup_sco:sco_exit (); cleanup_cap:
net/bluetooth/hci_conn.c +169 -0
181 lines not on this page · raw message
net/bluetooth/hci_core.c +194 -49
330 lines not on this page · raw message
net/bluetooth/hci_event.c +230 -0
273 lines not on this page · raw message
net/bluetooth/iso.c new file +1393 -0
1,393 lines not on this page · raw message
Signature · 1 line
2.21.0
kbuild test robot
build botRe: [PATCH 02/10] Bluetooth: Add initial implementation of CIS connections
Thank you for the patch! Yet something to improve:
Hi Luiz,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on bluetooth-next/master]
[also build test ERROR on next-20200106]
[cannot apply to bluetooth/master v5.5-rc5]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system. BTW, we also suggest to use '--base' option to specify the base tree in git format-patch, please see https://stackoverflow.com/a/37406982]
url: https://github.com/0day-ci/linux/commits/Luiz-Augusto-von-Dentz/Bluetooth-5-2-initial-support/20200107-160723 base: https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git master config: i386-randconfig-f001-20200107 (attached as .config) compiler: gcc-7 (Debian 7.5.0-3) 7.5.0 reproduce: # save the attached .config to linux build tree make ARCH=i386
If you fix the issue, kindly add following tag
All errors (new ones prefixed by >>):
ld: net/bluetooth/af_bluetooth.o: in function `bt_init':
>> net/bluetooth/af_bluetooth.c:760: undefined reference to `iso_init' >> ld: net/bluetooth/af_bluetooth.c:771: undefined reference to `iso_exit' ld: net/bluetooth/hci_core.o: in function `hci_isodata_packet': >> net/bluetooth/hci_core.c:4480: undefined reference to `iso_recv' ld: net/bluetooth/hci_event.o: in function `hci_proto_connect_ind': >> include/net/bluetooth/hci_core.h:1285: undefined reference to `iso_connect_ind' >> ld: include/net/bluetooth/hci_core.h:1285: undefined reference to `iso_connect_ind'
vim +760 net/bluetooth/af_bluetooth.c
718
719 #define VERSION __stringify(BT_SUBSYS_VERSION) "." \
720 __stringify(BT_SUBSYS_REVISION)
721
722 static int __init bt_init(void)
723 {
724 int err;
725
726 sock_skb_cb_check_size(sizeof(struct bt_skb_cb));
727
728 BT_INFO("Core ver %s", VERSION);
729
730 err = bt_selftest();
731 if (err < 0)
732 return err;
733
734 bt_debugfs = debugfs_create_dir("bluetooth", NULL);
735
736 bt_leds_init();
737
738 err = bt_sysfs_init();
739 if (err < 0)
740 return err;
741
742 err = sock_register(&bt_sock_family_ops);
743 if (err)
744 goto cleanup_sysfs;
745
746 BT_INFO("HCI device and connection manager initialized");
747
748 err = hci_sock_init();
749 if (err)
750 goto unregister_socket;
751
752 err = l2cap_init();
753 if (err)
754 goto cleanup_socket;
755
756 err = sco_init();
757 if (err)
758 goto cleanup_cap;
759
> 760 err = iso_init(); 761 if (err) 762 goto cleanup_sco; 763 764 err = mgmt_init(); 765 if (err) 766 goto cleanup_iso; 767 768 return 0; 769 770 cleanup_iso: > 771 iso_exit();
772 cleanup_sco:
773 sco_exit();
774 cleanup_cap:
775 l2cap_exit();
776 cleanup_socket:
777 hci_sock_cleanup();
778 unregister_socket:
779 sock_unregister(PF_BLUETOOTH);
780 cleanup_sysfs:
781 bt_sysfs_cleanup();
782 return err;
783 }
784
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org Intel Corporation
kbuild test robot
build botRe: [PATCH 02/10] Bluetooth: Add initial implementation of CIS connections
In reply to Luiz Augusto von DentzThank you for the patch! Yet something to improve:
Hi Luiz,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on bluetooth-next/master]
[also build test ERROR on next-20200106]
[cannot apply to bluetooth/master v5.5-rc5]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system. BTW, we also suggest to use '--base' option to specify the base tree in git format-patch, please see https://stackoverflow.com/a/37406982]
url: https://github.com/0day-ci/linux/commits/Luiz-Augusto-von-Dentz/Bluetooth-5-2-initial-support/20200107-160723 base: https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git master config: x86_64-randconfig-f001-20200107 (attached as .config) compiler: gcc-7 (Debian 7.5.0-3) 7.5.0 reproduce: # save the attached .config to linux build tree make ARCH=x86_64
If you fix the issue, kindly add following tag
All errors (new ones prefixed by >>):
>> ERROR: "iso_init" [net/bluetooth/bluetooth.ko] undefined! >> ERROR: "iso_recv" [net/bluetooth/bluetooth.ko] undefined! >> ERROR: "iso_exit" [net/bluetooth/bluetooth.ko] undefined! >> ERROR: "iso_connect_ind" [net/bluetooth/bluetooth.ko] undefined!
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org Intel Corporation
Luiz Augusto von Dentz
maintainerPATCH 3/10 Bluetooth: L2CAP: Add definitions for Enhanced Credit Based Mode
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
This introduces the definitions for the new L2CAP mode called Enhanced Credit Based Mode.
--- include/net/bluetooth/l2cap.h | 45 +++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+)
include/net/bluetooth/l2cap.h +45 -0
@@ -119,6 +119,11 @@ struct l2cap_conninfo {#define L2CAP_LE_CONN_REQ 0x14#define L2CAP_LE_CONN_RSP 0x15#define L2CAP_LE_CREDITS 0x16 +#define L2CAP_ECRED_CONN_REQ 0x17 +#define L2CAP_ECRED_CONN_RSP 0x18 +#define L2CAP_ECRED_RECONF_REQ 0x19 +#define L2CAP_ECRED_RECONF_RSP 0x1a +/* L2CAP extended feature mask */ #define L2CAP_FEAT_FLOWCTL 0x00000001
@@ -360,6 +365,11 @@ struct l2cap_conf_rfc {*/ #define L2CAP_MODE_LE_FLOWCTL 0x80 +/* This is essentially L2CAP_MODE_LE_FLOWCTL but works with BR/EDR */ +#define L2CAP_MODE_ECRED 0x81 + +#define L2CAP_MODE_ECRED_MASK 0x80 +struct l2cap_conf_efs {__u8 id;__u8 stype;
@@ -483,6 +493,39 @@ struct l2cap_le_credits {__le16 credits; } __packed; +#define L2CAP_ECRED_MIN_MTU 64 +#define L2CAP_ECRED_MIN_MPS 64 + +struct l2cap_ecred_conn_req { +__le16 psm; +__le16 mtu; +__le16 mps; +__le16 credits; +__le16 scid[0 ]; +} __packed; + +struct l2cap_ecred_conn_rsp { +__le16 mtu; +__le16 mps; +__le16 credits; +__le16 result; +__le16 dcid[0 ]; +}; + +struct l2cap_ecred_reconf_req { +__le16 mtu; +__le16 mps; +__le16 scid[0 ]; +} __packed; + +#define L2CAP_RECONF_SUCCESS 0x0000 +#define L2CAP_RECONF_INVALID_MTU 0x0001 +#define L2CAP_RECONF_INVALID_MPS 0x0002 + +struct l2cap_ecred_reconf_rsp { +__le16 result; +} __packed; +/* ----- L2CAP channels and connections ----- */ struct l2cap_seq_list {__u16 head;
@@ -724,6 +767,7 @@ enum {FLAG_EFS_ENABLE ,FLAG_DEFER_SETUP ,FLAG_LE_CONN_REQ_SENT , +FLAG_ECRED_CONN_REQ_SENT ,FLAG_PENDING_SECURITY , FLAG_HOLD_HCI_CONN, };
@@ -923,6 +967,7 @@ void l2cap_cleanup_sockets(void);bool l2cap_is_socket (struct socket *sock);void __l2cap_le_connect_rsp_defer (struct l2cap_chan *chan); +void __l2cap_ecred_conn_rsp_defer (struct l2cap_chan *chan);void __l2cap_connect_rsp_defer (struct l2cap_chan *chan);int l2cap_add_psm (struct l2cap_chan *chan,bdaddr_t *src,__le16 psm);
Signature · 1 line
2.21.0
Marcel Holtmann
maintainerRe: [PATCH 03/10] Bluetooth: L2CAP: Add definitions for Enhanced Credit Based Mode
Hi Luiz,
Quoted 25 lines
This introduces the definitions for the new L2CAP mode called Enhanced Credit Based Mode.
Signed-off-by Luiz Augusto von Dentz <[email protected]>---
include/net/bluetooth/l2cap.h| 45 +++++++++++++++++++++++++++++++++++1 file changed, 45 insertions(+)include/net/bluetooth/l2cap.h +5
-0@@ -119,6 +119,11 @@ struct l2cap_conninfo {#define L2CAP_LE_CONN_REQ 0x14#define L2CAP_LE_CONN_RSP 0x15#define L2CAP_LE_CREDITS 0x16 +#define L2CAP_ECRED_CONN_REQ 0x17 +#define L2CAP_ECRED_CONN_RSP 0x18 +#define L2CAP_ECRED_RECONF_REQ 0x19 +#define L2CAP_ECRED_RECONF_RSP 0x1a +/* L2CAP extended feature mask */ #define L2CAP_FEAT_FLOWCTL 0x00000001
include/net/bluetooth/l2cap.h struct l2cap_conf_rfc { · line 368
Quoted 4 lines
include/net/bluetooth/l2cap.h +1
-0@@ -360,6 +365,11 @@ struct l2cap_conf_rfc {*/ #define L2CAP_MODE_LE_FLOWCTL 0x80 +/* This is essentially L2CAP_MODE_LE_FLOWCTL but works with BR/EDR */
scrap this comment since it is misleading. It is just another mode.
include/net/bluetooth/l2cap.h struct l2cap_conf_rfc { · line 372
Quoted 4 lines
include/net/bluetooth/l2cap.h +4
-0+#define L2CAP_MODE_ECRED 0x81 + +#define L2CAP_MODE_ECRED_MASK 0x80 +
Lets not use such a mask. It will come to bite us if we ever add another mode.
Quoted 52 lines
include/net/bluetooth/l2cap.h +34
-0struct l2cap_conf_efs {__u8 id;__u8 stype;@@ -483,6 +493,39 @@ struct l2cap_le_credits {__le16 credits; } __packed; +#define L2CAP_ECRED_MIN_MTU 64 +#define L2CAP_ECRED_MIN_MPS 64 + +struct l2cap_ecred_conn_req { +__le16 psm; +__le16 mtu; +__le16 mps; +__le16 credits; +__le16 scid[0 ]; +} __packed; + +struct l2cap_ecred_conn_rsp { +__le16 mtu; +__le16 mps; +__le16 credits; +__le16 result; +__le16 dcid[0 ]; +}; + +struct l2cap_ecred_reconf_req { +__le16 mtu; +__le16 mps; +__le16 scid[0 ]; +} __packed; + +#define L2CAP_RECONF_SUCCESS 0x0000 +#define L2CAP_RECONF_INVALID_MTU 0x0001 +#define L2CAP_RECONF_INVALID_MPS 0x0002 + +struct l2cap_ecred_reconf_rsp { +__le16 result; +} __packed; +/* ----- L2CAP channels and connections ----- */ struct l2cap_seq_list {__u16 head;@@ -724,6 +767,7 @@ enum {FLAG_EFS_ENABLE ,FLAG_DEFER_SETUP ,FLAG_LE_CONN_REQ_SENT , +FLAG_ECRED_CONN_REQ_SENT ,FLAG_PENDING_SECURITY , FLAG_HOLD_HCI_CONN, };
include/net/bluetooth/l2cap.h void l2cap_cleanup_sockets(void); · line 973
Quoted 7 lines
include/net/bluetooth/l2cap.h +1
-0@@ -923,6 +967,7 @@ void l2cap_cleanup_sockets(void);bool l2cap_is_socket (struct socket *sock);void __l2cap_le_connect_rsp_defer (struct l2cap_chan *chan); +void __l2cap_ecred_conn_rsp_defer (struct l2cap_chan *chan);void __l2cap_connect_rsp_defer (struct l2cap_chan *chan);int l2cap_add_psm (struct l2cap_chan *chan,bdaddr_t *src,__le16 psm);
Regards
Marcel
Luiz Augusto von Dentz
maintainerPATCH 4/10 Bluetooth: L2CAP: Add initial code for Enhanced Credit Based Mode
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
This adds the initial code for Enhanced Credit Based Mode which introduces a new socket mode called L2CAP_MODE_ECRED, which for the most part work the same as L2CAP_MODE_LE_FLOWCTL but uses different PDUs to setup the connections and also works over BR/EDR.
--- include/net/bluetooth/l2cap.h | 3 + net/bluetooth/l2cap_core.c | 498 +++++++++++++++++++++++++++++++++- net/bluetooth/l2cap_sock.c | 39 +-- 3 files changed, 508 insertions(+), 32 deletions(-)
include/net/bluetooth/l2cap.h +3 -0
@@ -295,6 +295,8 @@ struct l2cap_conn_rsp {#define L2CAP_CR_LE_ENCRYPTION 0x0008#define L2CAP_CR_LE_INVALID_SCID 0x0009#define L2CAP_CR_LE_SCID_IN_USE 0X000A +#define L2CAP_CR_LE_UNACCEPT_PARAMS 0X000B +#define L2CAP_CR_LE_INVALID_PARAMS 0X000C/* connect/create channel status */ #define L2CAP_CS_NO_INFO 0x0000
@@ -977,6 +979,7 @@ struct l2cap_chan *l2cap_chan_create(void);void l2cap_chan_close (struct l2cap_chan *chan,int reason);int l2cap_chan_connect (struct l2cap_chan *chan,__le16 psm,u16 cid,bdaddr_t *dst,u8 dst_type); +int l2cap_chan_reconfigure (struct l2cap_chan *chan,__u16 mtu);int l2cap_chan_send (struct l2cap_chan *chan,struct msghdr *msg,size_t len);void l2cap_chan_busy (struct l2cap_chan *chan,int busy);int l2cap_chan_check_security (struct l2cap_chan *chan,bool initiator);
net/bluetooth/l2cap_core.c +485 -13
615 lines not on this page · raw message
net/bluetooth/l2cap_sock.c +20 -19
@@ -232,7 +232,7 @@ static int l2cap_sock_connect(struct socket *sock, struct sockaddr *addr,return -EINVAL ; } -if (chan->psm &&bdaddr_type_is_le (chan->src_type)) +if (chan->psm &&bdaddr_type_is_le (chan->src_type) && !chan->mode) chan->mode =L2CAP_MODE_LE_FLOWCTL ; err = l2cap_chan_connect(chan, la.l2_psm, __le16_to_cpu(la.l2_cid),
@@ -273,6 +273,7 @@ static int l2cap_sock_listen(struct socket *sock, int backlog)switch (chan->mode) {case L2CAP_MODE_BASIC :case L2CAP_MODE_LE_FLOWCTL : +case L2CAP_MODE_ECRED :break ;case L2CAP_MODE_ERTM :case L2CAP_MODE_STREAMING :
@@ -408,16 +409,6 @@ static int l2cap_sock_getsockopt_old(struct socket *sock, int optname,switch (optname) {case L2CAP_OPTIONS : -/* LE sockets should use BT_SNDMTU/BT_RCVMTU, but since -* legacy ATT code depends on getsockopt for -* L2CAP_OPTIONS we need to let this pass. -*/ -if (bdaddr_type_is_le (chan->src_type) && - chan->scid !=L2CAP_CID_ATT ) { - err = -EINVAL ; -break ; - } -memset (&opts,0 ,sizeof (opts)); opts.imtu = chan->imtu; opts.omtu = chan->omtu;
@@ -427,6 +418,8 @@ static int l2cap_sock_getsockopt_old(struct socket *sock, int optname, opts.max_tx = chan->max_tx; opts.txwin_size = chan->tx_win; +BT_DBG ("mode 0x%2.2x" , chan->mode); + len = min_t(unsigned int, len, sizeof(opts));if (copy_to_user (optval, (char *) &opts, len)) err = -EFAULT ;
@@ -643,11 +636,6 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,switch (optname) {case L2CAP_OPTIONS : -if (bdaddr_type_is_le (chan->src_type)) { - err = -EINVAL ; -break ; - } -if (sk->sk_state ==BT_CONNECTED ) { err = -EINVAL ;break ;
@@ -680,6 +668,7 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname, chan->mode = opts.mode;switch (chan->mode) {case L2CAP_MODE_LE_FLOWCTL : +case L2CAP_MODE_ECRED :break ;case L2CAP_MODE_BASIC :clear_bit (CONF_STATE2_DEVICE , &chan->conf_state);
@@ -694,6 +683,8 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,break ; } +BT_DBG ("mode 0x%2.2x" , chan->mode); + chan->imtu = opts.imtu; chan->omtu = opts.omtu; chan->fcs = opts.fcs;
@@ -926,7 +917,8 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,break ; } -if (sk->sk_state ==BT_CONNECTED ) { +if (chan->mode ==L2CAP_MODE_LE_FLOWCTL && + sk->sk_state ==BT_CONNECTED ) { err = -EISCONN ;break ; }
@@ -936,7 +928,12 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,break ; } - chan->imtu = opt; +if (chan->mode ==L2CAP_MODE_ECRED && + sk->sk_state ==BT_CONNECTED ) + err =l2cap_chan_reconfigure (chan, opt); +else + chan->imtu = opt; +break ;default :
@@ -991,7 +988,11 @@ static int l2cap_sock_recvmsg(struct socket *sock, struct msghdr *msg,if (sk->sk_state ==BT_CONNECT2 &&test_bit (BT_SK_DEFER_SETUP , &bt_sk (sk)->flags)) { -if (bdaddr_type_is_le (pi->chan->src_type)) { +if (pi->chan->mode ==L2CAP_MODE_ECRED ) { + sk->sk_state =BT_CONNECTED ; + pi->chan->state =BT_CONNECTED ; +__l2cap_ecred_conn_rsp_defer (pi->chan); + }if (bdaddr_type_is_le (pi->chan->src_type)) { sk->sk_state =BT_CONNECTED ; pi->chan->state =BT_CONNECTED ;__l2cap_le_connect_rsp_defer (pi->chan);
Signature · 1 line
2.21.0
Luiz Augusto von Dentz
maintainerPATCH 5/10 Bluetooth: hci_vhci: Add support for ISO packets
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
This make virtual controllers to pass ISO packets around.
--- drivers/bluetooth/hci_vhci.c | 1 + 1 file changed, 1 insertion(+)
drivers/bluetooth/hci_vhci.c +1 -0
@@ -178,6 +178,7 @@ static inline ssize_t vhci_get_user(struct vhci_data *data,case HCI_EVENT_PKT :case HCI_ACLDATA_PKT :case HCI_SCODATA_PKT : +case HCI_ISODATA_PKT :if (!data->hdev) {kfree_skb (skb);return -ENODEV ;
Signature · 1 line
2.21.0
Luiz Augusto von Dentz
maintainerPATCH 6/10 Bluetooth: monitor: Add support for ISO packets
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
This enables passing ISO packets to the monitor socket.
--- include/net/bluetooth/hci_mon.h | 2 ++ net/bluetooth/hci_sock.c | 6 ++++++ 2 files changed, 8 insertions(+)
include/net/bluetooth/hci_mon.h +2 -0
@@ -49,6 +49,8 @@ struct hci_mon_hdr {#define HCI_MON_CTRL_CLOSE 15#define HCI_MON_CTRL_COMMAND 16#define HCI_MON_CTRL_EVENT 17 +#define HCI_MON_ISO_TX_PKT 18 +#define HCI_MON_ISO_RX_PKT 19struct hci_mon_new_index {__u8 type;
net/bluetooth/hci_sock.c +6 -0
@@ -324,6 +324,12 @@ void hci_send_to_monitor(struct hci_dev *hdev, struct sk_buff *skb)else opcode =cpu_to_le16 (HCI_MON_SCO_TX_PKT );break ; +case HCI_ISODATA_PKT : +if (bt_cb (skb)->incoming) + opcode =cpu_to_le16 (HCI_MON_ISO_RX_PKT ); +else + opcode =cpu_to_le16 (HCI_MON_ISO_TX_PKT ); +break ;case HCI_DIAG_PKT : opcode =cpu_to_le16 (HCI_MON_VENDOR_DIAG );break ;
Signature · 1 line
2.21.0
Luiz Augusto von Dentz
maintainerPATCH 7/10 Bluetooth: Make use of __check_timeout on hci_sched_le
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
This reuse __check_timeout on hci_sched_le following the same logic used hci_sched_acl.
--- net/bluetooth/hci_core.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)
net/bluetooth/hci_core.c +3 -8
@@ -4298,15 +4298,10 @@ static void hci_sched_le(struct hci_dev *hdev)if (!hci_conn_num (hdev,LE_LINK ))return ; -if (!hci_dev_test_flag (hdev,HCI_UNCONFIGURED )) { -/* LE tx timeout must be longer than maximum -* link supervision timeout (40.9 seconds) */ -if (!hdev->le_cnt && hdev->le_pkts && -time_after (jiffies, hdev->le_last_tx +HZ *45 )) -hci_link_tx_to (hdev,LE_LINK ); - } - cnt = hdev->le_pkts ? hdev->le_cnt : hdev->acl_cnt; + +__check_timeout (hdev, cnt); + tmp = cnt;while (cnt && (chan =hci_chan_sent (hdev,LE_LINK , "e))) {u32 priority = (skb_peek (&chan->data_q))->priority;
Signature · 1 line
2.21.0
Luiz Augusto von Dentz
maintainerPATCH 8/10 Bluetooth: hci_h4: Add support for ISO packets
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
This enabled H4 driver to properly handle ISO packets.
--- drivers/bluetooth/hci_h4.c | 1 + drivers/bluetooth/hci_uart.h | 7 +++++++ 2 files changed, 8 insertions(+)
drivers/bluetooth/hci_h4.c +1 -0
@@ -103,6 +103,7 @@ static const struct h4_recv_pkt h4_recv_pkts[] = { { H4_RECV_ACL, .recv = hci_recv_frame }, { H4_RECV_SCO, .recv = hci_recv_frame }, { H4_RECV_EVENT, .recv = hci_recv_frame }, + { H4_RECV_ISO, .recv = hci_recv_frame }, };/* Recv data */
drivers/bluetooth/hci_uart.h +7 -0
@@ -143,6 +143,13 @@ struct h4_recv_pkt { .lsize = 1, \ .maxlen = HCI_MAX_EVENT_SIZE +#define H4_RECV_ISO \ + .type = HCI_ISODATA_PKT, \ + .hlen = HCI_ISO_HDR_SIZE, \ + .loff = 2, \ + .lsize = 2, \ + .maxlen = HCI_MAX_FRAME_SIZE \ +struct sk_buff *h4_recv_buf (struct hci_dev *hdev,struct sk_buff *skb,const unsigned char *buffer,int count,const struct h4_recv_pkt *pkts,int pkts_count);
Signature · 1 line
2.21.0
Marcel Holtmann
maintainerRe: [PATCH 08/10] Bluetooth: hci_h4: Add support for ISO packets
Hi Luiz,
Quoted 28 lines
This enabled H4 driver to properly handle ISO packets.
Signed-off-by Luiz Augusto von Dentz <[email protected]>---
drivers/bluetooth/hci_h4.c| 1 +drivers/bluetooth/hci_uart.h| 7 +++++++2 files changed, 8 insertions(+)drivers/bluetooth/hci_h4.c +1
-0@@ -103,6 +103,7 @@ static const struct h4_recv_pkt h4_recv_pkts[] = { { H4_RECV_ACL, .recv = hci_recv_frame }, { H4_RECV_SCO, .recv = hci_recv_frame }, { H4_RECV_EVENT, .recv = hci_recv_frame }, + { H4_RECV_ISO, .recv = hci_recv_frame }, };/* Recv data */ drivers/bluetooth/hci_uart.h +0
-0@@ -143,6 +143,13 @@ struct h4_recv_pkt { .lsize = 1, \ .maxlen =HCI_MAX_EVENT_SIZE
drivers/bluetooth/hci_uart.h struct h4_recv_pkt { · line 155
Quoted 10 lines
drivers/bluetooth/hci_uart.h +7
-0+#define H4_RECV_ISO \ + .type = HCI_ISODATA_PKT, \ + .hlen = HCI_ISO_HDR_SIZE, \ + .loff = 2, \ + .lsize = 2, \ + .maxlen = HCI_MAX_FRAME_SIZE \ +struct sk_buff *h4_recv_buf (struct hci_dev *hdev,struct sk_buff *skb,const unsigned char *buffer,int count,const struct h4_recv_pkt *pkts,int pkts_count);
there are a bunch of drivers that should be able to handle packet type 5. We should fix them all.
Regards
Marcel
Luiz Augusto von Dentz
maintainerRe: [PATCH 08/10] Bluetooth: hci_h4: Add support for ISO packets
Hi Marcel,
Quoted 31 lines · Marcel Holtmann
Hi Luiz,
Quoted 28 lines
This enabled H4 driver to properly handle ISO packets.
Signed-off-by Luiz Augusto von Dentz <[email protected]>---
drivers/bluetooth/hci_h4.c| 1 +drivers/bluetooth/hci_uart.h| 7 +++++++2 files changed, 8 insertions(+)drivers/bluetooth/hci_h4.c +1
-0@@ -103,6 +103,7 @@ static const struct h4_recv_pkt h4_recv_pkts[] = { { H4_RECV_ACL, .recv = hci_recv_frame }, { H4_RECV_SCO, .recv = hci_recv_frame }, { H4_RECV_EVENT, .recv = hci_recv_frame }, + { H4_RECV_ISO, .recv = hci_recv_frame }, };/* Recv data */ drivers/bluetooth/hci_uart.h +0
-0@@ -143,6 +143,13 @@ struct h4_recv_pkt { .lsize = 1, \ .maxlen =HCI_MAX_EVENT_SIZE
Quoted 12 lines
drivers/bluetooth/hci_uart.h struct h4_recv_pkt { · line 155
Quoted 10 lines
drivers/bluetooth/hci_uart.h +7
-0+#define H4_RECV_ISO \ + .type = HCI_ISODATA_PKT, \ + .hlen = HCI_ISO_HDR_SIZE, \ + .loff = 2, \ + .lsize = 2, \ + .maxlen = HCI_MAX_FRAME_SIZE \ +struct sk_buff *h4_recv_buf (struct hci_dev *hdev,struct sk_buff *skb,const unsigned char *buffer,int count,const struct h4_recv_pkt *pkts,int pkts_count);there are a bunch of drivers that should be able to handle packet type 5. We should fix them all.
Indeed, I haven't looked into drivers I didn't have any means to test but in theory that should be straight forward to support the new type so I will try to add support to them as well.
Quoted 4 lines
Regards
Marcel
Signature · 1 line
Luiz Augusto von Dentz
Luiz Augusto von Dentz
maintainerPATCH 9/10 Bluetooth: btusb: Add support for ISO packets
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
This enabled btusb driver to properly transmit ISO packets.
--- drivers/bluetooth/btusb.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
drivers/bluetooth/btusb.c +14 -0
@@ -1463,6 +1463,13 @@ static int btusb_send_frame(struct hci_dev *hdev, struct sk_buff *skb) hdev->stat.sco_tx++;return submit_tx_urb (hdev, urb); + +case HCI_ISODATA_PKT : + urb =alloc_bulk_urb (hdev, skb); +if (IS_ERR (urb)) +return PTR_ERR (urb); + +return submit_or_queue_tx_urb (hdev, urb); }return -EILSEQ ;
@@ -2123,6 +2130,13 @@ static int btusb_send_frame_intel(struct hci_dev *hdev, struct sk_buff *skb) hdev->stat.sco_tx++;return submit_tx_urb (hdev, urb); + +case HCI_ISODATA_PKT : + urb =alloc_bulk_urb (hdev, skb); +if (IS_ERR (urb)) +return PTR_ERR (urb); + +return submit_or_queue_tx_urb (hdev, urb); }return -EILSEQ ;
Signature · 1 line
2.21.0
Marcel Holtmann
maintainerRe: [PATCH 09/10] Bluetooth: btusb: Add support for ISO packets
Hi Luiz,
Quoted 27 lines
This enabled btusb driver to properly transmit ISO packets.
Signed-off-by Luiz Augusto von Dentz <[email protected]>---
drivers/bluetooth/btusb.c| 14 ++++++++++++++1 file changed, 14 insertions(+)drivers/bluetooth/btusb.c +7
-0@@ -1463,6 +1463,13 @@ static int btusb_send_frame(struct hci_dev *hdev, struct sk_buff *skb) hdev->stat.sco_tx++;return submit_tx_urb (hdev, urb); + +case HCI_ISODATA_PKT : + urb =alloc_bulk_urb (hdev, skb); +if (IS_ERR (urb)) +return PTR_ERR (urb); + +return submit_or_queue_tx_urb (hdev, urb); }return -EILSEQ ;@@ -2123,6 +2130,13 @@ static int btusb_send_frame_intel(struct hci_dev *hdev, struct sk_buff *skb)
drivers/bluetooth/btusb.c static int btusb_send_frame_intel(struct hci_dev *hdev, struct sk_buff *skb) · line 2140
Quoted 10 lines
drivers/bluetooth/btusb.c +7
-0hdev->stat.sco_tx++;return submit_tx_urb (hdev, urb); + +case HCI_ISODATA_PKT : + urb =alloc_bulk_urb (hdev, skb); +if (IS_ERR (urb)) +return PTR_ERR (urb); + +return submit_or_queue_tx_urb (hdev, urb); }
I am failing to see where it says to use bulk endpoints.
Regards
Marcel
Luiz Augusto von Dentz
maintainerRe: [PATCH 09/10] Bluetooth: btusb: Add support for ISO packets
Hi Marcel,
Quoted 30 lines · Marcel Holtmann
Hi Luiz,
Quoted 27 lines
This enabled btusb driver to properly transmit ISO packets.
Signed-off-by Luiz Augusto von Dentz <[email protected]>---
drivers/bluetooth/btusb.c| 14 ++++++++++++++1 file changed, 14 insertions(+)drivers/bluetooth/btusb.c +7
-0@@ -1463,6 +1463,13 @@ static int btusb_send_frame(struct hci_dev *hdev, struct sk_buff *skb) hdev->stat.sco_tx++;return submit_tx_urb (hdev, urb); + +case HCI_ISODATA_PKT : + urb =alloc_bulk_urb (hdev, skb); +if (IS_ERR (urb)) +return PTR_ERR (urb); + +return submit_or_queue_tx_urb (hdev, urb); }return -EILSEQ ;@@ -2123,6 +2130,13 @@ static int btusb_send_frame_intel(struct hci_dev *hdev, struct sk_buff *skb)
Quoted 12 lines
drivers/bluetooth/btusb.c static int btusb_send_frame(struct hci_dev *hdev, struct sk_buff *skb) · line 1473
Quoted 10 lines
drivers/bluetooth/btusb.c +7
-0hdev->stat.sco_tx++;return submit_tx_urb (hdev, urb); + +case HCI_ISODATA_PKT : + urb =alloc_bulk_urb (hdev, skb); +if (IS_ERR (urb)) +return PTR_ERR (urb); + +return submit_or_queue_tx_urb (hdev, urb); }I am failing to see where it says to use bulk endpoints.
It doesn't, in fact USB don't seem to have anything for ISO so this is the assumption we made that bulk would cut it, though I would agree an ISOC endpoint would actually be better but afaik we would need new alternate settings if we intend to use with the new ISO packets, so it doesn't look like there is any other option to USB transport to just sent packet over the bulk endpoint, or perhaps you want to file an issue against the spec to specify this properly?
Quoted 4 lines
Regards
Marcel
Signature · 1 line
Luiz Augusto von Dentz
Luiz Augusto von Dentz
maintainerPATCH 10/10 Bluetooth: btusb: Detect if an ACL packet is in fact an ISO packet
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
Fix up the packet type if ISO packets are sent over the bulk endpoint.
--- drivers/bluetooth/btusb.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/bluetooth/btusb.c +7 -0
@@ -663,11 +663,18 @@ static int btusb_recv_bulk(struct btusb_data *data, void *buffer, int count)hci_skb_expect (skb) -= len;if (skb->len ==HCI_ACL_HDR_SIZE ) { +__u16 handle =__le16_to_cpu (hci_acl_hdr (skb)->handle);__le16 dlen =hci_acl_hdr (skb)->dlen; +__u8 type;/* Complete ACL header */ hci_skb_expect (skb) =__le16_to_cpu (dlen); + type =hci_conn_lookup_type (data->hdev, +hci_handle (handle)); +if (type ==ISO_LINK ) +hci_skb_pkt_type (skb) =HCI_ISODATA_PKT ; +if (skb_tailroom (skb) <hci_skb_expect (skb)) {kfree_skb (skb); skb =NULL ;
Signature · 1 line
2.21.0
Marcel Holtmann
maintainerRe: [PATCH 10/10] Bluetooth: btusb: Detect if an ACL packet is in fact an ISO packet
Hi Luiz,
Quoted 20 lines
Fix up the packet type if ISO packets are sent over the bulk endpoint.
Signed-off-by Luiz Augusto von Dentz <[email protected]>---
drivers/bluetooth/btusb.c| 7 +++++++1 file changed, 7 insertions(+)drivers/bluetooth/btusb.c +2
-0@@ -663,11 +663,18 @@ static int btusb_recv_bulk(struct btusb_data *data, void *buffer, int count)hci_skb_expect (skb) -= len;if (skb->len ==HCI_ACL_HDR_SIZE ) { +__u16 handle =__le16_to_cpu (hci_acl_hdr (skb)->handle);__le16 dlen =hci_acl_hdr (skb)->dlen; +__u8 type;/* Complete ACL header */
drivers/bluetooth/btusb.c static int btusb_recv_bulk(struct btusb_data *data, void *buffer, int count) · line 680
Quoted 10 lines
drivers/bluetooth/btusb.c +5
-0hci_skb_expect (skb) =__le16_to_cpu (dlen); + type =hci_conn_lookup_type (data->hdev, +hci_handle (handle)); +if (type ==ISO_LINK ) +hci_skb_pkt_type (skb) =HCI_ISODATA_PKT ; +if (skb_tailroom (skb) <hci_skb_expect (skb)) {kfree_skb (skb); skb =NULL ;
is this a local hack for development. We can not just look up the connection type on every packet we receive.
Regards
Marcel
Luiz Augusto von Dentz
maintainerRe: [PATCH 10/10] Bluetooth: btusb: Detect if an ACL packet is in fact an ISO packet
Hi Marcel,
Quoted 25 lines · Marcel Holtmann
Hi Luiz,
Quoted 22 lines
Fix up the packet type if ISO packets are sent over the bulk endpoint.
Signed-off-by Luiz Augusto von Dentz <[email protected]>---
drivers/bluetooth/btusb.c| 7 +++++++1 file changed, 7 insertions(+)drivers/bluetooth/btusb.c +2
-0@@ -663,11 +663,18 @@ static int btusb_recv_bulk(struct btusb_data *data, void *buffer, int count)hci_skb_expect (skb) -= len;if (skb->len ==HCI_ACL_HDR_SIZE ) { +__u16 handle =__le16_to_cpu (hci_acl_hdr (skb)->handle);__le16 dlen =hci_acl_hdr (skb)->dlen; +__u8 type;/* Complete ACL header */ hci_skb_expect (skb) =__le16_to_cpu (dlen);
Quoted 10 lines
drivers/bluetooth/btusb.c static int btusb_recv_bulk(struct btusb_data *data, void *buffer, int count) · line 680
Quoted 8 lines
drivers/bluetooth/btusb.c +5
-0+ type =hci_conn_lookup_type (data->hdev, +hci_handle (handle)); +if (type ==ISO_LINK ) +hci_skb_pkt_type (skb) =HCI_ISODATA_PKT ; +if (skb_tailroom (skb) <hci_skb_expect (skb)) {kfree_skb (skb); skb =NULL ;is this a local hack for development. We can not just look up the connection type on every packet we receive.
Unfortunately there is no dedicated endpoint for ISO packets, what I could do instead is try to figure out if there is any ISO connection first and only then lookup but that would still incur in lookups when an ISO link is up.
Quoted 4 lines
Regards
Marcel
Signature · 1 line
Luiz Augusto von Dentz