Bluetooth: More hci_request.c & hci_req_sync updates
Subsystems (2)
cover Bluetooth: More hci_request.c & hci_req_sync updates
Hi,
The first three patches in this set are preparations for moving the power on sequence to be done with hci_req_sync. The fourth patch does the actual refactoring for that.
Johan
----------------------------------------------------------------
Johan Hedberg (4):
Bluetooth: HCI name update to hci_request.c
Bluetooth: Move EIR update to hci_request.c
Bluetooth: Move fast connectable code to hci_request.c
Bluetooth: Perform HCI update for power on synchronously
include/net/bluetooth/hci_core.h | 3 +- net/bluetooth/hci_core.c | 21 ++- net/bluetooth/hci_request.c | 334 ++++++++++++++++++++++++++++++++ net/bluetooth/hci_request.h | 6 + net/bluetooth/mgmt.c | 388 ++------------------------------------ 5 files changed, 376 insertions(+), 376 deletions(-)
PATCH 1/4 Bluetooth: HCI name update to hci_request.c
From: Johan Hedberg <[email protected]>
We'll soon need this both from hci_request.c and mgmt.c so move it as a request helper function to hci_request.c.
--- net/bluetooth/hci_request.c | 10 ++++++++++ net/bluetooth/hci_request.h | 2 ++ net/bluetooth/mgmt.c | 14 ++------------ 3 files changed, 14 insertions(+), 12 deletions(-)
net/bluetooth/hci_request.c +10 -0
@@ -420,6 +420,16 @@ static void __hci_update_background_scan(struct hci_request *req) } } +void __hci_req_update_name (struct hci_request *req) +{ +struct hci_dev *hdev = req->hdev; +struct hci_cp_write_local_name cp; + +memcpy (cp.name, hdev->dev_name,sizeof (cp.name)); + +hci_req_add (req,HCI_OP_WRITE_LOCAL_NAME ,sizeof (cp), &cp); +} +void hci_req_add_le_scan_disable (struct hci_request *req) {struct hci_cp_le_set_scan_enable cp;
net/bluetooth/hci_request.h +2 -0
@@ -55,6 +55,8 @@ void hci_req_sync_cancel(struct hci_dev *hdev, int err);struct sk_buff *hci_prepare_cmd (struct hci_dev *hdev,u16 opcode,u32 plen,const void *param); +void __hci_req_update_name (struct hci_request *req); +void hci_req_add_le_scan_disable (struct hci_request *req);void hci_req_add_le_passive_scan (struct hci_request *req);
net/bluetooth/mgmt.c +2 -12
@@ -3153,16 +3153,6 @@ static int user_passkey_neg_reply(struct sock *sk, struct hci_dev *hdev, HCI_OP_USER_PASSKEY_NEG_REPLY, 0); } -static void update_name (struct hci_request *req) -{ -struct hci_dev *hdev = req->hdev; -struct hci_cp_write_local_name cp; - -memcpy (cp.name, hdev->dev_name,sizeof (cp.name)); - -hci_req_add (req,HCI_OP_WRITE_LOCAL_NAME ,sizeof (cp), &cp); -} -static void set_name_complete (struct hci_dev *hdev,u8 status,u16 opcode) {struct mgmt_cp_set_local_name *cp;
@@ -3241,7 +3231,7 @@ static int set_local_name(struct sock *sk, struct hci_dev *hdev, void *data,hci_req_init (&req, hdev);if (lmp_bredr_capable (hdev)) { -update_name (&req); +__hci_req_update_name (&req);update_eir (&req); }
@@ -6768,7 +6758,7 @@ static int powered_update_hci(struct hci_dev *hdev)write_fast_connectable (&req, false);__hci_req_update_scan (&req);__hci_req_update_class (&req); -update_name (&req); +__hci_req_update_name (&req);update_eir (&req); }
Signature · 1 line
2.5.0
PATCH 2/4 Bluetooth: Move EIR update to hci_request.c
In reply to Johan HedbergFrom: Johan Hedberg <[email protected]>
We'll soon need to update the EIR both from hci_request.c and mgmt.c so move update_eir() as a more generic request helper to hci_request.c.
--- net/bluetooth/hci_request.c | 189 +++++++++++++++++++++++++++++++++++++++++ net/bluetooth/hci_request.h | 1 + net/bluetooth/mgmt.c | 203 ++------------------------------------------ 3 files changed, 198 insertions(+), 195 deletions(-)
net/bluetooth/hci_request.c +189 -0
@@ -21,6 +21,8 @@SOFTWARE IS DISCLAIMED. */ +#include <asm/unaligned.h> +#include <net/bluetooth/bluetooth.h> #include <net/bluetooth/hci_core.h> #include <net/bluetooth/mgmt.h>
@@ -430,6 +432,193 @@ void __hci_req_update_name(struct hci_request *req)hci_req_add (req,HCI_OP_WRITE_LOCAL_NAME ,sizeof (cp), &cp); } +#define PNP_INFO_SVCLASS_ID 0x1200 + +static u8 *create_uuid16_list (struct hci_dev *hdev,u8 *data,ptrdiff_t len) +{ +u8 *ptr = data, *uuids_start =NULL ; +struct bt_uuid *uuid; + +if (len <4 ) +return ptr; + +list_for_each_entry (uuid, &hdev->uuids, list) { +u16 uuid16; + +if (uuid->size !=16 ) +continue ; + + uuid16 =get_unaligned_le16 (&uuid->uuid[12 ]); +if (uuid16 <0x1100 ) +continue ; + +if (uuid16 ==PNP_INFO_SVCLASS_ID ) +continue ; + +if (!uuids_start) { + uuids_start = ptr; + uuids_start[0 ] =1 ; + uuids_start[1 ] =EIR_UUID16_ALL ; + ptr +=2 ; + } + +/* Stop if not enough space to put next UUID */ +if ((ptr - data) +sizeof (u16) > len) { + uuids_start[1 ] =EIR_UUID16_SOME ; +break ; + } + + *ptr++ = (uuid16 &0x00ff ); + *ptr++ = (uuid16 &0xff00 ) >>8 ; + uuids_start[0 ] +=sizeof (uuid16); + } + +return ptr; +} + +static u8 *create_uuid32_list (struct hci_dev *hdev,u8 *data,ptrdiff_t len) +{ +u8 *ptr = data, *uuids_start =NULL ; +struct bt_uuid *uuid; + +if (len <6 ) +return ptr; + +list_for_each_entry (uuid, &hdev->uuids, list) { +if (uuid->size !=32 ) +continue ; + +if (!uuids_start) { + uuids_start = ptr; + uuids_start[0 ] =1 ; + uuids_start[1 ] =EIR_UUID32_ALL ; + ptr +=2 ; + } + +/* Stop if not enough space to put next UUID */ +if ((ptr - data) +sizeof (u32) > len) { + uuids_start[1 ] =EIR_UUID32_SOME ; +break ; + } + +memcpy (ptr, &uuid->uuid[12 ],sizeof (u32)); + ptr +=sizeof (u32); + uuids_start[0 ] +=sizeof (u32); + } + +return ptr; +} + +static u8 *create_uuid128_list (struct hci_dev *hdev,u8 *data,ptrdiff_t len) +{ +u8 *ptr = data, *uuids_start =NULL ; +struct bt_uuid *uuid; + +if (len <18 ) +return ptr; + +list_for_each_entry (uuid, &hdev->uuids, list) { +if (uuid->size !=128 ) +continue ; + +if (!uuids_start) { + uuids_start = ptr; + uuids_start[0 ] =1 ; + uuids_start[1 ] =EIR_UUID128_ALL ; + ptr +=2 ; + } + +/* Stop if not enough space to put next UUID */ +if ((ptr - data) +16 > len) { + uuids_start[1 ] =EIR_UUID128_SOME ; +break ; + } + +memcpy (ptr, uuid->uuid,16 ); + ptr +=16 ; + uuids_start[0 ] +=16 ; + } + +return ptr; +} + +static void create_eir (struct hci_dev *hdev,u8 *data) +{ +u8 *ptr = data; +size_t name_len; + + name_len =strlen (hdev->dev_name); + +if (name_len >0 ) { +/* EIR Data type */ +if (name_len >48 ) { + name_len =48 ; + ptr[1 ] =EIR_NAME_SHORT ; + }else + ptr[1 ] =EIR_NAME_COMPLETE ; + +/* EIR Data length */ + ptr[0 ] = name_len +1 ; + +memcpy (ptr +2 , hdev->dev_name, name_len); + + ptr += (name_len +2 ); + } + +if (hdev->inq_tx_power !=HCI_TX_POWER_INVALID ) { + ptr[0 ] =2 ; + ptr[1 ] =EIR_TX_POWER ; + ptr[2 ] = (u8 ) hdev->inq_tx_power; + + ptr +=3 ; + } + +if (hdev->devid_source >0 ) { + ptr[0 ] =9 ; + ptr[1 ] =EIR_DEVICE_ID ; + +put_unaligned_le16 (hdev->devid_source, ptr +2 ); +put_unaligned_le16 (hdev->devid_vendor, ptr +4 ); +put_unaligned_le16 (hdev->devid_product, ptr +6 ); +put_unaligned_le16 (hdev->devid_version, ptr +8 ); + + ptr +=10 ; + } + + ptr =create_uuid16_list (hdev, ptr,HCI_MAX_EIR_LENGTH - (ptr - data)); + ptr =create_uuid32_list (hdev, ptr,HCI_MAX_EIR_LENGTH - (ptr - data)); + ptr =create_uuid128_list (hdev, ptr,HCI_MAX_EIR_LENGTH - (ptr - data)); +} + +void __hci_req_update_eir (struct hci_request *req) +{ +struct hci_dev *hdev = req->hdev; +struct hci_cp_write_eir cp; + +if (!hdev_is_powered (hdev)) +return ; + +if (!lmp_ext_inq_capable (hdev)) +return ; + +if (!hci_dev_test_flag (hdev,HCI_SSP_ENABLED )) +return ; + +if (hci_dev_test_flag (hdev,HCI_SERVICE_CACHE )) +return ; + +memset (&cp,0 ,sizeof (cp)); + +create_eir (hdev, cp.data); + +if (memcmp (cp.data, hdev->eir,sizeof (cp.data)) ==0 ) +return ; + +memcpy (hdev->eir, cp.data,sizeof (cp.data)); + +hci_req_add (req,HCI_OP_WRITE_EIR ,sizeof (cp), &cp); +} +void hci_req_add_le_scan_disable (struct hci_request *req) {struct hci_cp_le_set_scan_enable cp;
net/bluetooth/hci_request.h +1 -0
@@ -56,6 +56,7 @@ struct sk_buff *hci_prepare_cmd(struct hci_dev *hdev, u16 opcode, u32 plen, const void *param);void __hci_req_update_name (struct hci_request *req); +void __hci_req_update_eir (struct hci_request *req);void hci_req_add_le_scan_disable (struct hci_request *req);void hci_req_add_le_passive_scan (struct hci_request *req);
net/bluetooth/mgmt.c +8 -195
263 lines not on this page · raw message
Signature · 1 line
2.5.0
PATCH 3/4 Bluetooth: Move fast connectable code to hci_request.c
In reply to Johan HedbergFrom: Johan Hedberg <[email protected]>
We'll soon need this both in hci_request.c and mgmt.c so move it to hci_request.c as a generic helper.
--- net/bluetooth/hci_request.c | 35 +++++++++++++++++++++++++++++++++++ net/bluetooth/hci_request.h | 1 + net/bluetooth/mgmt.c | 43 ++++--------------------------------------- 3 files changed, 40 insertions(+), 39 deletions(-)
net/bluetooth/hci_request.c +35 -0
@@ -349,6 +349,41 @@ void hci_req_add(struct hci_request *req, u16 opcode, u32 plen,hci_req_add_ev (req, opcode, plen, param,0 ); } +void __hci_req_write_fast_connectable (struct hci_request *req,bool enable) +{ +struct hci_dev *hdev = req->hdev; +struct hci_cp_write_page_scan_activity acp; +u8 type; + +if (!hci_dev_test_flag (hdev,HCI_BREDR_ENABLED )) +return ; + +if (hdev->hci_ver <BLUETOOTH_VER_1_2 ) +return ; + +if (enable) { + type =PAGE_SCAN_TYPE_INTERLACED ; + +/* 160 msec page scan interval */ + acp.interval =cpu_to_le16 (0x0100 ); + }else { + type =PAGE_SCAN_TYPE_STANDARD ;/* default */ + +/* default 1.28 sec page scan */ + acp.interval =cpu_to_le16 (0x0800 ); + } + + acp.window =cpu_to_le16 (0x0012 ); + +if (__cpu_to_le16 (hdev->page_scan_interval) != acp.interval || +__cpu_to_le16 (hdev->page_scan_window) != acp.window) +hci_req_add (req,HCI_OP_WRITE_PAGE_SCAN_ACTIVITY , +sizeof (acp), &acp); + +if (hdev->page_scan_type != type) +hci_req_add (req,HCI_OP_WRITE_PAGE_SCAN_TYPE ,1 , &type); +} +/* This function controls the background scanning based on hdev->pend_le_conns * list. If there are pending LE connection we start the background scanning, * otherwise we stop it.
net/bluetooth/hci_request.h +1 -0
@@ -55,6 +55,7 @@ void hci_req_sync_cancel(struct hci_dev *hdev, int err);struct sk_buff *hci_prepare_cmd (struct hci_dev *hdev,u16 opcode,u32 plen,const void *param); +void __hci_req_write_fast_connectable (struct hci_request *req,bool enable);void __hci_req_update_name (struct hci_request *req);void __hci_req_update_eir (struct hci_request *req);
net/bluetooth/mgmt.c +4 -39
68 lines not on this page · raw message
Signature · 1 line
2.5.0
PATCH 4/4 Bluetooth: Perform HCI update for power on synchronously
In reply to Johan HedbergFrom: Johan Hedberg <[email protected]>
The request to update HCI during power on is always coming either from hdev->req_workqueue or through an ioctl, so it's safe to use hci_req_sync for it. This way we also eliminate potential races with incoming mgmt commands or other actions while powering on.
Part of this refactoring is the splitting of mgmt_powered() into mgmt_power_on() and __mgmt_power_off() functions. The main reason is the different requirements as far as hdev locking is concerned, as highlighted with the __ prefix of the power off API.
Since the power on in the case of clearing the AUTO_OFF flag cannot be done synchronously in the set_powered mgmt handler, the hci_power_on work callback is extended to cover this (which also simplifies the set_powered helper a lot).
--- include/net/bluetooth/hci_core.h | 3 +- net/bluetooth/hci_core.c | 21 ++++-- net/bluetooth/hci_request.c | 100 ++++++++++++++++++++++++++++ net/bluetooth/hci_request.h | 2 + net/bluetooth/mgmt.c | 136 +++------------------------------------ 5 files changed, 128 insertions(+), 134 deletions(-)
include/net/bluetooth/hci_core.h +2 -1
@@ -1435,7 +1435,8 @@ int mgmt_new_settings(struct hci_dev *hdev);void mgmt_index_added (struct hci_dev *hdev);void mgmt_index_removed (struct hci_dev *hdev);void mgmt_set_powered_failed (struct hci_dev *hdev,int err); -int mgmt_powered (struct hci_dev *hdev,u8 powered); +void mgmt_power_on (struct hci_dev *hdev,int err); +void __mgmt_power_off (struct hci_dev *hdev);void mgmt_new_link_key (struct hci_dev *hdev,struct link_key *key,bool persistent); void mgmt_device_connected(struct hci_dev *hdev, struct hci_conn *conn,
net/bluetooth/hci_core.c +16 -5
@@ -1399,10 +1399,10 @@ static int hci_dev_do_open(struct hci_dev *hdev) !hci_dev_test_flag(hdev, HCI_CONFIG) && !hci_dev_test_flag(hdev, HCI_UNCONFIGURED) && !hci_dev_test_flag(hdev, HCI_USER_CHANNEL) && + hci_dev_test_flag(hdev, HCI_MGMT) && hdev->dev_type == HCI_BREDR) { -hci_dev_lock (hdev); -mgmt_powered (hdev,1 ); -hci_dev_unlock (hdev); + ret =__hci_req_hci_power_on (hdev); +mgmt_power_on (hdev, ret); } }else {/* Init failed, cleanup */
@@ -1559,8 +1559,9 @@ int hci_dev_do_close(struct hci_dev *hdev) auto_off =hci_dev_test_and_clear_flag (hdev,HCI_AUTO_OFF ); -if (!auto_off && hdev->dev_type ==HCI_BREDR ) -mgmt_powered (hdev,0 ); +if (!auto_off && hdev->dev_type ==HCI_BREDR && +hci_dev_test_flag (hdev,HCI_MGMT )) +__mgmt_power_off (hdev);hci_inquiry_cache_flush (hdev);hci_pend_le_actions_clear (hdev);
@@ -2013,6 +2014,16 @@ static void hci_power_on(struct work_struct *work)BT_DBG ("%s" , hdev->name); +if (test_bit (HCI_UP , &hdev->flags) && +hci_dev_test_flag (hdev,HCI_MGMT ) && +hci_dev_test_and_clear_flag (hdev,HCI_AUTO_OFF )) { +hci_req_sync_lock (hdev); + err =__hci_req_hci_power_on (hdev); +hci_req_sync_unlock (hdev); +mgmt_power_on (hdev, err); +return ; + } + err =hci_dev_do_open (hdev);if (err <0 ) {hci_dev_lock (hdev);
net/bluetooth/hci_request.c +100 -0
106 lines not on this page · raw message
net/bluetooth/hci_request.h +2 -0
@@ -55,6 +55,8 @@ void hci_req_sync_cancel(struct hci_dev *hdev, int err);struct sk_buff *hci_prepare_cmd (struct hci_dev *hdev,u16 opcode,u32 plen,const void *param); +int __hci_req_hci_power_on (struct hci_dev *hdev); +void __hci_req_write_fast_connectable (struct hci_request *req,bool enable);void __hci_req_update_name (struct hci_request *req);void __hci_req_update_eir (struct hci_request *req);
net/bluetooth/mgmt.c +8 -128
177 lines not on this page · raw message
Signature · 1 line
2.5.0
Marcel Holtmann
maintainerHi Johan,
Quoted 13 lines
The first three patches in this set are preparations for moving the power on sequence to be done with
hci_req_sync. The fourth patch does the actual refactoring for that.Johan
----------------------------------------------------------------
Johan Hedberg (4):
Bluetooth: HCI name update tohci_request.c
Bluetooth: Move EIR update tohci_request.c
Bluetooth: Move fast connectable code tohci_request.c
Bluetooth: Perform HCI update for power on synchronously
Quoted 6 lines
include/net/bluetooth/hci_core.h | 3 +- net/bluetooth/hci_core.c | 21 ++- net/bluetooth/hci_request.c | 334 ++++++++++++++++++++++++++++++++ net/bluetooth/hci_request.h | 6 + net/bluetooth/mgmt.c | 388 ++------------------------------------ 5 files changed, 376 insertions(+), 376 deletions(-)
all 4 patches have been applied to bluetooth-next tree.
Regards
Marcel