From: Spoorthi Ravishankar Koppad <spoorthix.k@xxxxxxxxx> 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 | 1 + net/bluetooth/hci_core.c | 1 + net/bluetooth/hci_debugfs.c | 31 +++++++++++++++++++++++++++ net/bluetooth/hci_event.c | 46 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 89 insertions(+) diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h index fbba43e..a9e7470d9 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 conn_handle; + __u16 timeout; +} __packed; +struct hci_rp_write_auth_payload_to { + __u8 status; + __le16 conn_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..f957bb0 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 le_auth_payload_timeout; #if IS_ENABLED(CONFIG_BT_LEDS) struct led_trigger *power_led; diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index d6b2540..a00358b 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->le_auth_payload_timeout = 0xbb8; 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..2776708 100644 --- a/net/bluetooth/hci_debugfs.c +++ b/net/bluetooth/hci_debugfs.c @@ -941,6 +941,35 @@ 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 authenticated_payload_timeout_set(void *data, u64 val) +{ + struct hci_dev *hdev = data; + + if (val < 0x0001 || val > 0xffff) + return -EINVAL; + + hci_dev_lock(hdev); + hdev->le_auth_payload_timeout = val; + hci_dev_unlock(hdev); + + return 0; +} + +static int authenticated_payload_timeout_get(void *data, u64 *val) +{ + struct hci_dev *hdev = data; + + hci_dev_lock(hdev); + *val = hdev->le_auth_payload_timeout; + hci_dev_unlock(hdev); + + return 0; +} + +DEFINE_SIMPLE_ATTRIBUTE(authenticated_payload_timeout_fops, + authenticated_payload_timeout_get, + authenticated_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("authenticated_payload_timeout", + 0644, hdev->debugfs, hdev, + &authenticated_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..001ece2 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -564,6 +564,31 @@ 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_cp_write_auth_payload_to *sent; + + BT_DBG("%s status 0x%2.2x", hdev->name, rp->status); + + if (rp->status) + return; + + sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_AUTH_PAYLOAD_TO); + if (!sent) + return; + + hci_dev_lock(hdev); + + if (!rp->status) + hdev->features[1][0] |= LMP_PING; + else + hdev->features[1][0] &= ~LMP_PING; + + hci_dev_unlock(hdev); +} + static void hci_cc_read_local_commands(struct hci_dev *hdev, struct sk_buff *skb) { @@ -3170,6 +3195,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; @@ -4971,7 +5000,24 @@ static void le_conn_complete_evt(struct hci_dev *hdev, u8 status, params->conn = NULL; } } + /* 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 must be LE and controller must support LE Ping. + */ + if (conn->type == LE_LINK && lmp_ping_capable(hdev) && + test_bit(HCI_ENCRYPT, &hdev->flags)) { + struct hci_cp_write_auth_payload_to cp; + cp.conn_handle = cpu_to_le16(conn->handle); + cp.timeout = cpu_to_le16(hdev->le_auth_payload_timeout); + hci_send_cmd(conn->hdev, HCI_OP_WRITE_AUTH_PAYLOAD_TO, + sizeof(cp), &cp); + } else { + conn->state = BT_CONNECTED; + hci_connect_cfm(conn, status); + } unlock: hci_update_background_scan(hdev); hci_dev_unlock(hdev); -- 1.9.1