Commit cfdb0c2d authored by Ankit Navik's avatar Ankit Navik Committed by Marcel Holtmann
Browse files

Bluetooth: Store Resolv list size 



When the controller supports the Read LE Resolv List size feature, the
maximum list size are read and now stored.

Before patch:
< HCI Command: LE Read White List... (0x08|0x000f) plen 0  #55 [hci0] 17.979791
> HCI Event: Command Complete (0x0e) plen 5                #56 [hci0] 17.980629
      LE Read White List Size (0x08|0x000f) ncmd 1
        Status: Success (0x00)
        Size: 25
< HCI Command: LE Clear White List (0x08|0x0010) plen 0    #57 [hci0] 17.980786
> HCI Event: Command Complete (0x0e) plen 4                #58 [hci0] 17.981627
      LE Clear White List (0x08|0x0010) ncmd 1
        Status: Success (0x00)
< HCI Command: LE Read Maximum Dat.. (0x08|0x002f) plen 0  #59 [hci0] 17.981786
> HCI Event: Command Complete (0x0e) plen 12               #60 [hci0] 17.982636
      LE Read Maximum Data Length (0x08|0x002f) ncmd 1
        Status: Success (0x00)
        Max TX octets: 251
        Max TX time: 17040
        Max RX octets: 251
        Max RX time: 17040

After patch:
< HCI Command: LE Read White List... (0x08|0x000f) plen 0  #55 [hci0] 13.338168
> HCI Event: Command Complete (0x0e) plen 5                #56 [hci0] 13.338842
      LE Read White List Size (0x08|0x000f) ncmd 1
        Status: Success (0x00)
        Size: 25
< HCI Command: LE Clear White List (0x08|0x0010) plen 0    #57 [hci0] 13.339029
> HCI Event: Command Complete (0x0e) plen 4                #58 [hci0] 13.339939
      LE Clear White List (0x08|0x0010) ncmd 1
        Status: Success (0x00)
< HCI Command: LE Read Resolving L.. (0x08|0x002a) plen 0  #59 [hci0] 13.340152
> HCI Event: Command Complete (0x0e) plen 5                #60 [hci0] 13.340952
      LE Read Resolving List Size (0x08|0x002a) ncmd 1
        Status: Success (0x00)
        Size: 25
< HCI Command: LE Read Maximum Dat.. (0x08|0x002f) plen 0  #61 [hci0] 13.341180
> HCI Event: Command Complete (0x0e) plen 12               #62 [hci0] 13.341898
      LE Read Maximum Data Length (0x08|0x002f) ncmd 1
        Status: Success (0x00)
        Max TX octets: 251
        Max TX time: 17040
        Max RX octets: 251
        Max RX time: 17040

Signed-off-by: default avatarAnkit Navik <ankit.p.navik@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent a5e50d5b

include/net/bluetooth/hci.h

+6 −0
Original line number Diff line number Diff line
@@ -1490,6 +1490,12 @@ struct hci_cp_le_write_def_data_len { 
	__le16	tx_time;

} __packed;



#define HCI_OP_LE_READ_RESOLV_LIST_SIZE	0x202a

struct hci_rp_le_read_resolv_list_size {

	__u8	status;

	__u8	size;

} __packed;



#define HCI_OP_LE_READ_MAX_DATA_LEN	0x202f

struct hci_rp_le_read_max_data_len {

