* [PATCH v3 0/6] Bluetooth: Add support for HDT and EKS
@ 2026-11-04 22:13 Luiz Augusto von Dentz
2026-11-04 22:13 ` [PATCH v3 1/6] Bluetooth: Add initial support for HDT PHY Luiz Augusto von Dentz
` (5 more replies)
0 siblings, 6 replies; 9+ messages in thread
From: Luiz Augusto von Dentz @ 2026-11-04 22:13 UTC (permalink / raw)
To: linux-bluetooth
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This adds support for the LE High Data Throughput (HDT) PHY and the
Encryption Key Schedule (EKS) introduced in Bluetooth Core 7.0:
- HDT PHY selection for ACL, CIS and BIS, the v2/v3 HCI commands and
events that carry the HDT rates, and the LE Set HDT Default
Parameters command.
- ISO sockets take an extended, versioned QoS (struct bt_iso_qos_ext)
through the existing BT_ISO_QOS option, carrying the HDT rates per
direction; the legacy struct bt_iso_qos keeps working.
- LE Enable Encryption v2 with the MIC length, Encryption Change v3
and Key Refresh Complete v2.
- L2CAP and BT_SECURITY gain a MIC length requirement; connections
whose MIC is too short are refused with the MIC Length Too Short
result.
- EKS opportunistic encryption, enabled with a new MGMT system
configuration parameter.
This series depends on:
"Bluetooth: Fix not updating of hdev->commands[] after reset"
Changes in v3:
- Opportunistic encryption sets HCI_CONN_ENCRYPT and HCI_CONN_AES_CCM
along with a new HCI_CONN_OPP_ENCRYPT flag, and the L2CAP key size
check is skipped for it since it has no key from pairing. Pairing
over such a link now completes: its Key Refresh Complete clears the
flag. A failure, or a command that can't be sent, leaves the link
unencrypted instead of disconnecting, and HCI_CONN_ENCRYPT_PEND is
no longer used for it so it doesn't block SMP. The MIC length is
taken right before the command is sent.
- Changing TLV 0x0024 while the controller is up updates the
Opportunistic Encryption host feature bit.
- SMP checks the result of hci_le_enable_encrypt().
- Set CIG Parameters v2 returns the failure of a response that doesn't
match the command, and fails the unbound CIS of the CIG it was sent
for.
- CIS Established v3 and Create BIG Complete v2 are only unmasked with
CIS and BIS support.
- BT_PHY rejects HDT6 and HDT7.5 rates the controller doesn't support
in that direction, and only reports supported ones.
- struct bt_iso_qos_ext replaces its rfu bytes with a 16-bit version
and a 16-bit type telling whether the unicast or broadcast member is
in use, so each can later grow on its own; the union is the last
member for that. BT_ISO_QOS_ANY, used for struct bt_iso_qos, leaves
the type to connect() or listen(), which fail with -EINVAL on a
mismatch. Connections set up by the controller get the version and
type, and BT_ISO_HDT_RATE_* name the rates bits.
- The extended ISO QoS is copied field by field, so padding is zeroed,
and the v1 CIS Established event clears the HDT rates.
Changes in v2:
- Remove the values from drafts of the specification and use the ones
from Core 7.0: L2CAP MIC Length Too Short is 0x000C for LE Credit
Based and 0x0010 for Enhanced Credit Based, and LE feature page 0
bit 59 is no longer checked.
- A 64-bit MIC is only used when both sides prefer it, so downgrading
on re-encryption is no longer an error.
- The key size of Encryption Change v3 is ignored for LE as the spec
requires; hci_change_encrypt() no longer takes it.
- Rename struct bt_iso_qos_v2 to struct bt_iso_qos_ext with a version
field; the length passed to BT_ISO_QOS selects legacy or extended.
Convert field by field, which fixes an out-of-bounds copy and an
info leak through the legacy struct.
- HDT rates are little endian and kept per direction.
- HDT PHY selection is gated on hdt_capable(); mixed LE and HDT PHY
masks are accepted; phy_opts is initialized.
- Create BIG Complete v1/v2 share one bounds-checked handler; Set CIG
Parameters v2 response is validated like v1; Create CIS waits for
CIS Established v3.
- Drop the unused LE Set Data Length v2 command and the unhandled
Data Length Change v2 event mask bit.
- EKS: copy the LTK under RCU and encrypt after unlocking, zero-pad
the key for v1 and copy key_size bytes for v2, free the command
when queueing fails, and handle the Command Status of LE Enable
Encryption v2.
- L2CAP: keep the requested MIC length separate from the negotiated
one, take the negotiated one from Encryption Change v3 and Key
Refresh Complete v2, propagate the channel MIC length on every LE
security path and reject values above 0x02.
- RFCOMM BT_SECURITY accepts the 2-byte struct and zeroes the struct
returned by getsockopt.
- One hci_le_set_hdt_params_sync() is shared by init and MGMT, and the
defaults are resent when changed while the controller is up.
- Opportunistic encryption requires eks_capable() and its TLV
(0x0024) is validated as u8. Encryption Change v3 for it still only
clears ENCRYPT_PEND: the key size is 0, so setting ENCRYPT would make
the key size check refuse every L2CAP channel.
Luiz Augusto von Dentz (6):
Bluetooth: Add initial support for HDT PHY
Bluetooth: ISO: Add extended QoS with the HDT rates
Bluetooth: Add initial support for EKS
Bluetooth: L2CAP: Add MIC length validation for HDT PHY
Bluetooth: Add HCI_OP_LE_SET_HDT_DEFAULT_PARAMS support
Bluetooth: Add EKS Opportunistic Encryption support
include/net/bluetooth/bluetooth.h | 101 +++++
include/net/bluetooth/hci.h | 211 +++++++++-
include/net/bluetooth/hci_core.h | 64 ++-
include/net/bluetooth/hci_sync.h | 12 +-
include/net/bluetooth/l2cap.h | 7 +
include/net/bluetooth/mgmt.h | 1 +
net/bluetooth/hci_conn.c | 259 ++++++------
net/bluetooth/hci_core.c | 4 +
net/bluetooth/hci_event.c | 606 ++++++++++++++++++++++++----
net/bluetooth/hci_sync.c | 631 +++++++++++++++++++++++++++++-
net/bluetooth/iso.c | 244 +++++++++++-
net/bluetooth/l2cap_core.c | 50 ++-
net/bluetooth/l2cap_sock.c | 23 +-
net/bluetooth/mgmt.c | 6 +
net/bluetooth/mgmt_config.c | 56 +++
net/bluetooth/rfcomm/sock.c | 13 +-
net/bluetooth/smp.c | 77 +++-
net/bluetooth/smp.h | 2 +
18 files changed, 2125 insertions(+), 242 deletions(-)
--
2.56.0
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v3 1/6] Bluetooth: Add initial support for HDT PHY
2026-11-04 22:13 [PATCH v3 0/6] Bluetooth: Add support for HDT and EKS Luiz Augusto von Dentz
@ 2026-11-04 22:13 ` Luiz Augusto von Dentz
2026-11-05 2:35 ` Bluetooth: Add support for HDT and EKS bluez.test.bot
2026-11-04 22:13 ` [PATCH v3 2/6] Bluetooth: ISO: Add extended QoS with the HDT rates Luiz Augusto von Dentz
` (4 subsequent siblings)
5 siblings, 1 reply; 9+ messages in thread
From: Luiz Augusto von Dentz @ 2026-11-04 22:13 UTC (permalink / raw)
To: linux-bluetooth
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Add support for the LE HDT PHY introduced by High Data Throughput (HDT)
in Bluetooth 7.0:
- The HDT feature bits (Link Layer feature bits 76-83) and the
le_feature() helper to access the FeatureSet pages above page 0,
along with hdt_capable() and the per-rate capability checks.
- BT_PHY_HDT_* bits for the HDT2, HDT3, HDT4, HDT6 and HDT7.5 rates in
each direction, so userspace can select them with BT_PHY, which map
to the LE HDT PHY and the rate bits of PHY_Options in LE Set PHY.
- LE Read Maximum Data Length v2 and LE Read/Write Suggested Default
Data Length v2, used instead of their v1 counterparts on HDT capable
controllers so the default data length is set for each PHY. The
values given to LE Write Suggested Default Data Length are clamped to
the maximum the specification allows.
- LE Set CIG Parameters v2, LE CIS Established v3, LE Create BIG v2 and
LE Create BIG Complete v2, which carry the HDT rates, MIC length and
packet format of a CIS or BIS. The CIS and BIS default to all the HDT
rates the controller supports when the HDT PHY is selected.
- MGMT_SETTING_HDT to report HDT support to userspace.
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
---
include/net/bluetooth/bluetooth.h | 18 ++
include/net/bluetooth/hci.h | 173 ++++++++++++++-
include/net/bluetooth/hci_core.h | 27 +++
include/net/bluetooth/hci_sync.h | 5 +-
include/net/bluetooth/mgmt.h | 1 +
net/bluetooth/hci_conn.c | 207 ++++++++++-------
net/bluetooth/hci_event.c | 357 ++++++++++++++++++++++++++++--
net/bluetooth/hci_sync.c | 355 ++++++++++++++++++++++++++++-
net/bluetooth/iso.c | 2 +-
net/bluetooth/mgmt.c | 6 +
10 files changed, 1041 insertions(+), 110 deletions(-)
diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h
index cd9189244566..fbedd1ebd051 100644
--- a/include/net/bluetooth/bluetooth.h
+++ b/include/net/bluetooth/bluetooth.h
@@ -142,6 +142,16 @@ struct bt_voice {
#define BT_PHY_LE_2M_RX BIT(12)
#define BT_PHY_LE_CODED_TX BIT(13)
#define BT_PHY_LE_CODED_RX BIT(14)
+#define BT_PHY_HDT_2M_TX BIT(15)
+#define BT_PHY_HDT_2M_RX BIT(16)
+#define BT_PHY_HDT_3M_TX BIT(17)
+#define BT_PHY_HDT_3M_RX BIT(18)
+#define BT_PHY_HDT_4M_TX BIT(19)
+#define BT_PHY_HDT_4M_RX BIT(20)
+#define BT_PHY_HDT_6M_TX BIT(21)
+#define BT_PHY_HDT_6M_RX BIT(22)
+#define BT_PHY_HDT_7_5M_TX BIT(23)
+#define BT_PHY_HDT_7_5M_RX BIT(24)
#define BT_PHY_BREDR_MASK (BT_PHY_BR_1M_1SLOT | BT_PHY_BR_1M_3SLOT | \
BT_PHY_BR_1M_5SLOT | BT_PHY_EDR_2M_1SLOT | \
@@ -151,6 +161,13 @@ struct bt_voice {
#define BT_PHY_LE_MASK (BT_PHY_LE_1M_TX | BT_PHY_LE_1M_RX | \
BT_PHY_LE_2M_TX | BT_PHY_LE_2M_RX | \
BT_PHY_LE_CODED_TX | BT_PHY_LE_CODED_RX)
+#define BT_PHY_HDT_TX_MASK (BT_PHY_HDT_2M_TX | BT_PHY_HDT_3M_TX | \
+ BT_PHY_HDT_4M_TX | BT_PHY_HDT_6M_TX | \
+ BT_PHY_HDT_7_5M_TX)
+#define BT_PHY_HDT_RX_MASK (BT_PHY_HDT_2M_RX | BT_PHY_HDT_3M_RX | \
+ BT_PHY_HDT_4M_RX | BT_PHY_HDT_6M_RX | \
+ BT_PHY_HDT_7_5M_RX)
+#define BT_PHY_HDT_MASK (BT_PHY_HDT_TX_MASK | BT_PHY_HDT_RX_MASK)
#define BT_MODE 15
@@ -221,6 +238,7 @@ struct bt_iso_qos {
#define BT_ISO_PHY_1M BIT(0)
#define BT_ISO_PHY_2M BIT(1)
#define BT_ISO_PHY_CODED BIT(2)
+#define BT_ISO_PHY_HDT BIT(4)
#define BT_ISO_PHY_ANY (BT_ISO_PHY_1M | BT_ISO_PHY_2M | \
BT_ISO_PHY_CODED)
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index 1c992e87534d..00f90e24581c 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -659,6 +659,16 @@ enum {
#define HCI_LE_SCI 0x01 /* byte 9 - Shorter Connection Intervals */
#define HCI_LE_SCI_HOST 0x02 /* byte 9 - Shorter Connection Intervals (Host) */
+/* HDT features - Page 1 */
+#define HCI_LE_EKS_FEATURE BIT(4) /* Byte 1 */
+#define HCI_LE_HDT_FEATURE BIT(5)
+#define HCI_LE_HDT_6_RX_FEATURE BIT(6)
+#define HCI_LE_HDT_6_TX_FEATURE BIT(7)
+#define HCI_LE_HDT_7_5_RX_FEATURE BIT(0) /* Byte 2 */
+#define HCI_LE_HDT_7_5_TX_FEATURE BIT(1)
+#define HCI_LE_HDT_PF_1 BIT(2)
+#define HCI_LE_HDT_LQF_FEATURE BIT(3)
+
/* Connection modes */
#define HCI_CM_ACTIVE 0x0000
#define HCI_CM_HOLD 0x0001
@@ -1891,9 +1901,10 @@ struct hci_cp_le_set_default_phy {
__u8 rx_phys;
} __packed;
-#define HCI_LE_SET_PHY_1M 0x01
-#define HCI_LE_SET_PHY_2M 0x02
-#define HCI_LE_SET_PHY_CODED 0x04
+#define HCI_LE_SET_PHY_1M BIT(0)
+#define HCI_LE_SET_PHY_2M BIT(1)
+#define HCI_LE_SET_PHY_CODED BIT(2)
+#define HCI_LE_SET_PHY_HDT BIT(4)
#define HCI_OP_LE_SET_PHY 0x2032
struct hci_cp_le_set_phy {
@@ -2216,7 +2227,7 @@ struct hci_bis {
__le16 sdu;
__le16 latency;
__u8 rtn;
- __u8 phy;
+ __u8 phys;
__u8 packing;
__u8 framing;
__u8 encryption;
@@ -2535,6 +2546,108 @@ struct hci_rp_le_read_conn_interval {
struct hci_le_conn_interval_group grps[];
} __packed;
+#define HCI_OP_LE_WRITE_DEF_DATA_LEN_V2 0x20b2
+struct hci_cp_le_write_def_data_len_v2 {
+ __le16 tx_len;
+ __le16 tx_time;
+ __u8 phys;
+} __packed;
+
+#define HCI_OP_LE_READ_DEF_DATA_LEN_V2 0x20b1
+struct hci_cp_le_read_def_data_len_v2 {
+ __u8 phys;
+} __packed;
+
+struct hci_rp_le_read_def_data_len_v2 {
+ __u8 status;
+ __le16 tx_len;
+ __le16 tx_time;
+} __packed;
+
+#define HCI_OP_LE_READ_MAX_DATA_LEN_V2 0x20b0
+struct hci_cp_le_read_max_data_len_v2 {
+ __u8 phy;
+} __packed;
+
+struct hci_rp_le_read_max_data_len_v2 {
+ __u8 status;
+ __le16 tx_len;
+ __le16 tx_time;
+ __le16 rx_len;
+ __le16 rx_time;
+ __u8 tx_win;
+ __u8 rx_win;
+ __le16 rx_packet;
+} __packed;
+
+/* HDT_Rates bits of the CIS and BIS parameters */
+#define HCI_HDT_RATE_2M BIT(0)
+#define HCI_HDT_RATE_3M BIT(1)
+#define HCI_HDT_RATE_4M BIT(2)
+#define HCI_HDT_RATE_6M BIT(3)
+#define HCI_HDT_RATE_7_5M BIT(4)
+
+#define HCI_OP_LE_SET_CIG_PARAMS_V2 0x20b3
+struct hci_cis_params_v2 {
+ __u8 cis_id;
+ __le16 c_sdu;
+ __le16 p_sdu;
+ __u8 c_phys;
+ __u8 p_phys;
+ __u8 c_rtn;
+ __u8 p_rtn;
+ __u8 c_coded_rates;
+ __u8 p_coded_rates;
+ __le16 c_hdt_rates;
+ __le16 p_hdt_rates;
+ __u8 mic_len;
+ __u8 format;
+} __packed;
+
+struct hci_cp_le_set_cig_params_v2 {
+ __u8 cig_id;
+ __u8 c_interval[3];
+ __u8 p_interval[3];
+ __u8 sca;
+ __u8 packing;
+ __u8 framing;
+ __le16 c_latency;
+ __le16 p_latency;
+ __u8 num_cis;
+ struct hci_cis_params_v2 cis[] __counted_by(num_cis);
+} __packed;
+
+struct hci_rp_le_set_cig_params_v2 {
+ __u8 status;
+ __u8 cig_id;
+ __u8 num_handles;
+ __le16 handle[];
+} __packed;
+
+#define HCI_OP_LE_CREATE_BIG_V2 0x20b6
+struct hci_bis_v2 {
+ __u8 sdu_interval[3];
+ __le16 sdu;
+ __le16 latency;
+ __u8 rtn;
+ __u8 phys;
+ __u8 packing;
+ __u8 framing;
+ __u8 encryption;
+ __u8 bcode[16];
+ __u8 coded_rates;
+ __le16 hdt_rates;
+ __u8 mic_len;
+ __u8 format;
+} __packed;
+
+struct hci_cp_le_create_big_v2 {
+ __u8 handle;
+ __u8 adv_handle;
+ __u8 num_bis;
+ struct hci_bis_v2 bis;
+} __packed;
+
/* ---- HCI Events ---- */
struct hci_ev_status {
__u8 status;
@@ -3360,6 +3473,58 @@ struct hci_evt_le_conn_rate_change {
__le16 supv_timeout;
} __packed;
+#define HCI_EVT_LE_CIS_ESTABLISHED_V3 0x3a
+struct hci_evt_le_cis_established_v3 {
+ __u8 status;
+ __le16 handle;
+ __u8 cig_sync_delay[3];
+ __u8 cis_sync_delay[3];
+ __u8 c_latency[3];
+ __u8 p_latency[3];
+ __u8 c_phy;
+ __u8 p_phy;
+ __u8 nse;
+ __u8 c_bn;
+ __u8 p_bn;
+ __u8 c_ft;
+ __u8 p_ft;
+ __le16 c_mtu;
+ __le16 p_mtu;
+ __le16 interval;
+ __u8 sub_interval[3];
+ __le16 c_sdu;
+ __le16 p_sdu;
+ __u8 c_sdu_interval[3];
+ __u8 p_sdu_interval[3];
+ __u8 framing;
+ __le16 c_rates;
+ __le16 p_rates;
+ __u8 config_id;
+ __u8 group_id;
+ __u8 encryption;
+ __u8 mic_len;
+} __packed;
+
+#define HCI_EVT_LE_CREATE_BIG_COMPLETE_V2 0x3b
+struct hci_evt_le_create_big_complete_v2 {
+ __u8 status;
+ __u8 handle;
+ __u8 sync_delay[3];
+ __u8 latency[3];
+ __u8 phy;
+ __u8 nse;
+ __u8 bn;
+ __u8 pto;
+ __u8 irc;
+ __le16 max_pdu;
+ __le16 interval;
+ __le16 rates;
+ __u8 encryption;
+ __u8 mic_len;
+ __u8 num_bis;
+ __le16 bis_handle[];
+} __packed;
+
#define HCI_EV_VENDOR 0xff
/* Internal events generated by Bluetooth stack */
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index e33b158086fd..e48f032bcd62 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -424,6 +424,15 @@ struct hci_dev {
__u16 le_max_tx_time;
__u16 le_max_rx_len;
__u16 le_max_rx_time;
+ __u16 hdt_def_tx_len;
+ __u16 hdt_def_tx_time;
+ __u16 hdt_max_tx_len;
+ __u16 hdt_max_tx_time;
+ __u16 hdt_max_rx_len;
+ __u16 hdt_max_rx_time;
+ __u8 hdt_max_tx_win;
+ __u8 hdt_max_rx_win;
+ __u16 hdt_max_rx_packet;
__u8 le_max_key_size;
__u8 le_min_key_size;
__u16 discov_interleaved_timeout;
@@ -784,6 +793,7 @@ struct hci_conn {
__u8 le_rx_def_phys;
__u8 le_tx_phy;
__u8 le_rx_phy;
+ __u16 le_phy_opts;
__s8 rssi;
__s8 tx_power;
__s8 max_tx_power;
@@ -2148,6 +2158,23 @@ void hci_conn_del_sysfs(struct hci_conn *conn);
(past_sender_enabled(dev) || past_receiver_enabled(dev))
#define ll_ext_feature_capable(dev) \
((dev)->le_features[7] & HCI_LE_LL_EXT_FEATURE)
+#define le_feature(dev, page, byte) \
+ (page ? ((dev)->le_features[(page - 1) * 24 + 8 + byte]) : \
+ ((dev)->le_features[byte]))
+#define hdt_capable(dev) \
+ (le_feature(dev, 1, 1) & HCI_LE_HDT_FEATURE)
+#define hdt_enabled(dev) \
+ (le_enabled(dev) && hdt_capable(dev))
+#define hdt_6_rx_capable(dev) \
+ (le_feature(dev, 1, 1) & HCI_LE_HDT_6_RX_FEATURE)
+#define hdt_6_tx_capable(dev) \
+ (le_feature(dev, 1, 1) & HCI_LE_HDT_6_TX_FEATURE)
+#define hdt_7_5_rx_capable(dev) \
+ (le_feature(dev, 1, 2) & HCI_LE_HDT_7_5_RX_FEATURE)
+#define hdt_7_5_tx_capable(dev) \
+ (le_feature(dev, 1, 2) & HCI_LE_HDT_7_5_TX_FEATURE)
+#define hdt_pf1_capable(dev) \
+ (le_feature(dev, 1, 2) & HCI_LE_HDT_PF_1)
/* Channel sounding support */
#define le_cs_capable(dev) \
diff --git a/include/net/bluetooth/hci_sync.h b/include/net/bluetooth/hci_sync.h
index 59cb918d1405..a24f6a84a447 100644
--- a/include/net/bluetooth/hci_sync.h
+++ b/include/net/bluetooth/hci_sync.h
@@ -193,4 +193,7 @@ int hci_past_sync(struct hci_conn *conn, struct hci_conn *le);
int hci_le_read_remote_features(struct hci_conn *conn);
int hci_acl_change_pkt_type(struct hci_conn *conn, u16 pkt_type);
-int hci_le_set_phy(struct hci_conn *conn, u8 tx_phys, u8 rx_phys);
+int hci_le_set_phy(struct hci_conn *conn, u8 tx_phys, u8 rx_phys, u16 phy_opts);
+int hci_le_set_cig_params_sync(struct hci_dev *hdev, u8 cig_id);
+int hci_le_create_big_sync(struct hci_conn *conn, struct bt_iso_qos *qos,
+ u8 num_bis);
diff --git a/include/net/bluetooth/mgmt.h b/include/net/bluetooth/mgmt.h
index b02e915bb44c..17bdd6345d19 100644
--- a/include/net/bluetooth/mgmt.h
+++ b/include/net/bluetooth/mgmt.h
@@ -119,6 +119,7 @@ struct mgmt_rp_read_index_list {
#define MGMT_SETTING_PAST_SENDER BIT(23)
#define MGMT_SETTING_PAST_RECEIVER BIT(24)
#define MGMT_SETTING_SCI BIT(25)
+#define MGMT_SETTING_HDT BIT(26)
#define MGMT_OP_READ_INFO 0x0004
#define MGMT_READ_INFO_SIZE 0
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index b007f623b2ec..92621a7c152b 100644
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -1941,11 +1941,8 @@ struct hci_conn *hci_connect_sco(struct hci_dev *hdev, int type, bdaddr_t *dst,
static int hci_le_create_big(struct hci_conn *conn, struct bt_iso_qos *qos)
{
struct hci_dev *hdev = conn->hdev;
- struct hci_cp_le_create_big cp;
struct iso_list_data data;
- memset(&cp, 0, sizeof(cp));
-
data.big = qos->bcast.big;
data.bis = qos->bcast.bis;
data.count = 0;
@@ -1954,84 +1951,14 @@ static int hci_le_create_big(struct hci_conn *conn, struct bt_iso_qos *qos)
hci_conn_hash_list_state(hdev, bis_list, BIS_LINK,
BT_BOUND, &data);
- cp.handle = qos->bcast.big;
- cp.adv_handle = qos->bcast.bis;
- cp.num_bis = data.count;
- hci_cpu_to_le24(qos->bcast.out.interval, cp.bis.sdu_interval);
- cp.bis.sdu = cpu_to_le16(qos->bcast.out.sdu);
- cp.bis.latency = cpu_to_le16(qos->bcast.out.latency);
- cp.bis.rtn = qos->bcast.out.rtn;
- cp.bis.phy = qos->bcast.out.phys;
- cp.bis.packing = qos->bcast.packing;
- cp.bis.framing = qos->bcast.framing;
- cp.bis.encryption = qos->bcast.encryption;
- memcpy(cp.bis.bcode, qos->bcast.bcode, sizeof(cp.bis.bcode));
-
- return hci_send_cmd(hdev, HCI_OP_LE_CREATE_BIG, sizeof(cp), &cp);
+ return hci_le_create_big_sync(conn, qos, data.count);
}
static int set_cig_params_sync(struct hci_dev *hdev, void *data)
{
- DEFINE_FLEX(struct hci_cp_le_set_cig_params, pdu, cis, num_cis, 0x1f);
u8 cig_id = PTR_UINT(data);
- struct hci_conn *conn;
- struct bt_iso_qos *qos;
- u8 aux_num_cis = 0;
- u8 cis_id;
-
- hci_dev_lock(hdev);
-
- conn = hci_conn_hash_lookup_cig(hdev, cig_id);
- if (!conn) {
- hci_dev_unlock(hdev);
- return 0;
- }
-
- qos = &conn->iso_qos;
- pdu->cig_id = cig_id;
- hci_cpu_to_le24(qos->ucast.out.interval, pdu->c_interval);
- hci_cpu_to_le24(qos->ucast.in.interval, pdu->p_interval);
- pdu->sca = qos->ucast.sca;
- pdu->packing = qos->ucast.packing;
- pdu->framing = qos->ucast.framing;
- pdu->c_latency = cpu_to_le16(qos->ucast.out.latency);
- pdu->p_latency = cpu_to_le16(qos->ucast.in.latency);
-
- /* Reprogram all CIS(s) with the same CIG, valid range are:
- * num_cis: 0x00 to 0x1F
- * cis_id: 0x00 to 0xEF
- */
- for (cis_id = 0x00; cis_id < 0xf0 &&
- aux_num_cis < pdu->num_cis; cis_id++) {
- struct hci_cis_params *cis;
- conn = hci_conn_hash_lookup_cis(hdev, NULL, 0, cig_id, cis_id);
- if (!conn)
- continue;
-
- qos = &conn->iso_qos;
-
- cis = &pdu->cis[aux_num_cis++];
- cis->cis_id = cis_id;
- cis->c_sdu = cpu_to_le16(conn->iso_qos.ucast.out.sdu);
- cis->p_sdu = cpu_to_le16(conn->iso_qos.ucast.in.sdu);
- cis->c_phys = qos->ucast.out.phys ? qos->ucast.out.phys :
- qos->ucast.in.phys;
- cis->p_phys = qos->ucast.in.phys ? qos->ucast.in.phys :
- qos->ucast.out.phys;
- cis->c_rtn = qos->ucast.out.rtn;
- cis->p_rtn = qos->ucast.in.rtn;
- }
- pdu->num_cis = aux_num_cis;
-
- hci_dev_unlock(hdev);
-
- if (!pdu->num_cis)
- return 0;
-
- return __hci_cmd_sync_status(hdev, HCI_OP_LE_SET_CIG_PARAMS,
- struct_size(pdu, cis, pdu->num_cis),
- pdu, HCI_CMD_TIMEOUT);
+ return hci_le_set_cig_params_sync(hdev, cig_id);
}
static bool hci_le_set_cig_params(struct hci_conn *conn, struct bt_iso_qos *qos)
@@ -3122,6 +3049,78 @@ u32 hci_conn_get_phy(struct hci_conn *conn)
if (conn->le_rx_def_phys & HCI_LE_SET_PHY_CODED)
phys |= BT_PHY_LE_CODED_RX;
+ if (conn->le_tx_def_phys & HCI_LE_SET_PHY_HDT) {
+ /* If le_phy_opts is set, it means user has
+ * specified specific PHYs to use rather than the
+ * default ones. PHY_Options is common to both
+ * directions, so only the rates this direction
+ * supports are reported.
+ */
+ if (conn->le_phy_opts) {
+ if (conn->le_phy_opts & BIT(2))
+ phys |= BT_PHY_HDT_2M_TX;
+
+ if (conn->le_phy_opts & BIT(3))
+ phys |= BT_PHY_HDT_3M_TX;
+
+ if (conn->le_phy_opts & BIT(4))
+ phys |= BT_PHY_HDT_4M_TX;
+
+ if (conn->le_phy_opts & BIT(5) &&
+ hdt_6_tx_capable(conn->hdev))
+ phys |= BT_PHY_HDT_6M_TX;
+
+ if (conn->le_phy_opts & BIT(6) &&
+ hdt_7_5_tx_capable(conn->hdev))
+ phys |= BT_PHY_HDT_7_5M_TX;
+ } else {
+ phys |= BT_PHY_HDT_2M_TX;
+ phys |= BT_PHY_HDT_3M_TX;
+ phys |= BT_PHY_HDT_4M_TX;
+
+ if (hdt_6_tx_capable(conn->hdev))
+ phys |= BT_PHY_HDT_6M_TX;
+
+ if (hdt_7_5_tx_capable(conn->hdev))
+ phys |= BT_PHY_HDT_7_5M_TX;
+ }
+ }
+
+ if (conn->le_rx_def_phys & HCI_LE_SET_PHY_HDT) {
+ /* If le_phy_opts is set, it means user has
+ * specified specific PHYs to use rather than the
+ * default ones.
+ */
+ if (conn->le_phy_opts) {
+ if (conn->le_phy_opts & BIT(2))
+ phys |= BT_PHY_HDT_2M_RX;
+
+ if (conn->le_phy_opts & BIT(3))
+ phys |= BT_PHY_HDT_3M_RX;
+
+ if (conn->le_phy_opts & BIT(4))
+ phys |= BT_PHY_HDT_4M_RX;
+
+ if (conn->le_phy_opts & BIT(5) &&
+ hdt_6_rx_capable(conn->hdev))
+ phys |= BT_PHY_HDT_6M_RX;
+
+ if (conn->le_phy_opts & BIT(6) &&
+ hdt_7_5_rx_capable(conn->hdev))
+ phys |= BT_PHY_HDT_7_5M_RX;
+ } else {
+ phys |= BT_PHY_HDT_2M_RX;
+ phys |= BT_PHY_HDT_3M_RX;
+ phys |= BT_PHY_HDT_4M_RX;
+
+ if (hdt_6_rx_capable(conn->hdev))
+ phys |= BT_PHY_HDT_6M_RX;
+
+ if (hdt_7_5_rx_capable(conn->hdev))
+ phys |= BT_PHY_HDT_7_5M_RX;
+ }
+ }
+
break;
}
@@ -3175,7 +3174,7 @@ static u16 bt_phy_pkt_type(struct hci_conn *conn, u32 phys)
return pkt_type;
}
-static int bt_phy_le_phy(u32 phys, u8 *tx_phys, u8 *rx_phys)
+static int bt_phy_le_phy(u32 phys, u8 *tx_phys, u8 *rx_phys, u16 *phy_opts)
{
if (!tx_phys || !rx_phys)
return -EINVAL;
@@ -3201,12 +3200,47 @@ static int bt_phy_le_phy(u32 phys, u8 *tx_phys, u8 *rx_phys)
if (phys & BT_PHY_LE_CODED_RX)
*rx_phys |= HCI_LE_SET_PHY_CODED;
+ if (phys & BT_PHY_HDT_2M_TX || phys & BT_PHY_HDT_3M_TX ||
+ phys & BT_PHY_HDT_4M_TX || phys & BT_PHY_HDT_6M_TX ||
+ phys & BT_PHY_HDT_7_5M_TX) {
+ *tx_phys |= HCI_LE_SET_PHY_HDT;
+
+ if (phys & BT_PHY_HDT_2M_TX)
+ *phy_opts |= BIT(2);
+ if (phys & BT_PHY_HDT_3M_TX)
+ *phy_opts |= BIT(3);
+ if (phys & BT_PHY_HDT_4M_TX)
+ *phy_opts |= BIT(4);
+ if (phys & BT_PHY_HDT_6M_TX)
+ *phy_opts |= BIT(5);
+ if (phys & BT_PHY_HDT_7_5M_TX)
+ *phy_opts |= BIT(6);
+ }
+
+ if (phys & BT_PHY_HDT_2M_RX || phys & BT_PHY_HDT_3M_RX ||
+ phys & BT_PHY_HDT_4M_RX || phys & BT_PHY_HDT_6M_RX ||
+ phys & BT_PHY_HDT_7_5M_RX) {
+ *rx_phys |= HCI_LE_SET_PHY_HDT;
+
+ if (phys & BT_PHY_HDT_2M_RX)
+ *phy_opts |= BIT(2);
+ if (phys & BT_PHY_HDT_3M_RX)
+ *phy_opts |= BIT(3);
+ if (phys & BT_PHY_HDT_4M_RX)
+ *phy_opts |= BIT(4);
+ if (phys & BT_PHY_HDT_6M_RX)
+ *phy_opts |= BIT(5);
+ if (phys & BT_PHY_HDT_7_5M_RX)
+ *phy_opts |= BIT(6);
+ }
+
return 0;
}
int hci_conn_set_phy(struct hci_conn *conn, u32 phys)
{
u8 tx_phys, rx_phys;
+ u16 phy_opts = 0;
switch (conn->type) {
case SCO_LINK:
@@ -3221,13 +3255,28 @@ int hci_conn_set_phy(struct hci_conn *conn, u32 phys)
bt_phy_pkt_type(conn, phys));
case LE_LINK:
/* Only allow setting LE PHYs if link type is LE */
- if (phys & ~BT_PHY_LE_MASK)
+ if (phys & ~(BT_PHY_LE_MASK | BT_PHY_HDT_MASK))
+ return -EINVAL;
+
+ /* HDT PHYs can only be selected if the controller supports
+ * them.
+ */
+ if (phys & BT_PHY_HDT_MASK && !hdt_capable(conn->hdev))
+ return -EINVAL;
+
+ /* HDT6 and HDT7.5 are optional in each direction */
+ if ((phys & BT_PHY_HDT_6M_TX && !hdt_6_tx_capable(conn->hdev)) ||
+ (phys & BT_PHY_HDT_6M_RX && !hdt_6_rx_capable(conn->hdev)) ||
+ (phys & BT_PHY_HDT_7_5M_TX &&
+ !hdt_7_5_tx_capable(conn->hdev)) ||
+ (phys & BT_PHY_HDT_7_5M_RX &&
+ !hdt_7_5_rx_capable(conn->hdev)))
return -EINVAL;
- if (bt_phy_le_phy(phys, &tx_phys, &rx_phys))
+ if (bt_phy_le_phy(phys, &tx_phys, &rx_phys, &phy_opts))
return -EINVAL;
- return hci_le_set_phy(conn, tx_phys, rx_phys);
+ return hci_le_set_phy(conn, tx_phys, rx_phys, phy_opts);
default:
return -EINVAL;
}
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index f0ce124bb12b..80b28049895b 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -2995,6 +2995,7 @@ static void hci_cs_le_set_phy(struct hci_dev *hdev, u8 status)
if (conn) {
conn->le_tx_def_phys = cp->tx_phys;
conn->le_rx_def_phys = cp->rx_phys;
+ conn->le_phy_opts = __le16_to_cpu(cp->phy_opts);
}
hci_dev_unlock(hdev);
@@ -3942,6 +3943,35 @@ static inline void handle_cmd_cnt_and_timer(struct hci_dev *hdev, u8 ncmd)
rcu_read_unlock();
}
+static u8 hci_cc_le_read_def_data_len_v2(struct hci_dev *hdev, void *data,
+ struct sk_buff *skb)
+{
+ struct hci_rp_le_read_def_data_len_v2 *rp = data;
+ struct hci_cp_le_read_def_data_len_v2 *cp;
+
+ bt_dev_dbg(hdev, "status 0x%2.2x", rp->status);
+
+ if (rp->status)
+ return rp->status;
+
+ cp = hci_sent_cmd_data(hdev, HCI_OP_LE_READ_DEF_DATA_LEN_V2);
+ if (!cp)
+ return rp->status;
+
+ switch (cp->phys) {
+ case 0x00: /* All GFSK PHYs */
+ hdev->le_def_tx_len = le16_to_cpu(rp->tx_len);
+ hdev->le_def_tx_time = le16_to_cpu(rp->tx_time);
+ break;
+ case 0x01: /* HDT PHY */
+ hdev->hdt_def_tx_len = le16_to_cpu(rp->tx_len);
+ hdev->hdt_def_tx_time = le16_to_cpu(rp->tx_time);
+ break;
+ }
+
+ return rp->status;
+}
+
static u8 hci_cc_le_read_buffer_size_v2(struct hci_dev *hdev, void *data,
struct sk_buff *skb)
{
@@ -3969,6 +3999,78 @@ static u8 hci_cc_le_read_buffer_size_v2(struct hci_dev *hdev, void *data,
return rp->status;
}
+static u8 hci_cc_le_read_max_data_len_v2(struct hci_dev *hdev, void *data,
+ struct sk_buff *skb)
+{
+ struct hci_rp_le_read_max_data_len_v2 *rp = data;
+ struct hci_cp_le_read_max_data_len_v2 *cp;
+
+ bt_dev_dbg(hdev, "status 0x%2.2x", rp->status);
+
+ if (rp->status)
+ return rp->status;
+
+ cp = hci_sent_cmd_data(hdev, HCI_OP_LE_READ_MAX_DATA_LEN_V2);
+ if (!cp)
+ return rp->status;
+
+ switch (cp->phy) {
+ case 0x00:
+ case 0x01:
+ case 0x02:
+ case 0x03:
+ hdev->le_max_tx_len = le16_to_cpu(rp->tx_len);
+ hdev->le_max_tx_time = le16_to_cpu(rp->tx_time);
+ hdev->le_max_rx_len = le16_to_cpu(rp->rx_len);
+ hdev->le_max_rx_time = le16_to_cpu(rp->rx_time);
+ break;
+ case 0x05:
+ hdev->hdt_max_tx_len = le16_to_cpu(rp->tx_len);
+ hdev->hdt_max_tx_time = le16_to_cpu(rp->tx_time);
+ hdev->hdt_max_rx_len = le16_to_cpu(rp->rx_len);
+ hdev->hdt_max_rx_time = le16_to_cpu(rp->rx_time);
+ hdev->hdt_max_tx_win = rp->tx_win;
+ hdev->hdt_max_rx_win = rp->rx_win;
+ hdev->hdt_max_rx_packet = le16_to_cpu(rp->rx_packet);
+ break;
+ }
+
+ return rp->status;
+}
+
+static u8 hci_cc_le_write_def_data_len_v2(struct hci_dev *hdev, void *data,
+ struct sk_buff *skb)
+{
+ struct hci_cp_le_write_def_data_len_v2 *sent;
+ struct hci_ev_status *rp = data;
+
+ bt_dev_dbg(hdev, "status 0x%2.2x", rp->status);
+
+ if (rp->status)
+ return rp->status;
+
+ sent = hci_sent_cmd_data(hdev, HCI_OP_LE_WRITE_DEF_DATA_LEN_V2);
+ if (!sent)
+ return rp->status;
+
+ hci_dev_lock(hdev);
+
+ switch (sent->phys) {
+ case 0x00:
+ hdev->le_def_tx_len = le16_to_cpu(sent->tx_len);
+ hdev->le_def_tx_time = le16_to_cpu(sent->tx_time);
+ break;
+ case 0x01:
+ hdev->hdt_def_tx_len = le16_to_cpu(sent->tx_len);
+ hdev->hdt_def_tx_time = le16_to_cpu(sent->tx_time);
+ break;
+ }
+
+ hci_dev_unlock(hdev);
+
+ return rp->status;
+}
+
static void hci_unbound_cis_failed(struct hci_dev *hdev, u8 cig, u8 status)
{
struct hci_conn *conn, *tmp;
@@ -4121,6 +4223,81 @@ static u8 hci_cc_le_read_all_local_features(struct hci_dev *hdev, void *data,
return rp->status;
}
+static u8 hci_cc_le_set_cig_params_v2(struct hci_dev *hdev, void *data,
+ struct sk_buff *skb)
+{
+ struct hci_rp_le_set_cig_params_v2 *rp = data;
+ struct hci_cp_le_set_cig_params_v2 *cp;
+ struct hci_conn *conn;
+ u8 status = rp->status;
+ bool pending = false;
+ size_t len;
+ int i;
+
+ bt_dev_dbg(hdev, "status 0x%2.2x", rp->status);
+
+ cp = hci_sent_cmd_data_len(hdev, HCI_OP_LE_SET_CIG_PARAMS_V2, &len);
+ if (!rp->status &&
+ (!cp || len < sizeof(*cp) ||
+ len < struct_size(cp, cis, cp->num_cis) ||
+ rp->num_handles != cp->num_cis ||
+ rp->cig_id != cp->cig_id ||
+ skb->len < array_size(rp->num_handles, sizeof(*rp->handle)))) {
+ bt_dev_err(hdev,
+ "unexpected Set CIG Parameters v2 response data");
+ status = HCI_ERROR_UNSPECIFIED;
+ }
+
+ hci_dev_lock(hdev);
+
+ /* BLUETOOTH CORE SPECIFICATION Version 5.4 | Vol 4, Part E page 2554
+ *
+ * If the Status return parameter is non-zero, then the state of the CIG
+ * and its CIS configurations shall not be changed by the command. If
+ * the CIG did not already exist, it shall not be created.
+ */
+ if (status) {
+ /* Keep current configuration, fail only the unbound CIS of the
+ * CIG the command was sent for.
+ */
+ hci_unbound_cis_failed(hdev, cp && len >= sizeof(*cp) ?
+ cp->cig_id : rp->cig_id, status);
+ goto unlock;
+ }
+
+ /* BLUETOOTH CORE SPECIFICATION Version 5.3 | Vol 4, Part E page 2553
+ *
+ * If the Status return parameter is zero, then the Controller shall
+ * set the Connection_Handle arrayed return parameter to the connection
+ * handle(s) corresponding to the CIS configurations specified in
+ * the CIS_IDs command parameter, in the same order.
+ */
+ for (i = 0; i < rp->num_handles; ++i) {
+ conn = hci_conn_hash_lookup_cis(hdev, NULL, 0, rp->cig_id,
+ cp->cis[i].cis_id);
+ if (!conn || !bacmp(&conn->dst, BDADDR_ANY))
+ continue;
+
+ if (conn->state != BT_BOUND && conn->state != BT_CONNECT)
+ continue;
+
+ if (hci_conn_set_handle(conn, __le16_to_cpu(rp->handle[i])))
+ continue;
+
+ if (conn->state == BT_CONNECT)
+ pending = true;
+ }
+
+unlock:
+ if (pending)
+ hci_le_create_cis_pending(hdev);
+
+ hci_dev_unlock(hdev);
+
+ /* A response that doesn't match the command fails it */
+ return status;
+}
+
static void hci_cs_le_create_big(struct hci_dev *hdev, u8 status)
{
bt_dev_dbg(hdev, "status 0x%2.2x", status);
@@ -4409,8 +4586,14 @@ static const struct hci_cc {
HCI_CC(HCI_OP_LE_READ_TRANSMIT_POWER, hci_cc_le_read_transmit_power,
sizeof(struct hci_rp_le_read_transmit_power)),
HCI_CC_STATUS(HCI_OP_LE_SET_PRIVACY_MODE, hci_cc_le_set_privacy_mode),
+ HCI_CC(HCI_OP_LE_READ_DEF_DATA_LEN_V2, hci_cc_le_read_def_data_len_v2,
+ sizeof(struct hci_rp_le_read_def_data_len_v2)),
HCI_CC(HCI_OP_LE_READ_BUFFER_SIZE_V2, hci_cc_le_read_buffer_size_v2,
sizeof(struct hci_rp_le_read_buffer_size_v2)),
+ HCI_CC(HCI_OP_LE_READ_MAX_DATA_LEN_V2, hci_cc_le_read_max_data_len_v2,
+ sizeof(struct hci_rp_le_read_max_data_len_v2)),
+ HCI_CC_STATUS(HCI_OP_LE_WRITE_DEF_DATA_LEN_V2,
+ hci_cc_le_write_def_data_len_v2),
HCI_CC_VL(HCI_OP_LE_SET_CIG_PARAMS, hci_cc_le_set_cig_params,
sizeof(struct hci_rp_le_set_cig_params), HCI_MAX_CC_PLEN),
HCI_CC(HCI_OP_LE_SETUP_ISO_PATH, hci_cc_le_setup_iso_path,
@@ -4418,6 +4601,9 @@ static const struct hci_cc {
HCI_CC(HCI_OP_LE_READ_ALL_LOCAL_FEATURES,
hci_cc_le_read_all_local_features,
sizeof(struct hci_rp_le_read_all_local_features)),
+ HCI_CC_VL(HCI_OP_LE_SET_CIG_PARAMS_V2, hci_cc_le_set_cig_params_v2,
+ sizeof(struct hci_rp_le_set_cig_params_v2),
+ HCI_MAX_CC_PLEN),
};
static u8 hci_cc_func(struct hci_dev *hdev, const struct hci_cc *cc,
@@ -7185,6 +7371,8 @@ static u8 le_phy_qos(u8 phy)
return HCI_LE_SET_PHY_2M;
case 0x03:
return HCI_LE_SET_PHY_CODED;
+ case 0x05:
+ return HCI_LE_SET_PHY_HDT;
}
return 0;
@@ -7368,51 +7556,45 @@ static int hci_iso_term_big_sync(struct hci_dev *hdev, void *data)
HCI_ERROR_LOCAL_HOST_TERM);
}
-static void hci_le_create_big_complete_evt(struct hci_dev *hdev, void *data,
- struct sk_buff *skb)
+static void hci_le_create_big_complete(struct hci_dev *hdev, u8 status,
+ u8 handle, u8 num_bis,
+ const __le16 *bis_handle)
{
- struct hci_evt_le_create_big_complete *ev = data;
struct hci_conn *conn;
__u8 i = 0;
- BT_DBG("%s status 0x%2.2x", hdev->name, ev->status);
-
- if (!hci_le_ev_skb_pull(hdev, skb, HCI_EVT_LE_CREATE_BIG_COMPLETE,
- flex_array_size(ev, bis_handle, ev->num_bis)))
- return;
-
hci_dev_lock(hdev);
/* Connect all BISes that are bound to the BIG */
- while ((conn = hci_conn_hash_lookup_big_state(hdev, ev->handle,
+ while ((conn = hci_conn_hash_lookup_big_state(hdev, handle,
BT_BOUND,
HCI_ROLE_MASTER))) {
- if (ev->status) {
- hci_connect_cfm(conn, ev->status);
+ if (status) {
+ hci_connect_cfm(conn, status);
hci_conn_del(conn);
continue;
}
- if (ev->num_bis <= i) {
+ if (num_bis <= i) {
bt_dev_err(hdev,
"Not enough BIS handles for BIG 0x%2.2x",
- ev->handle);
- ev->status = HCI_ERROR_UNSPECIFIED;
- hci_connect_cfm(conn, ev->status);
+ handle);
+ status = HCI_ERROR_UNSPECIFIED;
+ hci_connect_cfm(conn, status);
hci_conn_del(conn);
continue;
}
if (hci_conn_set_handle(conn,
- __le16_to_cpu(ev->bis_handle[i++]))) {
+ __le16_to_cpu(bis_handle[i++]))) {
bt_dev_err(hdev,
"Failed to set BIS handle for BIG 0x%2.2x",
- ev->handle);
+ handle);
/* Force error so BIG gets terminated as not all BIS
* could be connected.
*/
- ev->status = HCI_ERROR_UNSPECIFIED;
- hci_connect_cfm(conn, ev->status);
+ status = HCI_ERROR_UNSPECIFIED;
+ hci_connect_cfm(conn, status);
hci_conn_del(conn);
continue;
}
@@ -7427,18 +7609,33 @@ static void hci_le_create_big_complete_evt(struct hci_dev *hdev, void *data,
/* If there is an unexpected error or if no BISes have been connected
* for the BIG, terminate it.
*/
- if (ev->status == HCI_ERROR_UNSPECIFIED || (!ev->status && !i))
+ if (status == HCI_ERROR_UNSPECIFIED || (!status && !i))
/* If no BISes have been connected for the BIG,
* terminate. This is in case all bound connections
* have been closed before the BIG creation
* has completed.
*/
hci_cmd_sync_queue(hdev, hci_iso_term_big_sync,
- UINT_PTR(ev->handle), NULL);
+ UINT_PTR(handle), NULL);
hci_dev_unlock(hdev);
}
+static void hci_le_create_big_complete_evt(struct hci_dev *hdev, void *data,
+ struct sk_buff *skb)
+{
+ struct hci_evt_le_create_big_complete *ev = data;
+
+ BT_DBG("%s status 0x%2.2x", hdev->name, ev->status);
+
+ if (!hci_le_ev_skb_pull(hdev, skb, HCI_EVT_LE_CREATE_BIG_COMPLETE,
+ flex_array_size(ev, bis_handle, ev->num_bis)))
+ return;
+
+ hci_le_create_big_complete(hdev, ev->status, ev->handle, ev->num_bis,
+ ev->bis_handle);
+}
+
static void hci_le_big_sync_established_evt(struct hci_dev *hdev, void *data,
struct sk_buff *skb)
{
@@ -7623,6 +7820,11 @@ static void hci_le_read_all_remote_features_evt(struct hci_dev *hdev,
conn->le_tx_def_phys &= ~HCI_LE_SET_PHY_CODED;
conn->le_rx_def_phys &= ~HCI_LE_SET_PHY_CODED;
}
+
+ if (!hdt_capable(conn)) {
+ conn->le_tx_def_phys &= ~HCI_LE_SET_PHY_HDT;
+ conn->le_rx_def_phys &= ~HCI_LE_SET_PHY_HDT;
+ }
}
if (conn->state == BT_CONFIG) {
@@ -7682,6 +7884,109 @@ static void hci_le_conn_rate_change_evt(struct hci_dev *hdev, void *data,
hci_dev_unlock(hdev);
}
+static void hci_le_cis_established_evt_v3(struct hci_dev *hdev, void *data,
+ struct sk_buff *skb)
+{
+ struct hci_evt_le_cis_established_v3 *ev = data;
+ struct hci_conn *conn;
+ struct bt_iso_qos *qos;
+ bool pending = false;
+ u16 handle = __le16_to_cpu(ev->handle);
+ u32 c_sdu_interval, p_sdu_interval;
+
+ bt_dev_dbg(hdev, "status 0x%2.2x", ev->status);
+
+ hci_dev_lock(hdev);
+
+ conn = hci_conn_hash_lookup_handle(hdev, handle);
+ if (!conn) {
+ bt_dev_err(hdev,
+ "Unable to find connection with handle 0x%4.4x",
+ handle);
+ goto unlock;
+ }
+
+ if (conn->type != CIS_LINK) {
+ bt_dev_err(hdev,
+ "Invalid connection link type handle 0x%4.4x",
+ handle);
+ goto unlock;
+ }
+
+ qos = &conn->iso_qos;
+
+ pending = test_and_clear_bit(HCI_CONN_CREATE_CIS, conn->flags);
+
+ c_sdu_interval = get_unaligned_le24(ev->c_sdu_interval);
+ p_sdu_interval = get_unaligned_le24(ev->p_sdu_interval);
+
+ switch (conn->role) {
+ case HCI_ROLE_SLAVE:
+ qos->ucast.in.interval = c_sdu_interval;
+ qos->ucast.out.interval = p_sdu_interval;
+ /* Convert Transport Latency (us) to Latency (msec) */
+ qos->ucast.in.latency =
+ DIV_ROUND_CLOSEST(get_unaligned_le24(ev->c_latency),
+ 1000);
+ qos->ucast.out.latency =
+ DIV_ROUND_CLOSEST(get_unaligned_le24(ev->p_latency),
+ 1000);
+ qos->ucast.in.sdu = ev->c_bn ? le16_to_cpu(ev->c_mtu) : 0;
+ qos->ucast.out.sdu = ev->p_bn ? le16_to_cpu(ev->p_mtu) : 0;
+ qos->ucast.in.phys = le_phy_qos(ev->c_phy);
+ qos->ucast.out.phys = le_phy_qos(ev->p_phy);
+ break;
+ case HCI_ROLE_MASTER:
+ qos->ucast.in.interval = p_sdu_interval;
+ qos->ucast.out.interval = c_sdu_interval;
+ /* Convert Transport Latency (us) to Latency (msec) */
+ qos->ucast.out.latency =
+ DIV_ROUND_CLOSEST(get_unaligned_le24(ev->c_latency),
+ 1000);
+ qos->ucast.in.latency =
+ DIV_ROUND_CLOSEST(get_unaligned_le24(ev->p_latency),
+ 1000);
+ qos->ucast.out.sdu = ev->c_bn ? le16_to_cpu(ev->c_mtu) : 0;
+ qos->ucast.in.sdu = ev->p_bn ? le16_to_cpu(ev->p_mtu) : 0;
+ qos->ucast.out.phys = le_phy_qos(ev->c_phy);
+ qos->ucast.in.phys = le_phy_qos(ev->p_phy);
+ break;
+ }
+
+ if (!ev->status) {
+ conn->state = BT_CONNECTED;
+ hci_debugfs_create_conn(conn);
+ hci_conn_add_sysfs(conn);
+ hci_iso_setup_path(conn);
+ goto unlock;
+ }
+
+ conn->state = BT_CLOSED;
+ hci_connect_cfm(conn, ev->status);
+ hci_conn_del(conn);
+
+unlock:
+ if (pending)
+ hci_le_create_cis_pending(hdev);
+
+ hci_dev_unlock(hdev);
+}
+
+static void hci_le_create_big_complete_v2_evt(struct hci_dev *hdev, void *data,
+ struct sk_buff *skb)
+{
+ struct hci_evt_le_create_big_complete_v2 *ev = data;
+
+ BT_DBG("%s status 0x%2.2x", hdev->name, ev->status);
+
+ if (!hci_le_ev_skb_pull(hdev, skb, HCI_EVT_LE_CREATE_BIG_COMPLETE_V2,
+ flex_array_size(ev, bis_handle, ev->num_bis)))
+ return;
+
+ hci_le_create_big_complete(hdev, ev->status, ev->handle, ev->num_bis,
+ ev->bis_handle);
+}
+
#define HCI_LE_EV_VL(_op, _func, _min_len, _max_len) \
[_op] = { \
.func = _func, \
@@ -7799,6 +8104,14 @@ static const struct hci_le_ev {
/* [0x37 = HCI_EVT_LE_CONN_RATE_CHANGE] */
HCI_LE_EV(HCI_EVT_LE_CONN_RATE_CHANGE, hci_le_conn_rate_change_evt,
sizeof(struct hci_evt_le_conn_rate_change)),
+ /* [0x3a = HCI_EVT_LE_CIS_ESTABLISHED_V3] */
+ HCI_LE_EV(HCI_EVT_LE_CIS_ESTABLISHED_V3, hci_le_cis_established_evt_v3,
+ sizeof(struct hci_evt_le_cis_established_v3)),
+ /* [0x3b = HCI_EVT_LE_CREATE_BIG_COMPLETE_V2] */
+ HCI_LE_EV_VL(HCI_EVT_LE_CREATE_BIG_COMPLETE_V2,
+ hci_le_create_big_complete_v2_evt,
+ sizeof(struct hci_evt_le_create_big_complete_v2),
+ HCI_MAX_LE_SUBEVT_PLEN),
};
static void hci_le_meta_evt(struct hci_dev *hdev, void *data,
diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c
index 9213e3ef9f26..e7558de7458e 100644
--- a/net/bluetooth/hci_sync.c
+++ b/net/bluetooth/hci_sync.c
@@ -4717,6 +4717,16 @@ static int hci_le_set_event_mask_sync(struct hci_dev *hdev)
if (le_sci_capable(hdev))
events[6] |= 0x40; /* LE Connection Rate Change event */
+ /* With the newer versions of these events unmasked the controller
+ * reports them instead of the older ones.
+ */
+ if (hdt_capable(hdev)) {
+ if (cis_capable(hdev))
+ events[7] |= BIT(1); /* LE CIS Established v3 */
+ if (bis_capable(hdev))
+ events[7] |= BIT(2); /* LE Create BIG Complete v2 */
+ }
+
return __hci_cmd_sync_status(hdev, HCI_OP_LE_SET_EVENT_MASK,
sizeof(events), events, HCI_CMD_TIMEOUT);
}
@@ -4794,22 +4804,71 @@ static int hci_le_set_rpa_timeout_sync(struct hci_dev *hdev)
HCI_CMD_TIMEOUT);
}
+/* Read LE Maximum Data Length V2 */
+static int hci_le_read_max_data_len_v2_sync(struct hci_dev *hdev, u8 phy)
+{
+ struct hci_cp_le_read_max_data_len_v2 cp;
+
+ memset(&cp, 0, sizeof(cp));
+ cp.phy = phy;
+
+ return __hci_cmd_sync_status(hdev, HCI_OP_LE_READ_MAX_DATA_LEN_V2,
+ sizeof(cp), &cp, HCI_CMD_TIMEOUT);
+}
+
/* Read LE Maximum Data Length */
static int hci_le_read_max_data_len_sync(struct hci_dev *hdev)
{
if (!(hdev->le_features[0] & HCI_LE_DATA_LEN_EXT))
return 0;
+ /* Check if HDT PHY and HCI_OP_LE_READ_MAX_DATA_LEN_V2 are supported */
+ if (hdt_capable(hdev) && hdev->commands[50] & BIT(5)) {
+ int err;
+
+ /* Read max data length for non-hdt PHYs (use 0x01 for LE 1M) */
+ err = hci_le_read_max_data_len_v2_sync(hdev, 0x01);
+ if (err)
+ return err;
+
+ /* Read max data length for HDT (0x05) */
+ return hci_le_read_max_data_len_v2_sync(hdev, 0x05);
+ }
+
return __hci_cmd_sync_status(hdev, HCI_OP_LE_READ_MAX_DATA_LEN, 0, NULL,
HCI_CMD_TIMEOUT);
}
+/* Read LE Suggested Default Data Length V2 */
+static int hci_le_read_def_data_len_v2_sync(struct hci_dev *hdev, u8 phys)
+{
+ struct hci_cp_le_read_def_data_len_v2 cp;
+
+ memset(&cp, 0, sizeof(cp));
+ cp.phys = phys;
+
+ return __hci_cmd_sync_status(hdev, HCI_OP_LE_READ_DEF_DATA_LEN_V2,
+ sizeof(cp), &cp, HCI_CMD_TIMEOUT);
+}
+
/* Read LE Suggested Default Data Length */
static int hci_le_read_def_data_len_sync(struct hci_dev *hdev)
{
if (!(hdev->le_features[0] & HCI_LE_DATA_LEN_EXT))
return 0;
+ if (hdt_capable(hdev) && hdev->commands[50] & BIT(6)) {
+ int err;
+
+ /* All GFSK PHYs */
+ err = hci_le_read_def_data_len_v2_sync(hdev, 0x00);
+ if (err)
+ return err;
+
+ /* HDT PHY */
+ return hci_le_read_def_data_len_v2_sync(hdev, 0x01);
+ }
+
return __hci_cmd_sync_status(hdev, HCI_OP_LE_READ_DEF_DATA_LEN, 0, NULL,
HCI_CMD_TIMEOUT);
}
@@ -5233,6 +5292,39 @@ static const struct hci_init_stage hci_init4[] = {
{}
};
+/* Write Suggested Default Data Length V2 */
+static int hci_le_write_def_data_len_v2_sync(struct hci_dev *hdev, u8 phys)
+{
+ struct hci_cp_le_write_def_data_len_v2 cp;
+
+ switch (phys) {
+ case 0x00:
+ /* If already set to max skip */
+ if (hdev->le_def_tx_len == hdev->le_max_tx_len)
+ return 0;
+
+ memset(&cp, 0, sizeof(cp));
+ /* All GFSK PHYs */
+ cp.tx_len = cpu_to_le16(hdev->le_max_tx_len);
+ cp.tx_time = cpu_to_le16(hdev->le_max_tx_time);
+ break;
+ case 0x01:
+ /* If already set to max skip */
+ if (hdev->hdt_def_tx_len == hdev->hdt_max_tx_len)
+ return 0;
+
+ memset(&cp, 0, sizeof(cp));
+ /* HDT PHY */
+ cp.phys = 0x01;
+ cp.tx_len = cpu_to_le16(hdev->hdt_max_tx_len);
+ cp.tx_time = cpu_to_le16(hdev->hdt_max_tx_time);
+ break;
+ }
+
+ return __hci_cmd_sync_status(hdev, HCI_OP_LE_WRITE_DEF_DATA_LEN_V2,
+ sizeof(cp), &cp, HCI_CMD_TIMEOUT);
+}
+
/* Set Suggested Default Data Length to maximum if supported */
static int hci_le_set_write_def_data_len_sync(struct hci_dev *hdev)
{
@@ -5241,7 +5333,31 @@ static int hci_le_set_write_def_data_len_sync(struct hci_dev *hdev)
if (!(hdev->le_features[0] & HCI_LE_DATA_LEN_EXT))
return 0;
+ /* Clamp if reported value is over maximum allowed by spec */
+ if (hdev->le_max_tx_len > 0x00fb)
+ hdev->le_max_tx_len = 0x00fb;
+
+ if (hdev->le_max_tx_time > 0x4290)
+ hdev->le_max_tx_time = 0x4290;
+
+ /* If controller is HDT check if it support V2 then use it */
+ if (hdt_capable(hdev) && hdev->commands[50] & BIT(7)) {
+ int err;
+
+ /* All GFSK PHYs */
+ err = hci_le_write_def_data_len_v2_sync(hdev, 0x00);
+ if (err)
+ return err;
+
+ return hci_le_write_def_data_len_v2_sync(hdev, 0x01);
+ }
+
+ /* If already set to max skip */
+ if (hdev->le_def_tx_len == hdev->le_max_tx_len)
+ return 0;
+
memset(&cp, 0, sizeof(cp));
+
cp.tx_len = cpu_to_le16(hdev->le_max_tx_len);
cp.tx_time = cpu_to_le16(hdev->le_max_tx_time);
@@ -5282,6 +5398,12 @@ static int hci_le_set_default_phy_sync(struct hci_dev *hdev)
cp.rx_phys |= HCI_LE_SET_PHY_CODED;
}
+ /* Enables HDT PHY if supported */
+ if (hdt_capable(hdev)) {
+ cp.tx_phys |= HCI_LE_SET_PHY_HDT;
+ cp.rx_phys |= HCI_LE_SET_PHY_HDT;
+ }
+
return __hci_cmd_sync_status(hdev, HCI_OP_LE_SET_DEFAULT_PHY,
sizeof(cp), &cp, HCI_CMD_TIMEOUT);
}
@@ -7253,10 +7375,14 @@ int hci_le_create_cis_sync(struct hci_dev *hdev)
if (!aux_num_cis)
return 0;
- /* Wait for HCI_LE_CIS_Established */
+ /* Wait for HCI_LE_CIS_Established, which HDT capable controllers
+ * report with the v3 event since it is the one unmasked.
+ */
return __hci_cmd_sync_status_sk(hdev, HCI_OP_LE_CREATE_CIS,
struct_size(cmd, cis, cmd->num_cis),
- cmd, HCI_EVT_LE_CIS_ESTABLISHED,
+ cmd, hdt_capable(hdev) ?
+ HCI_EVT_LE_CIS_ESTABLISHED_V3 :
+ HCI_EVT_LE_CIS_ESTABLISHED,
timeout, NULL);
}
@@ -8225,7 +8351,7 @@ static int hci_le_set_phy_sync(struct hci_dev *hdev, void *data)
HCI_CMD_TIMEOUT, NULL);
}
-int hci_le_set_phy(struct hci_conn *conn, u8 tx_phys, u8 rx_phys)
+int hci_le_set_phy(struct hci_conn *conn, u8 tx_phys, u8 rx_phys, u16 phy_opts)
{
struct hci_dev *hdev = conn->hdev;
struct hci_cp_le_set_phy *cp;
@@ -8239,6 +8365,7 @@ int hci_le_set_phy(struct hci_conn *conn, u8 tx_phys, u8 rx_phys)
cp->handle = cpu_to_le16(conn->handle);
cp->tx_phys = tx_phys;
cp->rx_phys = rx_phys;
+ cp->phy_opts = cpu_to_le16(phy_opts);
err = hci_cmd_sync_queue_once(hdev, hci_le_set_phy_sync, cp,
le_phy_update_complete);
@@ -8247,3 +8374,225 @@ int hci_le_set_phy(struct hci_conn *conn, u8 tx_phys, u8 rx_phys)
return (err == -EEXIST) ? 0 : err;
}
+
+/* HDT rates the controller supports in each direction: HDT2, HDT3 and HDT4
+ * are mandatory, HDT6 and HDT7.5 are optional.
+ */
+static u16 hci_hdt_tx_rates(struct hci_dev *hdev)
+{
+ u16 rates = HCI_HDT_RATE_2M | HCI_HDT_RATE_3M | HCI_HDT_RATE_4M;
+
+ if (hdt_6_tx_capable(hdev))
+ rates |= HCI_HDT_RATE_6M;
+
+ if (hdt_7_5_tx_capable(hdev))
+ rates |= HCI_HDT_RATE_7_5M;
+
+ return rates;
+}
+
+static u16 hci_hdt_rx_rates(struct hci_dev *hdev)
+{
+ u16 rates = HCI_HDT_RATE_2M | HCI_HDT_RATE_3M | HCI_HDT_RATE_4M;
+
+ if (hdt_6_rx_capable(hdev))
+ rates |= HCI_HDT_RATE_6M;
+
+ if (hdt_7_5_rx_capable(hdev))
+ rates |= HCI_HDT_RATE_7_5M;
+
+ return rates;
+}
+
+/* LE Set CIG Params v2 */
+static int hci_le_set_cig_params_v2_sync(struct hci_dev *hdev, u8 cig_id)
+{
+ DEFINE_FLEX(struct hci_cp_le_set_cig_params_v2, pdu, cis, num_cis,
+ 0x1f);
+ struct hci_conn *conn;
+ struct bt_iso_qos *qos;
+ u8 aux_num_cis = 0;
+ u8 cis_id;
+
+ hci_dev_lock(hdev);
+
+ conn = hci_conn_hash_lookup_cig(hdev, cig_id);
+ if (!conn) {
+ hci_dev_unlock(hdev);
+ return 0;
+ }
+
+ qos = &conn->iso_qos;
+ pdu->cig_id = cig_id;
+ hci_cpu_to_le24(qos->ucast.out.interval, pdu->c_interval);
+ hci_cpu_to_le24(qos->ucast.in.interval, pdu->p_interval);
+ pdu->sca = qos->ucast.sca;
+ pdu->packing = qos->ucast.packing;
+ pdu->framing = qos->ucast.framing;
+ pdu->c_latency = cpu_to_le16(qos->ucast.out.latency);
+ pdu->p_latency = cpu_to_le16(qos->ucast.in.latency);
+
+ /* Reprogram all CIS(s) with the same CIG, valid range are:
+ * num_cis: 0x00 to 0x1F
+ * cis_id: 0x00 to 0xEF
+ */
+ for (cis_id = 0x00; cis_id < 0xf0 &&
+ aux_num_cis < pdu->num_cis; cis_id++) {
+ struct hci_cis_params_v2 *cis;
+
+ conn = hci_conn_hash_lookup_cis(hdev, NULL, 0, cig_id, cis_id);
+ if (!conn)
+ continue;
+
+ qos = &conn->iso_qos;
+
+ cis = &pdu->cis[aux_num_cis++];
+ cis->cis_id = cis_id;
+ cis->c_sdu = cpu_to_le16(conn->iso_qos.ucast.out.sdu);
+ cis->p_sdu = cpu_to_le16(conn->iso_qos.ucast.in.sdu);
+ cis->c_phys = qos->ucast.out.phys ? qos->ucast.out.phys :
+ qos->ucast.in.phys;
+ cis->p_phys = qos->ucast.in.phys ? qos->ucast.in.phys :
+ qos->ucast.out.phys;
+ cis->c_rtn = qos->ucast.out.rtn;
+ cis->p_rtn = qos->ucast.in.rtn;
+
+ if (cis->c_phys & HCI_LE_SET_PHY_HDT)
+ cis->c_hdt_rates = cpu_to_le16(hci_hdt_tx_rates(hdev));
+
+ if (cis->p_phys & HCI_LE_SET_PHY_HDT)
+ cis->p_hdt_rates = cpu_to_le16(hci_hdt_rx_rates(hdev));
+ }
+ pdu->num_cis = aux_num_cis;
+
+ hci_dev_unlock(hdev);
+
+ if (!pdu->num_cis)
+ return 0;
+
+ return __hci_cmd_sync_status(hdev, HCI_OP_LE_SET_CIG_PARAMS_V2,
+ struct_size(pdu, cis, pdu->num_cis),
+ pdu, HCI_CMD_TIMEOUT);
+}
+
+/* LE Set CIG Params */
+int hci_le_set_cig_params_sync(struct hci_dev *hdev, u8 cig_id)
+{
+ DEFINE_FLEX(struct hci_cp_le_set_cig_params, pdu, cis, num_cis, 0x1f);
+ struct hci_conn *conn;
+ struct bt_iso_qos *qos;
+ u8 aux_num_cis = 0;
+ u8 cis_id;
+
+ if (hdt_capable(hdev) && hdev->commands[51] & BIT(0))
+ return hci_le_set_cig_params_v2_sync(hdev, cig_id);
+
+ hci_dev_lock(hdev);
+
+ conn = hci_conn_hash_lookup_cig(hdev, cig_id);
+ if (!conn) {
+ hci_dev_unlock(hdev);
+ return 0;
+ }
+
+ qos = &conn->iso_qos;
+ pdu->cig_id = cig_id;
+ hci_cpu_to_le24(qos->ucast.out.interval, pdu->c_interval);
+ hci_cpu_to_le24(qos->ucast.in.interval, pdu->p_interval);
+ pdu->sca = qos->ucast.sca;
+ pdu->packing = qos->ucast.packing;
+ pdu->framing = qos->ucast.framing;
+ pdu->c_latency = cpu_to_le16(qos->ucast.out.latency);
+ pdu->p_latency = cpu_to_le16(qos->ucast.in.latency);
+
+ /* Reprogram all CIS(s) with the same CIG, valid range are:
+ * num_cis: 0x00 to 0x1F
+ * cis_id: 0x00 to 0xEF
+ */
+ for (cis_id = 0x00; cis_id < 0xf0 &&
+ aux_num_cis < pdu->num_cis; cis_id++) {
+ struct hci_cis_params *cis;
+
+ conn = hci_conn_hash_lookup_cis(hdev, NULL, 0, cig_id, cis_id);
+ if (!conn)
+ continue;
+
+ qos = &conn->iso_qos;
+
+ cis = &pdu->cis[aux_num_cis++];
+ cis->cis_id = cis_id;
+ cis->c_sdu = cpu_to_le16(conn->iso_qos.ucast.out.sdu);
+ cis->p_sdu = cpu_to_le16(conn->iso_qos.ucast.in.sdu);
+ cis->c_phys = qos->ucast.out.phys ? qos->ucast.out.phys :
+ qos->ucast.in.phys;
+ cis->p_phys = qos->ucast.in.phys ? qos->ucast.in.phys :
+ qos->ucast.out.phys;
+ cis->c_rtn = qos->ucast.out.rtn;
+ cis->p_rtn = qos->ucast.in.rtn;
+ }
+ pdu->num_cis = aux_num_cis;
+
+ hci_dev_unlock(hdev);
+
+ if (!pdu->num_cis)
+ return 0;
+
+ return __hci_cmd_sync_status(hdev, HCI_OP_LE_SET_CIG_PARAMS,
+ struct_size(pdu, cis, pdu->num_cis),
+ pdu, HCI_CMD_TIMEOUT);
+}
+
+static int hci_le_create_big_v2_sync(struct hci_conn *conn,
+ struct bt_iso_qos *qos, u8 num_bis)
+{
+ struct hci_dev *hdev = conn->hdev;
+ struct hci_cp_le_create_big_v2 cp;
+
+ memset(&cp, 0, sizeof(cp));
+ cp.handle = qos->bcast.big;
+ cp.adv_handle = qos->bcast.bis;
+ cp.num_bis = num_bis;
+ hci_cpu_to_le24(qos->bcast.out.interval, cp.bis.sdu_interval);
+ cp.bis.sdu = cpu_to_le16(qos->bcast.out.sdu);
+ cp.bis.latency = cpu_to_le16(qos->bcast.out.latency);
+ cp.bis.rtn = qos->bcast.out.rtn;
+ cp.bis.phys = qos->bcast.out.phys;
+ cp.bis.packing = qos->bcast.packing;
+ cp.bis.framing = qos->bcast.framing;
+ cp.bis.encryption = qos->bcast.encryption;
+ memcpy(cp.bis.bcode, qos->bcast.bcode, sizeof(cp.bis.bcode));
+
+ /* Check if HDT PHY is set then enable HDT supported rates */
+ if (cp.bis.phys & HCI_LE_SET_PHY_HDT)
+ cp.bis.hdt_rates = cpu_to_le16(hci_hdt_tx_rates(hdev));
+
+ return __hci_cmd_sync_status(hdev, HCI_OP_LE_CREATE_BIG_V2,
+ sizeof(cp), &cp, HCI_CMD_TIMEOUT);
+}
+
+int hci_le_create_big_sync(struct hci_conn *conn, struct bt_iso_qos *qos,
+ u8 num_bis)
+{
+ struct hci_dev *hdev = conn->hdev;
+ struct hci_cp_le_create_big cp;
+
+ if (hdt_capable(hdev) && hdev->commands[51] & BIT(3))
+ return hci_le_create_big_v2_sync(conn, qos, num_bis);
+
+ memset(&cp, 0, sizeof(cp));
+ cp.handle = qos->bcast.big;
+ cp.adv_handle = qos->bcast.bis;
+ cp.num_bis = num_bis;
+ hci_cpu_to_le24(qos->bcast.out.interval, cp.bis.sdu_interval);
+ cp.bis.sdu = cpu_to_le16(qos->bcast.out.sdu);
+ cp.bis.latency = cpu_to_le16(qos->bcast.out.latency);
+ cp.bis.rtn = qos->bcast.out.rtn;
+ cp.bis.phys = qos->bcast.out.phys;
+ cp.bis.packing = qos->bcast.packing;
+ cp.bis.framing = qos->bcast.framing;
+ cp.bis.encryption = qos->bcast.encryption;
+ memcpy(cp.bis.bcode, qos->bcast.bcode, sizeof(cp.bis.bcode));
+
+ return __hci_cmd_sync_status(hdev, HCI_OP_LE_CREATE_BIG,
+ sizeof(cp), &cp, HCI_CMD_TIMEOUT);
+}
diff --git a/net/bluetooth/iso.c b/net/bluetooth/iso.c
index 06f1e7ba2cb1..cc6c8b7ba027 100644
--- a/net/bluetooth/iso.c
+++ b/net/bluetooth/iso.c
@@ -1875,7 +1875,7 @@ static bool check_io_qos(struct bt_iso_io_qos *qos)
if (qos->latency && (qos->latency < 0x05 || qos->latency > 0xfa0))
return false;
- if (qos->phys > BT_ISO_PHY_ANY)
+ if (qos->phys & ~(BT_ISO_PHY_ANY | BT_ISO_PHY_HDT))
return false;
return true;
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 260ef2a45719..6ed3bf6f1738 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -865,6 +865,9 @@ static u32 get_supported_settings(struct hci_dev *hdev)
if (le_sci_capable(hdev))
settings |= MGMT_SETTING_SCI;
+ if (hdt_capable(hdev))
+ settings |= MGMT_SETTING_HDT;
+
settings |= MGMT_SETTING_PHY_CONFIGURATION;
return settings;
@@ -959,6 +962,9 @@ static u32 get_current_settings(struct hci_dev *hdev)
if (le_sci_enabled(hdev))
settings |= MGMT_SETTING_SCI;
+ if (hdt_enabled(hdev))
+ settings |= MGMT_SETTING_HDT;
+
return settings;
}
--
2.56.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v3 2/6] Bluetooth: ISO: Add extended QoS with the HDT rates
2026-11-04 22:13 [PATCH v3 0/6] Bluetooth: Add support for HDT and EKS Luiz Augusto von Dentz
2026-11-04 22:13 ` [PATCH v3 1/6] Bluetooth: Add initial support for HDT PHY Luiz Augusto von Dentz
@ 2026-11-04 22:13 ` Luiz Augusto von Dentz
2026-11-04 22:13 ` [PATCH v3 3/6] Bluetooth: Add initial support for EKS Luiz Augusto von Dentz
` (3 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Luiz Augusto von Dentz @ 2026-11-04 22:13 UTC (permalink / raw)
To: linux-bluetooth
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Add struct bt_iso_qos_ext, an extensible version of struct bt_iso_qos,
so new QoS fields can be added without defining a new socket option or
struct each time. It starts with two fields:
- version tells which fields are valid, so later versions can add
fields while applications built for an earlier version keep working.
- type tells which member of the union is in use, unicast or
broadcast. The QoS is usually set before bind() or connect(), when
the socket can't tell which one it was given, so without type the
two could only grow together. With it, each can be extended on its
own by adding fields at its end, which is also why the union is the
last member.
BT_ISO_QOS_ANY leaves the type to connect() or listen(), which set it.
That works for version 1 since its unicast fields are a prefix of the
broadcast ones, and is what struct bt_iso_qos uses. A type that doesn't
match how the socket is used makes connect() or listen() fail with
-EINVAL.
Version 1 adds the rates of each direction, BT_ISO_HDT_RATE_*, so
userspace can select the HDT rates of a CIS or BIS along with
BT_ISO_PHY_HDT; 0 selects every rate the controller supports.
BT_ISO_QOS accepts either struct: the length of struct bt_iso_qos
selects it, as before, and any other length must carry struct
bt_iso_qos_ext of a known version and type. The struct is copied field
by field, so its padding is zeroed. Reading BT_ISO_QOS with a buffer
shorter than struct bt_iso_qos_ext returns struct bt_iso_qos, so
existing userspace is not affected; otherwise the version and type in
use are reported, including for connections set up by the controller.
The ISO sockets keep the extended form internally, so the rates are
passed to LE Set CIG Parameters v2 and LE Create BIG v2, and reported
back from LE CIS Established v3 and LE Create BIG Complete v2.
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
---
include/net/bluetooth/bluetooth.h | 82 ++++++++++
include/net/bluetooth/hci_core.h | 15 +-
include/net/bluetooth/hci_sync.h | 2 +-
net/bluetooth/hci_conn.c | 34 +++--
net/bluetooth/hci_event.c | 20 ++-
net/bluetooth/hci_sync.c | 32 ++--
net/bluetooth/iso.c | 242 +++++++++++++++++++++++++++---
7 files changed, 371 insertions(+), 56 deletions(-)
diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h
index fbedd1ebd051..03530dab8b3a 100644
--- a/include/net/bluetooth/bluetooth.h
+++ b/include/net/bluetooth/bluetooth.h
@@ -235,6 +235,88 @@ struct bt_iso_qos {
};
};
+/* Extended ISO QoS, set and read with BT_ISO_QOS.
+ *
+ * The option length tells it apart from struct bt_iso_qos, which is kept for
+ * existing applications. New fields are added by extending this struct rather
+ * than by adding new socket options or structs:
+ *
+ * - version tells which fields are valid, so later versions can add fields
+ * while older applications keep working with the fields they know.
+ * - type tells which member of the union is in use. The QoS is usually set
+ * before bind() or connect(), so the socket can't tell unicast from
+ * broadcast at that point. With type, struct bt_iso_ucast_qos_ext and
+ * struct bt_iso_bcast_qos_ext can each grow on their own, by adding fields
+ * at their end, without the kernel having to guess which one it was given.
+ * For that the union shall remain the last member.
+ *
+ * BT_ISO_QOS_ANY leaves the type to be set by connect() or listen(), which is
+ * possible with version 1 since its unicast fields are a prefix of the
+ * broadcast ones. A type that doesn't match how the socket is used makes
+ * connect() or listen() fail with -EINVAL. getsockopt() reports the type in
+ * use once it is known.
+ *
+ * Version 1 adds the HDT rates of each direction, see BT_ISO_HDT_RATE_*, used
+ * when the PHY is BT_ISO_PHY_HDT; 0 means every rate the controller supports.
+ */
+#define BT_ISO_QOS_VERSION_1 0x0001
+
+#define BT_ISO_QOS_ANY 0x0000
+#define BT_ISO_QOS_UCAST 0x0001
+#define BT_ISO_QOS_BCAST 0x0002
+
+#define BT_ISO_HDT_RATE_2M BIT(0)
+#define BT_ISO_HDT_RATE_3M BIT(1)
+#define BT_ISO_HDT_RATE_4M BIT(2)
+#define BT_ISO_HDT_RATE_6M BIT(3)
+#define BT_ISO_HDT_RATE_7_5M BIT(4)
+
+struct bt_iso_io_qos_ext {
+ __u32 interval;
+ __u16 latency;
+ __u16 sdu;
+ __u8 phys;
+ __u8 rtn;
+ __u16 rates;
+};
+
+struct bt_iso_ucast_qos_ext {
+ __u8 cig;
+ __u8 cis;
+ __u8 sca;
+ __u8 packing;
+ __u8 framing;
+ struct bt_iso_io_qos_ext in;
+ struct bt_iso_io_qos_ext out;
+};
+
+struct bt_iso_bcast_qos_ext {
+ __u8 big;
+ __u8 bis;
+ __u8 sync_factor;
+ __u8 packing;
+ __u8 framing;
+ struct bt_iso_io_qos_ext in;
+ struct bt_iso_io_qos_ext out;
+ __u8 encryption;
+ __u8 bcode[16];
+ __u8 options;
+ __u16 skip;
+ __u16 sync_timeout;
+ __u8 sync_cte_type;
+ __u8 mse;
+ __u16 timeout;
+};
+
+struct bt_iso_qos_ext {
+ __u16 version;
+ __u16 type;
+ union { /* Shall be the last member */
+ struct bt_iso_ucast_qos_ext ucast;
+ struct bt_iso_bcast_qos_ext bcast;
+ };
+};
+
#define BT_ISO_PHY_1M BIT(0)
#define BT_ISO_PHY_2M BIT(1)
#define BT_ISO_PHY_CODED BIT(2)
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index e48f032bcd62..dd4c846343d6 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -797,7 +797,7 @@ struct hci_conn {
__s8 rssi;
__s8 tx_power;
__s8 max_tx_power;
- struct bt_iso_qos iso_qos;
+ struct bt_iso_qos_ext iso_qos;
__u8 num_bis;
__u8 bis[HCI_MAX_ISO_BIS];
@@ -1678,23 +1678,24 @@ struct hci_conn *hci_connect_sco(struct hci_dev *hdev, int type, bdaddr_t *dst,
__u16 setting, struct bt_codec *codec,
u16 timeout);
struct hci_conn *hci_bind_cis(struct hci_dev *hdev, bdaddr_t *dst,
- __u8 dst_type, struct bt_iso_qos *qos,
+ __u8 dst_type, struct bt_iso_qos_ext *qos,
u16 timeout);
struct hci_conn *hci_bind_bis(struct hci_dev *hdev, bdaddr_t *dst, __u8 sid,
- struct bt_iso_qos *qos,
+ struct bt_iso_qos_ext *qos,
__u8 base_len, __u8 *base, u16 timeout);
int hci_past_bis(struct hci_conn *conn, bdaddr_t *dst, __u8 dst_type);
struct hci_conn *hci_connect_cis(struct hci_dev *hdev, bdaddr_t *dst,
- __u8 dst_type, struct bt_iso_qos *qos,
+ __u8 dst_type, struct bt_iso_qos_ext *qos,
u16 timeout);
struct hci_conn *hci_connect_bis(struct hci_dev *hdev, bdaddr_t *dst,
__u8 dst_type, __u8 sid,
- struct bt_iso_qos *qos,
+ struct bt_iso_qos_ext *qos,
__u8 data_len, __u8 *data, u16 timeout);
struct hci_conn *hci_pa_create_sync(struct hci_dev *hdev, bdaddr_t *dst,
- __u8 dst_type, __u8 sid, struct bt_iso_qos *qos);
+ __u8 dst_type, __u8 sid,
+ struct bt_iso_qos_ext *qos);
int hci_conn_big_create_sync(struct hci_dev *hdev, struct hci_conn *hcon,
- struct bt_iso_qos *qos, __u16 sync_handle,
+ struct bt_iso_qos_ext *qos, __u16 sync_handle,
__u8 num_bis, __u8 bis[]);
int hci_conn_check_link_mode(struct hci_conn *conn);
int hci_conn_check_secure(struct hci_conn *conn, __u8 sec_level);
diff --git a/include/net/bluetooth/hci_sync.h b/include/net/bluetooth/hci_sync.h
index a24f6a84a447..aa12250eca52 100644
--- a/include/net/bluetooth/hci_sync.h
+++ b/include/net/bluetooth/hci_sync.h
@@ -195,5 +195,5 @@ int hci_le_read_remote_features(struct hci_conn *conn);
int hci_acl_change_pkt_type(struct hci_conn *conn, u16 pkt_type);
int hci_le_set_phy(struct hci_conn *conn, u8 tx_phys, u8 rx_phys, u16 phy_opts);
int hci_le_set_cig_params_sync(struct hci_dev *hdev, u8 cig_id);
-int hci_le_create_big_sync(struct hci_conn *conn, struct bt_iso_qos *qos,
+int hci_le_create_big_sync(struct hci_conn *conn, struct bt_iso_qos_ext *qos,
u8 num_bis);
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index 92621a7c152b..f5fbdcc7b45a 100644
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -1120,6 +1120,12 @@ static struct hci_conn *__hci_conn_add(struct hci_dev *hdev, int type,
conn->cleanup = cis_cleanup;
conn->mtu = hdev->iso_mtu;
+
+ /* Set for connections the controller sets up, such as an
+ * incoming CIS, sockets replace it with their own QoS.
+ */
+ conn->iso_qos.version = BT_ISO_QOS_VERSION_1;
+ conn->iso_qos.type = BT_ISO_QOS_UCAST;
break;
case PA_LINK:
case BIS_LINK:
@@ -1127,6 +1133,8 @@ static struct hci_conn *__hci_conn_add(struct hci_dev *hdev, int type,
hci_copy_identity_address(hdev, &conn->src, &conn->src_type);
conn->cleanup = bis_cleanup;
conn->mtu = hdev->iso_mtu;
+ conn->iso_qos.version = BT_ISO_QOS_VERSION_1;
+ conn->iso_qos.type = BT_ISO_QOS_BCAST;
break;
case SCO_LINK:
if (lmp_esco_capable(hdev))
@@ -1637,7 +1645,7 @@ static int hci_explicit_conn_params_set(struct hci_dev *hdev,
return 0;
}
-static int qos_set_big(struct hci_dev *hdev, struct bt_iso_qos *qos)
+static int qos_set_big(struct hci_dev *hdev, struct bt_iso_qos_ext *qos)
{
struct hci_conn *conn;
u8 big;
@@ -1661,7 +1669,7 @@ static int qos_set_big(struct hci_dev *hdev, struct bt_iso_qos *qos)
return 0;
}
-static int qos_set_bis(struct hci_dev *hdev, struct bt_iso_qos *qos)
+static int qos_set_bis(struct hci_dev *hdev, struct bt_iso_qos_ext *qos)
{
struct hci_conn *conn;
u8 bis;
@@ -1703,7 +1711,7 @@ static int qos_set_bis(struct hci_dev *hdev, struct bt_iso_qos *qos)
/* This function requires the caller holds hdev->lock */
static struct hci_conn *hci_add_bis(struct hci_dev *hdev, bdaddr_t *dst,
- __u8 sid, struct bt_iso_qos *qos,
+ __u8 sid, struct bt_iso_qos_ext *qos,
__u8 base_len, __u8 *base, u16 timeout)
{
struct hci_conn *conn;
@@ -1938,7 +1946,7 @@ struct hci_conn *hci_connect_sco(struct hci_dev *hdev, int type, bdaddr_t *dst,
return sco;
}
-static int hci_le_create_big(struct hci_conn *conn, struct bt_iso_qos *qos)
+static int hci_le_create_big(struct hci_conn *conn, struct bt_iso_qos_ext *qos)
{
struct hci_dev *hdev = conn->hdev;
struct iso_list_data data;
@@ -1961,7 +1969,7 @@ static int set_cig_params_sync(struct hci_dev *hdev, void *data)
return hci_le_set_cig_params_sync(hdev, cig_id);
}
-static bool hci_le_set_cig_params(struct hci_conn *conn, struct bt_iso_qos *qos)
+static bool hci_le_set_cig_params(struct hci_conn *conn, struct bt_iso_qos_ext *qos)
{
struct hci_dev *hdev = conn->hdev;
struct iso_list_data data;
@@ -2023,7 +2031,7 @@ static bool hci_le_set_cig_params(struct hci_conn *conn, struct bt_iso_qos *qos)
}
struct hci_conn *hci_bind_cis(struct hci_dev *hdev, bdaddr_t *dst,
- __u8 dst_type, struct bt_iso_qos *qos,
+ __u8 dst_type, struct bt_iso_qos_ext *qos,
u16 timeout)
{
struct hci_conn *cis;
@@ -2166,7 +2174,7 @@ int hci_le_create_cis_pending(struct hci_dev *hdev)
}
static void hci_iso_qos_setup(struct hci_dev *hdev, struct hci_conn *conn,
- struct bt_iso_io_qos *qos, __u8 phys)
+ struct bt_iso_io_qos_ext *qos, __u8 phys)
{
/* Only set MTU if PHY is enabled */
if (!qos->sdu && qos->phys)
@@ -2189,7 +2197,7 @@ static void hci_iso_qos_setup(struct hci_dev *hdev, struct hci_conn *conn,
static int create_big_sync(struct hci_dev *hdev, void *data)
{
struct hci_conn *conn = data;
- struct bt_iso_qos *qos = &conn->iso_qos;
+ struct bt_iso_qos_ext *qos = &conn->iso_qos;
u16 interval, sync_interval = 0;
u32 flags = 0;
int err;
@@ -2218,7 +2226,7 @@ static int create_big_sync(struct hci_dev *hdev, void *data)
struct hci_conn *hci_pa_create_sync(struct hci_dev *hdev, bdaddr_t *dst,
__u8 dst_type, __u8 sid,
- struct bt_iso_qos *qos)
+ struct bt_iso_qos_ext *qos)
{
struct hci_conn *conn;
@@ -2241,7 +2249,7 @@ struct hci_conn *hci_pa_create_sync(struct hci_dev *hdev, bdaddr_t *dst,
}
int hci_conn_big_create_sync(struct hci_dev *hdev, struct hci_conn *hcon,
- struct bt_iso_qos *qos, __u16 sync_handle,
+ struct bt_iso_qos_ext *qos, __u16 sync_handle,
__u8 num_bis, __u8 bis[])
{
int err;
@@ -2292,7 +2300,7 @@ static void create_big_complete(struct hci_dev *hdev, void *data, int err)
}
struct hci_conn *hci_bind_bis(struct hci_dev *hdev, bdaddr_t *dst, __u8 sid,
- struct bt_iso_qos *qos,
+ struct bt_iso_qos_ext *qos,
__u8 base_len, __u8 *base, u16 timeout)
{
struct hci_conn *conn;
@@ -2380,7 +2388,7 @@ static void bis_mark_per_adv(struct hci_conn *conn, void *data)
struct hci_conn *hci_connect_bis(struct hci_dev *hdev, bdaddr_t *dst,
__u8 dst_type, __u8 sid,
- struct bt_iso_qos *qos,
+ struct bt_iso_qos_ext *qos,
__u8 base_len, __u8 *base, u16 timeout)
{
struct hci_conn *conn;
@@ -2431,7 +2439,7 @@ struct hci_conn *hci_connect_bis(struct hci_dev *hdev, bdaddr_t *dst,
}
struct hci_conn *hci_connect_cis(struct hci_dev *hdev, bdaddr_t *dst,
- __u8 dst_type, struct bt_iso_qos *qos,
+ __u8 dst_type, struct bt_iso_qos_ext *qos,
u16 timeout)
{
struct hci_conn *le;
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 80b28049895b..1c1c3cb71757 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -7383,7 +7383,7 @@ static void hci_le_cis_established_evt(struct hci_dev *hdev, void *data,
{
struct hci_evt_le_cis_established *ev = data;
struct hci_conn *conn;
- struct bt_iso_qos *qos;
+ struct bt_iso_qos_ext *qos;
bool pending = false;
u16 handle = __le16_to_cpu(ev->handle);
u32 c_sdu_interval, p_sdu_interval;
@@ -7409,6 +7409,10 @@ static void hci_le_cis_established_evt(struct hci_dev *hdev, void *data,
qos = &conn->iso_qos;
+ /* This version of the event doesn't report the HDT rates */
+ qos->ucast.in.rates = 0x0000;
+ qos->ucast.out.rates = 0x0000;
+
pending = test_and_clear_bit(HCI_CONN_CREATE_CIS, conn->flags);
/* BLUETOOTH CORE SPECIFICATION Version 5.4 | Vol 6, Part G
@@ -7558,7 +7562,7 @@ static int hci_iso_term_big_sync(struct hci_dev *hdev, void *data)
static void hci_le_create_big_complete(struct hci_dev *hdev, u8 status,
u8 handle, u8 num_bis,
- const __le16 *bis_handle)
+ const __le16 *bis_handle, u16 rates)
{
struct hci_conn *conn;
__u8 i = 0;
@@ -7600,6 +7604,7 @@ static void hci_le_create_big_complete(struct hci_dev *hdev, u8 status,
}
conn->state = BT_CONNECTED;
+ conn->iso_qos.bcast.out.rates = rates;
set_bit(HCI_CONN_BIG_CREATED, conn->flags);
hci_debugfs_create_conn(conn);
hci_conn_add_sysfs(conn);
@@ -7633,7 +7638,7 @@ static void hci_le_create_big_complete_evt(struct hci_dev *hdev, void *data,
return;
hci_le_create_big_complete(hdev, ev->status, ev->handle, ev->num_bis,
- ev->bis_handle);
+ ev->bis_handle, 0x0000);
}
static void hci_le_big_sync_established_evt(struct hci_dev *hdev, void *data,
@@ -7889,7 +7894,7 @@ static void hci_le_cis_established_evt_v3(struct hci_dev *hdev, void *data,
{
struct hci_evt_le_cis_established_v3 *ev = data;
struct hci_conn *conn;
- struct bt_iso_qos *qos;
+ struct bt_iso_qos_ext *qos;
bool pending = false;
u16 handle = __le16_to_cpu(ev->handle);
u32 c_sdu_interval, p_sdu_interval;
@@ -7935,6 +7940,8 @@ static void hci_le_cis_established_evt_v3(struct hci_dev *hdev, void *data,
qos->ucast.out.sdu = ev->p_bn ? le16_to_cpu(ev->p_mtu) : 0;
qos->ucast.in.phys = le_phy_qos(ev->c_phy);
qos->ucast.out.phys = le_phy_qos(ev->p_phy);
+ qos->ucast.in.rates = le16_to_cpu(ev->c_rates);
+ qos->ucast.out.rates = le16_to_cpu(ev->p_rates);
break;
case HCI_ROLE_MASTER:
qos->ucast.in.interval = p_sdu_interval;
@@ -7950,6 +7957,8 @@ static void hci_le_cis_established_evt_v3(struct hci_dev *hdev, void *data,
qos->ucast.in.sdu = ev->p_bn ? le16_to_cpu(ev->p_mtu) : 0;
qos->ucast.out.phys = le_phy_qos(ev->c_phy);
qos->ucast.in.phys = le_phy_qos(ev->p_phy);
+ qos->ucast.out.rates = le16_to_cpu(ev->c_rates);
+ qos->ucast.in.rates = le16_to_cpu(ev->p_rates);
break;
}
@@ -7984,7 +7993,8 @@ static void hci_le_create_big_complete_v2_evt(struct hci_dev *hdev, void *data,
return;
hci_le_create_big_complete(hdev, ev->status, ev->handle, ev->num_bis,
- ev->bis_handle);
+ ev->bis_handle,
+ le16_to_cpu(ev->rates));
}
#define HCI_LE_EV_VL(_op, _func, _min_len, _max_len) \
diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c
index e7558de7458e..dd764d6a722f 100644
--- a/net/bluetooth/hci_sync.c
+++ b/net/bluetooth/hci_sync.c
@@ -3187,7 +3187,7 @@ static int hci_le_set_ext_scan_param_sync(struct hci_dev *hdev, u8 type,
conn = hci_conn_hash_lookup_ba(hdev, PA_LINK,
&bdaddr);
if (conn) {
- struct bt_iso_qos *qos = &conn->iso_qos;
+ struct bt_iso_qos_ext *qos = &conn->iso_qos;
if (qos->bcast.in.phys & BT_ISO_PHY_1M ||
qos->bcast.in.phys & BT_ISO_PHY_2M) {
@@ -7878,7 +7878,7 @@ static void create_pa_complete(struct hci_dev *hdev, void *data, int err)
}
static int hci_le_past_params_sync(struct hci_dev *hdev, struct hci_conn *conn,
- u16 acl_handle, struct bt_iso_qos *qos)
+ u16 acl_handle, struct bt_iso_qos_ext *qos)
{
struct hci_cp_le_past_params cp;
int err;
@@ -7912,7 +7912,7 @@ static int hci_le_pa_create_sync(struct hci_dev *hdev, void *data)
{
struct hci_cp_le_pa_create_sync cp;
struct hci_conn *conn = data, *le;
- struct bt_iso_qos *qos = &conn->iso_qos;
+ struct bt_iso_qos_ext *qos = &conn->iso_qos;
int err;
if (!hci_conn_valid(hdev, conn))
@@ -8053,7 +8053,7 @@ static int hci_le_big_create_sync(struct hci_dev *hdev, void *data)
DEFINE_FLEX(struct hci_cp_le_big_create_sync, cp, bis, num_bis,
HCI_MAX_ISO_BIS);
struct hci_conn *conn = data;
- struct bt_iso_qos *qos = &conn->iso_qos;
+ struct bt_iso_qos_ext *qos = &conn->iso_qos;
int err;
if (!hci_conn_valid(hdev, conn))
@@ -8410,7 +8410,7 @@ static int hci_le_set_cig_params_v2_sync(struct hci_dev *hdev, u8 cig_id)
DEFINE_FLEX(struct hci_cp_le_set_cig_params_v2, pdu, cis, num_cis,
0x1f);
struct hci_conn *conn;
- struct bt_iso_qos *qos;
+ struct bt_iso_qos_ext *qos;
u8 aux_num_cis = 0;
u8 cis_id;
@@ -8457,11 +8457,16 @@ static int hci_le_set_cig_params_v2_sync(struct hci_dev *hdev, u8 cig_id)
cis->c_rtn = qos->ucast.out.rtn;
cis->p_rtn = qos->ucast.in.rtn;
+ /* Use the rates of each direction, or all the HDT rates the
+ * controller supports if none were set.
+ */
if (cis->c_phys & HCI_LE_SET_PHY_HDT)
- cis->c_hdt_rates = cpu_to_le16(hci_hdt_tx_rates(hdev));
+ cis->c_hdt_rates = cpu_to_le16(qos->ucast.out.rates ? :
+ hci_hdt_tx_rates(hdev));
if (cis->p_phys & HCI_LE_SET_PHY_HDT)
- cis->p_hdt_rates = cpu_to_le16(hci_hdt_rx_rates(hdev));
+ cis->p_hdt_rates = cpu_to_le16(qos->ucast.in.rates ? :
+ hci_hdt_rx_rates(hdev));
}
pdu->num_cis = aux_num_cis;
@@ -8480,7 +8485,7 @@ int hci_le_set_cig_params_sync(struct hci_dev *hdev, u8 cig_id)
{
DEFINE_FLEX(struct hci_cp_le_set_cig_params, pdu, cis, num_cis, 0x1f);
struct hci_conn *conn;
- struct bt_iso_qos *qos;
+ struct bt_iso_qos_ext *qos;
u8 aux_num_cis = 0;
u8 cis_id;
@@ -8543,7 +8548,7 @@ int hci_le_set_cig_params_sync(struct hci_dev *hdev, u8 cig_id)
}
static int hci_le_create_big_v2_sync(struct hci_conn *conn,
- struct bt_iso_qos *qos, u8 num_bis)
+ struct bt_iso_qos_ext *qos, u8 num_bis)
{
struct hci_dev *hdev = conn->hdev;
struct hci_cp_le_create_big_v2 cp;
@@ -8562,15 +8567,18 @@ static int hci_le_create_big_v2_sync(struct hci_conn *conn,
cp.bis.encryption = qos->bcast.encryption;
memcpy(cp.bis.bcode, qos->bcast.bcode, sizeof(cp.bis.bcode));
- /* Check if HDT PHY is set then enable HDT supported rates */
+ /* Use the rates set, or all the HDT rates the controller supports if
+ * none were set.
+ */
if (cp.bis.phys & HCI_LE_SET_PHY_HDT)
- cp.bis.hdt_rates = cpu_to_le16(hci_hdt_tx_rates(hdev));
+ cp.bis.hdt_rates = cpu_to_le16(qos->bcast.out.rates ? :
+ hci_hdt_tx_rates(hdev));
return __hci_cmd_sync_status(hdev, HCI_OP_LE_CREATE_BIG_V2,
sizeof(cp), &cp, HCI_CMD_TIMEOUT);
}
-int hci_le_create_big_sync(struct hci_conn *conn, struct bt_iso_qos *qos,
+int hci_le_create_big_sync(struct hci_conn *conn, struct bt_iso_qos_ext *qos,
u8 num_bis)
{
struct hci_dev *hdev = conn->hdev;
diff --git a/net/bluetooth/iso.c b/net/bluetooth/iso.c
index cc6c8b7ba027..88148c122896 100644
--- a/net/bluetooth/iso.c
+++ b/net/bluetooth/iso.c
@@ -75,7 +75,7 @@ struct iso_pinfo {
__u8 bc_bis[ISO_MAX_NUM_BIS];
__u16 sync_handle;
unsigned long flags;
- struct bt_iso_qos qos;
+ struct bt_iso_qos_ext qos;
bool qos_user_set;
__u8 base_len;
__u8 base[BASE_MAX_LENGTH];
@@ -83,10 +83,23 @@ struct iso_pinfo {
struct delayed_work timeout_work;
};
-static struct bt_iso_qos default_qos;
+static struct bt_iso_qos_ext default_qos;
+
+static bool check_ucast_qos(struct bt_iso_qos_ext *qos);
+static bool check_bcast_qos(struct bt_iso_qos_ext *qos);
+
+/* The type is set by the first connect() or listen() if left as
+ * BT_ISO_QOS_ANY, otherwise it has to match how the socket is used, see
+ * struct bt_iso_qos_ext.
+ */
+static bool iso_qos_check_type(struct bt_iso_qos_ext *qos, u16 type)
+{
+ if (qos->type == BT_ISO_QOS_ANY)
+ qos->type = type;
+
+ return qos->type == type;
+}
-static bool check_ucast_qos(struct bt_iso_qos *qos);
-static bool check_bcast_qos(struct bt_iso_qos *qos);
static bool iso_match_sid(struct sock *sk, void *data);
static bool iso_match_sid_past(struct sock *sk, void *data);
static bool iso_match_sync_handle(struct sock *sk, void *data);
@@ -427,6 +440,12 @@ static int iso_connect_bis(struct sock *sk)
goto unlock;
}
+ /* Fail if the QoS was set for the other type */
+ if (!iso_qos_check_type(&iso_pi(sk)->qos, BT_ISO_QOS_BCAST)) {
+ err = -EINVAL;
+ goto unlock;
+ }
+
/* Fail if user set invalid QoS */
if (iso_pi(sk)->qos_user_set && !check_bcast_qos(&iso_pi(sk)->qos)) {
iso_pi(sk)->qos = default_qos;
@@ -531,6 +550,12 @@ static int iso_connect_cis(struct sock *sk)
goto unlock;
}
+ /* Fail if the QoS was set for the other type */
+ if (!iso_qos_check_type(&iso_pi(sk)->qos, BT_ISO_QOS_UCAST)) {
+ err = -EINVAL;
+ goto unlock;
+ }
+
/* Fail if user set invalid QoS */
if (iso_pi(sk)->qos_user_set && !check_ucast_qos(&iso_pi(sk)->qos)) {
iso_pi(sk)->qos = default_qos;
@@ -620,7 +645,7 @@ static int iso_connect_cis(struct sock *sk)
return err;
}
-static struct bt_iso_qos *iso_sock_get_qos(struct sock *sk)
+static struct bt_iso_qos_ext *iso_sock_get_qos(struct sock *sk)
{
if (sk->sk_state == BT_CONNECTED || sk->sk_state == BT_CONNECT2)
return &iso_pi(sk)->conn->hcon->iso_qos;
@@ -628,11 +653,134 @@ static struct bt_iso_qos *iso_sock_get_qos(struct sock *sk)
return &iso_pi(sk)->qos;
}
+/* The unicast QoS is a prefix of the broadcast one, with the same fields at
+ * the same offsets, in both struct bt_iso_qos and struct bt_iso_qos_ext, so
+ * converting the broadcast view converts either.
+ */
+static void iso_io_qos_to_ext(const struct bt_iso_io_qos *io,
+ struct bt_iso_io_qos_ext *ext)
+{
+ ext->interval = io->interval;
+ ext->latency = io->latency;
+ ext->sdu = io->sdu;
+ ext->phys = io->phys;
+ ext->rtn = io->rtn;
+ ext->rates = 0x0000;
+}
+
+static void iso_io_qos_from_ext(const struct bt_iso_io_qos_ext *ext,
+ struct bt_iso_io_qos *io)
+{
+ io->interval = ext->interval;
+ io->latency = ext->latency;
+ io->sdu = ext->sdu;
+ io->phys = ext->phys;
+ io->rtn = ext->rtn;
+}
+
+static void iso_io_qos_ext_copy(const struct bt_iso_io_qos_ext *src,
+ struct bt_iso_io_qos_ext *dst)
+{
+ dst->interval = src->interval;
+ dst->latency = src->latency;
+ dst->sdu = src->sdu;
+ dst->phys = src->phys;
+ dst->rtn = src->rtn;
+ dst->rates = src->rates;
+}
+
+/* Copy field by field so the padding, which the likes of hci_add_bis()
+ * compare with memcmp(), is zeroed rather than copied from or to userspace.
+ *
+ * In version 1 the unicast fields are a prefix of the broadcast ones, so
+ * copying the broadcast view copies either type. Fields added later to only
+ * one of them will need copying according to type.
+ */
+static void iso_qos_ext_copy(const struct bt_iso_qos_ext *src,
+ struct bt_iso_qos_ext *dst)
+{
+ const struct bt_iso_bcast_qos_ext *s = &src->bcast;
+ struct bt_iso_bcast_qos_ext *d = &dst->bcast;
+
+ memset(dst, 0, sizeof(*dst));
+ dst->version = BT_ISO_QOS_VERSION_1;
+ dst->type = src->type;
+
+ d->big = s->big;
+ d->bis = s->bis;
+ d->sync_factor = s->sync_factor;
+ d->packing = s->packing;
+ d->framing = s->framing;
+ iso_io_qos_ext_copy(&s->in, &d->in);
+ iso_io_qos_ext_copy(&s->out, &d->out);
+ d->encryption = s->encryption;
+ memcpy(d->bcode, s->bcode, sizeof(d->bcode));
+ d->options = s->options;
+ d->skip = s->skip;
+ d->sync_timeout = s->sync_timeout;
+ d->sync_cte_type = s->sync_cte_type;
+ d->mse = s->mse;
+ d->timeout = s->timeout;
+}
+
+static void iso_qos_to_ext(const struct bt_iso_qos *qos,
+ struct bt_iso_qos_ext *ext)
+{
+ const struct bt_iso_bcast_qos *b = &qos->bcast;
+ struct bt_iso_bcast_qos_ext *e = &ext->bcast;
+
+ memset(ext, 0, sizeof(*ext));
+ ext->version = BT_ISO_QOS_VERSION_1;
+ /* struct bt_iso_qos has no type, connect() or listen() sets it */
+ ext->type = BT_ISO_QOS_ANY;
+
+ e->big = b->big;
+ e->bis = b->bis;
+ e->sync_factor = b->sync_factor;
+ e->packing = b->packing;
+ e->framing = b->framing;
+ iso_io_qos_to_ext(&b->in, &e->in);
+ iso_io_qos_to_ext(&b->out, &e->out);
+ e->encryption = b->encryption;
+ memcpy(e->bcode, b->bcode, sizeof(e->bcode));
+ e->options = b->options;
+ e->skip = b->skip;
+ e->sync_timeout = b->sync_timeout;
+ e->sync_cte_type = b->sync_cte_type;
+ e->mse = b->mse;
+ e->timeout = b->timeout;
+}
+
+static void iso_qos_from_ext(const struct bt_iso_qos_ext *ext,
+ struct bt_iso_qos *qos)
+{
+ const struct bt_iso_bcast_qos_ext *e = &ext->bcast;
+ struct bt_iso_bcast_qos *b = &qos->bcast;
+
+ memset(qos, 0, sizeof(*qos));
+
+ b->big = e->big;
+ b->bis = e->bis;
+ b->sync_factor = e->sync_factor;
+ b->packing = e->packing;
+ b->framing = e->framing;
+ iso_io_qos_from_ext(&e->in, &b->in);
+ iso_io_qos_from_ext(&e->out, &b->out);
+ b->encryption = e->encryption;
+ memcpy(b->bcode, e->bcode, sizeof(b->bcode));
+ b->options = e->options;
+ b->skip = e->skip;
+ b->sync_timeout = e->sync_timeout;
+ b->sync_cte_type = e->sync_cte_type;
+ b->mse = e->mse;
+ b->timeout = e->timeout;
+}
+
static int iso_send_frame(struct sock *sk, struct sk_buff *skb,
const struct sockcm_cookie *sockc)
{
struct iso_conn *conn = iso_pi(sk)->conn;
- struct bt_iso_qos *qos = iso_sock_get_qos(sk);
+ struct bt_iso_qos_ext *qos = iso_sock_get_qos(sk);
struct hci_iso_data_hdr *hdr;
int len = 0;
@@ -1009,7 +1157,8 @@ static struct proto iso_proto = {
.rtn = 2u, \
}
-static struct bt_iso_qos default_qos = {
+static struct bt_iso_qos_ext default_qos = {
+ .version = BT_ISO_QOS_VERSION_1,
.bcast = {
.big = BT_ISO_QOS_BIG_UNSET,
.bis = BT_ISO_QOS_BIS_UNSET,
@@ -1375,6 +1524,12 @@ static int iso_listen_bis(struct sock *sk)
goto unlock;
}
+ /* Fail if the QoS was set for the other type */
+ if (!iso_qos_check_type(&iso_pi(sk)->qos, BT_ISO_QOS_BCAST)) {
+ err = -EINVAL;
+ goto unlock;
+ }
+
/* Fail if user set invalid QoS */
if (iso_pi(sk)->qos_user_set && !check_bcast_qos(&iso_pi(sk)->qos)) {
iso_pi(sk)->qos = default_qos;
@@ -1417,6 +1572,10 @@ static int iso_listen_cis(struct sock *sk)
BT_DBG("%pMR", &iso_pi(sk)->src);
+ /* Fail if the QoS was set for the other type */
+ if (!iso_qos_check_type(&iso_pi(sk)->qos, BT_ISO_QOS_UCAST))
+ return -EINVAL;
+
write_lock(&iso_sk_list.lock);
if (__iso_get_sock_listen_by_addr(&iso_pi(sk)->src, &iso_pi(sk)->dst))
@@ -1863,7 +2022,7 @@ static int iso_sock_recvmsg(struct socket *sock, struct msghdr *msg,
return bt_sock_recvmsg(sock, msg, len, flags);
}
-static bool check_io_qos(struct bt_iso_io_qos *qos)
+static bool check_io_qos(struct bt_iso_io_qos_ext *qos)
{
/* If no PHY is enable SDU must be 0 */
if (!qos->phys && qos->sdu)
@@ -1881,7 +2040,7 @@ static bool check_io_qos(struct bt_iso_io_qos *qos)
return true;
}
-static bool check_ucast_qos(struct bt_iso_qos *qos)
+static bool check_ucast_qos(struct bt_iso_qos_ext *qos)
{
if (qos->ucast.cig > 0xef && qos->ucast.cig != BT_ISO_QOS_CIG_UNSET)
return false;
@@ -1907,7 +2066,7 @@ static bool check_ucast_qos(struct bt_iso_qos *qos)
return true;
}
-static bool check_bcast_qos(struct bt_iso_qos *qos)
+static bool check_bcast_qos(struct bt_iso_qos_ext *qos)
{
if (!qos->bcast.sync_factor)
qos->bcast.sync_factor = 0x01;
@@ -1959,7 +2118,9 @@ static int iso_sock_setsockopt(struct socket *sock, int level, int optname,
{
struct sock *sk = sock->sk;
int err = 0;
- struct bt_iso_qos qos = default_qos;
+ struct bt_iso_qos_ext qos = default_qos;
+ struct bt_iso_qos_ext qos_user;
+ struct bt_iso_qos qos_old;
u32 opt;
BT_DBG("sk %p", sk);
@@ -2005,9 +2166,36 @@ static int iso_sock_setsockopt(struct socket *sock, int level, int optname,
break;
}
- err = copy_safe_from_sockptr(&qos, sizeof(qos), optval, optlen);
- if (err)
- break;
+ /* The length of struct bt_iso_qos selects it, any other
+ * length is struct bt_iso_qos_ext of a known version.
+ */
+ if (optlen == sizeof(qos_old)) {
+ err = copy_safe_from_sockptr(&qos_old, sizeof(qos_old),
+ optval, optlen);
+ if (err)
+ break;
+
+ iso_qos_to_ext(&qos_old, &qos);
+ } else {
+ if (optlen < sizeof(qos)) {
+ err = -EINVAL;
+ break;
+ }
+
+ err = copy_struct_from_sockptr(&qos_user,
+ sizeof(qos_user),
+ optval, optlen);
+ if (err)
+ break;
+
+ if (qos_user.version != BT_ISO_QOS_VERSION_1 ||
+ qos_user.type > BT_ISO_QOS_BCAST) {
+ err = -EINVAL;
+ break;
+ }
+
+ iso_qos_ext_copy(&qos_user, &qos);
+ }
iso_pi(sk)->qos = qos;
iso_pi(sk)->qos_user_set = true;
@@ -2048,7 +2236,9 @@ static int iso_sock_getsockopt(struct socket *sock, int level, int optname,
sockopt_t *opt)
{
struct sock *sk = sock->sk;
- struct bt_iso_qos *qos;
+ struct bt_iso_qos_ext *qos;
+ struct bt_iso_qos_ext qos_ext;
+ struct bt_iso_qos qos_old;
int len, val, err = 0;
u8 base_len;
u8 *base;
@@ -2083,9 +2273,25 @@ static int iso_sock_getsockopt(struct socket *sock, int level, int optname,
case BT_ISO_QOS:
qos = iso_sock_get_qos(sk);
- len = min_t(unsigned int, len, sizeof(*qos));
- if (copy_to_iter(qos, len, &opt->iter_out) != len)
- err = -EFAULT;
+ /* A buffer too short for struct bt_iso_qos_ext gets
+ * struct bt_iso_qos, as it did before the extension.
+ */
+ if (len < sizeof(*qos)) {
+ iso_qos_from_ext(qos, &qos_old);
+
+ len = min_t(unsigned int, len, sizeof(qos_old));
+ if (copy_to_iter(&qos_old, len, &opt->iter_out) != len)
+ err = -EFAULT;
+ } else {
+ /* Report the version of this struct, with its padding
+ * zeroed.
+ */
+ iso_qos_ext_copy(qos, &qos_ext);
+
+ len = sizeof(qos_ext);
+ if (copy_to_iter(&qos_ext, len, &opt->iter_out) != len)
+ err = -EFAULT;
+ }
break;
--
2.56.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v3 3/6] Bluetooth: Add initial support for EKS
2026-11-04 22:13 [PATCH v3 0/6] Bluetooth: Add support for HDT and EKS Luiz Augusto von Dentz
2026-11-04 22:13 ` [PATCH v3 1/6] Bluetooth: Add initial support for HDT PHY Luiz Augusto von Dentz
2026-11-04 22:13 ` [PATCH v3 2/6] Bluetooth: ISO: Add extended QoS with the HDT rates Luiz Augusto von Dentz
@ 2026-11-04 22:13 ` Luiz Augusto von Dentz
2026-11-04 22:13 ` [PATCH v3 4/6] Bluetooth: L2CAP: Add MIC length validation for HDT PHY Luiz Augusto von Dentz
` (2 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Luiz Augusto von Dentz @ 2026-11-04 22:13 UTC (permalink / raw)
To: linux-bluetooth
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Add support for Encryption Key Schedule (EKS) introduced in Bluetooth
7.0:
- LE Enable Encryption v2, which replaces LE Start Encryption on EKS
capable controllers and carries the MIC length to use on the LE HDT
PHY. SMP now starts encryption through hci_le_enable_encrypt(),
which picks the version the controller supports, outside of the RCU
read-side section since queueing the command may sleep. If it can't
be queued SMP fails the pairing or doesn't consider the encryption
started. A Command Status error disconnects the link as it does for
LE Start Encryption.
- Encryption Change v3 and Encryption Key Refresh Complete v2, enabled
through Event Mask Page 2, which report the MIC length and whether
the key schedule is in use. The encryption change and key refresh
handling is moved to helpers shared by every version of the events.
- eks_capable() for the Encryption Key Schedule feature bit.
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
---
include/net/bluetooth/hci.h | 30 +++++
include/net/bluetooth/hci_core.h | 4 +-
include/net/bluetooth/hci_sync.h | 3 +
net/bluetooth/hci_conn.c | 18 ---
net/bluetooth/hci_event.c | 185 +++++++++++++++++++++++--------
net/bluetooth/hci_sync.c | 98 ++++++++++++++++
net/bluetooth/smp.c | 54 ++++++---
7 files changed, 312 insertions(+), 80 deletions(-)
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index 00f90e24581c..41bd2482614e 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -2564,6 +2564,16 @@ struct hci_rp_le_read_def_data_len_v2 {
__le16 tx_time;
} __packed;
+#define HCI_OP_LE_ENABLE_ENCRYPT_V2 0x20af
+struct hci_cp_le_enable_encrypt_v2 {
+ __le16 handle;
+ __le64 rand;
+ __le16 ediv;
+ __u8 ltk[16];
+ __u8 mic_len;
+ __u8 encryption;
+} __packed;
+
#define HCI_OP_LE_READ_MAX_DATA_LEN_V2 0x20b0
struct hci_cp_le_read_max_data_len_v2 {
__u8 phy;
@@ -3034,6 +3044,26 @@ struct hci_ev_sync_train_complete {
#define HCI_EV_PERIPHERAL_PAGE_RESP_TIMEOUT 0x54
+#define HCI_EVT_KEY_REFRESH_COMPLETE_V2 0x5b
+struct hci_evt_key_refresh_complete_v2 {
+ __u8 status;
+ __le16 handle;
+ __u8 mic_len;
+ __u8 eks_mode;
+ __u8 eks_debug;
+} __packed;
+
+#define HCI_EVT_ENCRYPT_CHANGE_V3 0x5a
+struct hci_evt_encrypt_change_v3 {
+ __u8 status;
+ __le16 handle;
+ __u8 mode;
+ __u8 key_size;
+ __u8 mic_len;
+ __u8 eks_mode;
+ __u8 eks_debug;
+} __packed;
+
#define HCI_EV_LE_CONN_COMPLETE 0x01
struct hci_ev_le_conn_complete {
__u8 status;
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index dd4c846343d6..09a603dc43e0 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -2176,6 +2176,8 @@ void hci_conn_del_sysfs(struct hci_conn *conn);
(le_feature(dev, 1, 2) & HCI_LE_HDT_7_5_TX_FEATURE)
#define hdt_pf1_capable(dev) \
(le_feature(dev, 1, 2) & HCI_LE_HDT_PF_1)
+#define eks_capable(dev) \
+ (le_feature(dev, 1, 1) & HCI_LE_EKS_FEATURE)
/* Channel sounding support */
#define le_cs_capable(dev) \
@@ -2623,8 +2625,6 @@ void mgmt_conn_subrate_notify(struct hci_dev *hdev, struct hci_conn *conn,
int hci_abort_conn(struct hci_conn *conn, u8 reason);
void hci_le_conn_update(struct hci_conn *conn, u16 min, u16 max, u16 latency,
u16 to_multiplier);
-void hci_le_start_enc(struct hci_conn *conn, __le16 ediv, __le64 rand,
- __u8 ltk[16], __u8 key_size);
void hci_copy_identity_address(struct hci_dev *hdev, bdaddr_t *bdaddr,
u8 *bdaddr_type);
diff --git a/include/net/bluetooth/hci_sync.h b/include/net/bluetooth/hci_sync.h
index aa12250eca52..ab880384614a 100644
--- a/include/net/bluetooth/hci_sync.h
+++ b/include/net/bluetooth/hci_sync.h
@@ -197,3 +197,6 @@ int hci_le_set_phy(struct hci_conn *conn, u8 tx_phys, u8 rx_phys, u16 phy_opts);
int hci_le_set_cig_params_sync(struct hci_dev *hdev, u8 cig_id);
int hci_le_create_big_sync(struct hci_conn *conn, struct bt_iso_qos_ext *qos,
u8 num_bis);
+
+int hci_le_enable_encrypt(struct hci_conn *conn, __le16 ediv, __le64 rand,
+ __u8 ltk[16], __u8 key_size);
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index f5fbdcc7b45a..b175538bfbcd 100644
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -598,24 +598,6 @@ void hci_le_conn_update(struct hci_conn *conn, u16 min, u16 max, u16 latency,
}
}
-void hci_le_start_enc(struct hci_conn *conn, __le16 ediv, __le64 rand,
- __u8 ltk[16], __u8 key_size)
-{
- struct hci_dev *hdev = conn->hdev;
- struct hci_cp_le_start_enc cp;
-
- BT_DBG("hcon %p", conn);
-
- memset(&cp, 0, sizeof(cp));
-
- cp.handle = cpu_to_le16(conn->handle);
- cp.rand = rand;
- cp.ediv = ediv;
- memcpy(cp.ltk, ltk, key_size);
-
- hci_send_cmd(hdev, HCI_OP_LE_START_ENC, sizeof(cp), &cp);
-}
-
/* Device _must_ be locked */
void hci_sco_setup(struct hci_conn *conn, __u8 status)
{
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 1c1c3cb71757..fb30615db02a 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -3071,6 +3071,41 @@ static void hci_cs_le_start_enc(struct hci_dev *hdev, u8 status)
hci_dev_unlock(hdev);
}
+static void hci_cs_le_enable_encrypt_v2(struct hci_dev *hdev, u8 status)
+{
+ struct hci_cp_le_enable_encrypt_v2 *cp;
+ struct hci_conn *conn;
+
+ bt_dev_dbg(hdev, "status 0x%2.2x", status);
+
+ if (!status)
+ return;
+
+ hci_dev_lock(hdev);
+
+ cp = hci_sent_cmd_data(hdev, HCI_OP_LE_ENABLE_ENCRYPT_V2);
+ if (!cp)
+ goto unlock;
+
+ conn = hci_conn_hash_lookup_handle(hdev, __le16_to_cpu(cp->handle));
+ if (!conn)
+ goto unlock;
+
+ clear_bit(HCI_CONN_ENCRYPT_PEND, conn->flags);
+
+ /* An opportunistic encryption that cannot be started just leaves
+ * the link unencrypted, as it was.
+ */
+ if (cp->encryption == 0x01 || conn->state != BT_CONNECTED)
+ goto unlock;
+
+ hci_disconnect(conn, HCI_ERROR_AUTH_FAILURE);
+ hci_conn_drop(conn);
+
+unlock:
+ hci_dev_unlock(hdev);
+}
+
static void hci_cs_switch_role(struct hci_dev *hdev, u8 status)
{
struct hci_cp_switch_role *cp;
@@ -3725,22 +3760,12 @@ static void hci_remote_name_evt(struct hci_dev *hdev, void *data,
hci_dev_unlock(hdev);
}
-static void hci_encrypt_change_evt(struct hci_dev *hdev, void *data,
- struct sk_buff *skb)
+static void hci_change_encrypt(struct hci_conn *conn, u8 status, u8 encrypt)
{
- struct hci_ev_encrypt_change *ev = data;
- struct hci_conn *conn;
-
- bt_dev_dbg(hdev, "status 0x%2.2x", ev->status);
-
- hci_dev_lock(hdev);
-
- conn = hci_conn_hash_lookup_handle(hdev, __le16_to_cpu(ev->handle));
- if (!conn)
- goto unlock;
+ struct hci_dev *hdev = conn->hdev;
- if (!ev->status) {
- if (ev->encrypt) {
+ if (!status) {
+ if (encrypt) {
/* Encryption implies authentication */
set_bit(HCI_CONN_AUTH, conn->flags);
set_bit(HCI_CONN_ENCRYPT, conn->flags);
@@ -3750,7 +3775,7 @@ static void hci_encrypt_change_evt(struct hci_dev *hdev, void *data,
if (conn->key_type == HCI_LK_AUTH_COMBINATION_P256)
set_bit(HCI_CONN_FIPS, conn->flags);
- if ((conn->type == ACL_LINK && ev->encrypt == 0x02) ||
+ if ((conn->type == ACL_LINK && encrypt == 0x02) ||
conn->type == LE_LINK)
set_bit(HCI_CONN_AES_CCM, conn->flags);
@@ -3781,7 +3806,7 @@ static void hci_encrypt_change_evt(struct hci_dev *hdev, void *data,
/* We should disregard the current RPA and generate a new one
* whenever the encryption procedure fails.
*/
- if (ev->status && conn->type == LE_LINK) {
+ if (status && conn->type == LE_LINK) {
hci_dev_set_flag(hdev, HCI_RPA_EXPIRED);
hci_adv_instances_set_rpa_expired(hdev, true);
}
@@ -3790,23 +3815,23 @@ static void hci_encrypt_change_evt(struct hci_dev *hdev, void *data,
/* Check link security requirements are met */
if (!hci_conn_check_link_mode(conn))
- ev->status = HCI_ERROR_AUTH_FAILURE;
+ status = HCI_ERROR_AUTH_FAILURE;
- if (ev->status && conn->state == BT_CONNECTED) {
- if (ev->status == HCI_ERROR_PIN_OR_KEY_MISSING)
+ if (status && conn->state == BT_CONNECTED) {
+ if (status == HCI_ERROR_PIN_OR_KEY_MISSING)
set_bit(HCI_CONN_AUTH_FAILURE, conn->flags);
/* Notify upper layers so they can cleanup before
* disconnecting.
*/
- hci_encrypt_cfm(conn, ev->status);
+ hci_encrypt_cfm(conn, status);
hci_disconnect(conn, HCI_ERROR_AUTH_FAILURE);
hci_conn_drop(conn);
- goto unlock;
+ return;
}
/* Try reading the encryption key size for encrypted ACL links */
- if (!ev->status && ev->encrypt && conn->type == ACL_LINK) {
+ if (!status && encrypt && conn->type == ACL_LINK) {
if (hci_read_enc_key_size(hdev, conn)) {
/* Could not even issue the key-size read: report the
* security level now since hci_cc_read_enc_key_size()
@@ -3816,7 +3841,7 @@ static void hci_encrypt_change_evt(struct hci_dev *hdev, void *data,
goto notify;
}
- goto unlock;
+ return;
}
/* We skip the WRITE_AUTH_PAYLOAD_TIMEOUT for ATS2851 based controllers
@@ -3846,7 +3871,44 @@ static void hci_encrypt_change_evt(struct hci_dev *hdev, void *data,
}
notify:
- hci_encrypt_cfm(conn, ev->status);
+ hci_encrypt_cfm(conn, status);
+}
+
+static void hci_encrypt_change_evt(struct hci_dev *hdev, void *data,
+ struct sk_buff *skb)
+{
+ struct hci_ev_encrypt_change *ev = data;
+ struct hci_conn *conn;
+
+ bt_dev_dbg(hdev, "status 0x%2.2x", ev->status);
+
+ hci_dev_lock(hdev);
+
+ conn = hci_conn_hash_lookup_handle(hdev, __le16_to_cpu(ev->handle));
+ if (!conn)
+ goto unlock;
+
+ hci_change_encrypt(conn, ev->status, ev->encrypt);
+
+unlock:
+ hci_dev_unlock(hdev);
+}
+
+static void hci_encrypt_change_v3_evt(struct hci_dev *hdev, void *data,
+ struct sk_buff *skb)
+{
+ struct hci_evt_encrypt_change_v3 *ev = data;
+ struct hci_conn *conn;
+
+ bt_dev_dbg(hdev, "status 0x%2.2x", ev->status);
+
+ hci_dev_lock(hdev);
+
+ conn = hci_conn_hash_lookup_handle(hdev, __le16_to_cpu(ev->handle));
+ if (!conn)
+ goto unlock;
+
+ hci_change_encrypt(conn, ev->status, ev->mode);
unlock:
hci_dev_unlock(hdev);
@@ -4760,6 +4822,7 @@ static const struct hci_cs {
HCI_CS(HCI_OP_LE_CREATE_CONN, hci_cs_le_create_conn),
HCI_CS(HCI_OP_LE_READ_REMOTE_FEATURES, hci_cs_le_read_remote_features),
HCI_CS(HCI_OP_LE_START_ENC, hci_cs_le_start_enc),
+ HCI_CS(HCI_OP_LE_ENABLE_ENCRYPT_V2, hci_cs_le_enable_encrypt_v2),
HCI_CS(HCI_OP_LE_SET_PHY, hci_cs_le_set_phy),
HCI_CS(HCI_OP_LE_EXT_CREATE_CONN, hci_cs_le_ext_create_conn),
HCI_CS(HCI_OP_LE_CREATE_CIS, hci_cs_le_create_cis),
@@ -5555,28 +5618,15 @@ static void hci_extended_inquiry_result_evt(struct hci_dev *hdev, void *edata,
hci_dev_unlock(hdev);
}
-static void hci_key_refresh_complete_evt(struct hci_dev *hdev, void *data,
- struct sk_buff *skb)
+static void hci_conn_refresh_key(struct hci_conn *conn, u8 status)
{
- struct hci_ev_key_refresh_complete *ev = data;
- struct hci_conn *conn;
-
- bt_dev_dbg(hdev, "status 0x%2.2x handle 0x%4.4x", ev->status,
- __le16_to_cpu(ev->handle));
-
- hci_dev_lock(hdev);
-
- conn = hci_conn_hash_lookup_handle(hdev, __le16_to_cpu(ev->handle));
- if (!conn)
- goto unlock;
-
/* For BR/EDR the necessary steps are taken through the
* auth_complete event.
*/
if (conn->type != LE_LINK)
- goto unlock;
+ return;
- if (!ev->status) {
+ if (!status) {
bool sec_level_changed =
conn->sec_level != conn->pending_sec_level;
@@ -5587,25 +5637,64 @@ static void hci_key_refresh_complete_evt(struct hci_dev *hdev, void *data,
clear_bit(HCI_CONN_ENCRYPT_PEND, conn->flags);
- if (ev->status && conn->state == BT_CONNECTED) {
+ if (status && conn->state == BT_CONNECTED) {
hci_disconnect(conn, HCI_ERROR_AUTH_FAILURE);
hci_conn_drop(conn);
- goto unlock;
+ return;
}
if (conn->state == BT_CONFIG) {
- if (!ev->status)
+ if (!status)
conn->state = BT_CONNECTED;
- hci_connect_cfm(conn, ev->status);
+ hci_connect_cfm(conn, status);
hci_conn_drop(conn);
} else {
- hci_auth_cfm(conn, ev->status);
+ hci_auth_cfm(conn, status);
hci_conn_hold(conn);
conn->disc_timeout = HCI_DISCONN_TIMEOUT;
hci_conn_drop(conn);
}
+}
+
+static void hci_key_refresh_complete_evt(struct hci_dev *hdev, void *data,
+ struct sk_buff *skb)
+{
+ struct hci_ev_key_refresh_complete *ev = data;
+ struct hci_conn *conn;
+
+ bt_dev_dbg(hdev, "status 0x%2.2x handle 0x%4.4x", ev->status,
+ __le16_to_cpu(ev->handle));
+
+ hci_dev_lock(hdev);
+
+ conn = hci_conn_hash_lookup_handle(hdev, __le16_to_cpu(ev->handle));
+ if (!conn)
+ goto unlock;
+
+ hci_conn_refresh_key(conn, ev->status);
+
+unlock:
+ hci_dev_unlock(hdev);
+}
+
+static void hci_key_refresh_complete_v2_evt(struct hci_dev *hdev, void *data,
+ struct sk_buff *skb)
+{
+ struct hci_evt_key_refresh_complete_v2 *ev = data;
+ struct hci_conn *conn;
+
+ bt_dev_dbg(hdev, "status 0x%2.2x handle 0x%4.4x", ev->status,
+ __le16_to_cpu(ev->handle));
+
+ hci_dev_lock(hdev);
+
+ conn = hci_conn_hash_lookup_handle(hdev, __le16_to_cpu(ev->handle));
+ if (!conn)
+ goto unlock;
+
+ hci_conn_refresh_key(conn, ev->status);
unlock:
hci_dev_unlock(hdev);
@@ -8402,6 +8491,12 @@ static const struct hci_ev {
/* [0x3e = HCI_EV_LE_META] */
HCI_EV_REQ_VL(HCI_EV_LE_META, hci_le_meta_evt,
sizeof(struct hci_ev_le_meta), HCI_MAX_EVENT_PLEN),
+ /* [0xfb = HCI_EVT_LE_ENCRYPT_KEY_REFRESH_COMPLETE_V2] */
+ HCI_EV(HCI_EVT_KEY_REFRESH_COMPLETE_V2, hci_key_refresh_complete_v2_evt,
+ sizeof(struct hci_evt_key_refresh_complete_v2)),
+ /* [0xfc = HCI_EVT_LE_ENCRYPT_CHANGE_V3 */
+ HCI_EV(HCI_EVT_ENCRYPT_CHANGE_V3, hci_encrypt_change_v3_evt,
+ sizeof(struct hci_evt_encrypt_change_v3)),
/* [0xff = HCI_EV_VENDOR] */
HCI_EV_VL(HCI_EV_VENDOR, hci_vendor_evt, 0, HCI_MAX_EVENT_PLEN),
};
diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c
index dd764d6a722f..f5083823223c 100644
--- a/net/bluetooth/hci_sync.c
+++ b/net/bluetooth/hci_sync.c
@@ -5180,6 +5180,13 @@ static int hci_set_event_mask_page_2_sync(struct hci_dev *hdev)
changed = true;
}
+ if (eks_capable(hdev)) {
+ /* EKS events */
+ events[3] |= BIT(2); /* Encrytion Change v3 */
+ events[3] |= BIT(3); /* Encrytion Key Refresh Complete v2 */
+ changed = true;
+ }
+
/* Some Broadcom based controllers indicate support for Set Event
* Mask Page 2 command, but then actually do not support it. Since
* the default value is all bits set to zero, the command is only
@@ -8456,6 +8463,7 @@ static int hci_le_set_cig_params_v2_sync(struct hci_dev *hdev, u8 cig_id)
qos->ucast.out.phys;
cis->c_rtn = qos->ucast.out.rtn;
cis->p_rtn = qos->ucast.in.rtn;
+ cis->mic_len = 0x02; /* Always prefer 128 bits? */
/* Use the rates of each direction, or all the HDT rates the
* controller supports if none were set.
@@ -8604,3 +8612,93 @@ int hci_le_create_big_sync(struct hci_conn *conn, struct bt_iso_qos_ext *qos,
return __hci_cmd_sync_status(hdev, HCI_OP_LE_CREATE_BIG,
sizeof(cp), &cp, HCI_CMD_TIMEOUT);
}
+
+static void le_enable_encrypt_complete(struct hci_dev *hdev, void *data, int err)
+{
+ bt_dev_dbg(hdev, "err %d", err);
+
+ kfree(data);
+}
+
+static int hci_le_enable_encrypt_v2_sync(struct hci_dev *hdev, void *data)
+{
+ struct hci_cp_le_enable_encrypt_v2 *cp = data;
+
+ return __hci_cmd_sync_status(hdev, HCI_OP_LE_ENABLE_ENCRYPT_V2,
+ sizeof(*cp), cp, HCI_CMD_TIMEOUT);
+}
+
+static int hci_le_enable_encrypt_v2(struct hci_conn *conn, __le16 ediv,
+ __le64 rand, __u8 ltk[16], __u8 key_size)
+{
+ struct hci_dev *hdev = conn->hdev;
+ struct hci_cp_le_enable_encrypt_v2 *cp;
+ int err;
+
+ bt_dev_dbg(hdev, "hcon %p", conn);
+
+ cp = kzalloc_obj(*cp);
+ if (!cp)
+ return -ENOMEM;
+
+ cp->handle = cpu_to_le16(conn->handle);
+ cp->rand = rand;
+ cp->ediv = ediv;
+ cp->mic_len = 0x02; /* Always prefer 128 bits? */
+
+ /* The key is zero padded when shorter than 16 octets */
+ if (ltk) {
+ memcpy(cp->ltk, ltk, key_size);
+ cp->encryption = 0x00; /* Use LTK provided in LTK field */
+ } else {
+ cp->encryption = 0x01; /* Use opportunistic with EKS */
+ }
+
+ err = hci_cmd_sync_queue_once(hdev, hci_le_enable_encrypt_v2_sync, cp,
+ le_enable_encrypt_complete);
+ if (err)
+ kfree(cp);
+
+ return err;
+}
+
+static int hci_le_enable_encrypt_sync(struct hci_dev *hdev, void *data)
+{
+ struct hci_cp_le_start_enc *cp = data;
+
+ return __hci_cmd_sync_status(hdev, HCI_OP_LE_START_ENC,
+ sizeof(*cp), cp,
+ HCI_CMD_TIMEOUT);
+}
+
+int hci_le_enable_encrypt(struct hci_conn *conn, __le16 ediv, __le64 rand,
+ __u8 ltk[16], __u8 key_size)
+{
+ struct hci_dev *hdev = conn->hdev;
+ struct hci_cp_le_start_enc *cp;
+ int err;
+
+ /* Check if EKS and HCI_OP_LE_ENABLE_ENCRYPT_V2 are supported */
+ if (eks_capable(hdev) && (hdev->commands[50] & BIT(4)))
+ return hci_le_enable_encrypt_v2(conn, ediv, rand, ltk,
+ key_size);
+
+ bt_dev_dbg(hdev, "hcon %p", conn);
+
+ /* The key is zero padded when shorter than 16 octets */
+ cp = kzalloc_obj(*cp);
+ if (!cp)
+ return -ENOMEM;
+
+ cp->handle = cpu_to_le16(conn->handle);
+ cp->rand = rand;
+ cp->ediv = ediv;
+ memcpy(cp->ltk, ltk, key_size);
+
+ err = hci_cmd_sync_queue_once(hdev, hci_le_enable_encrypt_sync, cp,
+ le_enable_encrypt_complete);
+ if (err)
+ kfree(cp);
+
+ return err;
+}
diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index b7015e37e1f1..dce5ad7b3b6b 100644
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@ -987,7 +987,12 @@ static u8 smp_random(struct smp_chan *smp)
if (test_and_set_bit(HCI_CONN_ENCRYPT_PEND, hcon->flags))
return SMP_UNSPECIFIED;
- hci_le_start_enc(hcon, ediv, rand, stk, smp->enc_key_size);
+ if (hci_le_enable_encrypt(hcon, ediv, rand, stk,
+ smp->enc_key_size)) {
+ clear_bit(HCI_CONN_ENCRYPT_PEND, hcon->flags);
+ return SMP_UNSPECIFIED;
+ }
+
hcon->enc_key_size = smp->enc_key_size;
set_bit(HCI_CONN_STK_ENCRYPT, hcon->flags);
} else {
@@ -2209,30 +2214,46 @@ static bool smp_ltk_encrypt(struct l2cap_conn *conn, u8 sec_level)
{
struct smp_ltk *key;
struct hci_conn *hcon = conn->hcon;
- bool ret = false;
+ u8 val[16], enc_size;
+ __le64 rand;
+ __le16 ediv;
rcu_read_lock();
key = hci_find_ltk(hcon->hdev, &hcon->dst, hcon->dst_type, hcon->role);
- if (!key)
- goto unlock;
+ if (!key || smp_ltk_sec_level(key) < sec_level) {
+ rcu_read_unlock();
+ return false;
+ }
- if (smp_ltk_sec_level(key) < sec_level)
- goto unlock;
+ if (test_and_set_bit(HCI_CONN_ENCRYPT_PEND, hcon->flags)) {
+ rcu_read_unlock();
+ return true;
+ }
- ret = true;
- if (test_and_set_bit(HCI_CONN_ENCRYPT_PEND, hcon->flags))
- goto unlock;
+ /* Starting the encryption may sleep, so take a copy of the key and
+ * leave the RCU read-side section first.
+ */
+ memcpy(val, key->val, sizeof(val));
+ enc_size = key->enc_size;
+ rand = key->rand;
+ ediv = key->ediv;
+
+ rcu_read_unlock();
+
+ if (hci_le_enable_encrypt(hcon, ediv, rand, val, enc_size)) {
+ memzero_explicit(val, sizeof(val));
+ clear_bit(HCI_CONN_ENCRYPT_PEND, hcon->flags);
+ return false;
+ }
- hci_le_start_enc(hcon, key->ediv, key->rand, key->val, key->enc_size);
- hcon->enc_key_size = key->enc_size;
+ hcon->enc_key_size = enc_size;
+ memzero_explicit(val, sizeof(val));
/* We never store STKs for initiator role, so clear this flag */
clear_bit(HCI_CONN_STK_ENCRYPT, hcon->flags);
-unlock:
- rcu_read_unlock();
- return ret;
+ return true;
}
bool smp_sufficient_security(struct hci_conn *hcon, u8 sec_level,
@@ -2927,7 +2948,10 @@ static int smp_cmd_dhkey_check(struct l2cap_conn *conn, struct sk_buff *skb)
sc_add_ltk(smp);
if (test_bit(SMP_FLAG_INITIATOR, &smp->flags)) {
- hci_le_start_enc(hcon, 0, 0, smp->tk, smp->enc_key_size);
+ if (hci_le_enable_encrypt(hcon, 0, 0, smp->tk,
+ smp->enc_key_size))
+ return SMP_UNSPECIFIED;
+
hcon->enc_key_size = smp->enc_key_size;
}
--
2.56.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v3 4/6] Bluetooth: L2CAP: Add MIC length validation for HDT PHY
2026-11-04 22:13 [PATCH v3 0/6] Bluetooth: Add support for HDT and EKS Luiz Augusto von Dentz
` (2 preceding siblings ...)
2026-11-04 22:13 ` [PATCH v3 3/6] Bluetooth: Add initial support for EKS Luiz Augusto von Dentz
@ 2026-11-04 22:13 ` Luiz Augusto von Dentz
2026-11-04 22:13 ` [PATCH v3 5/6] Bluetooth: Add HCI_OP_LE_SET_HDT_DEFAULT_PARAMS support Luiz Augusto von Dentz
2026-11-04 22:13 ` [PATCH v3 6/6] Bluetooth: Add EKS Opportunistic Encryption support Luiz Augusto von Dentz
5 siblings, 0 replies; 9+ messages in thread
From: Luiz Augusto von Dentz @ 2026-11-04 22:13 UTC (permalink / raw)
To: linux-bluetooth
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Add a mic_len field to struct bt_security so userspace can require a
minimum MIC length on an L2CAP channel with BT_SECURITY, and read the
MIC length in use on the link back. The field is added at the end of
the struct, so the shorter struct is still accepted by L2CAP and RFCOMM,
leaving mic_len unset, and values other than 32, 64 and 128 bits are
rejected.
The MIC length a channel requires is requested on the connection on
every path starting LE security, so LE Enable Encryption v2 asks for
it, while the MIC length the controller reports with Encryption Change
v3 and Encryption Key Refresh Complete v2 is kept separately, so a
request never stands for what is in use. When a connection is
encrypted on the LE HDT PHY with a MIC shorter than the channel
requires, the LE Credit Based and Enhanced Credit Based connection
requests are rejected with MIC Length Too Short.
The reported MIC length only applies on the LE HDT PHY, the MIC is
always 32 bits on the GFSK PHYs, so hci_conn_mic_len() reports it as
such both for the check and for BT_SECURITY.
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
---
include/net/bluetooth/bluetooth.h | 1 +
include/net/bluetooth/hci_core.h | 9 +++++++
include/net/bluetooth/l2cap.h | 7 +++++
net/bluetooth/hci_event.c | 19 ++++++++++---
net/bluetooth/hci_sync.c | 5 +++-
net/bluetooth/l2cap_core.c | 44 ++++++++++++++++++++++++++++++-
net/bluetooth/l2cap_sock.c | 23 +++++++++++++---
net/bluetooth/rfcomm/sock.c | 13 ++++++---
8 files changed, 110 insertions(+), 11 deletions(-)
diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h
index 03530dab8b3a..fbec6c0f233d 100644
--- a/include/net/bluetooth/bluetooth.h
+++ b/include/net/bluetooth/bluetooth.h
@@ -66,6 +66,7 @@
struct bt_security {
__u8 level;
__u8 key_size;
+ __u8 mic_len;
};
#define BT_SECURITY_SDP 0
#define BT_SECURITY_LOW 1
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 09a603dc43e0..d08bca919793 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -765,6 +765,8 @@ struct hci_conn {
__u8 pending_sec_level;
__u8 pin_length;
__u8 enc_key_size;
+ __u8 mic_len;
+ __u8 req_mic_len;
__u8 io_capability;
__u32 passkey_notify;
__u8 passkey_entered;
@@ -2176,6 +2178,13 @@ void hci_conn_del_sysfs(struct hci_conn *conn);
(le_feature(dev, 1, 2) & HCI_LE_HDT_7_5_TX_FEATURE)
#define hdt_pf1_capable(dev) \
(le_feature(dev, 1, 2) & HCI_LE_HDT_PF_1)
+/* The MIC length reported by the controller only applies on the LE HDT PHY,
+ * the MIC is always 32 bits (0x00) on the GFSK PHYs.
+ */
+static inline __u8 hci_conn_mic_len(struct hci_conn *conn)
+{
+ return conn->le_rx_phy == 0x05 ? conn->mic_len : 0x00;
+}
#define eks_capable(dev) \
(le_feature(dev, 1, 1) & HCI_LE_EKS_FEATURE)
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
index 54eddcdd341f..7eda42071b06 100644
--- a/include/net/bluetooth/l2cap.h
+++ b/include/net/bluetooth/l2cap.h
@@ -285,6 +285,11 @@ struct l2cap_conn_rsp {
#define L2CAP_CR_LE_SCID_IN_USE 0x000A
#define L2CAP_CR_LE_UNACCEPT_PARAMS 0x000B
#define L2CAP_CR_LE_INVALID_PARAMS 0x000C
+/* MIC Length Too Short has a different value in each response: the LE Credit
+ * Based value is Invalid Parameters in the Enhanced Credit Based one.
+ */
+#define L2CAP_CR_LE_MIC_LEN_TOO_SHORT 0x000C
+#define L2CAP_CR_ECRED_MIC_LEN_TOO_SHORT 0x0010
/* connect/create channel status */
#define L2CAP_CS_NO_INFO 0x0000
@@ -533,6 +538,7 @@ struct l2cap_chan {
__u8 chan_policy;
__u8 sec_level;
+ __u8 mic_len;
__u8 ident;
@@ -981,6 +987,7 @@ int l2cap_chan_send(struct l2cap_chan *chan, struct msghdr *msg, size_t len,
const struct sockcm_cookie *sockc);
void l2cap_chan_busy(struct l2cap_chan *chan, int busy);
void l2cap_chan_rx_avail(struct l2cap_chan *chan, ssize_t rx_avail);
+void l2cap_chan_req_mic_len(struct l2cap_chan *chan, struct hci_conn *hcon);
int l2cap_chan_check_security(struct l2cap_chan *chan, bool initiator);
void l2cap_chan_set_defaults(struct l2cap_chan *chan, struct l2cap_chan *pchan);
int l2cap_ertm_init(struct l2cap_chan *chan);
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index fb30615db02a..e826809f8c75 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -3760,7 +3760,8 @@ static void hci_remote_name_evt(struct hci_dev *hdev, void *data,
hci_dev_unlock(hdev);
}
-static void hci_change_encrypt(struct hci_conn *conn, u8 status, u8 encrypt)
+static void hci_change_encrypt(struct hci_conn *conn, u8 status, u8 encrypt,
+ u8 mic_len)
{
struct hci_dev *hdev = conn->hdev;
@@ -3779,6 +3780,14 @@ static void hci_change_encrypt(struct hci_conn *conn, u8 status, u8 encrypt)
conn->type == LE_LINK)
set_bit(HCI_CONN_AES_CCM, conn->flags);
+ /* The key size of Encryption Change v3 is not used:
+ * it is ignored for LE, where it comes from SMP, and
+ * the ACL key size is read below.
+ *
+ * A 32-bit MIC is reported as 0x00.
+ */
+ conn->mic_len = mic_len;
+
/* For ACL links the encryption key size is still
* validated below via hci_read_enc_key_size(). Its
* completion handler, hci_cc_read_enc_key_size(),
@@ -3888,7 +3897,7 @@ static void hci_encrypt_change_evt(struct hci_dev *hdev, void *data,
if (!conn)
goto unlock;
- hci_change_encrypt(conn, ev->status, ev->encrypt);
+ hci_change_encrypt(conn, ev->status, ev->encrypt, 0);
unlock:
hci_dev_unlock(hdev);
@@ -3908,7 +3917,7 @@ static void hci_encrypt_change_v3_evt(struct hci_dev *hdev, void *data,
if (!conn)
goto unlock;
- hci_change_encrypt(conn, ev->status, ev->mode);
+ hci_change_encrypt(conn, ev->status, ev->mode, ev->mic_len);
unlock:
hci_dev_unlock(hdev);
@@ -5694,6 +5703,10 @@ static void hci_key_refresh_complete_v2_evt(struct hci_dev *hdev, void *data,
if (!conn)
goto unlock;
+ /* The key refresh may change the MIC length */
+ if (!ev->status)
+ conn->mic_len = ev->mic_len;
+
hci_conn_refresh_key(conn, ev->status);
unlock:
diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c
index f5083823223c..d79aef0c8468 100644
--- a/net/bluetooth/hci_sync.c
+++ b/net/bluetooth/hci_sync.c
@@ -8644,7 +8644,10 @@ static int hci_le_enable_encrypt_v2(struct hci_conn *conn, __le16 ediv,
cp->handle = cpu_to_le16(conn->handle);
cp->rand = rand;
cp->ediv = ediv;
- cp->mic_len = 0x02; /* Always prefer 128 bits? */
+ /* Use the MIC length requested for the connection, default to 128
+ * bits if unset.
+ */
+ cp->mic_len = conn->req_mic_len ? conn->req_mic_len : 0x02;
/* The key is zero padded when shorter than 16 octets */
if (ltk) {
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 70ad30b091e4..b19dd027adc3 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -579,6 +579,7 @@ void l2cap_chan_set_defaults(struct l2cap_chan *chan, struct l2cap_chan *pchan)
chan->tx_win = pchan->tx_win;
chan->tx_win_max = pchan->tx_win_max;
chan->sec_level = pchan->sec_level;
+ chan->mic_len = pchan->mic_len;
chan->conf_state = pchan->conf_state;
chan->flags = pchan->flags;
chan->tx_credits = pchan->tx_credits;
@@ -1025,14 +1026,26 @@ static inline u8 l2cap_get_auth_type(struct l2cap_chan *chan)
}
}
+/* Raise the MIC length requested for the connection to the one the channel
+ * requires, so the next time encryption is started it asks for it.
+ */
+void l2cap_chan_req_mic_len(struct l2cap_chan *chan, struct hci_conn *hcon)
+{
+ if (chan->mic_len > hcon->req_mic_len)
+ hcon->req_mic_len = chan->mic_len;
+}
+
/* Service level security */
int l2cap_chan_check_security(struct l2cap_chan *chan, bool initiator)
{
struct l2cap_conn *conn = chan->conn;
__u8 auth_type;
- if (conn->hcon->type == LE_LINK)
+ if (conn->hcon->type == LE_LINK) {
+ l2cap_chan_req_mic_len(chan, conn->hcon);
+
return smp_conn_security(conn->hcon, chan->sec_level);
+ }
auth_type = l2cap_get_auth_type(chan);
@@ -1512,6 +1525,8 @@ static void l2cap_le_start(struct l2cap_chan *chan)
{
struct l2cap_conn *conn = chan->conn;
+ l2cap_chan_req_mic_len(chan, conn->hcon);
+
if (!smp_conn_security(conn->hcon, chan->sec_level))
return;
@@ -1579,6 +1594,18 @@ static bool l2cap_check_enc_key_size(struct hci_conn *hcon,
hcon->enc_key_size >= min_key_size);
}
+static bool l2cap_check_mic_len(struct hci_conn *hcon, struct l2cap_chan *chan)
+{
+ /* If the channel has no MIC length requirement, skip check */
+ if (!chan->mic_len)
+ return true;
+
+ if (!test_bit(HCI_CONN_ENCRYPT, hcon->flags))
+ return true;
+
+ return hci_conn_mic_len(hcon) >= chan->mic_len;
+}
+
static void l2cap_do_start(struct l2cap_chan *chan)
__must_hold(&chan->lock)
__must_hold(&chan->conn->lock)
@@ -5119,6 +5146,7 @@ static int l2cap_le_connect_rsp(struct l2cap_conn *conn,
/* We'll need to send a new Connect Request */
clear_bit(FLAG_LE_CONN_REQ_SENT, &chan->flags);
+ l2cap_chan_req_mic_len(chan, hcon);
smp_conn_security(hcon, chan->sec_level);
break;
@@ -5283,6 +5311,13 @@ static int l2cap_le_connect_req(struct l2cap_conn *conn,
goto response_unlock;
}
+ /* Check if MIC length is sufficient for HDT PHY */
+ if (!l2cap_check_mic_len(conn->hcon, pchan)) {
+ result = L2CAP_CR_LE_MIC_LEN_TOO_SHORT;
+ chan = NULL;
+ goto response_unlock;
+ }
+
/* Check for valid dynamic CID range */
if (scid < L2CAP_CID_DYN_START || scid > L2CAP_CID_LE_DYN_END) {
result = L2CAP_CR_LE_INVALID_SCID;
@@ -5501,6 +5536,12 @@ static inline int l2cap_ecred_conn_req(struct l2cap_conn *conn,
goto unlock;
}
+ /* Check if MIC length is sufficient */
+ if (!l2cap_check_mic_len(conn->hcon, pchan)) {
+ result = L2CAP_CR_ECRED_MIC_LEN_TOO_SHORT;
+ goto unlock;
+ }
+
/* Check if the listening channel has set an output MTU then the
* requested MTU shall be less than or equal to that value.
*/
@@ -5697,6 +5738,7 @@ static inline int l2cap_ecred_conn_rsp(struct l2cap_conn *conn,
/* We'll need to send a new Connect Request */
clear_bit(FLAG_ECRED_CONN_REQ_SENT, &chan->flags);
+ l2cap_chan_req_mic_len(chan, hcon);
smp_conn_security(hcon, chan->sec_level);
break;
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
index 7a2551ef7f50..2fa93e84dc91 100644
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
@@ -623,8 +623,10 @@ static int l2cap_sock_getsockopt(struct socket *sock, int level, int optname,
if (conn) {
sec.level = conn->hcon->sec_level;
- if (sk->sk_state == BT_CONNECTED)
+ if (sk->sk_state == BT_CONNECTED) {
sec.key_size = conn->hcon->enc_key_size;
+ sec.mic_len = hci_conn_mic_len(conn->hcon);
+ }
} else {
sec.level = chan->sec_level;
}
@@ -960,9 +962,16 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
break;
}
- sec.level = BT_SECURITY_LOW;
+ /* mic_len was added at the end of struct bt_security, so
+ * accept the shorter struct as well, leaving mic_len unset.
+ */
+ if (optlen < offsetofend(struct bt_security, key_size)) {
+ err = -EINVAL;
+ break;
+ }
- err = copy_safe_from_sockptr(&sec, sizeof(sec), optval, optlen);
+ err = copy_struct_from_sockptr(&sec, sizeof(sec), optval,
+ optlen);
if (err)
break;
@@ -972,7 +981,14 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
break;
}
+ /* MIC_Length values: 32, 64 and 128 bits */
+ if (sec.mic_len > 0x02) {
+ err = -EINVAL;
+ break;
+ }
+
chan->sec_level = sec.level;
+ chan->mic_len = sec.mic_len;
conn = l2cap_chan_conn(chan);
if (!conn)
@@ -980,6 +996,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
/* change security for LE channels */
if (chan->scid == L2CAP_CID_ATT) {
+ l2cap_chan_req_mic_len(chan, conn->hcon);
if (smp_conn_security(conn->hcon, sec.level)) {
err = -EINVAL;
break;
diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
index 3fb8b5474948..3ec2fb4ce580 100644
--- a/net/bluetooth/rfcomm/sock.c
+++ b/net/bluetooth/rfcomm/sock.c
@@ -700,9 +700,16 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname,
break;
}
- sec.level = BT_SECURITY_LOW;
+ /* mic_len was added at the end of struct bt_security, so
+ * accept the shorter struct as well. RFCOMM ignores it.
+ */
+ if (optlen < offsetofend(struct bt_security, key_size)) {
+ err = -EINVAL;
+ break;
+ }
- err = copy_safe_from_sockptr(&sec, sizeof(sec), optval, optlen);
+ err = copy_struct_from_sockptr(&sec, sizeof(sec), optval,
+ optlen);
if (err)
break;
@@ -844,8 +851,8 @@ static int rfcomm_sock_getsockopt(struct socket *sock, int level, int optname,
break;
}
+ memset(&sec, 0, sizeof(sec));
sec.level = rfcomm_pi(sk)->sec_level;
- sec.key_size = 0;
len = min(len, sizeof(sec));
if (copy_to_iter(&sec, len, &sopt->iter_out) != len)
--
2.56.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v3 5/6] Bluetooth: Add HCI_OP_LE_SET_HDT_DEFAULT_PARAMS support
2026-11-04 22:13 [PATCH v3 0/6] Bluetooth: Add support for HDT and EKS Luiz Augusto von Dentz
` (3 preceding siblings ...)
2026-11-04 22:13 ` [PATCH v3 4/6] Bluetooth: L2CAP: Add MIC length validation for HDT PHY Luiz Augusto von Dentz
@ 2026-11-04 22:13 ` Luiz Augusto von Dentz
2026-11-04 22:13 ` [PATCH v3 6/6] Bluetooth: Add EKS Opportunistic Encryption support Luiz Augusto von Dentz
5 siblings, 0 replies; 9+ messages in thread
From: Luiz Augusto von Dentz @ 2026-11-04 22:13 UTC (permalink / raw)
To: linux-bluetooth
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Add support for LE Set HDT Default Parameters, which sets the MIC
length, packet format and ACL rates the controller prefers on the LE
HDT PHY. The command is sent during controller initialization when the
controller supports HDT and the command, with the rates limited to the
ones the controller supports.
The defaults are stored in hci_dev, 128-bit MIC, no packet format
preference and all HDT rates, and exposed through the MGMT system
configuration TLVs 0x0021-0x0023 so userspace can change them; changing
them while the controller is up sends the command again.
The default MIC length applies when the connection did not request
one: to LE Enable Encryption v2, LE Set CIG Parameters v2 and LE Create
BIG v2, so ACL, CIS and BIS are set up with the MIC length the host was
told to use.
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
---
include/net/bluetooth/hci.h | 7 ++++++
include/net/bluetooth/hci_core.h | 3 +++
include/net/bluetooth/hci_sync.h | 2 ++
net/bluetooth/hci_core.c | 3 +++
net/bluetooth/hci_sync.c | 41 ++++++++++++++++++++++++++++----
net/bluetooth/mgmt_config.c | 33 +++++++++++++++++++++++++
6 files changed, 85 insertions(+), 4 deletions(-)
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index 41bd2482614e..3bda65f6998b 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -2658,6 +2658,13 @@ struct hci_cp_le_create_big_v2 {
struct hci_bis_v2 bis;
} __packed;
+#define HCI_OP_LE_SET_HDT_DEFAULT_PARAMS 0x20bc
+struct hci_cp_le_set_hdt_default_params {
+ __u8 mic_len;
+ __u8 format;
+ __le16 rates;
+} __packed;
+
/* ---- HCI Events ---- */
struct hci_ev_status {
__u8 status;
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index d08bca919793..d05ef2cd413f 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -433,6 +433,9 @@ struct hci_dev {
__u8 hdt_max_tx_win;
__u8 hdt_max_rx_win;
__u16 hdt_max_rx_packet;
+ __u8 hdt_def_mic_len;
+ __u8 hdt_def_format;
+ __u16 hdt_def_rates;
__u8 le_max_key_size;
__u8 le_min_key_size;
__u16 discov_interleaved_timeout;
diff --git a/include/net/bluetooth/hci_sync.h b/include/net/bluetooth/hci_sync.h
index ab880384614a..e4e220ed098b 100644
--- a/include/net/bluetooth/hci_sync.h
+++ b/include/net/bluetooth/hci_sync.h
@@ -198,5 +198,7 @@ int hci_le_set_cig_params_sync(struct hci_dev *hdev, u8 cig_id);
int hci_le_create_big_sync(struct hci_conn *conn, struct bt_iso_qos_ext *qos,
u8 num_bis);
+int hci_le_set_hdt_params_sync(struct hci_dev *hdev);
+
int hci_le_enable_encrypt(struct hci_conn *conn, __le16 ediv, __le64 rand,
__u8 ltk[16], __u8 key_size);
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index bfc5bdebc71a..a4014bbcdfc2 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -2575,6 +2575,9 @@ struct hci_dev *hci_alloc_dev_priv(int sizeof_priv)
hdev->le_min_key_size = SMP_MIN_ENC_KEY_SIZE;
hdev->le_tx_def_phys = HCI_LE_SET_PHY_1M;
hdev->le_rx_def_phys = HCI_LE_SET_PHY_1M;
+ hdev->hdt_def_mic_len = 0x02; /* 128-bit */
+ hdev->hdt_def_format = 0x00; /* No preference */
+ hdev->hdt_def_rates = 0x001f; /* All defined HDT rates */
hdev->le_num_of_adv_sets = HCI_MAX_ADV_INSTANCES;
hdev->def_multi_adv_rotation_duration = HCI_DEFAULT_ADV_DURATION;
hdev->def_le_autoconnect_timeout = HCI_LE_CONN_TIMEOUT;
diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c
index d79aef0c8468..9d9f5b47331c 100644
--- a/net/bluetooth/hci_sync.c
+++ b/net/bluetooth/hci_sync.c
@@ -5415,11 +5415,40 @@ static int hci_le_set_default_phy_sync(struct hci_dev *hdev)
sizeof(cp), &cp, HCI_CMD_TIMEOUT);
}
+int hci_le_set_hdt_params_sync(struct hci_dev *hdev)
+{
+ struct hci_cp_le_set_hdt_default_params cp;
+ u16 rates;
+
+ /* Only send if controller supports HDT and the command */
+ if (!hdt_capable(hdev) || !(hdev->commands[52] & BIT(1)))
+ return 0;
+
+ /* Compute supported rates based on controller capabilities */
+ rates = hdev->hdt_def_rates;
+
+ /* Mask out rates not supported by the controller */
+ if (!hdt_6_tx_capable(hdev))
+ rates &= ~HCI_HDT_RATE_6M;
+ if (!hdt_7_5_tx_capable(hdev))
+ rates &= ~HCI_HDT_RATE_7_5M;
+
+ memset(&cp, 0, sizeof(cp));
+ cp.mic_len = hdev->hdt_def_mic_len;
+ cp.format = hdev->hdt_def_format;
+ cp.rates = cpu_to_le16(rates);
+
+ return __hci_cmd_sync_status(hdev, HCI_OP_LE_SET_HDT_DEFAULT_PARAMS,
+ sizeof(cp), &cp, HCI_CMD_TIMEOUT);
+}
+
static const struct hci_init_stage le_init4[] = {
/* HCI_OP_LE_WRITE_DEF_DATA_LEN */
HCI_INIT(hci_le_set_write_def_data_len_sync),
/* HCI_OP_LE_SET_DEFAULT_PHY */
HCI_INIT(hci_le_set_default_phy_sync),
+ /* HCI_OP_LE_SET_HDT_DEFAULT_PARAMS */
+ HCI_INIT(hci_le_set_hdt_params_sync),
{}
};
@@ -8463,7 +8492,8 @@ static int hci_le_set_cig_params_v2_sync(struct hci_dev *hdev, u8 cig_id)
qos->ucast.out.phys;
cis->c_rtn = qos->ucast.out.rtn;
cis->p_rtn = qos->ucast.in.rtn;
- cis->mic_len = 0x02; /* Always prefer 128 bits? */
+ cis->mic_len = conn->req_mic_len ? conn->req_mic_len :
+ hdev->hdt_def_mic_len;
/* Use the rates of each direction, or all the HDT rates the
* controller supports if none were set.
@@ -8574,6 +8604,8 @@ static int hci_le_create_big_v2_sync(struct hci_conn *conn,
cp.bis.framing = qos->bcast.framing;
cp.bis.encryption = qos->bcast.encryption;
memcpy(cp.bis.bcode, qos->bcast.bcode, sizeof(cp.bis.bcode));
+ cp.bis.mic_len = conn->req_mic_len ? conn->req_mic_len :
+ hdev->hdt_def_mic_len;
/* Use the rates set, or all the HDT rates the controller supports if
* none were set.
@@ -8644,10 +8676,11 @@ static int hci_le_enable_encrypt_v2(struct hci_conn *conn, __le16 ediv,
cp->handle = cpu_to_le16(conn->handle);
cp->rand = rand;
cp->ediv = ediv;
- /* Use the MIC length requested for the connection, default to 128
- * bits if unset.
+ /* Use the MIC length requested for the connection, or the default
+ * one if unset.
*/
- cp->mic_len = conn->req_mic_len ? conn->req_mic_len : 0x02;
+ cp->mic_len = conn->req_mic_len ? conn->req_mic_len :
+ hdev->hdt_def_mic_len;
/* The key is zero padded when shorter than 16 octets */
if (ltk) {
diff --git a/net/bluetooth/mgmt_config.c b/net/bluetooth/mgmt_config.c
index fdcc752c6f13..f30cffa94fbf 100644
--- a/net/bluetooth/mgmt_config.c
+++ b/net/bluetooth/mgmt_config.c
@@ -91,6 +91,9 @@ int read_def_system_config(struct sock *sk, struct hci_dev *hdev, void *data,
HDEV_PARAM_U16(advmon_no_filter_duration);
HDEV_PARAM_U8(enable_advmon_interleave_scan);
HDEV_PARAM_U32(idle_timeout);
+ HDEV_PARAM_U8(hdt_def_mic_len);
+ HDEV_PARAM_U8(hdt_def_format);
+ HDEV_PARAM_U16(hdt_def_rates);
} __packed rp = {
TLV_SET_U16(0x0000, def_page_scan_type),
TLV_SET_U16(0x0001, def_page_scan_int),
@@ -125,6 +128,9 @@ int read_def_system_config(struct sock *sk, struct hci_dev *hdev, void *data,
TLV_SET_U16(0x001e, advmon_no_filter_duration),
TLV_SET_U8(0x001f, enable_advmon_interleave_scan),
TLV_SET_U32(0x0020, idle_timeout),
+ TLV_SET_U8(0x0021, hdt_def_mic_len),
+ TLV_SET_U8(0x0022, hdt_def_format),
+ TLV_SET_U16(0x0023, hdt_def_rates),
};
bt_dev_dbg(hdev, "sock %p", sk);
@@ -140,11 +146,19 @@ int read_def_system_config(struct sock *sk, struct hci_dev *hdev, void *data,
#define TLV_GET_LE16(tlv) le16_to_cpu(*((__le16 *)(TO_TLV(tlv)->value)))
#define TLV_GET_U8(tlv) (*((__u8 *)(TO_TLV(tlv)->value)))
+static int set_hdt_params_sync(struct hci_dev *hdev, void *data)
+{
+ return hci_le_set_hdt_params_sync(hdev);
+}
+
int set_def_system_config(struct sock *sk, struct hci_dev *hdev, void *data,
u16 data_len)
{
u16 buffer_left = data_len;
u8 *buffer = data;
+ u8 old_mic_len = hdev->hdt_def_mic_len;
+ u8 old_format = hdev->hdt_def_format;
+ u16 old_rates = hdev->hdt_def_rates;
if (buffer_left < sizeof(struct mgmt_tlv)) {
return mgmt_cmd_status(sk, hdev->id,
@@ -201,9 +215,12 @@ int set_def_system_config(struct sock *sk, struct hci_dev *hdev, void *data,
case 0x001b:
case 0x001d:
case 0x001e:
+ case 0x0023:
exp_type_len = sizeof(u16);
break;
case 0x001f:
+ case 0x0021:
+ case 0x0022:
exp_type_len = sizeof(u8);
break;
case 0x0020:
@@ -335,6 +352,15 @@ int set_def_system_config(struct sock *sk, struct hci_dev *hdev, void *data,
case 0x00020:
hdev->idle_timeout = TLV_GET_LE32(buffer);
break;
+ case 0x0021:
+ hdev->hdt_def_mic_len = TLV_GET_U8(buffer);
+ break;
+ case 0x0022:
+ hdev->hdt_def_format = TLV_GET_U8(buffer);
+ break;
+ case 0x0023:
+ hdev->hdt_def_rates = TLV_GET_LE16(buffer);
+ break;
default:
bt_dev_warn(hdev, "unsupported parameter %u", type);
break;
@@ -344,6 +370,13 @@ int set_def_system_config(struct sock *sk, struct hci_dev *hdev, void *data,
buffer += exp_len;
}
+ /* The controller may be up without being powered through MGMT */
+ if (test_bit(HCI_UP, &hdev->flags) &&
+ (hdev->hdt_def_mic_len != old_mic_len ||
+ hdev->hdt_def_format != old_format ||
+ hdev->hdt_def_rates != old_rates))
+ hci_cmd_sync_queue(hdev, set_hdt_params_sync, NULL, NULL);
+
return mgmt_cmd_complete(sk, hdev->id,
MGMT_OP_SET_DEF_SYSTEM_CONFIG, 0, NULL, 0);
}
--
2.56.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v3 6/6] Bluetooth: Add EKS Opportunistic Encryption support
2026-11-04 22:13 [PATCH v3 0/6] Bluetooth: Add support for HDT and EKS Luiz Augusto von Dentz
` (4 preceding siblings ...)
2026-11-04 22:13 ` [PATCH v3 5/6] Bluetooth: Add HCI_OP_LE_SET_HDT_DEFAULT_PARAMS support Luiz Augusto von Dentz
@ 2026-11-04 22:13 ` Luiz Augusto von Dentz
2026-11-05 14:47 ` kernel test robot
5 siblings, 1 reply; 9+ messages in thread
From: Luiz Augusto von Dentz @ 2026-11-04 22:13 UTC (permalink / raw)
To: linux-bluetooth
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Add support for opportunistic encryption with Encryption Key Schedule,
which encrypts a link without pairing when both devices support it:
- The Opportunistic Encryption (Host Support) feature bit (Link Layer
feature bit 90) is set with LE Set Host Feature during
initialization, and eks_oppt_capable() checks the remote supports it.
- When the remote features are read as Central and there is no LTK for
the peer, LE Enable Encryption v2 is sent with Encryption set to
opportunistic. The checks are repeated right before the command is
sent, so it is skipped if the link is gone, already encrypted, has
SMP encryption pending or SMP pairing has started in the meantime,
and the MIC length is taken at that point so the one requested by
L2CAP is used.
- The new HCI_CONN_OPP_ENCRYPT flag marks the request in flight and,
once Encryption Change v3 reports it, an opportunistically encrypted
link, which is also marked as encrypted with AES-CCM. It doesn't
raise the security level, as it is not authenticated, and since it
has no key from pairing the L2CAP key size check is skipped for it.
A failure, or a command that cannot be sent, just leaves the link
unencrypted, as it was.
- HCI_CONN_ENCRYPT_PEND is not used for opportunistic encryption, so
it doesn't block SMP. Pairing over such a link completes and its key
replaces the opportunistic one with Key Refresh Complete, which then
clears HCI_CONN_OPP_ENCRYPT.
- The feature can be turned off with the MGMT system configuration TLV
0x0024; it is on by default. Changing it while the controller is up
updates the feature bit, which the controller only allows when there
are no connections.
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
---
include/net/bluetooth/hci.h | 1 +
include/net/bluetooth/hci_core.h | 6 ++
include/net/bluetooth/hci_sync.h | 2 +
net/bluetooth/hci_core.c | 1 +
net/bluetooth/hci_event.c | 49 ++++++++++--
net/bluetooth/hci_sync.c | 126 ++++++++++++++++++++++++++++++-
net/bluetooth/l2cap_core.c | 6 ++
net/bluetooth/mgmt_config.c | 23 ++++++
net/bluetooth/smp.c | 23 ++++++
net/bluetooth/smp.h | 2 +
10 files changed, 232 insertions(+), 7 deletions(-)
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index 3bda65f6998b..8c77a3eab739 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -668,6 +668,7 @@ enum {
#define HCI_LE_HDT_7_5_TX_FEATURE BIT(1)
#define HCI_LE_HDT_PF_1 BIT(2)
#define HCI_LE_HDT_LQF_FEATURE BIT(3)
+#define HCI_LE_OPPORTUNISTIC_ENC BIT(2) /* Byte 3 */
/* Connection modes */
#define HCI_CM_ACTIVE 0x0000
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index d05ef2cd413f..dd0306da0d66 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -436,6 +436,7 @@ struct hci_dev {
__u8 hdt_def_mic_len;
__u8 hdt_def_format;
__u16 hdt_def_rates;
+ bool eks_oppt;
__u8 le_max_key_size;
__u8 le_min_key_size;
__u16 discov_interleaved_timeout;
@@ -707,6 +708,7 @@ enum {
HCI_CONN_POWER_SAVE,
HCI_CONN_FLUSH_KEY,
HCI_CONN_ENCRYPT,
+ HCI_CONN_OPP_ENCRYPT,
HCI_CONN_AUTH,
HCI_CONN_SECURE,
HCI_CONN_FIPS,
@@ -2191,6 +2193,10 @@ static inline __u8 hci_conn_mic_len(struct hci_conn *conn)
#define eks_capable(dev) \
(le_feature(dev, 1, 1) & HCI_LE_EKS_FEATURE)
+#define eks_oppt_capable(dev) \
+ (eks_capable(dev) && \
+ (le_feature(dev, 1, 3) & HCI_LE_OPPORTUNISTIC_ENC))
+
/* Channel sounding support */
#define le_cs_capable(dev) \
((dev)->le_features[5] & HCI_LE_CS)
diff --git a/include/net/bluetooth/hci_sync.h b/include/net/bluetooth/hci_sync.h
index e4e220ed098b..966106b4a0fe 100644
--- a/include/net/bluetooth/hci_sync.h
+++ b/include/net/bluetooth/hci_sync.h
@@ -202,3 +202,5 @@ int hci_le_set_hdt_params_sync(struct hci_dev *hdev);
int hci_le_enable_encrypt(struct hci_conn *conn, __le16 ediv, __le64 rand,
__u8 ltk[16], __u8 key_size);
+int hci_le_eks_oppt_encrypt(struct hci_conn *conn);
+int hci_le_set_eks_oppt_sync(struct hci_dev *hdev);
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index a4014bbcdfc2..06e676eed468 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -2578,6 +2578,7 @@ struct hci_dev *hci_alloc_dev_priv(int sizeof_priv)
hdev->hdt_def_mic_len = 0x02; /* 128-bit */
hdev->hdt_def_format = 0x00; /* No preference */
hdev->hdt_def_rates = 0x001f; /* All defined HDT rates */
+ hdev->eks_oppt = true; /* Opportunistic encryption enabled */
hdev->le_num_of_adv_sets = HCI_MAX_ADV_INSTANCES;
hdev->def_multi_adv_rotation_duration = HCI_DEFAULT_ADV_DURATION;
hdev->def_le_autoconnect_timeout = HCI_LE_CONN_TIMEOUT;
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index e826809f8c75..5ce240f2f52e 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -3091,12 +3091,18 @@ static void hci_cs_le_enable_encrypt_v2(struct hci_dev *hdev, u8 status)
if (!conn)
goto unlock;
- clear_bit(HCI_CONN_ENCRYPT_PEND, conn->flags);
-
/* An opportunistic encryption that cannot be started just leaves
* the link unencrypted, as it was.
*/
- if (cp->encryption == 0x01 || conn->state != BT_CONNECTED)
+ if (cp->encryption == 0x01) {
+ if (!test_bit(HCI_CONN_ENCRYPT, conn->flags))
+ clear_bit(HCI_CONN_OPP_ENCRYPT, conn->flags);
+ goto unlock;
+ }
+
+ clear_bit(HCI_CONN_ENCRYPT_PEND, conn->flags);
+
+ if (conn->state != BT_CONNECTED)
goto unlock;
hci_disconnect(conn, HCI_ERROR_AUTH_FAILURE);
@@ -3917,6 +3923,30 @@ static void hci_encrypt_change_v3_evt(struct hci_dev *hdev, void *data,
if (!conn)
goto unlock;
+ /* Opportunistic encryption (eks_mode 0x02), started by this side or
+ * by the remote, encrypts the link without a key from pairing: it is
+ * marked with HCI_CONN_OPP_ENCRYPT, has no key size, and doesn't
+ * change the security level as it is not authenticated. If it could
+ * not be started the link is just left unencrypted, as it was.
+ */
+ if (ev->eks_mode == 0x02 ||
+ (test_bit(HCI_CONN_OPP_ENCRYPT, conn->flags) &&
+ !test_bit(HCI_CONN_ENCRYPT, conn->flags))) {
+ if (ev->status || !ev->mode) {
+ clear_bit(HCI_CONN_OPP_ENCRYPT, conn->flags);
+ goto unlock;
+ }
+
+ set_bit(HCI_CONN_OPP_ENCRYPT, conn->flags);
+ set_bit(HCI_CONN_ENCRYPT, conn->flags);
+ set_bit(HCI_CONN_AES_CCM, conn->flags);
+ conn->mic_len = ev->mic_len;
+ goto unlock;
+ }
+
+ /* Encryption with a key from pairing replaces the opportunistic one */
+ clear_bit(HCI_CONN_OPP_ENCRYPT, conn->flags);
+
hci_change_encrypt(conn, ev->status, ev->mode, ev->mic_len);
unlock:
@@ -5703,10 +5733,17 @@ static void hci_key_refresh_complete_v2_evt(struct hci_dev *hdev, void *data,
if (!conn)
goto unlock;
- /* The key refresh may change the MIC length */
- if (!ev->status)
+ if (!ev->status) {
+ /* The key refresh may change the MIC length */
conn->mic_len = ev->mic_len;
+ /* The key from pairing replaces the opportunistic one, which
+ * makes the link encrypted as with Encryption Change.
+ */
+ if (test_and_clear_bit(HCI_CONN_OPP_ENCRYPT, conn->flags))
+ set_bit(HCI_CONN_AUTH, conn->flags);
+ }
+
hci_conn_refresh_key(conn, ev->status);
unlock:
@@ -7932,6 +7969,8 @@ static void hci_le_read_all_remote_features_evt(struct hci_dev *hdev,
conn->le_tx_def_phys &= ~HCI_LE_SET_PHY_HDT;
conn->le_rx_def_phys &= ~HCI_LE_SET_PHY_HDT;
}
+
+ hci_le_eks_oppt_encrypt(conn);
}
if (conn->state == BT_CONFIG) {
diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c
index 9d9f5b47331c..bdc1ba5b5d87 100644
--- a/net/bluetooth/hci_sync.c
+++ b/net/bluetooth/hci_sync.c
@@ -5036,6 +5036,16 @@ static int hci_le_set_def_rate_sync(struct hci_dev *hdev)
/* Set Host Features, each feature needs to be sent separately since
* HCI_OP_LE_SET_HOST_FEATURE doesn't support setting all of them at once.
*/
+int hci_le_set_eks_oppt_sync(struct hci_dev *hdev)
+{
+ if (!eks_capable(hdev))
+ return 0;
+
+ /* Opportunistic Encryption (Host Support) */
+ return hci_le_set_host_feature_sync(hdev, 90,
+ hdev->eks_oppt ? 0x01 : 0x00);
+}
+
static int hci_le_set_host_features_sync(struct hci_dev *hdev)
{
int err = 0;
@@ -5056,11 +5066,14 @@ static int hci_le_set_host_features_sync(struct hci_dev *hdev)
return err;
}
- if (le_sci_capable(hdev))
+ if (le_sci_capable(hdev)) {
/* Shorter Connection Intervals (Host Support) */
err = hci_le_set_host_feature_sync(hdev, 73, 0x01);
+ if (err)
+ return err;
+ }
- return err;
+ return hci_le_set_eks_oppt_sync(hdev);
}
/* LE Controller init stage 3 command sequence */
@@ -8738,3 +8751,112 @@ int hci_le_enable_encrypt(struct hci_conn *conn, __le16 ediv, __le64 rand,
return err;
}
+
+/* The opportunistic encryption is queued when the connection is set up, so
+ * by the time it runs the connection may be gone, already encrypted, have
+ * SMP encryption pending or SMP pairing in progress, so check again right
+ * before sending the command and leave the link to SMP in those cases.
+ *
+ * HCI_CONN_OPP_ENCRYPT, without HCI_CONN_ENCRYPT, marks the request in
+ * flight. HCI_CONN_ENCRYPT_PEND is not used for it, so SMP is not blocked
+ * by it: SMP pairing over a link being encrypted works, and the encryption
+ * started by SMP afterwards replaces the opportunistic key.
+ */
+static int hci_le_eks_oppt_encrypt_sync(struct hci_dev *hdev, void *data)
+{
+ struct hci_cp_le_enable_encrypt_v2 *cp = data;
+ struct hci_conn *conn;
+ int err;
+
+ hci_dev_lock(hdev);
+
+ conn = hci_conn_hash_lookup_handle(hdev, le16_to_cpu(cp->handle));
+ if (!conn || conn->state != BT_CONNECTED ||
+ test_bit(HCI_CONN_ENCRYPT, conn->flags) ||
+ test_bit(HCI_CONN_ENCRYPT_PEND, conn->flags))
+ goto unlock;
+
+ if (smp_pairing_in_progress(conn)) {
+ bt_dev_dbg(hdev, "SMP in progress, skipping hcon %p", conn);
+ goto unlock;
+ }
+
+ if (test_and_set_bit(HCI_CONN_OPP_ENCRYPT, conn->flags))
+ goto unlock;
+
+ /* Use the MIC length requested by now, or the default one if unset */
+ cp->mic_len = conn->req_mic_len ? conn->req_mic_len :
+ hdev->hdt_def_mic_len;
+
+ bt_dev_dbg(hdev, "starting EKS opportunistic encryption hcon %p", conn);
+
+ hci_dev_unlock(hdev);
+
+ err = hci_le_enable_encrypt_v2_sync(hdev, data);
+ if (!err)
+ return 0;
+
+ /* No result will come for a command that was not sent or failed */
+ hci_dev_lock(hdev);
+
+ conn = hci_conn_hash_lookup_handle(hdev, le16_to_cpu(cp->handle));
+ if (conn && !test_bit(HCI_CONN_ENCRYPT, conn->flags))
+ clear_bit(HCI_CONN_OPP_ENCRYPT, conn->flags);
+
+ hci_dev_unlock(hdev);
+
+ return err;
+
+unlock:
+ hci_dev_unlock(hdev);
+ return 0;
+}
+
+int hci_le_eks_oppt_encrypt(struct hci_conn *conn)
+{
+ struct hci_dev *hdev = conn->hdev;
+ struct hci_cp_le_enable_encrypt_v2 *cp;
+ int err;
+
+ /* Only central initiates encryption */
+ if (conn->role != HCI_ROLE_MASTER)
+ return -EINVAL;
+
+ /* Check hdev config */
+ if (!hdev->eks_oppt)
+ return -EOPNOTSUPP;
+
+ /* Remote must support opportunistic encryption */
+ if (!eks_oppt_capable(conn))
+ return -EOPNOTSUPP;
+
+ /* Must support EKS and the encrypt_v2 command */
+ if (!eks_capable(hdev) || !(hdev->commands[50] & BIT(4)))
+ return -EOPNOTSUPP;
+
+ /* Don't encrypt if already encrypted or pending */
+ if (test_bit(HCI_CONN_ENCRYPT, conn->flags) ||
+ test_bit(HCI_CONN_ENCRYPT_PEND, conn->flags) ||
+ test_bit(HCI_CONN_OPP_ENCRYPT, conn->flags))
+ return -EALREADY;
+
+ /* Skip if we have an LTK for this peer (use normal encryption) */
+ if (hci_find_ltk(hdev, &conn->dst, conn->dst_type, conn->role))
+ return -EEXIST;
+
+ bt_dev_dbg(hdev, "queueing EKS opportunistic encryption hcon %p", conn);
+
+ cp = kzalloc_obj(*cp);
+ if (!cp)
+ return -ENOMEM;
+
+ cp->handle = cpu_to_le16(conn->handle);
+ cp->encryption = 0x01; /* Opportunistic with EKS */
+
+ err = hci_cmd_sync_queue_once(hdev, hci_le_eks_oppt_encrypt_sync, cp,
+ le_enable_encrypt_complete);
+ if (err)
+ kfree(cp);
+
+ return err;
+}
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index b19dd027adc3..3b2db6cb8f95 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -1583,6 +1583,11 @@ static bool l2cap_check_enc_key_size(struct hci_conn *hcon,
* This check might also be called for unencrypted connections
* that have no key size requirements. Ensure that the link is
* actually encrypted before enforcing a key size.
+ *
+ * Opportunistic encryption has no key from pairing, so there is no
+ * key size to enforce. The security level stays as if the link were
+ * unencrypted, so a channel requiring more still needs pairing,
+ * which then replaces the opportunistic key.
*/
int min_key_size = hcon->hdev->min_enc_key_size;
@@ -1591,6 +1596,7 @@ static bool l2cap_check_enc_key_size(struct hci_conn *hcon,
min_key_size = 16;
return (!test_bit(HCI_CONN_ENCRYPT, hcon->flags) ||
+ test_bit(HCI_CONN_OPP_ENCRYPT, hcon->flags) ||
hcon->enc_key_size >= min_key_size);
}
diff --git a/net/bluetooth/mgmt_config.c b/net/bluetooth/mgmt_config.c
index f30cffa94fbf..4fa6d93638c4 100644
--- a/net/bluetooth/mgmt_config.c
+++ b/net/bluetooth/mgmt_config.c
@@ -94,6 +94,7 @@ int read_def_system_config(struct sock *sk, struct hci_dev *hdev, void *data,
HDEV_PARAM_U8(hdt_def_mic_len);
HDEV_PARAM_U8(hdt_def_format);
HDEV_PARAM_U16(hdt_def_rates);
+ HDEV_PARAM_U8(eks_oppt);
} __packed rp = {
TLV_SET_U16(0x0000, def_page_scan_type),
TLV_SET_U16(0x0001, def_page_scan_int),
@@ -131,6 +132,7 @@ int read_def_system_config(struct sock *sk, struct hci_dev *hdev, void *data,
TLV_SET_U8(0x0021, hdt_def_mic_len),
TLV_SET_U8(0x0022, hdt_def_format),
TLV_SET_U16(0x0023, hdt_def_rates),
+ TLV_SET_U8(0x0024, eks_oppt),
};
bt_dev_dbg(hdev, "sock %p", sk);
@@ -151,6 +153,19 @@ static int set_hdt_params_sync(struct hci_dev *hdev, void *data)
return hci_le_set_hdt_params_sync(hdev);
}
+static int set_eks_oppt_sync(struct hci_dev *hdev, void *data)
+{
+ int err;
+
+ /* The controller doesn't allow it while there are connections */
+ err = hci_le_set_eks_oppt_sync(hdev);
+ if (err)
+ bt_dev_warn(hdev, "unable to set opportunistic encryption: %d",
+ err);
+
+ return err;
+}
+
int set_def_system_config(struct sock *sk, struct hci_dev *hdev, void *data,
u16 data_len)
{
@@ -159,6 +174,7 @@ int set_def_system_config(struct sock *sk, struct hci_dev *hdev, void *data,
u8 old_mic_len = hdev->hdt_def_mic_len;
u8 old_format = hdev->hdt_def_format;
u16 old_rates = hdev->hdt_def_rates;
+ bool old_eks_oppt = hdev->eks_oppt;
if (buffer_left < sizeof(struct mgmt_tlv)) {
return mgmt_cmd_status(sk, hdev->id,
@@ -221,6 +237,7 @@ int set_def_system_config(struct sock *sk, struct hci_dev *hdev, void *data,
case 0x001f:
case 0x0021:
case 0x0022:
+ case 0x0024:
exp_type_len = sizeof(u8);
break;
case 0x0020:
@@ -361,6 +378,9 @@ int set_def_system_config(struct sock *sk, struct hci_dev *hdev, void *data,
case 0x0023:
hdev->hdt_def_rates = TLV_GET_LE16(buffer);
break;
+ case 0x0024:
+ hdev->eks_oppt = !!TLV_GET_U8(buffer);
+ break;
default:
bt_dev_warn(hdev, "unsupported parameter %u", type);
break;
@@ -377,6 +397,9 @@ int set_def_system_config(struct sock *sk, struct hci_dev *hdev, void *data,
hdev->hdt_def_rates != old_rates))
hci_cmd_sync_queue(hdev, set_hdt_params_sync, NULL, NULL);
+ if (test_bit(HCI_UP, &hdev->flags) && hdev->eks_oppt != old_eks_oppt)
+ hci_cmd_sync_queue(hdev, set_eks_oppt_sync, NULL, NULL);
+
return mgmt_cmd_complete(sk, hdev->id,
MGMT_OP_SET_DEF_SYSTEM_CONFIG, 0, NULL, 0);
}
diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index dce5ad7b3b6b..f7c2027cd4bd 100644
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@ -2464,6 +2464,29 @@ int smp_conn_security(struct hci_conn *hcon, __u8 sec_level)
return ret;
}
+bool smp_pairing_in_progress(struct hci_conn *hcon)
+{
+ struct l2cap_conn *conn;
+ struct l2cap_chan *chan;
+ bool pending;
+
+ lockdep_assert_held(&hcon->hdev->lock);
+
+ conn = hcon->l2cap_data;
+ if (!conn)
+ return false;
+
+ chan = conn->smp;
+ if (!chan)
+ return false;
+
+ l2cap_chan_lock(chan);
+ pending = !!chan->data;
+ l2cap_chan_unlock(chan);
+
+ return pending;
+}
+
int smp_cancel_and_remove_pairing(struct hci_dev *hdev, bdaddr_t *bdaddr,
u8 addr_type)
{
diff --git a/net/bluetooth/smp.h b/net/bluetooth/smp.h
index c86c46389007..0537762e2775 100644
--- a/net/bluetooth/smp.h
+++ b/net/bluetooth/smp.h
@@ -185,6 +185,8 @@ int smp_cancel_and_remove_pairing(struct hci_dev *hdev, bdaddr_t *bdaddr,
bool smp_sufficient_security(struct hci_conn *hcon, u8 sec_level,
enum smp_key_pref key_pref);
int smp_conn_security(struct hci_conn *hcon, __u8 sec_level);
+bool smp_pairing_in_progress(struct hci_conn *hcon)
+ __must_hold(&hcon->hdev->lock);
int smp_user_confirm_reply(struct hci_conn *conn, u16 mgmt_op, __le32 passkey)
__must_hold(&conn->hdev->lock);
--
2.56.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* RE: Bluetooth: Add support for HDT and EKS
2026-11-04 22:13 ` [PATCH v3 1/6] Bluetooth: Add initial support for HDT PHY Luiz Augusto von Dentz
@ 2026-11-05 2:35 ` bluez.test.bot
0 siblings, 0 replies; 9+ messages in thread
From: bluez.test.bot @ 2026-11-05 2:35 UTC (permalink / raw)
To: linux-bluetooth, luiz.dentz
[-- Attachment #1: Type: text/plain, Size: 4745 bytes --]
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/series/1202517/
---Test result---
Test Summary:
CheckPatch PASS 10.90 seconds
VerifyFixes PASS 0.10 seconds
VerifySignedoff PASS 0.10 seconds
GitLint PASS 1.64 seconds
SubjectPrefix PASS 0.60 seconds
BuildKernel PASS 21.17 seconds
CheckAllWarning PASS 30.39 seconds
CheckSparse WARNING 26.06 seconds
BuildKernel32 PASS 20.59 seconds
CheckKernelLLVM FAIL 17.92 seconds
TestRunnerSetup PASS 457.10 seconds
TestRunner_l2cap-tester FAIL 11.74 seconds
TestRunner_iso-tester PASS 12.87 seconds
TestRunner_bnep-tester PASS 7.01 seconds
TestRunner_mgmt-tester PASS 82.65 seconds
TestRunner_rfcomm-tester PASS 4.04 seconds
TestRunner_sco-tester PASS 5.04 seconds
TestRunner_ioctl-tester PASS 4.30 seconds
TestRunner_mesh-tester PASS 5.12 seconds
TestRunner_smp-tester PASS 4.12 seconds
TestRunner_userchan-tester PASS 2.94 seconds
TestRunner_6lowpan-tester PASS 8.30 seconds
IncrementalBuild PASS 84.33 seconds
Details
##############################
Test: CheckSparse - WARNING
Desc: Run sparse tool with linux kernel
Output:
net/bluetooth/hci_event.c: note: in included file (through include/net/bluetooth/hci_core.h):net/bluetooth/hci_event.c: note: in included file (through include/net/bluetooth/hci_core.h):net/bluetooth/hci_event.c: note: in included file (through include/net/bluetooth/hci_core.h):net/bluetooth/hci_event.c: note: in included file (through include/net/bluetooth/hci_core.h):net/bluetooth/hci_event.c: note: in included file (through include/net/bluetooth/hci_core.h):
##############################
Test: CheckKernelLLVM - FAIL
Desc: Build kernel with LLVM + context analysis
Output:
net/bluetooth/hci_sync.c:8779:6: error: calling function 'smp_pairing_in_progress' requires holding mutex 'hci_conn_hash_lookup_handle(hdev, data->handle).hdev->lock' exclusively [-Werror,-Wthread-safety-precise]
8779 | if (smp_pairing_in_progress(conn)) {
| ^
net/bluetooth/hci_sync.c:8779:6: note: found near match 'hdev->lock'
1 error generated.
make[4]: *** [scripts/Makefile.build:290: net/bluetooth/hci_sync.o] Error 1
make[4]: *** Waiting for unfinished jobs....
make[3]: *** [scripts/Makefile.build:572: net/bluetooth] Error 2
make[2]: *** [scripts/Makefile.build:572: net] Error 2
make[2]: *** Waiting for unfinished jobs....
make[1]: *** [/home/runner/work/bluetooth-next/bluetooth-next/src/src/Makefile:2243: .] Error 2
make: *** [Makefile:248: __sub-make] Error 2
##############################
Test: TestRunner_l2cap-tester - FAIL
Desc: Run l2cap-tester with test-runner
Output:
Sanitizer errors:
==35==ERROR: AddressSanitizer: heap-use-after-free on address 0x7b5248ae33d0 at pc 0x562a65d71eee bp 0x7ffc09474db0 sp 0x7ffc09474da0
READ of size 4 at 0x7b5248ae33d0 thread T0
#0 0x562a65d71eed in timeout_callback src/shared/timeout-mainloop.c:33
#1 0x562a65d72ed5 in timeout_callback src/shared/mainloop.c:271
#2 0x562a65d74006 in mainloop_run src/shared/mainloop.c:125
#3 0x562a65d7696a in mainloop_run_with_signal src/shared/mainloop-notify.c:196
#4 0x562a65d7bc4b in tester_run src/shared/tester.c:1297
#5 0x562a65ca51dd in main tools/l2cap-tester.c:3918
#6 0x7f12499d7600 in __libc_start_call_main ../sysdeps/nptl/libc_start_call_main.h:59
#7 0x7f12499d7717 in __libc_start_main_impl ../csu/libc-start.c:360
#8 0x562a65cabce4 in _start (/home/runner/work/bluetooth-next/bluetooth-next/src/bluez/tools/l2cap-tester+0x16dce4) (BuildId: 4b6cbb2e2c80ac13520eedc70b7cea5c676c63f3)
0x7b5248ae33d0 is located 0 bytes inside of 40-byte region [0x7b5248ae33d0,0x7b5248ae33f8)
freed by thread T0 here:
#0 0x7f124a3153ff in free ../../../../src/libsanitizer/asan/asan_malloc_linux.cpp:51
#1 0x562a65d723ca in timeout_destroy src/shared/mainloop.c:252
previously allocated by thread T0 here:
#0 0x7f124a31660f in malloc ../../../../src/libsanitizer/asan/asan_malloc_linux.cpp:67
#1 0x562a65d5c335 in util_malloc src/shared/util.c:46
SUMMARY: AddressSanitizer: heap-use-after-free src/shared/timeout-mainloop.c:33 in timeout_callback
No test result found
https://github.com/bluez/bluetooth-next/pull/1067
---
Regards,
Linux Bluetooth
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v3 6/6] Bluetooth: Add EKS Opportunistic Encryption support
2026-11-04 22:13 ` [PATCH v3 6/6] Bluetooth: Add EKS Opportunistic Encryption support Luiz Augusto von Dentz
@ 2026-11-05 14:47 ` kernel test robot
0 siblings, 0 replies; 9+ messages in thread
From: kernel test robot @ 2026-11-05 14:47 UTC (permalink / raw)
To: Luiz Augusto von Dentz, linux-bluetooth; +Cc: llvm, oe-kbuild-all
Hi Luiz,
kernel test robot noticed the following build warnings:
[auto build test WARNING on bluetooth-next/master]
[also build test WARNING on bluetooth/master]
[cannot apply to linus/master v7.3 next-20261030]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Luiz-Augusto-von-Dentz/Bluetooth-Add-initial-support-for-HDT-PHY/20261104-171316
base: https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git master
patch link: https://lore.kernel.org/r/20261104221321.1200529-7-luiz.dentz%40gmail.com
patch subject: [PATCH v3 6/6] Bluetooth: Add EKS Opportunistic Encryption support
config: arm-defconfig (https://download.01.org/0day-ci/archive/20261105/202611052210.pgQkfWp2-lkp@intel.com/config)
compiler: clang version 24.0.0git (https://github.com/llvm/llvm-project 812626a41399a1d464a0d69627ab45c83b8ebfb9)
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20261105/202611052210.pgQkfWp2-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202611052210.pgQkfWp2-lkp@intel.com/
All warnings (new ones prefixed by >>):
>> net/bluetooth/hci_sync.c:8779:6: warning: calling function 'smp_pairing_in_progress' requires holding mutex 'hci_conn_hash_lookup_handle(hdev, data->handle)->hdev->lock' exclusively [-Wthread-safety-precise]
8779 | if (smp_pairing_in_progress(conn)) {
| ^
net/bluetooth/hci_sync.c:8779:6: note: found near match 'hdev->lock'
1 warning generated.
vim +8779 net/bluetooth/hci_sync.c
8754
8755 /* The opportunistic encryption is queued when the connection is set up, so
8756 * by the time it runs the connection may be gone, already encrypted, have
8757 * SMP encryption pending or SMP pairing in progress, so check again right
8758 * before sending the command and leave the link to SMP in those cases.
8759 *
8760 * HCI_CONN_OPP_ENCRYPT, without HCI_CONN_ENCRYPT, marks the request in
8761 * flight. HCI_CONN_ENCRYPT_PEND is not used for it, so SMP is not blocked
8762 * by it: SMP pairing over a link being encrypted works, and the encryption
8763 * started by SMP afterwards replaces the opportunistic key.
8764 */
8765 static int hci_le_eks_oppt_encrypt_sync(struct hci_dev *hdev, void *data)
8766 {
8767 struct hci_cp_le_enable_encrypt_v2 *cp = data;
8768 struct hci_conn *conn;
8769 int err;
8770
8771 hci_dev_lock(hdev);
8772
8773 conn = hci_conn_hash_lookup_handle(hdev, le16_to_cpu(cp->handle));
8774 if (!conn || conn->state != BT_CONNECTED ||
8775 test_bit(HCI_CONN_ENCRYPT, conn->flags) ||
8776 test_bit(HCI_CONN_ENCRYPT_PEND, conn->flags))
8777 goto unlock;
8778
> 8779 if (smp_pairing_in_progress(conn)) {
8780 bt_dev_dbg(hdev, "SMP in progress, skipping hcon %p", conn);
8781 goto unlock;
8782 }
8783
8784 if (test_and_set_bit(HCI_CONN_OPP_ENCRYPT, conn->flags))
8785 goto unlock;
8786
8787 /* Use the MIC length requested by now, or the default one if unset */
8788 cp->mic_len = conn->req_mic_len ? conn->req_mic_len :
8789 hdev->hdt_def_mic_len;
8790
8791 bt_dev_dbg(hdev, "starting EKS opportunistic encryption hcon %p", conn);
8792
8793 hci_dev_unlock(hdev);
8794
8795 err = hci_le_enable_encrypt_v2_sync(hdev, data);
8796 if (!err)
8797 return 0;
8798
8799 /* No result will come for a command that was not sent or failed */
8800 hci_dev_lock(hdev);
8801
8802 conn = hci_conn_hash_lookup_handle(hdev, le16_to_cpu(cp->handle));
8803 if (conn && !test_bit(HCI_CONN_ENCRYPT, conn->flags))
8804 clear_bit(HCI_CONN_OPP_ENCRYPT, conn->flags);
8805
8806 hci_dev_unlock(hdev);
8807
8808 return err;
8809
8810 unlock:
8811 hci_dev_unlock(hdev);
8812 return 0;
8813 }
8814
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2026-11-05 14:48 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-04 22:13 [PATCH v3 0/6] Bluetooth: Add support for HDT and EKS Luiz Augusto von Dentz
2026-11-04 22:13 ` [PATCH v3 1/6] Bluetooth: Add initial support for HDT PHY Luiz Augusto von Dentz
2026-11-05 2:35 ` Bluetooth: Add support for HDT and EKS bluez.test.bot
2026-11-04 22:13 ` [PATCH v3 2/6] Bluetooth: ISO: Add extended QoS with the HDT rates Luiz Augusto von Dentz
2026-11-04 22:13 ` [PATCH v3 3/6] Bluetooth: Add initial support for EKS Luiz Augusto von Dentz
2026-11-04 22:13 ` [PATCH v3 4/6] Bluetooth: L2CAP: Add MIC length validation for HDT PHY Luiz Augusto von Dentz
2026-11-04 22:13 ` [PATCH v3 5/6] Bluetooth: Add HCI_OP_LE_SET_HDT_DEFAULT_PARAMS support Luiz Augusto von Dentz
2026-11-04 22:13 ` [PATCH v3 6/6] Bluetooth: Add EKS Opportunistic Encryption support Luiz Augusto von Dentz
2026-11-05 14:47 ` kernel test robot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox