redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

Bluetooth: Add BT_PHY socket option

Browse source 
This adds BT_PHY socket option (read-only) which can be used to read
the PHYs in use by the underline connection.

Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Luiz Augusto von Dentz 2020-02-14 10:08:57 -08:00 committed by Marcel Holtmann
parent cee5f20fec
commit eab2404ba7
5 changed files with 152 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
include/net/bluetooth/bluetooth.h
View file

@ -121,6 +121,23 @@ struct bt_voice {
#define BT_SNDMTU 12
#define BT_RCVMTU 13
#define BT_PHY 14
#define BT_PHY_BR_1M_1SLOT 0x00000001
#define BT_PHY_BR_1M_3SLOT 0x00000002
#define BT_PHY_BR_1M_5SLOT 0x00000004
#define BT_PHY_EDR_2M_1SLOT 0x00000008
#define BT_PHY_EDR_2M_3SLOT 0x00000010
#define BT_PHY_EDR_2M_5SLOT 0x00000020
#define BT_PHY_EDR_3M_1SLOT 0x00000040
#define BT_PHY_EDR_3M_3SLOT 0x00000080
#define BT_PHY_EDR_3M_5SLOT 0x00000100
#define BT_PHY_LE_1M_TX 0x00000200
#define BT_PHY_LE_1M_RX 0x00000400
#define BT_PHY_LE_2M_TX 0x00000800
#define BT_PHY_LE_2M_RX 0x00001000
#define BT_PHY_LE_CODED_TX 0x00002000
#define BT_PHY_LE_CODED_RX 0x00004000
__printf(1, 2)
void bt_info(const char *fmt, ...);

2
include/net/bluetooth/hci_core.h
View file

@ -1477,6 +1477,8 @@ void *hci_sent_cmd_data(struct hci_dev *hdev, __u16 opcode);
struct sk_buff *hci_cmd_sync(struct hci_dev *hdev, u16 opcode, u32 plen,
const void *param, u32 timeout);
u32 hci_conn_get_phy(struct hci_conn *conn);
/* ----- HCI Sockets ----- */
void hci_send_to_sock(struct hci_dev *hdev, struct sk_buff *skb);
void hci_send_to_channel(unsigned short channel, struct sk_buff *skb,

107
net/bluetooth/hci_conn.c
View file

@ -1725,3 +1725,110 @@ struct hci_chan *hci_chan_lookup_handle(struct hci_dev *hdev, __u16 handle)
return hchan;
}
u32 hci_conn_get_phy(struct hci_conn *conn)
{
u32 phys = 0;
hci_dev_lock(conn->hdev);
/* BLUETOOTH CORE SPECIFICATION Version 5.2 | Vol 2, Part B page 471:
* Table 6.2: Packets defined for synchronous, asynchronous, and
* CSB logical transport types.
*/
switch (conn->type) {
case SCO_LINK:
/* SCO logical transport (1 Mb/s):
* HV1, HV2, HV3 and DV.
*/
phys |= BT_PHY_BR_1M_1SLOT;
break;
case ACL_LINK:
/* ACL logical transport (1 Mb/s) ptt=0:
* DH1, DM3, DH3, DM5 and DH5.
*/
phys |= BT_PHY_BR_1M_1SLOT;
if (conn->pkt_type & (HCI_DM3 | HCI_DH3))
phys |= BT_PHY_BR_1M_3SLOT;
if (conn->pkt_type & (HCI_DM5 | HCI_DH5))
phys |= BT_PHY_BR_1M_5SLOT;
/* ACL logical transport (2 Mb/s) ptt=1:
* 2-DH1, 2-DH3 and 2-DH5.
*/
if (!(conn->pkt_type & HCI_2DH1))
phys |= BT_PHY_EDR_2M_1SLOT;
if (!(conn->pkt_type & HCI_2DH3))
phys |= BT_PHY_EDR_2M_3SLOT;
if (!(conn->pkt_type & HCI_2DH5))
phys |= BT_PHY_EDR_2M_5SLOT;
/* ACL logical transport (3 Mb/s) ptt=1:
* 3-DH1, 3-DH3 and 3-DH5.
*/
if (!(conn->pkt_type & HCI_3DH1))
phys |= BT_PHY_EDR_3M_1SLOT;
if (!(conn->pkt_type & HCI_3DH3))
phys |= BT_PHY_EDR_3M_3SLOT;
if (!(conn->pkt_type & HCI_3DH5))
phys |= BT_PHY_EDR_3M_5SLOT;
break;
case ESCO_LINK:
/* eSCO logical transport (1 Mb/s): EV3, EV4 and EV5 */
phys |= BT_PHY_BR_1M_1SLOT;
if (!(conn->pkt_type & (ESCO_EV4 | ESCO_EV5)))
phys |= BT_PHY_BR_1M_3SLOT;
/* eSCO logical transport (2 Mb/s): 2-EV3, 2-EV5 */
if (!(conn->pkt_type & ESCO_2EV3))
phys |= BT_PHY_EDR_2M_1SLOT;
if (!(conn->pkt_type & ESCO_2EV5))
phys |= BT_PHY_EDR_2M_3SLOT;
/* eSCO logical transport (3 Mb/s): 3-EV3, 3-EV5 */
if (!(conn->pkt_type & ESCO_3EV3))
phys |= BT_PHY_EDR_3M_1SLOT;
if (!(conn->pkt_type & ESCO_3EV5))
phys |= BT_PHY_EDR_3M_3SLOT;
break;
case LE_LINK:
if (conn->le_tx_phy & HCI_LE_SET_PHY_1M)
phys |= BT_PHY_LE_1M_TX;
if (conn->le_rx_phy & HCI_LE_SET_PHY_1M)
phys |= BT_PHY_LE_1M_RX;
if (conn->le_tx_phy & HCI_LE_SET_PHY_2M)
phys |= BT_PHY_LE_2M_TX;
if (conn->le_rx_phy & HCI_LE_SET_PHY_2M)
phys |= BT_PHY_LE_2M_RX;
if (conn->le_tx_phy & HCI_LE_SET_PHY_CODED)
phys |= BT_PHY_LE_CODED_TX;
if (conn->le_rx_phy & HCI_LE_SET_PHY_CODED)
phys |= BT_PHY_LE_CODED_RX;
break;
}
hci_dev_unlock(conn->hdev);
return phys;
}

13
net/bluetooth/l2cap_sock.c
View file

@ -499,6 +499,7 @@ static int l2cap_sock_getsockopt(struct socket *sock, int level, int optname,
struct l2cap_chan *chan = l2cap_pi(sk)->chan;
struct bt_security sec;
struct bt_power pwr;
u32 phys;
int len, err = 0;
BT_DBG("sk %p", sk);
@ -603,6 +604,18 @@ static int l2cap_sock_getsockopt(struct socket *sock, int level, int optname,
err = -EFAULT;
break;
case BT_PHY:
if (sk->sk_state == BT_CONNECTED) {
err = -ENOTCONN;
break;
}
phys = hci_conn_get_phy(chan->conn->hcon);
if (put_user(phys, (u32 __user *) optval))
err = -EFAULT;
break;
default:
err = -ENOPROTOOPT;
break;

13
net/bluetooth/sco.c
View file

@ -922,6 +922,7 @@ static int sco_sock_getsockopt(struct socket *sock, int level, int optname,
struct sock *sk = sock->sk;
int len, err = 0;
struct bt_voice voice;
u32 phys;
BT_DBG("sk %p", sk);
@ -956,6 +957,18 @@ static int sco_sock_getsockopt(struct socket *sock, int level, int optname,
break;
case BT_PHY:
if (sk->sk_state == BT_CONNECTED) {
err = -ENOTCONN;
break;
}
phys = hci_conn_get_phy(sco_pi(sk)->conn->hcon);
if (put_user(phys, (u32 __user *) optval))
err = -EFAULT;
break;
default:
err = -ENOPROTOOPT;
break;