	__u8	status;

include/net/bluetooth/hci_core.h

+2 −0
Original line number Diff line number Diff line
@@ -221,6 +221,7 @@ struct hci_dev { 
	__u8		features[HCI_MAX_PAGES][8];

	__u8		le_features[8];

	__u8		le_white_list_size;

	__u8		le_resolv_list_size;

	__u8		le_states[8];

	__u8		commands[64];

	__u8		hci_ver;
@@ -367,6 +368,7 @@ struct hci_dev { 
	struct list_head	identity_resolving_keys;

	struct list_head	remote_oob_data;

	struct list_head	le_white_list;

	struct list_head	le_resolv_list;

	struct list_head	le_conn_params;

	struct list_head	pend_le_conns;

	struct list_head	pend_le_reports;

net/bluetooth/hci_core.c

+8 −0
Original line number Diff line number Diff line
@@ -714,6 +714,12 @@ static int hci_init3_req(struct hci_request *req, unsigned long opt) 
			hci_req_add(req, HCI_OP_LE_CLEAR_WHITE_LIST, 0, NULL);

		}



		if (hdev->commands[34] & 0x40) {

			/* Read LE Resolving List Size */

			hci_req_add(req, HCI_OP_LE_READ_RESOLV_LIST_SIZE,

				    0, NULL);

		}



		if (hdev->le_features[0] & HCI_LE_DATA_LEN_EXT) {

			/* Read LE Maximum Data Length */

			hci_req_add(req, HCI_OP_LE_READ_MAX_DATA_LEN, 0, NULL);
@@ -3017,6 +3023,7 @@ struct hci_dev *hci_alloc_dev(void) 
	INIT_LIST_HEAD(&hdev->identity_resolving_keys);

	INIT_LIST_HEAD(&hdev->remote_oob_data);

	INIT_LIST_HEAD(&hdev->le_white_list);

	INIT_LIST_HEAD(&hdev->le_resolv_list);

	INIT_LIST_HEAD(&hdev->le_conn_params);

	INIT_LIST_HEAD(&hdev->pend_le_conns);

	INIT_LIST_HEAD(&hdev->pend_le_reports);
@@ -3218,6 +3225,7 @@ void hci_unregister_dev(struct hci_dev *hdev) 
	hci_remote_oob_data_clear(hdev);

	hci_adv_instances_clear(hdev);

	hci_bdaddr_list_clear(&hdev->le_white_list);

	hci_bdaddr_list_clear(&hdev->le_resolv_list);

	hci_conn_params_clear_all(hdev);

	hci_discovery_filter_clear(hdev);

	hci_dev_unlock(hdev);

net/bluetooth/hci_debugfs.c

+19 −0
Original line number Diff line number Diff line
@@ -694,6 +694,21 @@ static int white_list_show(struct seq_file *f, void *ptr) 


DEFINE_SHOW_ATTRIBUTE(white_list);



static int resolv_list_show(struct seq_file *f, void *ptr)

{

	struct hci_dev *hdev = f->private;

	struct bdaddr_list *b;



	hci_dev_lock(hdev);

	list_for_each_entry(b, &hdev->le_resolv_list, list)

		seq_printf(f, "%pMR (type %u)\n", &b->bdaddr, b->bdaddr_type);

	hci_dev_unlock(hdev);



	return 0;

}



DEFINE_SHOW_ATTRIBUTE(resolv_list);



static int identity_resolving_keys_show(struct seq_file *f, void *ptr)

{

	struct hci_dev *hdev = f->private;
@@ -955,6 +970,10 @@ void hci_debugfs_create_le(struct hci_dev *hdev) 
			  &hdev->le_white_list_size);

	debugfs_create_file("white_list", 0444, hdev->debugfs, hdev,

			    &white_list_fops);

	debugfs_create_u8("resolv_list_size", 0444, hdev->debugfs,

			  &hdev->le_resolv_list_size);

	debugfs_create_file("resolv_list", 0444, hdev->debugfs, hdev,

			    &resolv_list_fops);

	debugfs_create_file("identity_resolving_keys", 0400, hdev->debugfs,

			    hdev, &identity_resolving_keys_fops);

	debugfs_create_file("long_term_keys", 0400, hdev->debugfs, hdev,

net/bluetooth/hci_event.c

+18 −0
Original line number Diff line number Diff line
@@ -221,6 +221,7 @@ static void hci_cc_reset(struct hci_dev *hdev, struct sk_buff *skb) 
	hdev->ssp_debug_mode = 0;



	hci_bdaddr_list_clear(&hdev->le_white_list);

	hci_bdaddr_list_clear(&hdev->le_resolv_list);

}



static void hci_cc_read_stored_link_key(struct hci_dev *hdev,
@@ -1306,6 +1307,19 @@ static void hci_cc_le_write_def_data_len(struct hci_dev *hdev, 
	hdev->le_def_tx_time = le16_to_cpu(sent->tx_time);

}



static void hci_cc_le_read_resolv_list_size(struct hci_dev *hdev,

					   struct sk_buff *skb)

{

	struct hci_rp_le_read_resolv_list_size *rp = (void *) skb->data;



	BT_DBG("%s status 0x%2.2x size %u", hdev->name, rp->status, rp->size);



	if (rp->status)

		return;



	hdev->le_resolv_list_size = rp->size;

}



static void hci_cc_le_read_max_data_len(struct hci_dev *hdev,

					struct sk_buff *skb)

{
@@ -3015,6 +3029,10 @@ static void hci_cmd_complete_evt(struct hci_dev *hdev, struct sk_buff *skb, 
		hci_cc_le_write_def_data_len(hdev, skb);

		break;



	case HCI_OP_LE_READ_RESOLV_LIST_SIZE:

		hci_cc_le_read_resolv_list_size(hdev, skb);

		break;



	case HCI_OP_LE_READ_MAX_DATA_LEN:

		hci_cc_le_read_max_data_len(hdev, skb);

		break;

CRA Git | Maintained and supported by SUSTech CRA and CCSE