Hi Spoorthi, > Changes made to add HCI Write Authenticated Payload timeout > command for LE Ping feature. > As per the Core Specification 5.0 Volume 2 Part E Section 7.3.94, > the following code changes implements > HCI Write Authenticated Payload timeout command for LE Ping feature. > > Signed-off-by: Spoorthi Ravishankar Koppad <spoorthix.k@xxxxxxxxx> > --- > include/net/bluetooth/hci.h | 10 ++++++++++ > include/net/bluetooth/hci_core.h | 2 ++ > net/bluetooth/hci_core.c | 1 + > net/bluetooth/hci_debugfs.c | 31 +++++++++++++++++++++++++++++ > net/bluetooth/hci_event.c | 42 ++++++++++++++++++++++++++++++++++++++++ > 5 files changed, 86 insertions(+) > > diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h > index fbba43e..4c59e5a 100644 > --- a/include/net/bluetooth/hci.h > +++ b/include/net/bluetooth/hci.h > @@ -1142,6 +1142,16 @@ struct hci_cp_write_sc_support { > __u8 support; > } __packed; > > +#define HCI_OP_WRITE_AUTH_PAYLOAD_TO 0x0c7c > +struct hci_cp_write_auth_payload_to { > + __le16 handle; > + __le16 timeout; > +} __packed; > +struct hci_rp_write_auth_payload_to { > + __u8 status; > + __le16 handle; > +} __packed; > + > #define HCI_OP_READ_LOCAL_OOB_EXT_DATA 0x0c7d > struct hci_rp_read_local_oob_ext_data { > __u8 status; > diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h > index 094e61e..06b1ce4 100644 > --- a/include/net/bluetooth/hci_core.h > +++ b/include/net/bluetooth/hci_core.h > @@ -421,6 +421,7 @@ struct hci_dev { > __u32 rpa_timeout; > struct delayed_work rpa_expired; > bdaddr_t rpa; > + __u16 auth_payload_timeout; > > #if IS_ENABLED(CONFIG_BT_LEDS) > struct led_trigger *power_led; > @@ -683,6 +684,7 @@ enum { > HCI_CONN_NEW_LINK_KEY, > HCI_CONN_SCANNING, > HCI_CONN_AUTH_FAILURE, > + HCI_CONN_AUTH_PAYLOAD_TIMEOUT, what is this bit doing and what are you using it for? > }; > > static inline bool hci_conn_ssp_enabled(struct hci_conn *conn) > diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c > index d6b2540..29f524d 100644 > --- a/net/bluetooth/hci_core.c > +++ b/net/bluetooth/hci_core.c > @@ -3193,6 +3193,7 @@ struct hci_dev *hci_alloc_dev(void) > hdev->le_max_tx_time = 0x0148; > hdev->le_max_rx_len = 0x001b; > hdev->le_max_rx_time = 0x0148; > + hdev->auth_payload_timeout = 0x0bb8; > hdev->le_max_key_size = SMP_MAX_ENC_KEY_SIZE; > hdev->le_min_key_size = SMP_MIN_ENC_KEY_SIZE; > hdev->le_tx_def_phys = HCI_LE_SET_PHY_1M; > diff --git a/net/bluetooth/hci_debugfs.c b/net/bluetooth/hci_debugfs.c > index 51f5b1e..2bc05f7 100644 > --- a/net/bluetooth/hci_debugfs.c > +++ b/net/bluetooth/hci_debugfs.c > @@ -531,6 +531,7 @@ static int sniff_max_interval_get(void *data, u64 *val) > DEFINE_SIMPLE_ATTRIBUTE(sniff_max_interval_fops, sniff_max_interval_get, > sniff_max_interval_set, "%llu\n"); > > void hci_debugfs_create_bredr(struct hci_dev *hdev) > { > debugfs_create_file("inquiry_cache", 0444, hdev->debugfs, hdev, > @@ -941,6 +942,34 @@ static int adv_max_interval_get(void *data, u64 *val) > DEFINE_SIMPLE_ATTRIBUTE(adv_max_interval_fops, adv_max_interval_get, > adv_max_interval_set, "%llu\n"); > > +static int auth_payload_timeout_set(void *data, u64 val) > +{ > + struct hci_dev *hdev = data; > + > + if (val < 0x0001 || val > 0xffff) > + return -EINVAL; > + hci_dev_lock(hdev); > + hdev->auth_payload_timeout = val; > + hci_dev_unlock(hdev); > + > + return 0; > +} > + > +static int auth_payload_timeout_get(void *data, u64 *val) > +{ > + struct hci_dev *hdev = data; > + > + hci_dev_lock(hdev); > + *val = hdev->auth_payload_timeout; > + hci_dev_unlock(hdev); > + > + return 0; > +} > + > +DEFINE_SIMPLE_ATTRIBUTE(auth_payload_timeout_fops, > + auth_payload_timeout_get, > + auth_payload_timeout_set, "%llu\n"); > + > DEFINE_QUIRK_ATTRIBUTE(quirk_strict_duplicate_filter, > HCI_QUIRK_STRICT_DUPLICATE_FILTER); > DEFINE_QUIRK_ATTRIBUTE(quirk_simultaneous_discovery, > @@ -992,6 +1021,8 @@ void hci_debugfs_create_le(struct hci_dev *hdev) > &adv_min_interval_fops); > debugfs_create_file("adv_max_interval", 0644, hdev->debugfs, hdev, > &adv_max_interval_fops); > + debugfs_create_file("auth_payload_timeout", 0644, hdev->debugfs, hdev, > + &auth_payload_timeout_fops); > debugfs_create_u16("discov_interleaved_timeout", 0644, hdev->debugfs, > &hdev->discov_interleaved_timeout); > > diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c > index 609fd68..e599c64 100644 > --- a/net/bluetooth/hci_event.c > +++ b/net/bluetooth/hci_event.c > @@ -564,6 +564,25 @@ static void hci_cc_read_local_version(struct hci_dev *hdev, struct sk_buff *skb) > } > } > > +static void hci_cc_write_auth_payload_timeout(struct hci_dev *hdev, > + struct sk_buff *skb) > +{ > + struct hci_rp_write_auth_payload_to *rp = (void *)skb->data; > + struct hci_conn *conn; > + > + BT_DBG("%s status 0x%2.2x", hdev->name, rp->status); > + > + if (rp->status) > + return; > + > + hci_dev_lock(hdev); > + conn = hci_conn_hash_lookup_handle(hdev, __le16_to_cpu(rp->handle)); > + > + if (conn) > + set_bit(HCI_CONN_AUTH_PAYLOAD_TIMEOUT, &conn->flags); Why are you not storing the actual conn->auth_payload_timeout here? There is the hdev->auth_payload_timeout value that you can set via debugfs and acts as the default to be set and then there is the conn->auth_payload_timeout value you get here. The conn->auth_payload_timeout needs to be also initialized from the spec provided default. So you might want to create a constant for that. > + hci_dev_unlock(hdev); > +} > + > static void hci_cc_read_local_commands(struct hci_dev *hdev, > struct sk_buff *skb) > { > @@ -2975,6 +2994,25 @@ static void hci_encrypt_change_evt(struct hci_dev *hdev, struct sk_buff *skb) > goto unlock; > } > > + /* Set the default Authenticated Payload Timeout after > + * an LE Link is established. As per Core Spec v5.0, Vol 2, Part B > + * Section 3.3, the HCI command WRITE_AUTH_PAYLOAD_TIMEOUT should be > + * sent when the link is active and Encryption is enabled, the conn > + * type can be either LE or ACL and controller must support LMP Ping. > + * Ensure for AES-CCM encryption as well. > + */ > + if ((conn->type == LE_LINK || conn->type == ACL_LINK) && > + lmp_ping_capable(hdev) && you need to check LE_LINK and ACL_LINK indecently. The LMP features only cover ACL_LINK and you need to use LE features for LE_LINK. > + test_bit(HCI_CONN_ENCRYPT, &conn->flags) && > + test_bit(HCI_CONN_AES_CCM, &conn->flags)) { Indentation is all wrong here. > + struct hci_cp_write_auth_payload_to cp; > + > + cp.handle = cpu_to_le16(conn->handle); > + cp.timeout = cpu_to_le16(hdev->auth_payload_timeout); > + hci_send_cmd(conn->hdev, HCI_OP_WRITE_AUTH_PAYLOAD_TO, > + sizeof(cp), &cp); > + } > + > notify: > if (conn->state == BT_CONFIG) { > if (!ev->status) > @@ -3170,6 +3208,10 @@ static void hci_cmd_complete_evt(struct hci_dev *hdev, struct sk_buff *skb, > hci_cc_write_sc_support(hdev, skb); > break; > > + case HCI_OP_WRITE_AUTH_PAYLOAD_TO: > + hci_cc_write_auth_payload_timeout(hdev, skb); > + break; > + > case HCI_OP_READ_LOCAL_VERSION: > hci_cc_read_local_version(hdev, skb); > break; Regards Marcel