Bluetooth: Add HCI transaction framework
Subsystems (2)
v2 cover Bluetooth: Add HCI transaction framework
Hi,
Here's a v2 of the whole set since I had messed up patches 09 and 10 a little bit. There's on extra patch in the set since I ended up splitting the old patch 09 into two (09 and 10 in this set) for slightly better readability.
Johan
----------------------------------------------------------------
Johan Hedberg (15):
Bluetooth: Fix __hci_request() handling of empty requests
Bluetooth: Split HCI init sequence into three stages
Bluetooth: Add initial skeleton for HCI transaction framework
Bluetooth: Refactor HCI command skb creation
Bluetooth: Introduce new hci_transaction_cmd function
Bluetooth: Introduce a hci_transaction_from_skb function
Bluetooth: Add transaction cmd_complete and cmd_status functions
Bluetooth: Convert hci_request to use HCI transaction framework
Bluetooth: Move power on HCI command updates to their own function
Bluetooth: Update mgmt powered HCI commands to use transactions
Bluetooth: Wait for HCI command completion with mgmt_set_powered
Bluetooth: Fix busy condition testing for EIR and class updates
Bluetooth: Fix UUID/class mgmt command response synchronization
Bluetooth: Remove useless HCI_PENDING_CLASS flag
Bluetooth: Remove empty HCI event handlers
include/net/bluetooth/bluetooth.h | 11 + include/net/bluetooth/hci_core.h | 20 +- net/bluetooth/hci_core.c | 647 ++++++++++++++++++++++++++++++++----- net/bluetooth/hci_event.c | 507 +---------------------------- net/bluetooth/hci_sock.c | 3 +- net/bluetooth/mgmt.c | 326 ++++++++++++------- 6 files changed, 830 insertions(+), 684 deletions(-)
PATCH v2 1/15 Bluetooth: Fix __hci_request() handling of empty requests
From: Johan Hedberg <[email protected]>
If a request callback doesn't send any commands __hci_request() should fail imediately instead of waiting for the inevitable timeout to occur. This is particularly important once we start creating requests with conditional command sending which can potentially result in no commands being sent at all.
--- net/bluetooth/hci_core.c | 8 ++++++++ 1 file changed, 8 insertions(+)
net/bluetooth/hci_core.c +8 -0
@@ -122,6 +122,14 @@ static int __hci_request(struct hci_dev *hdev,set_current_state (TASK_INTERRUPTIBLE );req (hdev, opt); + +/* If the request didn't send any commands return immediately */ +if (skb_queue_empty (&hdev->cmd_q) &&atomic_read (&hdev->cmd_cnt)) { + hdev->req_status =0 ; +remove_wait_queue (&hdev->req_wait_q, &wait); +return err; + } +schedule_timeout (timeout);remove_wait_queue (&hdev->req_wait_q, &wait);
Signature · 1 line
1.7.10.4
PATCH v2 2/15 Bluetooth: Split HCI init sequence into three stages
In reply to Johan HedbergFrom: Johan Hedberg <[email protected]>
Having contitional command sending during a request has always been problematic and caused hacks like the hdev->init_last_cmd variable. This patch removes these conditionals and instead splits the init sequence into three stages, each with its own __hci_request() call.
This also paves the way to the upcoming transaction framework which will also benefit by having a simpler implementation if it doesn't need to cater for transactions that change on the fly.
--- net/bluetooth/hci_core.c | 271 ++++++++++++++++++++++++++++++++++++++++++++- net/bluetooth/hci_event.c | 255 +----------------------------------------- 2 files changed, 271 insertions(+), 255 deletions(-)
net/bluetooth/hci_core.c +269 -2
@@ -193,6 +193,9 @@ static void bredr_init(struct hci_dev *hdev)/* Read Local Version */ hci_send_cmd (hdev,HCI_OP_READ_LOCAL_VERSION ,0 ,NULL ); + +/* Read BD Address */ +hci_send_cmd (hdev,HCI_OP_READ_BD_ADDR ,0 ,NULL ); }static void amp_init (struct hci_dev *hdev)
@@ -209,7 +212,7 @@ static void amp_init(struct hci_dev *hdev)hci_send_cmd (hdev,HCI_OP_READ_DATA_BLOCK_SIZE ,0 ,NULL ); } -static void hci_init_req (struct hci_dev *hdev,unsigned long opt) +static void hci_init1_req (struct hci_dev *hdev,unsigned long opt) {struct sk_buff *skb;
@@ -246,6 +249,270 @@ static void hci_init_req(struct hci_dev *hdev, unsigned long opt) } } +static void bredr_setup (struct hci_dev *hdev) +{ +struct hci_cp_delete_stored_link_key cp; +__le16 param; +__u8 flt_type; + +/* Read Buffer Size (ACL mtu, max pkt, etc.) */ +hci_send_cmd (hdev,HCI_OP_READ_BUFFER_SIZE ,0 ,NULL ); + +/* Read Class of Device */ +hci_send_cmd (hdev,HCI_OP_READ_CLASS_OF_DEV ,0 ,NULL ); + +/* Read Local Name */ +hci_send_cmd (hdev,HCI_OP_READ_LOCAL_NAME ,0 ,NULL ); + +/* Read Voice Setting */ +hci_send_cmd (hdev,HCI_OP_READ_VOICE_SETTING ,0 ,NULL ); + +/* Clear Event Filters */ + flt_type =HCI_FLT_CLEAR_ALL ; +hci_send_cmd (hdev,HCI_OP_SET_EVENT_FLT ,1 , &flt_type); + +/* Connection accept timeout ~20 secs */ + param =__constant_cpu_to_le16 (0x7d00 ); +hci_send_cmd (hdev,HCI_OP_WRITE_CA_TIMEOUT ,2 , ¶m); + +bacpy (&cp.bdaddr,BDADDR_ANY ); + cp.delete_all =1 ; +hci_send_cmd (hdev,HCI_OP_DELETE_STORED_LINK_KEY ,sizeof (cp), &cp); +} + +static void le_setup (struct hci_dev *hdev) +{ +/* Read LE Buffer Size */ +hci_send_cmd (hdev,HCI_OP_LE_READ_BUFFER_SIZE ,0 ,NULL ); + +/* Read LE Local Supported Features */ +hci_send_cmd (hdev,HCI_OP_LE_READ_LOCAL_FEATURES ,0 ,NULL ); + +/* Read LE Advertising Channel TX Power */ +hci_send_cmd (hdev,HCI_OP_LE_READ_ADV_TX_POWER ,0 ,NULL ); + +/* Read LE White List Size */ +hci_send_cmd (hdev,HCI_OP_LE_READ_WHITE_LIST_SIZE ,0 ,NULL ); + +/* Read LE Supported States */ +hci_send_cmd (hdev,HCI_OP_LE_READ_SUPPORTED_STATES ,0 ,NULL ); +} + +static u8 hci_get_inquiry_mode (struct hci_dev *hdev) +{ +if (lmp_ext_inq_capable (hdev)) +return 2 ; + +if (lmp_inq_rssi_capable (hdev)) +return 1 ; + +if (hdev->manufacturer ==11 && hdev->hci_rev ==0x00 && + hdev->lmp_subver ==0x0757 ) +return 1 ; + +if (hdev->manufacturer ==15 ) { +if (hdev->hci_rev ==0x03 && hdev->lmp_subver ==0x6963 ) +return 1 ; +if (hdev->hci_rev ==0x09 && hdev->lmp_subver ==0x6963 ) +return 1 ; +if (hdev->hci_rev ==0x00 && hdev->lmp_subver ==0x6965 ) +return 1 ; + } + +if (hdev->manufacturer ==31 && hdev->hci_rev ==0x2005 && + hdev->lmp_subver ==0x1805 ) +return 1 ; + +return 0 ; +} + +static void hci_setup_inquiry_mode (struct hci_dev *hdev) +{ +u8 mode; + + mode =hci_get_inquiry_mode (hdev); + +hci_send_cmd (hdev,HCI_OP_WRITE_INQUIRY_MODE ,1 , &mode); +} + +static void hci_setup_event_mask (struct hci_dev *hdev) +{ +/* The second byte is 0xff instead of 0x9f (two reserved bits +* disabled) since a Broadcom 1.2 dongle doesn't respond to the +* command otherwise. +*/ +u8 events[8 ] = {0xff ,0xff ,0xfb ,0xff ,0x00 ,0x00 ,0x00 ,0x00 }; + +/* CSR 1.1 dongles does not accept any bitfield so don't try to set +* any event mask for pre 1.2 devices. +*/ +if (hdev->hci_ver <BLUETOOTH_VER_1_2 ) +return ; + +if (lmp_bredr_capable (hdev)) { + events[4 ] |=0x01 ;/* Flow Specification Complete */ + events[4 ] |=0x02 ;/* Inquiry Result with RSSI */ + events[4 ] |=0x04 ;/* Read Remote Extended Features Complete */ + events[5 ] |=0x08 ;/* Synchronous Connection Complete */ + events[5 ] |=0x10 ;/* Synchronous Connection Changed */ + } + +if (lmp_inq_rssi_capable (hdev)) + events[4 ] |=0x02 ;/* Inquiry Result with RSSI */ + +if (lmp_sniffsubr_capable (hdev)) + events[5 ] |=0x20 ;/* Sniff Subrating */ + +if (lmp_pause_enc_capable (hdev)) + events[5 ] |=0x80 ;/* Encryption Key Refresh Complete */ + +if (lmp_ext_inq_capable (hdev)) + events[5 ] |=0x40 ;/* Extended Inquiry Result */ + +if (lmp_no_flush_capable (hdev)) + events[7 ] |=0x01 ;/* Enhanced Flush Complete */ + +if (lmp_lsto_capable (hdev)) + events[6 ] |=0x80 ;/* Link Supervision Timeout Changed */ + +if (lmp_ssp_capable (hdev)) { + events[6 ] |=0x01 ;/* IO Capability Request */ + events[6 ] |=0x02 ;/* IO Capability Response */ + events[6 ] |=0x04 ;/* User Confirmation Request */ + events[6 ] |=0x08 ;/* User Passkey Request */ + events[6 ] |=0x10 ;/* Remote OOB Data Request */ + events[6 ] |=0x20 ;/* Simple Pairing Complete */ + events[7 ] |=0x04 ;/* User Passkey Notification */ + events[7 ] |=0x08 ;/* Keypress Notification */ + events[7 ] |=0x10 ;/* Remote Host Supported +* Features Notification +*/ + } + +if (lmp_le_capable (hdev)) + events[7 ] |=0x20 ;/* LE Meta-Event */ + +hci_send_cmd (hdev,HCI_OP_SET_EVENT_MASK ,sizeof (events), events); + +if (lmp_le_capable (hdev)) { +memset (events,0 ,sizeof (events)); + events[0 ] =0x1f ; +hci_send_cmd (hdev,HCI_OP_LE_SET_EVENT_MASK , +sizeof (events), events); + } +} + +static void hci_init2_req (struct hci_dev *hdev,unsigned long opt) +{ +if (lmp_bredr_capable (hdev)) +bredr_setup (hdev); + +if (lmp_le_capable (hdev)) +le_setup (hdev); + +hci_setup_event_mask (hdev); + +if (hdev->hci_ver >BLUETOOTH_VER_1_1 ) +hci_send_cmd (hdev,HCI_OP_READ_LOCAL_COMMANDS ,0 ,NULL ); + +if (lmp_ssp_capable (hdev)) { +if (test_bit (HCI_SSP_ENABLED , &hdev->dev_flags)) { +u8 mode =0x01 ; +hci_send_cmd (hdev,HCI_OP_WRITE_SSP_MODE , +sizeof (mode), &mode); + }else { +struct hci_cp_write_eir cp; + +memset (hdev->eir,0 ,sizeof (hdev->eir)); +memset (&cp,0 ,sizeof (cp)); + +hci_send_cmd (hdev,HCI_OP_WRITE_EIR ,sizeof (cp), &cp); + } + } + +if (lmp_inq_rssi_capable (hdev)) +hci_setup_inquiry_mode (hdev); + +if (lmp_inq_tx_pwr_capable (hdev)) +hci_send_cmd (hdev,HCI_OP_READ_INQ_RSP_TX_POWER ,0 ,NULL ); + +if (lmp_ext_feat_capable (hdev)) { +struct hci_cp_read_local_ext_features cp; + + cp.page =0x01 ; +hci_send_cmd (hdev,HCI_OP_READ_LOCAL_EXT_FEATURES ,sizeof (cp), + &cp); + } + +if (test_bit (HCI_LINK_SECURITY , &hdev->dev_flags)) { +u8 enable =1 ; +hci_send_cmd (hdev,HCI_OP_WRITE_AUTH_ENABLE ,sizeof (enable), + &enable); + } +} + +static void hci_setup_link_policy (struct hci_dev *hdev) +{ +struct hci_cp_write_def_link_policy cp; +u16 link_policy =0 ; + +if (lmp_rswitch_capable (hdev)) + link_policy |=HCI_LP_RSWITCH ; +if (lmp_hold_capable (hdev)) + link_policy |=HCI_LP_HOLD ; +if (lmp_sniff_capable (hdev)) + link_policy |=HCI_LP_SNIFF ; +if (lmp_park_capable (hdev)) + link_policy |=HCI_LP_PARK ; + + cp.policy =cpu_to_le16 (link_policy); +hci_send_cmd (hdev,HCI_OP_WRITE_DEF_LINK_POLICY ,sizeof (cp), &cp); +} + +static void hci_set_le_support (struct hci_dev *hdev) +{ +struct hci_cp_write_le_host_supported cp; + +memset (&cp,0 ,sizeof (cp)); + +if (test_bit (HCI_LE_ENABLED , &hdev->dev_flags)) { + cp.le =1 ; + cp.simul =lmp_le_br_capable (hdev); + } + +if (cp.le !=lmp_host_le_capable (hdev)) +hci_send_cmd (hdev,HCI_OP_WRITE_LE_HOST_SUPPORTED ,sizeof (cp), + &cp); +} + +static void hci_init3_req (struct hci_dev *hdev,unsigned long opt) +{ +if (hdev->commands[5 ] &0x10 ) +hci_setup_link_policy (hdev); + +if (lmp_le_capable (hdev)) +hci_set_le_support (hdev); +} + +static int __hci_init (struct hci_dev *hdev) +{ +int err; + + err =__hci_request (hdev, hci_init1_req,0 ,HCI_INIT_TIMEOUT ); +if (err <0 ) +return err; + +/* AMP controllers do not need stage 2/3 init */ +if (hdev->dev_type !=HCI_BREDR ) +return 0 ; + + err =__hci_request (hdev, hci_init2_req,0 ,HCI_INIT_TIMEOUT ); +if (err <1 ) +return err; + +return __hci_request (hdev, hci_init3_req,0 ,HCI_INIT_TIMEOUT ); +} +static void hci_scan_req (struct hci_dev *hdev,unsigned long opt) {__u8 scan = opt;
@@ -745,7 +1012,7 @@ int hci_dev_open(__u16 dev)set_bit (HCI_INIT , &hdev->flags); hdev->init_last_cmd =0 ; - ret =__hci_request (hdev, hci_init_req,0 ,HCI_INIT_TIMEOUT ); + ret =__hci_init (hdev);clear_bit (HCI_INIT , &hdev->flags); }
net/bluetooth/hci_event.c +2 -253
290 lines not on this page · raw message
Signature · 1 line
1.7.10.4
PATCH v3 2/15 Bluetooth: Split HCI init sequence into three stages
From: Johan Hedberg <[email protected]>
Having contitional command sending during a request has always been problematic and caused hacks like the hdev->init_last_cmd variable. This patch removes these conditionals and instead splits the init sequence into three stages, each with its own __hci_request() call.
This also paves the way to the upcoming transaction framework which will also benefit by having a simpler implementation if it doesn't need to cater for transactions that change on the fly.
---
v3: Fix incorrect (err < 1) check for init2_req failure
net/bluetooth/hci_core.c | 271 ++++++++++++++++++++++++++++++++++++++++++++- net/bluetooth/hci_event.c | 255 +----------------------------------------- 2 files changed, 271 insertions(+), 255 deletions(-)
net/bluetooth/hci_core.c +269 -2
@@ -193,6 +193,9 @@ static void bredr_init(struct hci_dev *hdev)/* Read Local Version */ hci_send_cmd (hdev,HCI_OP_READ_LOCAL_VERSION ,0 ,NULL ); + +/* Read BD Address */ +hci_send_cmd (hdev,HCI_OP_READ_BD_ADDR ,0 ,NULL ); }static void amp_init (struct hci_dev *hdev)
@@ -209,7 +212,7 @@ static void amp_init(struct hci_dev *hdev)hci_send_cmd (hdev,HCI_OP_READ_DATA_BLOCK_SIZE ,0 ,NULL ); } -static void hci_init_req (struct hci_dev *hdev,unsigned long opt) +static void hci_init1_req (struct hci_dev *hdev,unsigned long opt) {struct sk_buff *skb;
@@ -246,6 +249,270 @@ static void hci_init_req(struct hci_dev *hdev, unsigned long opt) } } +static void bredr_setup (struct hci_dev *hdev) +{ +struct hci_cp_delete_stored_link_key cp; +__le16 param; +__u8 flt_type; + +/* Read Buffer Size (ACL mtu, max pkt, etc.) */ +hci_send_cmd (hdev,HCI_OP_READ_BUFFER_SIZE ,0 ,NULL ); + +/* Read Class of Device */ +hci_send_cmd (hdev,HCI_OP_READ_CLASS_OF_DEV ,0 ,NULL ); + +/* Read Local Name */ +hci_send_cmd (hdev,HCI_OP_READ_LOCAL_NAME ,0 ,NULL ); + +/* Read Voice Setting */ +hci_send_cmd (hdev,HCI_OP_READ_VOICE_SETTING ,0 ,NULL ); + +/* Clear Event Filters */ + flt_type =HCI_FLT_CLEAR_ALL ; +hci_send_cmd (hdev,HCI_OP_SET_EVENT_FLT ,1 , &flt_type); + +/* Connection accept timeout ~20 secs */ + param =__constant_cpu_to_le16 (0x7d00 ); +hci_send_cmd (hdev,HCI_OP_WRITE_CA_TIMEOUT ,2 , ¶m); + +bacpy (&cp.bdaddr,BDADDR_ANY ); + cp.delete_all =1 ; +hci_send_cmd (hdev,HCI_OP_DELETE_STORED_LINK_KEY ,sizeof (cp), &cp); +} + +static void le_setup (struct hci_dev *hdev) +{ +/* Read LE Buffer Size */ +hci_send_cmd (hdev,HCI_OP_LE_READ_BUFFER_SIZE ,0 ,NULL ); + +/* Read LE Local Supported Features */ +hci_send_cmd (hdev,HCI_OP_LE_READ_LOCAL_FEATURES ,0 ,NULL ); + +/* Read LE Advertising Channel TX Power */ +hci_send_cmd (hdev,HCI_OP_LE_READ_ADV_TX_POWER ,0 ,NULL ); + +/* Read LE White List Size */ +hci_send_cmd (hdev,HCI_OP_LE_READ_WHITE_LIST_SIZE ,0 ,NULL ); + +/* Read LE Supported States */ +hci_send_cmd (hdev,HCI_OP_LE_READ_SUPPORTED_STATES ,0 ,NULL ); +} + +static u8 hci_get_inquiry_mode (struct hci_dev *hdev) +{ +if (lmp_ext_inq_capable (hdev)) +return 2 ; + +if (lmp_inq_rssi_capable (hdev)) +return 1 ; + +if (hdev->manufacturer ==11 && hdev->hci_rev ==0x00 && + hdev->lmp_subver ==0x0757 ) +return 1 ; + +if (hdev->manufacturer ==15 ) { +if (hdev->hci_rev ==0x03 && hdev->lmp_subver ==0x6963 ) +return 1 ; +if (hdev->hci_rev ==0x09 && hdev->lmp_subver ==0x6963 ) +return 1 ; +if (hdev->hci_rev ==0x00 && hdev->lmp_subver ==0x6965 ) +return 1 ; + } + +if (hdev->manufacturer ==31 && hdev->hci_rev ==0x2005 && + hdev->lmp_subver ==0x1805 ) +return 1 ; + +return 0 ; +} + +static void hci_setup_inquiry_mode (struct hci_dev *hdev) +{ +u8 mode; + + mode =hci_get_inquiry_mode (hdev); + +hci_send_cmd (hdev,HCI_OP_WRITE_INQUIRY_MODE ,1 , &mode); +} + +static void hci_setup_event_mask (struct hci_dev *hdev) +{ +/* The second byte is 0xff instead of 0x9f (two reserved bits +* disabled) since a Broadcom 1.2 dongle doesn't respond to the +* command otherwise. +*/ +u8 events[8 ] = {0xff ,0xff ,0xfb ,0xff ,0x00 ,0x00 ,0x00 ,0x00 }; + +/* CSR 1.1 dongles does not accept any bitfield so don't try to set +* any event mask for pre 1.2 devices. +*/ +if (hdev->hci_ver <BLUETOOTH_VER_1_2 ) +return ; + +if (lmp_bredr_capable (hdev)) { + events[4 ] |=0x01 ;/* Flow Specification Complete */ + events[4 ] |=0x02 ;/* Inquiry Result with RSSI */ + events[4 ] |=0x04 ;/* Read Remote Extended Features Complete */ + events[5 ] |=0x08 ;/* Synchronous Connection Complete */ + events[5 ] |=0x10 ;/* Synchronous Connection Changed */ + } + +if (lmp_inq_rssi_capable (hdev)) + events[4 ] |=0x02 ;/* Inquiry Result with RSSI */ + +if (lmp_sniffsubr_capable (hdev)) + events[5 ] |=0x20 ;/* Sniff Subrating */ + +if (lmp_pause_enc_capable (hdev)) + events[5 ] |=0x80 ;/* Encryption Key Refresh Complete */ + +if (lmp_ext_inq_capable (hdev)) + events[5 ] |=0x40 ;/* Extended Inquiry Result */ + +if (lmp_no_flush_capable (hdev)) + events[7 ] |=0x01 ;/* Enhanced Flush Complete */ + +if (lmp_lsto_capable (hdev)) + events[6 ] |=0x80 ;/* Link Supervision Timeout Changed */ + +if (lmp_ssp_capable (hdev)) { + events[6 ] |=0x01 ;/* IO Capability Request */ + events[6 ] |=0x02 ;/* IO Capability Response */ + events[6 ] |=0x04 ;/* User Confirmation Request */ + events[6 ] |=0x08 ;/* User Passkey Request */ + events[6 ] |=0x10 ;/* Remote OOB Data Request */ + events[6 ] |=0x20 ;/* Simple Pairing Complete */ + events[7 ] |=0x04 ;/* User Passkey Notification */ + events[7 ] |=0x08 ;/* Keypress Notification */ + events[7 ] |=0x10 ;/* Remote Host Supported +* Features Notification +*/ + } + +if (lmp_le_capable (hdev)) + events[7 ] |=0x20 ;/* LE Meta-Event */ + +hci_send_cmd (hdev,HCI_OP_SET_EVENT_MASK ,sizeof (events), events); + +if (lmp_le_capable (hdev)) { +memset (events,0 ,sizeof (events)); + events[0 ] =0x1f ; +hci_send_cmd (hdev,HCI_OP_LE_SET_EVENT_MASK , +sizeof (events), events); + } +} + +static void hci_init2_req (struct hci_dev *hdev,unsigned long opt) +{ +if (lmp_bredr_capable (hdev)) +bredr_setup (hdev); + +if (lmp_le_capable (hdev)) +le_setup (hdev); + +hci_setup_event_mask (hdev); + +if (hdev->hci_ver >BLUETOOTH_VER_1_1 ) +hci_send_cmd (hdev,HCI_OP_READ_LOCAL_COMMANDS ,0 ,NULL ); + +if (lmp_ssp_capable (hdev)) { +if (test_bit (HCI_SSP_ENABLED , &hdev->dev_flags)) { +u8 mode =0x01 ; +hci_send_cmd (hdev,HCI_OP_WRITE_SSP_MODE , +sizeof (mode), &mode); + }else { +struct hci_cp_write_eir cp; + +memset (hdev->eir,0 ,sizeof (hdev->eir)); +memset (&cp,0 ,sizeof (cp)); + +hci_send_cmd (hdev,HCI_OP_WRITE_EIR ,sizeof (cp), &cp); + } + } + +if (lmp_inq_rssi_capable (hdev)) +hci_setup_inquiry_mode (hdev); + +if (lmp_inq_tx_pwr_capable (hdev)) +hci_send_cmd (hdev,HCI_OP_READ_INQ_RSP_TX_POWER ,0 ,NULL ); + +if (lmp_ext_feat_capable (hdev)) { +struct hci_cp_read_local_ext_features cp; + + cp.page =0x01 ; +hci_send_cmd (hdev,HCI_OP_READ_LOCAL_EXT_FEATURES ,sizeof (cp), + &cp); + } + +if (test_bit (HCI_LINK_SECURITY , &hdev->dev_flags)) { +u8 enable =1 ; +hci_send_cmd (hdev,HCI_OP_WRITE_AUTH_ENABLE ,sizeof (enable), + &enable); + } +} + +static void hci_setup_link_policy (struct hci_dev *hdev) +{ +struct hci_cp_write_def_link_policy cp; +u16 link_policy =0 ; + +if (lmp_rswitch_capable (hdev)) + link_policy |=HCI_LP_RSWITCH ; +if (lmp_hold_capable (hdev)) + link_policy |=HCI_LP_HOLD ; +if (lmp_sniff_capable (hdev)) + link_policy |=HCI_LP_SNIFF ; +if (lmp_park_capable (hdev)) + link_policy |=HCI_LP_PARK ; + + cp.policy =cpu_to_le16 (link_policy); +hci_send_cmd (hdev,HCI_OP_WRITE_DEF_LINK_POLICY ,sizeof (cp), &cp); +} + +static void hci_set_le_support (struct hci_dev *hdev) +{ +struct hci_cp_write_le_host_supported cp; + +memset (&cp,0 ,sizeof (cp)); + +if (test_bit (HCI_LE_ENABLED , &hdev->dev_flags)) { + cp.le =1 ; + cp.simul =lmp_le_br_capable (hdev); + } + +if (cp.le !=lmp_host_le_capable (hdev)) +hci_send_cmd (hdev,HCI_OP_WRITE_LE_HOST_SUPPORTED ,sizeof (cp), + &cp); +} + +static void hci_init3_req (struct hci_dev *hdev,unsigned long opt) +{ +if (hdev->commands[5 ] &0x10 ) +hci_setup_link_policy (hdev); + +if (lmp_le_capable (hdev)) +hci_set_le_support (hdev); +} + +static int __hci_init (struct hci_dev *hdev) +{ +int err; + + err =__hci_request (hdev, hci_init1_req,0 ,HCI_INIT_TIMEOUT ); +if (err <0 ) +return err; + +/* AMP controllers do not need stage 2/3 init */ +if (hdev->dev_type !=HCI_BREDR ) +return 0 ; + + err =__hci_request (hdev, hci_init2_req,0 ,HCI_INIT_TIMEOUT ); +if (err <0 ) +return err; + +return __hci_request (hdev, hci_init3_req,0 ,HCI_INIT_TIMEOUT ); +} +static void hci_scan_req (struct hci_dev *hdev,unsigned long opt) {__u8 scan = opt;
@@ -745,7 +1012,7 @@ int hci_dev_open(__u16 dev)set_bit (HCI_INIT , &hdev->flags); hdev->init_last_cmd =0 ; - ret =__hci_request (hdev, hci_init_req,0 ,HCI_INIT_TIMEOUT ); + ret =__hci_init (hdev);clear_bit (HCI_INIT , &hdev->flags); }
net/bluetooth/hci_event.c +2 -253
290 lines not on this page · raw message
Signature · 1 line
1.7.10.4
PATCH v2 3/15 Bluetooth: Add initial skeleton for HCI transaction framework
In reply to Johan HedbergFrom: Johan Hedberg <[email protected]>
This patch adds the initial definitions and functions for HCI transactions. HCI transactions are essentially a group of HCI commands together with an optional completion callback. The transaction is tracked through the already existing command queue by having the necessary context information as part of the control buffer of each skb.
The only information needed in the skb control buffer is a flag for indicating that the skb is the start of a transaction as well as the optional complete callback that should be used for the transaction (this will only be set for skbs that also have the start flag set).
--- include/net/bluetooth/bluetooth.h | 11 +++++++++++ include/net/bluetooth/hci_core.h | 13 +++++++++++++ net/bluetooth/hci_core.c | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+)
include/net/bluetooth/bluetooth.h +11 -0
@@ -260,12 +260,23 @@ struct l2cap_ctrl {__u8 retries; }; +struct hci_dev ; + +typedef void (*transaction_complete_t )(struct hci_dev *hdev,u16 last_cmd, +int status); + +struct transaction_ctrl { +__u8 start; +transaction_complete_t complete; +}; +struct bt_skb_cb {__u8 pkt_type;__u8 incoming;__u16 expect;__u8 force_active;struct l2cap_ctrl control; +struct transaction_ctrl transaction; };#define bt_cb (skb) ((struct bt_skb_cb *)((skb)->cb))
include/net/bluetooth/hci_core.h +13 -0
@@ -248,6 +248,8 @@ struct hci_dev {__u32 req_status;__u32 req_result; +transaction_complete_t transaction_complete; +__u16 init_last_cmd;struct list_head mgmt_pending;
@@ -1041,6 +1043,17 @@ static inline u16 eir_append_data(u8 *eir, u16 eir_len, u8 type, u8 *data,int hci_register_cb (struct hci_cb *hcb);int hci_unregister_cb (struct hci_cb *hcb); +struct hci_transaction { +struct hci_dev *hdev; +struct sk_buff_head cmd_q; +transaction_complete_t complete; +}; + +void hci_transaction_init (struct hci_transaction *transaction, +struct hci_dev *hdev, +transaction_complete_t complete); +int hci_transaction_run (struct hci_transaction *transaction); +int hci_send_cmd (struct hci_dev *hdev,__u16 opcode,__u32 plen,void *param);void hci_send_acl (struct hci_chan *chan,struct sk_buff *skb,__u16 flags);void hci_send_sco (struct hci_conn *conn,struct sk_buff *skb);
net/bluetooth/hci_core.c +35 -0
@@ -2435,6 +2435,36 @@ static int hci_send_frame(struct sk_buff *skb)return hdev->send (skb); } +void hci_transaction_init (struct hci_transaction *transaction, +struct hci_dev *hdev, +transaction_complete_t complete) +{ +memset (transaction,0 ,sizeof (*transaction)); +skb_queue_head_init (&transaction->cmd_q); + transaction->hdev = hdev; + transaction->complete = complete; +} + +int hci_transaction_run (struct hci_transaction *transaction) +{ +struct hci_dev *hdev = transaction->hdev; +unsigned long flags; + +BT_DBG ("length %u" ,skb_queue_len (&transaction->cmd_q)); + +/* Do not allow empty transactions */ +if (skb_queue_empty (&transaction->cmd_q)) +return -EINVAL ; + +spin_lock_irqsave (&hdev->cmd_q.lock, flags); +skb_queue_splice_tail (&transaction->cmd_q, &hdev->cmd_q); +spin_unlock_irqrestore (&hdev->cmd_q.lock, flags); + +queue_work (hdev->workqueue, &hdev->cmd_work); + +return 0 ; +} +/* Send HCI command */ int hci_send_cmd (struct hci_dev *hdev,__u16 opcode,__u32 plen,void *param) {
@@ -3209,6 +3239,11 @@ static void hci_cmd_work(struct work_struct *work) hdev->sent_cmd =skb_clone (skb,GFP_ATOMIC );if (hdev->sent_cmd) {atomic_dec (&hdev->cmd_cnt); + +if (bt_cb (skb)->transaction.start) + hdev->transaction_complete = +bt_cb (skb)->transaction.complete; +hci_send_frame (skb);if (test_bit (HCI_RESET , &hdev->flags))del_timer (&hdev->cmd_timer);
Signature · 1 line
1.7.10.4
PATCH v2 4/15 Bluetooth: Refactor HCI command skb creation
In reply to Johan HedbergFrom: Johan Hedberg <[email protected]>
This patch moves out the skb creation from hci_send_cmd() into its own prepare_cmd() function. This is essential so the same prepare_cmd() function can be easily reused for skb creation for HCI transactions.
--- net/bluetooth/hci_core.c | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-)
net/bluetooth/hci_core.c +20 -8
@@ -2465,20 +2465,16 @@ int hci_transaction_run(struct hci_transaction *transaction)return 0 ; } -/* Send HCI command */ -int hci_send_cmd (struct hci_dev *hdev,__u16 opcode,__u32 plen,void *param) +static struct sk_buff *prepare_cmd (struct hci_dev *hdev,u16 opcode,u32 plen, +void *param) {int len =HCI_COMMAND_HDR_SIZE + plen;struct hci_command_hdr *hdr;struct sk_buff *skb; -BT_DBG ("%s opcode 0x%4.4x plen %d" , hdev->name, opcode, plen); - skb =bt_skb_alloc (len,GFP_ATOMIC ); -if (!skb) { -BT_ERR ("%s no memory for command" , hdev->name); -return -ENOMEM ; - } +if (!skb) +return NULL ; hdr = (struct hci_command_hdr *)skb_put (skb,HCI_COMMAND_HDR_SIZE ); hdr->opcode =cpu_to_le16 (opcode);
@@ -2492,6 +2488,22 @@ int hci_send_cmd(struct hci_dev *hdev, __u16 opcode, __u32 plen, void *param)bt_cb (skb)->pkt_type =HCI_COMMAND_PKT ; skb->dev = (void *) hdev; +return skb; +} + +/* Send HCI command */ +int hci_send_cmd (struct hci_dev *hdev,__u16 opcode,__u32 plen,void *param) +{ +struct sk_buff *skb; + +BT_DBG ("%s opcode 0x%4.4x plen %d" , hdev->name, opcode, plen); + + skb =prepare_cmd (hdev, opcode, plen, param); +if (!skb) { +BT_ERR ("%s no memory for command" , hdev->name); +return -ENOMEM ; + } +if (test_bit (HCI_INIT , &hdev->flags)) hdev->init_last_cmd = opcode;
Signature · 1 line
1.7.10.4
PATCH v2 5/15 Bluetooth: Introduce new hci_transaction_cmd function
In reply to Johan HedbergFrom: Johan Hedberg <[email protected]>
This function is analogous to hci_send_cmd() but instead of directly queuing the command to hdev->cmd_q it adds it to the local queue of the transaction being build (in struct hci_transaction).
--- include/net/bluetooth/hci_core.h | 2 ++ net/bluetooth/hci_core.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+)
include/net/bluetooth/hci_core.h +2 -0
@@ -1053,6 +1053,8 @@ void hci_transaction_init(struct hci_transaction *transaction,struct hci_dev *hdev, transaction_complete_t complete);int hci_transaction_run (struct hci_transaction *transaction); +int hci_transaction_cmd (struct hci_transaction *transaction,u16 opcode, +u32 plen,void *param);int hci_send_cmd (struct hci_dev *hdev,__u16 opcode,__u32 plen,void *param);void hci_send_acl (struct hci_chan *chan,struct sk_buff *skb,__u16 flags);
net/bluetooth/hci_core.c +33 -0
@@ -175,6 +175,16 @@ static int hci_request(struct hci_dev *hdev,return ret; } +/* Mark an skb as the starting point for a transaction */ +static void transaction_start (struct sk_buff *skb, +transaction_complete_t complete) +{ +struct transaction_ctrl *cb = &bt_cb (skb)->transaction; + + cb->start =1 ; + cb->complete = complete; +} +static void hci_reset_req (struct hci_dev *hdev,unsigned long opt) {BT_DBG ("%s %ld" , hdev->name, opt);
@@ -2513,6 +2523,29 @@ int hci_send_cmd(struct hci_dev *hdev, __u16 opcode, __u32 plen, void *param)return 0 ; } +/* Queue a command to a HCI transaction */ +int hci_transaction_cmd (struct hci_transaction *transaction,u16 opcode, +u32 plen,void *param) +{ +struct hci_dev *hdev = transaction->hdev; +struct sk_buff *skb; + +BT_DBG ("%s opcode 0x%4.4x plen %d" , hdev->name, opcode, plen); + + skb =prepare_cmd (hdev, opcode, plen, param); +if (!skb) { +BT_ERR ("%s no memory for command" , hdev->name); +return -ENOMEM ; + } + +if (skb_queue_empty (&transaction->cmd_q)) +transaction_start (skb, transaction->complete); + +skb_queue_tail (&transaction->cmd_q, skb); + +return 0 ; +} +/* Get data from the previously sent command */ void *hci_sent_cmd_data (struct hci_dev *hdev,__u16 opcode) {
Signature · 1 line
1.7.10.4
PATCH v2 6/15 Bluetooth: Introduce a hci_transaction_from_skb function
In reply to Johan HedbergFrom: Johan Hedberg <[email protected]>
To have a consistent content for hdev->cmd_q all entries need to follow the semantics of HCI transactions. This means that even single commands need to be dressed as transactions. This patch introduces a new function to create a single-command transaction and converts the two places needing this (hci_send_cmd and hci_sock_sendmsg) to use it.
--- include/net/bluetooth/hci_core.h | 1 + net/bluetooth/hci_core.c | 11 +++++++++-- net/bluetooth/hci_sock.c | 3 +-- 3 files changed, 11 insertions(+), 4 deletions(-)
include/net/bluetooth/hci_core.h +1 -0
@@ -1055,6 +1055,7 @@ void hci_transaction_init(struct hci_transaction *transaction,int hci_transaction_run (struct hci_transaction *transaction);int hci_transaction_cmd (struct hci_transaction *transaction,u16 opcode,u32 plen,void *param); +void hci_transaction_from_skb (struct hci_dev *hdev,struct sk_buff *skb);int hci_send_cmd (struct hci_dev *hdev,__u16 opcode,__u32 plen,void *param);void hci_send_acl (struct hci_chan *chan,struct sk_buff *skb,__u16 flags);
net/bluetooth/hci_core.c +9 -2
@@ -2475,6 +2475,14 @@ int hci_transaction_run(struct hci_transaction *transaction)return 0 ; } +void hci_transaction_from_skb (struct hci_dev *hdev,struct sk_buff *skb) +{ +transaction_start (skb,NULL ); + +skb_queue_tail (&hdev->cmd_q, skb); +queue_work (hdev->workqueue, &hdev->cmd_work); +} +static struct sk_buff *prepare_cmd (struct hci_dev *hdev,u16 opcode,u32 plen,void *param) {
@@ -2517,8 +2525,7 @@ int hci_send_cmd(struct hci_dev *hdev, __u16 opcode, __u32 plen, void *param)if (test_bit (HCI_INIT , &hdev->flags)) hdev->init_last_cmd = opcode; -skb_queue_tail (&hdev->cmd_q, skb); -queue_work (hdev->workqueue, &hdev->cmd_work); +hci_transaction_from_skb (hdev, skb);return 0 ; }
net/bluetooth/hci_sock.c +1 -2
@@ -859,8 +859,7 @@ static int hci_sock_sendmsg(struct kiocb *iocb, struct socket *sock,skb_queue_tail (&hdev->raw_q, skb);queue_work (hdev->workqueue, &hdev->tx_work); }else { -skb_queue_tail (&hdev->cmd_q, skb); -queue_work (hdev->workqueue, &hdev->cmd_work); +hci_transaction_from_skb (hdev, skb); } }else {if (!capable (CAP_NET_RAW )) {
Signature · 1 line
1.7.10.4
PATCH v2 7/15 Bluetooth: Add transaction cmd_complete and cmd_status functions
In reply to Johan HedbergFrom: Johan Hedberg <[email protected]>
This patch introduces functions to process the transaction state when receiving HCI Command Status or Command Complete events. Some HCI commands, like Inquiry do not result in a Command complete event so special handling is needed for them. Inquiry is a particularly important one since it is the only forseeable "non-cmd_complete" command that will make good use of the transaction framework, and its completion is either indicated by an Inquiry Complete event of a successful Command Complete for HCI_Inquiry_Cancel.
--- include/net/bluetooth/hci_core.h | 2 ++ net/bluetooth/hci_core.c | 69 ++++++++++++++++++++++++++++++++++++++ net/bluetooth/hci_event.c | 7 ++++ 3 files changed, 78 insertions(+)
include/net/bluetooth/hci_core.h +2 -0
@@ -1056,6 +1056,8 @@ int hci_transaction_run(struct hci_transaction *transaction);int hci_transaction_cmd (struct hci_transaction *transaction,u16 opcode,u32 plen,void *param);void hci_transaction_from_skb (struct hci_dev *hdev,struct sk_buff *skb); +void hci_transaction_cmd_complete (struct hci_dev *hdev,u16 opcode,u8 status); +void hci_transaction_cmd_status (struct hci_dev *hdev,u16 opcode,u8 status);int hci_send_cmd (struct hci_dev *hdev,__u16 opcode,__u32 plen,void *param);void hci_send_acl (struct hci_chan *chan,struct sk_buff *skb,__u16 flags);
net/bluetooth/hci_core.c +69 -0
75 lines not on this page · raw message
net/bluetooth/hci_event.c +7 -0
@@ -53,6 +53,7 @@ static void hci_cc_inquiry_cancel(struct hci_dev *hdev, struct sk_buff *skb)hci_discovery_set_state (hdev,DISCOVERY_STOPPED );hci_dev_unlock (hdev); +hci_transaction_cmd_complete (hdev,HCI_OP_INQUIRY , status);hci_req_complete (hdev,HCI_OP_INQUIRY_CANCEL , status);hci_conn_check_pending (hdev);
@@ -1692,6 +1693,7 @@ static void hci_inquiry_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)BT_DBG ("%s status 0x%2.2x" , hdev->name, status); +hci_transaction_cmd_complete (hdev,HCI_OP_INQUIRY , status);hci_req_complete (hdev,HCI_OP_INQUIRY , status);hci_conn_check_pending (hdev);
@@ -2254,6 +2256,7 @@ static void hci_qos_setup_complete_evt(struct hci_dev *hdev,static void hci_cmd_complete_evt (struct hci_dev *hdev,struct sk_buff *skb) {struct hci_ev_cmd_complete *ev = (void *) skb->data; +u8 status = skb->data[sizeof (*ev)];__u16 opcode;skb_pull (skb,sizeof (*ev));
@@ -2497,6 +2500,8 @@ static void hci_cmd_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)if (ev->opcode !=HCI_OP_NOP )del_timer (&hdev->cmd_timer); +hci_transaction_cmd_complete (hdev, ev->opcode, status); +if (ev->ncmd && !test_bit (HCI_RESET , &hdev->flags)) {atomic_set (&hdev->cmd_cnt,1 );if (!skb_queue_empty (&hdev->cmd_q))
@@ -2590,6 +2595,8 @@ static void hci_cmd_status_evt(struct hci_dev *hdev, struct sk_buff *skb)if (ev->opcode !=HCI_OP_NOP )del_timer (&hdev->cmd_timer); +hci_transaction_cmd_status (hdev, ev->opcode, ev->status); +if (ev->ncmd && !test_bit (HCI_RESET , &hdev->flags)) {atomic_set (&hdev->cmd_cnt,1 );if (!skb_queue_empty (&hdev->cmd_q))
Signature · 1 line
1.7.10.4
PATCH v2 8/15 Bluetooth: Convert hci_request to use HCI transaction framework
In reply to Johan HedbergFrom: Johan Hedberg <[email protected]>
This patch converts the hci_request() procedure to use the HCI transaction framework. The consequence is that hci_req_complete() becomes private to hci_core.c (the extra reset command handling needs to be moved into hci_transaction_cmd_complete) and the HCI driver init commands are run in their own transaction prior to the HCI init requests.
--- include/net/bluetooth/hci_core.h | 2 - net/bluetooth/hci_core.c | 296 +++++++++++++++++++++++--------------- net/bluetooth/hci_event.c | 78 +--------- 3 files changed, 181 insertions(+), 195 deletions(-)
include/net/bluetooth/hci_core.h +0 -2
@@ -1171,8 +1171,6 @@ struct hci_sec_filter {#define hci_req_lock (d) mutex_lock(&d->req_lock)#define hci_req_unlock (d) mutex_unlock(&d->req_lock) -void hci_req_complete (struct hci_dev *hdev,__u16 cmd,int result); -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, __u8 rand[8],
net/bluetooth/hci_core.c +177 -119
586 lines not on this page · raw message
net/bluetooth/hci_event.c +4 -74
300 lines not on this page · raw message
Signature · 1 line
1.7.10.4
PATCH v2 9/15 Bluetooth: Move power on HCI command updates to their own function
In reply to Johan HedbergFrom: Johan Hedberg <[email protected]>
These commands will in a subsequent patch be performed in their own transaction, so it's more readable (not just from a resulting code perspective but also the way the patches look like) to have them performed in their own function.
--- net/bluetooth/mgmt.c | 76 ++++++++++++++++++++++++++------------------------ 1 file changed, 40 insertions(+), 36 deletions(-)
net/bluetooth/mgmt.c +40 -36
@@ -3058,53 +3058,57 @@ static int set_bredr_scan(struct hci_dev *hdev)return hci_send_cmd (hdev,HCI_OP_WRITE_SCAN_ENABLE ,1 , &scan); } -int mgmt_powered (struct hci_dev *hdev,u8 powered) +static int powered_update_hci (struct hci_dev *hdev) { -struct cmd_lookup match = {NULL , hdev }; -int err; +u8 link_sec; -if (!test_bit (HCI_MGMT , &hdev->dev_flags)) -return 0 ; +if (test_bit (HCI_SSP_ENABLED , &hdev->dev_flags) && + !lmp_host_ssp_capable (hdev)) { +u8 ssp =1 ; -mgmt_pending_foreach (MGMT_OP_SET_POWERED , hdev, settings_rsp, &match); +hci_send_cmd (hdev,HCI_OP_WRITE_SSP_MODE ,1 , &ssp); + } -if (powered) { -u8 link_sec; +if (test_bit (HCI_LE_ENABLED , &hdev->dev_flags)) { +struct hci_cp_write_le_host_supported cp; -if (test_bit (HCI_SSP_ENABLED , &hdev->dev_flags) && - !lmp_host_ssp_capable (hdev)) { -u8 ssp =1 ; + cp.le =1 ; + cp.simul =lmp_le_br_capable (hdev); -hci_send_cmd (hdev,HCI_OP_WRITE_SSP_MODE ,1 , &ssp); - } +/* Check first if we already have the right +* host state (host features set) +*/ +if (cp.le !=lmp_host_le_capable (hdev) || + cp.simul !=lmp_host_le_br_capable (hdev)) +hci_send_cmd (hdev,HCI_OP_WRITE_LE_HOST_SUPPORTED , +sizeof (cp), &cp); + } -if (test_bit (HCI_LE_ENABLED , &hdev->dev_flags)) { -struct hci_cp_write_le_host_supported cp; + link_sec =test_bit (HCI_LINK_SECURITY , &hdev->dev_flags); +if (link_sec !=test_bit (HCI_AUTH , &hdev->flags)) +hci_send_cmd (hdev,HCI_OP_WRITE_AUTH_ENABLE , +sizeof (link_sec), &link_sec); - cp.le =1 ; - cp.simul =lmp_le_br_capable (hdev); +if (lmp_bredr_capable (hdev)) { +set_bredr_scan (hdev); +update_class (hdev); +update_name (hdev, hdev->dev_name); +update_eir (hdev); + } +} -/* Check first if we already have the right -* host state (host features set) -*/ -if (cp.le !=lmp_host_le_capable (hdev) || - cp.simul !=lmp_host_le_br_capable (hdev)) -hci_send_cmd (hdev, -HCI_OP_WRITE_LE_HOST_SUPPORTED , -sizeof (cp), &cp); - } +int mgmt_powered (struct hci_dev *hdev,u8 powered) +{ +struct cmd_lookup match = {NULL , hdev }; +int err; - link_sec =test_bit (HCI_LINK_SECURITY , &hdev->dev_flags); -if (link_sec !=test_bit (HCI_AUTH , &hdev->flags)) -hci_send_cmd (hdev,HCI_OP_WRITE_AUTH_ENABLE , -sizeof (link_sec), &link_sec); +if (!test_bit (HCI_MGMT , &hdev->dev_flags)) +return 0 ; -if (lmp_bredr_capable (hdev)) { -set_bredr_scan (hdev); -update_class (hdev); -update_name (hdev, hdev->dev_name); -update_eir (hdev); - } +mgmt_pending_foreach (MGMT_OP_SET_POWERED , hdev, settings_rsp, &match); + +if (powered) { +powered_update_hci (hdev); }else {u8 status =MGMT_STATUS_NOT_POWERED ;u8 zero_cod[] = {0 ,0 ,0 };
Signature · 1 line
1.7.10.4
PATCH v2 10/15 Bluetooth: Update mgmt powered HCI commands to use transactions
In reply to Johan HedbergFrom: Johan Hedberg <[email protected]>
This patch updates sending of HCI commands related to mgmt_set_powered (e.g. class, name and EIR data) to be sent using transactions. This is necessary since it's the only (well, at least the cleanest) way to keep the power on procedure synchronized and let user space know it has completed only when all HCI commands are completed (this actual fix is coming in a subsequent patch).
--- net/bluetooth/mgmt.c | 147 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 99 insertions(+), 48 deletions(-)
net/bluetooth/mgmt.c +99 -48
@@ -591,8 +591,9 @@ static void create_eir(struct hci_dev *hdev, u8 *data) ptr =create_uuid128_list (hdev, ptr,HCI_MAX_EIR_LENGTH - (ptr - data)); } -static int update_eir (struct hci_dev *hdev) +static int update_eir (struct hci_transaction *transaction) { +struct hci_dev *hdev = transaction->hdev;struct hci_cp_write_eir cp;if (!hdev_is_powered (hdev))
@@ -616,7 +617,8 @@ static int update_eir(struct hci_dev *hdev)memcpy (hdev->eir, cp.data,sizeof (cp.data)); -return hci_send_cmd (hdev,HCI_OP_WRITE_EIR ,sizeof (cp), &cp); +return hci_transaction_cmd (transaction,HCI_OP_WRITE_EIR , +sizeof (cp), &cp); }static u8 get_service_classes (struct hci_dev *hdev)
@@ -630,8 +632,9 @@ static u8 get_service_classes(struct hci_dev *hdev)return val; } -static int update_class (struct hci_dev *hdev) +static int update_class (struct hci_transaction *transaction) { +struct hci_dev *hdev = transaction->hdev;u8 cod[3 ];int err;
@@ -650,7 +653,8 @@ static int update_class(struct hci_dev *hdev)if (memcmp (cod, hdev->dev_class,3 ) ==0 )return 0 ; - err =hci_send_cmd (hdev,HCI_OP_WRITE_CLASS_OF_DEV ,sizeof (cod), cod); + err =hci_transaction_cmd (transaction,HCI_OP_WRITE_CLASS_OF_DEV , +sizeof (cod), cod);if (err ==0 )set_bit (HCI_PENDING_CLASS , &hdev->dev_flags);
@@ -661,16 +665,21 @@ static void service_cache_off(struct work_struct *work) { struct hci_dev *hdev = container_of(work, struct hci_dev, service_cache.work); +struct hci_transaction transaction;if (!test_and_clear_bit (HCI_SERVICE_CACHE , &hdev->dev_flags))return ; +hci_transaction_init (&transaction, hdev,NULL ); +hci_dev_lock (hdev); -update_eir (hdev); -update_class (hdev); +update_eir (&transaction); +update_class (&transaction);hci_dev_unlock (hdev); + +hci_transaction_run (&transaction); }static void mgmt_init_hdev (struct sock *sk,struct hci_dev *hdev)
@@ -1354,6 +1363,7 @@ static u8 get_uuid_size(const u8 *uuid)static int add_uuid (struct sock *sk,struct hci_dev *hdev,void *data,u16 len) {struct mgmt_cp_add_uuid *cp = data; +struct hci_transaction transaction;struct pending_cmd *cmd;struct bt_uuid *uuid;int err;
@@ -1380,13 +1390,12 @@ static int add_uuid(struct sock *sk, struct hci_dev *hdev, void *data, u16 len)list_add_tail (&uuid->list, &hdev->uuids); - err =update_class (hdev); -if (err <0 ) - goto failed; +hci_transaction_init (&transaction, hdev,NULL ); - err =update_eir (hdev); -if (err <0 ) - goto failed; +update_class (&transaction); +update_eir (&transaction); + +hci_transaction_run (&transaction);if (!test_bit (HCI_PENDING_CLASS , &hdev->dev_flags)) { err = cmd_complete(sk, hdev->id, MGMT_OP_ADD_UUID, 0,
@@ -1395,8 +1404,12 @@ static int add_uuid(struct sock *sk, struct hci_dev *hdev, void *data, u16 len) } cmd =mgmt_pending_add (sk,MGMT_OP_ADD_UUID , hdev, data, len); -if (!cmd) +if (!cmd) { err = -ENOMEM ; + goto failed; + } + + err =0 ; failed:hci_dev_unlock (hdev);
@@ -1421,6 +1434,7 @@ static int remove_uuid(struct sock *sk, struct hci_dev *hdev, void *data, u16 len) {struct mgmt_cp_remove_uuid *cp = data; +struct hci_transaction transaction;struct pending_cmd *cmd;struct bt_uuid *match, *tmp;u8 bt_uuid_any[] = {0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 };
@@ -1466,13 +1480,12 @@ static int remove_uuid(struct sock *sk, struct hci_dev *hdev, void *data, } update_class: - err =update_class (hdev); -if (err <0 ) - goto unlock; +hci_transaction_init (&transaction, hdev,NULL ); - err =update_eir (hdev); -if (err <0 ) - goto unlock; +update_class (&transaction); +update_eir (&transaction); + +hci_transaction_run (&transaction);if (!test_bit (HCI_PENDING_CLASS , &hdev->dev_flags)) { err = cmd_complete(sk, hdev->id, MGMT_OP_REMOVE_UUID, 0,
@@ -1481,8 +1494,12 @@ update_class: } cmd =mgmt_pending_add (sk,MGMT_OP_REMOVE_UUID , hdev, data, len); -if (!cmd) +if (!cmd) { err = -ENOMEM ; + goto unlock; + } + + err =0 ; unlock:hci_dev_unlock (hdev);
@@ -1493,6 +1510,7 @@ static int set_dev_class(struct sock *sk, struct hci_dev *hdev, void *data, u16 len) {struct mgmt_cp_set_dev_class *cp = data; +struct hci_transaction transaction;struct pending_cmd *cmd;int err;
@@ -1521,16 +1539,18 @@ static int set_dev_class(struct sock *sk, struct hci_dev *hdev, void *data, goto unlock; } +hci_transaction_init (&transaction, hdev,NULL ); +if (test_and_clear_bit (HCI_SERVICE_CACHE , &hdev->dev_flags)) {hci_dev_unlock (hdev);cancel_delayed_work_sync (&hdev->service_cache);hci_dev_lock (hdev); -update_eir (hdev); +update_eir (&transaction); } - err =update_class (hdev); -if (err <0 ) - goto unlock; +update_class (&transaction); + +hci_transaction_run (&transaction);if (!test_bit (HCI_PENDING_CLASS , &hdev->dev_flags)) { err = cmd_complete(sk, hdev->id, MGMT_OP_SET_DEV_CLASS, 0,
@@ -1539,8 +1559,12 @@ static int set_dev_class(struct sock *sk, struct hci_dev *hdev, void *data, } cmd =mgmt_pending_add (sk,MGMT_OP_SET_DEV_CLASS , hdev, data, len); -if (!cmd) +if (!cmd) { err = -ENOMEM ; + goto unlock; + } + + err =0 ; unlock:hci_dev_unlock (hdev);
@@ -2268,19 +2292,21 @@ static int user_passkey_neg_reply(struct sock *sk, struct hci_dev *hdev, HCI_OP_USER_PASSKEY_NEG_REPLY, 0); } -static int update_name (struct hci_dev *hdev,const char *name) +static void update_name (struct hci_transaction *transaction,const char *name) {struct hci_cp_write_local_name cp;memcpy (cp.name, name,sizeof (cp.name)); -return hci_send_cmd (hdev,HCI_OP_WRITE_LOCAL_NAME ,sizeof (cp), &cp); +hci_transaction_cmd (transaction,HCI_OP_WRITE_LOCAL_NAME , +sizeof (cp), &cp); }static int set_local_name (struct sock *sk,struct hci_dev *hdev,void *data,u16 len) {struct mgmt_cp_set_local_name *cp = data; +struct hci_transaction transaction;struct pending_cmd *cmd;int err;
@@ -2310,7 +2336,9 @@ static int set_local_name(struct sock *sk, struct hci_dev *hdev, void *data, goto failed; } - err =update_name (hdev, cp->name); +hci_transaction_init (&transaction, hdev,NULL ); +update_name (&transaction, cp->name); + err =hci_transaction_run (&transaction);if (err <0 )mgmt_pending_remove (cmd);
@@ -2698,6 +2726,7 @@ static int set_device_id(struct sock *sk, struct hci_dev *hdev, void *data, u16 len) {struct mgmt_cp_set_device_id *cp = data; +struct hci_transaction transaction;int err;__u16 source;
@@ -2718,7 +2747,9 @@ static int set_device_id(struct sock *sk, struct hci_dev *hdev, void *data, err =cmd_complete (sk, hdev->id,MGMT_OP_SET_DEVICE_ID ,0 ,NULL ,0 ); -update_eir (hdev); +hci_transaction_init (&transaction, hdev,NULL ); +update_eir (&transaction); +hci_transaction_run (&transaction);hci_dev_unlock (hdev);
@@ -3043,8 +3074,9 @@ static void settings_rsp(struct pending_cmd *cmd, void *data)mgmt_pending_free (cmd); } -static int set_bredr_scan (struct hci_dev *hdev) +static int set_bredr_scan (struct hci_transaction *transaction) { +struct hci_dev *hdev = transaction->hdev;u8 scan =0 ;if (test_bit (HCI_CONNECTABLE , &hdev->dev_flags))
@@ -3055,18 +3087,23 @@ static int set_bredr_scan(struct hci_dev *hdev)if (!scan)return 0 ; -return hci_send_cmd (hdev,HCI_OP_WRITE_SCAN_ENABLE ,1 , &scan); +return hci_transaction_cmd (transaction,HCI_OP_WRITE_SCAN_ENABLE , +1 , &scan); }static int powered_update_hci (struct hci_dev *hdev) { +struct hci_transaction transaction;u8 link_sec; +hci_transaction_init (&transaction, hdev,NULL ); +if (test_bit (HCI_SSP_ENABLED , &hdev->dev_flags) && - !lmp_host_ssp_capable (hdev)) { + !lmp_host_ssp_capable (hdev)) {u8 ssp =1 ; -hci_send_cmd (hdev,HCI_OP_WRITE_SSP_MODE ,1 , &ssp); +hci_transaction_cmd (&transaction,HCI_OP_WRITE_SSP_MODE , +1 , &ssp); }if (test_bit (HCI_LE_ENABLED , &hdev->dev_flags)) {
@@ -3079,22 +3116,25 @@ static int powered_update_hci(struct hci_dev *hdev)* host state (host features set) */ if (cp.le !=lmp_host_le_capable (hdev) || - cp.simul !=lmp_host_le_br_capable (hdev)) -hci_send_cmd (hdev,HCI_OP_WRITE_LE_HOST_SUPPORTED , -sizeof (cp), &cp); + cp.simul !=lmp_host_le_br_capable (hdev)) +hci_transaction_cmd (&transaction, +HCI_OP_WRITE_LE_HOST_SUPPORTED , +sizeof (cp), &cp); } link_sec =test_bit (HCI_LINK_SECURITY , &hdev->dev_flags);if (link_sec !=test_bit (HCI_AUTH , &hdev->flags)) -hci_send_cmd (hdev,HCI_OP_WRITE_AUTH_ENABLE , -sizeof (link_sec), &link_sec); +hci_transaction_cmd (&transaction,HCI_OP_WRITE_AUTH_ENABLE , +sizeof (link_sec), &link_sec);if (lmp_bredr_capable (hdev)) { -set_bredr_scan (hdev); -update_class (hdev); -update_name (hdev, hdev->dev_name); -update_eir (hdev); +set_bredr_scan (&transaction); +update_class (&transaction); +update_name (&transaction, hdev->dev_name); +update_eir (&transaction); } + +return hci_transaction_run (&transaction); }int mgmt_powered (struct hci_dev *hdev,u8 powered)
@@ -3559,8 +3599,9 @@ int mgmt_auth_enable_complete(struct hci_dev *hdev, u8 status)return err; } -static int clear_eir (struct hci_dev *hdev) +static int clear_eir (struct hci_transaction *transaction) { +struct hci_dev *hdev = transaction->hdev;struct hci_cp_write_eir cp;if (!lmp_ext_inq_capable (hdev))
@@ -3570,12 +3611,14 @@ static int clear_eir(struct hci_dev *hdev)memset (&cp,0 ,sizeof (cp)); -return hci_send_cmd (hdev,HCI_OP_WRITE_EIR ,sizeof (cp), &cp); +return hci_transaction_cmd (transaction,HCI_OP_WRITE_EIR , +sizeof (cp), &cp); }int mgmt_ssp_enable_complete (struct hci_dev *hdev,u8 enable,u8 status) {struct cmd_lookup match = {NULL , hdev }; +struct hci_transaction transaction;bool changed = false;int err =0 ;
@@ -3608,10 +3651,14 @@ int mgmt_ssp_enable_complete(struct hci_dev *hdev, u8 enable, u8 status)if (match.sk)sock_put (match.sk); +hci_transaction_init (&transaction, hdev,NULL ); +if (test_bit (HCI_SSP_ENABLED , &hdev->dev_flags)) -update_eir (hdev); +update_eir (&transaction);else -clear_eir (hdev); +clear_eir (&transaction); + +hci_transaction_run (&transaction);return err; }
@@ -3699,8 +3746,12 @@ send_event:* adapter so only update them here if this is a name change * unrelated to power on. */ -if (!test_bit (HCI_INIT , &hdev->flags)) -update_eir (hdev); +if (!test_bit (HCI_INIT , &hdev->flags)) { +struct hci_transaction transaction; +hci_transaction_init (&transaction, hdev,NULL ); +update_eir (&transaction); +hci_transaction_run (&transaction); + } failed:if (cmd)
Signature · 1 line
1.7.10.4
PATCH v2 11/15 Bluetooth: Wait for HCI command completion with mgmt_set_powered
In reply to Johan HedbergFrom: Johan Hedberg <[email protected]>
We should only notify user space that the adapter has been powered on after all HCI commands related to the action have completed. This patch fixes the issue by instating a transaction complete callback for these HCI commands and only notifies user space in the callback.
--- net/bluetooth/mgmt.c | 42 ++++++++++++++++++++++++++++++------------ 1 file changed, 30 insertions(+), 12 deletions(-)
net/bluetooth/mgmt.c +30 -12
@@ -3091,12 +3091,26 @@ static int set_bredr_scan(struct hci_transaction *transaction) 1, &scan); } +static void powered_complete (struct hci_dev *hdev,u16 opcode,int status) +{ +struct cmd_lookup match = {NULL , hdev }; + +BT_DBG ("opcode 0x%04x status %d" , opcode, status); + +mgmt_pending_foreach (MGMT_OP_SET_POWERED , hdev, settings_rsp, &match); + +new_settings (hdev, match.sk); + +if (match.sk) +sock_put (match.sk); +} +static int powered_update_hci (struct hci_dev *hdev) {struct hci_transaction transaction;u8 link_sec; -hci_transaction_init (&transaction, hdev,NULL ); +hci_transaction_init (&transaction, hdev, powered_complete);if (test_bit (HCI_SSP_ENABLED , &hdev->dev_flags) && !lmp_host_ssp_capable (hdev)) {
@@ -3140,26 +3154,30 @@ static int powered_update_hci(struct hci_dev *hdev)int mgmt_powered (struct hci_dev *hdev,u8 powered) {struct cmd_lookup match = {NULL , hdev }; +u8 status_not_powered =MGMT_STATUS_NOT_POWERED ; +u8 zero_cod[] = {0 ,0 ,0 };int err;if (!test_bit (HCI_MGMT , &hdev->dev_flags))return 0 ; -mgmt_pending_foreach (MGMT_OP_SET_POWERED , hdev, settings_rsp, &match); -if (powered) { -powered_update_hci (hdev); - }else { -u8 status =MGMT_STATUS_NOT_POWERED ; -u8 zero_cod[] = {0 ,0 ,0 }; +if (powered_update_hci (hdev) ==0 ) +return 0 ; -mgmt_pending_foreach (0 , hdev, cmd_status_rsp, &status); - -if (memcmp (hdev->dev_class, zero_cod,sizeof (zero_cod)) !=0 ) -mgmt_event (MGMT_EV_CLASS_OF_DEV_CHANGED , hdev, - zero_cod,sizeof (zero_cod),NULL ); +mgmt_pending_foreach (MGMT_OP_SET_POWERED , hdev, settings_rsp, + &match); + goto new_settings; } +mgmt_pending_foreach (MGMT_OP_SET_POWERED , hdev, settings_rsp, &match); +mgmt_pending_foreach (0 , hdev, cmd_status_rsp, &status_not_powered); + +if (memcmp (hdev->dev_class, zero_cod,sizeof (zero_cod)) !=0 ) +mgmt_event (MGMT_EV_CLASS_OF_DEV_CHANGED , hdev, + zero_cod,sizeof (zero_cod),NULL ); + +new_settings: err =new_settings (hdev, match.sk);if (match.sk)
Signature · 1 line
1.7.10.4
PATCH v2 12/15 Bluetooth: Fix busy condition testing for EIR and class updates
In reply to Johan HedbergFrom: Johan Hedberg <[email protected]>
The add/remove_uuid and set_dev_class mgmt commands can trigger both EIR and class HCI commands, so testing just for a pending class command is enough. The simplest way to monitor conflicts that should trigger "busy" error returns is to check for any pending mgmt command that can trigger these HCI commands. This patch adds a helper function for this (pending_eir_or_class) and uses it instead of the old HCI_PENDING_CLASS flag to test for busy conditions.
--- net/bluetooth/mgmt.c | 39 ++++++++++++++++++++++++++++++--------- 1 file changed, 30 insertions(+), 9 deletions(-)
net/bluetooth/mgmt.c +30 -9
@@ -1341,6 +1341,23 @@ unlock:return err; } +static bool pending_eir_or_class (struct hci_dev *hdev) +{ +struct pending_cmd *cmd; + +list_for_each_entry (cmd, &hdev->mgmt_pending, list) { +switch (cmd->opcode) { +case MGMT_OP_ADD_UUID : +case MGMT_OP_REMOVE_UUID : +case MGMT_OP_SET_DEV_CLASS : +case MGMT_OP_SET_POWERED : +return true; + } + } + +return false; +} +static const u8 bluetooth_base_uuid[] = {0xfb ,0x34 ,0x9b ,0x5f ,0x80 ,0x00 ,0x00 ,0x80 ,0x00 ,0x10 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,
@@ -1372,7 +1389,7 @@ static int add_uuid(struct sock *sk, struct hci_dev *hdev, void *data, u16 len)hci_dev_lock (hdev); -if (test_bit (HCI_PENDING_CLASS , &hdev->dev_flags)) { +if (pending_eir_or_class (hdev)) { err =cmd_status (sk, hdev->id,MGMT_OP_ADD_UUID ,MGMT_STATUS_BUSY ); goto failed;
@@ -1444,7 +1461,7 @@ static int remove_uuid(struct sock *sk, struct hci_dev *hdev, void *data,hci_dev_lock (hdev); -if (test_bit (HCI_PENDING_CLASS , &hdev->dev_flags)) { +if (pending_eir_or_class (hdev)) { err =cmd_status (sk, hdev->id,MGMT_OP_REMOVE_UUID ,MGMT_STATUS_BUSY ); goto unlock;
@@ -1520,15 +1537,19 @@ static int set_dev_class(struct sock *sk, struct hci_dev *hdev, void *data,return cmd_status (sk, hdev->id,MGMT_OP_SET_DEV_CLASS ,MGMT_STATUS_NOT_SUPPORTED ); -if (test_bit (HCI_PENDING_CLASS , &hdev->dev_flags)) -return cmd_status (sk, hdev->id,MGMT_OP_SET_DEV_CLASS , -MGMT_STATUS_BUSY ); +hci_dev_lock (hdev); -if ((cp->minor &0x03 ) !=0 || (cp->major &0xe0 ) !=0 ) -return cmd_status (sk, hdev->id,MGMT_OP_SET_DEV_CLASS , -MGMT_STATUS_INVALID_PARAMS ); +if (pending_eir_or_class (hdev)) { + err =cmd_status (sk, hdev->id,MGMT_OP_SET_DEV_CLASS , +MGMT_STATUS_BUSY ); + goto unlock; + } -hci_dev_lock (hdev); +if ((cp->minor &0x03 ) !=0 || (cp->major &0xe0 ) !=0 ) { + err =cmd_status (sk, hdev->id,MGMT_OP_SET_DEV_CLASS , +MGMT_STATUS_INVALID_PARAMS ); + goto unlock; + } hdev->major_class = cp->major; hdev->minor_class = cp->minor;
Signature · 1 line
1.7.10.4
PATCH v2 13/15 Bluetooth: Fix UUID/class mgmt command response synchronization
In reply to Johan HedbergFrom: Johan Hedberg <[email protected]>
We should only return a mgmt command complete once all HCI commands to a mgmt_set_dev_class or mgmt_add/remove_uuid command have completed. This patch fixes the issue by having a proper transaction complete callback for these actions and responding to user space in the callback.
--- net/bluetooth/mgmt.c | 69 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 46 insertions(+), 23 deletions(-)
net/bluetooth/mgmt.c +46 -23
@@ -1377,6 +1377,28 @@ static u8 get_uuid_size(const u8 *uuid)return 16 ; } +static void mgmt_class_complete (struct hci_dev *hdev,u16 mgmt_op,int status) +{ +struct pending_cmd *cmd; + + cmd =mgmt_pending_find (mgmt_op, hdev); +if (!cmd) +return ; + +cmd_complete (cmd->sk, cmd->index, cmd->opcode,mgmt_status (status), + hdev->dev_class,3 ); + +list_del (&cmd->list); +mgmt_pending_free (cmd); +} + +static void add_uuid_complete (struct hci_dev *hdev,u16 opcode,int status) +{ +BT_DBG ("opcode 0x%02x status %d" , opcode, status); + +mgmt_class_complete (hdev,MGMT_OP_ADD_UUID , status); +} +static int add_uuid (struct sock *sk,struct hci_dev *hdev,void *data,u16 len) {struct mgmt_cp_add_uuid *cp = data;
@@ -1407,14 +1429,12 @@ static int add_uuid(struct sock *sk, struct hci_dev *hdev, void *data, u16 len)list_add_tail (&uuid->list, &hdev->uuids); -hci_transaction_init (&transaction, hdev,NULL ); +hci_transaction_init (&transaction, hdev, add_uuid_complete);update_class (&transaction);update_eir (&transaction); -hci_transaction_run (&transaction); - -if (!test_bit (HCI_PENDING_CLASS , &hdev->dev_flags)) { +if (hci_transaction_run (&transaction) <0 ) { err =cmd_complete (sk, hdev->id,MGMT_OP_ADD_UUID ,0 , hdev->dev_class,3 ); goto failed;
@@ -1447,6 +1467,13 @@ static bool enable_service_cache(struct hci_dev *hdev)return false; } +static void remove_uuid_complete (struct hci_dev *hdev,u16 opcode,int status) +{ +BT_DBG ("opcode 0x%02x status %d" , opcode, status); + +mgmt_class_complete (hdev,MGMT_OP_REMOVE_UUID , status); +} +static int remove_uuid (struct sock *sk,struct hci_dev *hdev,void *data,u16 len) {
@@ -1497,14 +1524,12 @@ static int remove_uuid(struct sock *sk, struct hci_dev *hdev, void *data, } update_class: -hci_transaction_init (&transaction, hdev,NULL ); +hci_transaction_init (&transaction, hdev, remove_uuid_complete);update_class (&transaction);update_eir (&transaction); -hci_transaction_run (&transaction); - -if (!test_bit (HCI_PENDING_CLASS , &hdev->dev_flags)) { +if (hci_transaction_run (&transaction) <0 ) { err =cmd_complete (sk, hdev->id,MGMT_OP_REMOVE_UUID ,0 , hdev->dev_class,3 ); goto unlock;
@@ -1523,6 +1548,13 @@ unlock:return err; } +static void set_class_complete (struct hci_dev *hdev,u16 opcode,int status) +{ +BT_DBG ("opcode 0x%02x status %d" , opcode, status); + +mgmt_class_complete (hdev,MGMT_OP_SET_DEV_CLASS , status); +} +static int set_dev_class (struct sock *sk,struct hci_dev *hdev,void *data,u16 len) {
@@ -1560,7 +1592,7 @@ static int set_dev_class(struct sock *sk, struct hci_dev *hdev, void *data, goto unlock; } -hci_transaction_init (&transaction, hdev,NULL ); +hci_transaction_init (&transaction, hdev, set_class_complete);if (test_and_clear_bit (HCI_SERVICE_CACHE , &hdev->dev_flags)) {hci_dev_unlock (hdev);
@@ -1571,9 +1603,7 @@ static int set_dev_class(struct sock *sk, struct hci_dev *hdev, void *data,update_class (&transaction); -hci_transaction_run (&transaction); - -if (!test_bit (HCI_PENDING_CLASS , &hdev->dev_flags)) { +if (hci_transaction_run (&transaction) <0 ) { err =cmd_complete (sk, hdev->id,MGMT_OP_SET_DEV_CLASS ,0 , hdev->dev_class,3 ); goto unlock;
@@ -3702,21 +3732,14 @@ int mgmt_ssp_enable_complete(struct hci_dev *hdev, u8 enable, u8 status)return err; } -static void class_rsp (struct pending_cmd *cmd,void *data) +static void sk_lookup (struct pending_cmd *cmd,void *data) {struct cmd_lookup *match = data; -cmd_complete (cmd->sk, cmd->index, cmd->opcode, match->mgmt_status, - match->hdev->dev_class,3 ); - -list_del (&cmd->list); -if (match->sk ==NULL ) { match->sk = cmd->sk;sock_hold (match->sk); } - -mgmt_pending_free (cmd); } int mgmt_set_class_of_dev_complete(struct hci_dev *hdev, u8 *dev_class,
@@ -3727,9 +3750,9 @@ int mgmt_set_class_of_dev_complete(struct hci_dev *hdev, u8 *dev_class,clear_bit (HCI_PENDING_CLASS , &hdev->dev_flags); -mgmt_pending_foreach (MGMT_OP_SET_DEV_CLASS , hdev, class_rsp, &match); -mgmt_pending_foreach (MGMT_OP_ADD_UUID , hdev, class_rsp, &match); -mgmt_pending_foreach (MGMT_OP_REMOVE_UUID , hdev, class_rsp, &match); +mgmt_pending_foreach (MGMT_OP_SET_DEV_CLASS , hdev, sk_lookup, &match); +mgmt_pending_foreach (MGMT_OP_ADD_UUID , hdev, sk_lookup, &match); +mgmt_pending_foreach (MGMT_OP_REMOVE_UUID , hdev, sk_lookup, &match);if (!status) err = mgmt_event(MGMT_EV_CLASS_OF_DEV_CHANGED, hdev, dev_class,
Signature · 1 line
1.7.10.4
PATCH v2 14/15 Bluetooth: Remove useless HCI_PENDING_CLASS flag
In reply to Johan HedbergFrom: Johan Hedberg <[email protected]>
Now that class related operations are tracked through HCI transactions this flag is no longer needed.
--- net/bluetooth/hci_event.c | 3 +-- net/bluetooth/mgmt.c | 11 ++--------- 2 files changed, 3 insertions(+), 11 deletions(-)
net/bluetooth/hci_event.c +1 -2
@@ -194,8 +194,7 @@ static void hci_cc_reset(struct hci_dev *hdev, struct sk_buff *skb)clear_bit (HCI_RESET , &hdev->flags);/* Reset all non-persistent flags */ - hdev->dev_flags &= ~(BIT (HCI_LE_SCAN ) |BIT (HCI_PENDING_CLASS ) | -BIT (HCI_PERIODIC_INQ )); + hdev->dev_flags &= ~(BIT (HCI_LE_SCAN ) |BIT (HCI_PERIODIC_INQ )); hdev->discovery.state =DISCOVERY_STOPPED ; hdev->inq_tx_power =HCI_TX_POWER_INVALID ;
net/bluetooth/mgmt.c +2 -9
@@ -636,7 +636,6 @@ static int update_class(struct hci_transaction *transaction) {struct hci_dev *hdev = transaction->hdev;u8 cod[3 ]; -int err;BT_DBG ("%s" , hdev->name);
@@ -653,12 +652,8 @@ static int update_class(struct hci_transaction *transaction)if (memcmp (cod, hdev->dev_class,3 ) ==0 )return 0 ; - err =hci_transaction_cmd (transaction,HCI_OP_WRITE_CLASS_OF_DEV , -sizeof (cod), cod); -if (err ==0 ) -set_bit (HCI_PENDING_CLASS , &hdev->dev_flags); - -return err; +return hci_transaction_cmd (transaction,HCI_OP_WRITE_CLASS_OF_DEV , +sizeof (cod), cod); }static void service_cache_off (struct work_struct *work)
@@ -3748,8 +3743,6 @@ int mgmt_set_class_of_dev_complete(struct hci_dev *hdev, u8 *dev_class,struct cmd_lookup match = {NULL , hdev,mgmt_status (status) };int err =0 ; -clear_bit (HCI_PENDING_CLASS , &hdev->dev_flags); -mgmt_pending_foreach (MGMT_OP_SET_DEV_CLASS , hdev, sk_lookup, &match);mgmt_pending_foreach (MGMT_OP_ADD_UUID , hdev, sk_lookup, &match);mgmt_pending_foreach (MGMT_OP_REMOVE_UUID , hdev, sk_lookup, &match);
Signature · 1 line
1.7.10.4
PATCH v2 15/15 Bluetooth: Remove empty HCI event handlers
In reply to Johan HedbergFrom: Johan Hedberg <[email protected]>
With the removal of hci_req_complete() several HCI event handles have essentially become empty and can be removed. The only potential benefit of these could have been logging, but the hci_event, hci_cmd_complete and hci_cmd_status already provide a log for events which they do not have an explicit handler for.
--- net/bluetooth/hci_event.c | 164 --------------------------------------------- 1 file changed, 164 deletions(-)
net/bluetooth/hci_event.c +0 -164
@@ -423,13 +423,6 @@ static void hci_cc_write_voice_setting(struct hci_dev *hdev, hdev->notify (hdev,HCI_NOTIFY_VOICE_SETTING ); } -static void hci_cc_host_buffer_size (struct hci_dev *hdev,struct sk_buff *skb) -{ -__u8 status = *((__u8 *) skb->data); - -BT_DBG ("%s status 0x%2.2x" , hdev->name, status); -} -static void hci_cc_write_ssp_mode (struct hci_dev *hdev,struct sk_buff *skb) {__u8 status = *((__u8 *) skb->data);
@@ -631,13 +624,6 @@ static void hci_cc_read_data_block_size(struct hci_dev *hdev, hdev->block_cnt, hdev->block_len); } -static void hci_cc_write_ca_timeout (struct hci_dev *hdev,struct sk_buff *skb) -{ -__u8 status = *((__u8 *) skb->data); - -BT_DBG ("%s status 0x%2.2x" , hdev->name, status); -} -static void hci_cc_read_local_amp_info (struct hci_dev *hdev,struct sk_buff *skb) {
@@ -700,29 +686,6 @@ a2mp_rsp:a2mp_send_create_phy_link_req (hdev, rp->status); } -static void hci_cc_delete_stored_link_key (struct hci_dev *hdev, -struct sk_buff *skb) -{ -__u8 status = *((__u8 *) skb->data); - -BT_DBG ("%s status 0x%2.2x" , hdev->name, status); -} - -static void hci_cc_set_event_mask (struct hci_dev *hdev,struct sk_buff *skb) -{ -__u8 status = *((__u8 *) skb->data); - -BT_DBG ("%s status 0x%2.2x" , hdev->name, status); -} - -static void hci_cc_write_inquiry_mode (struct hci_dev *hdev, -struct sk_buff *skb) -{ -__u8 status = *((__u8 *) skb->data); - -BT_DBG ("%s status 0x%2.2x" , hdev->name, status); -} -static void hci_cc_read_inq_rsp_tx_power (struct hci_dev *hdev,struct sk_buff *skb) {
@@ -734,13 +697,6 @@ static void hci_cc_read_inq_rsp_tx_power(struct hci_dev *hdev, hdev->inq_tx_power = rp->tx_power; } -static void hci_cc_set_event_flt (struct hci_dev *hdev,struct sk_buff *skb) -{ -__u8 status = *((__u8 *) skb->data); - -BT_DBG ("%s status 0x%2.2x" , hdev->name, status); -} -static void hci_cc_pin_code_reply (struct hci_dev *hdev,struct sk_buff *skb) {struct hci_rp_pin_code_reply *rp = (void *) skb->data;
@@ -827,13 +783,6 @@ static void hci_cc_le_read_adv_tx_power(struct hci_dev *hdev, } } -static void hci_cc_le_set_event_mask (struct hci_dev *hdev,struct sk_buff *skb) -{ -__u8 status = *((__u8 *) skb->data); - -BT_DBG ("%s status 0x%2.2x" , hdev->name, status); -} -static void hci_cc_user_confirm_reply (struct hci_dev *hdev,struct sk_buff *skb) {struct hci_rp_user_confirm_reply *rp = (void *) skb->data;
@@ -1014,26 +963,6 @@ static void hci_cc_le_read_white_list_size(struct hci_dev *hdev, hdev->le_white_list_size = rp->size; } -static void hci_cc_le_ltk_reply (struct hci_dev *hdev,struct sk_buff *skb) -{ -struct hci_rp_le_ltk_reply *rp = (void *) skb->data; - -BT_DBG ("%s status 0x%2.2x" , hdev->name, rp->status); - -if (rp->status) -return ; -} - -static void hci_cc_le_ltk_neg_reply (struct hci_dev *hdev,struct sk_buff *skb) -{ -struct hci_rp_le_ltk_neg_reply *rp = (void *) skb->data; - -BT_DBG ("%s status 0x%2.2x" , hdev->name, rp->status); - -if (rp->status) -return ; -} -static void hci_cc_le_read_supported_states (struct hci_dev *hdev,struct sk_buff *skb) {
@@ -1564,11 +1493,6 @@ static void hci_cs_le_create_conn(struct hci_dev *hdev, __u8 status) } } -static void hci_cs_le_start_enc (struct hci_dev *hdev,u8 status) -{ -BT_DBG ("%s status 0x%2.2x" , hdev->name, status); -} -static void hci_cs_create_phylink (struct hci_dev *hdev,u8 status) {struct hci_cp_create_phy_link *cp;
@@ -1610,11 +1534,6 @@ static void hci_cs_accept_phylink(struct hci_dev *hdev, u8 status)amp_write_remote_assoc (hdev, cp->phy_handle); } -static void hci_cs_create_logical_link (struct hci_dev *hdev,u8 status) -{ -BT_DBG ("%s status 0x%2.2x" , hdev->name, status); -} -static void hci_inquiry_complete_evt (struct hci_dev *hdev,struct sk_buff *skb) {__u8 status = *((__u8 *) skb->data);
@@ -2171,17 +2090,6 @@ unlock:hci_dev_unlock (hdev); } -static void hci_remote_version_evt (struct hci_dev *hdev,struct sk_buff *skb) -{ -BT_DBG ("%s" , hdev->name); -} - -static void hci_qos_setup_complete_evt (struct hci_dev *hdev, -struct sk_buff *skb) -{ -BT_DBG ("%s" , hdev->name); -} -static void hci_cmd_complete_evt (struct hci_dev *hdev,struct sk_buff *skb) {struct hci_ev_cmd_complete *ev = (void *) skb->data;
@@ -2269,10 +2177,6 @@ static void hci_cmd_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)hci_cc_write_voice_setting (hdev, skb);break ; -case HCI_OP_HOST_BUFFER_SIZE : -hci_cc_host_buffer_size (hdev, skb); -break ; -case HCI_OP_WRITE_SSP_MODE :hci_cc_write_ssp_mode (hdev, skb);break ;
@@ -2305,10 +2209,6 @@ static void hci_cmd_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)hci_cc_read_data_block_size (hdev, skb);break ; -case HCI_OP_WRITE_CA_TIMEOUT : -hci_cc_write_ca_timeout (hdev, skb); -break ; -case HCI_OP_READ_FLOW_CONTROL_MODE :hci_cc_read_flow_control_mode (hdev, skb);break ;
@@ -2321,26 +2221,10 @@ static void hci_cmd_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)hci_cc_read_local_amp_assoc (hdev, skb);break ; -case HCI_OP_DELETE_STORED_LINK_KEY : -hci_cc_delete_stored_link_key (hdev, skb); -break ; - -case HCI_OP_SET_EVENT_MASK : -hci_cc_set_event_mask (hdev, skb); -break ; - -case HCI_OP_WRITE_INQUIRY_MODE : -hci_cc_write_inquiry_mode (hdev, skb); -break ; -case HCI_OP_READ_INQ_RSP_TX_POWER :hci_cc_read_inq_rsp_tx_power (hdev, skb);break ; -case HCI_OP_SET_EVENT_FLT : -hci_cc_set_event_flt (hdev, skb); -break ; -case HCI_OP_PIN_CODE_REPLY :hci_cc_pin_code_reply (hdev, skb);break ;
@@ -2365,10 +2249,6 @@ static void hci_cmd_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)hci_cc_le_read_adv_tx_power (hdev, skb);break ; -case HCI_OP_LE_SET_EVENT_MASK : -hci_cc_le_set_event_mask (hdev, skb); -break ; -case HCI_OP_USER_CONFIRM_REPLY :hci_cc_user_confirm_reply (hdev, skb);break ;
@@ -2401,14 +2281,6 @@ static void hci_cmd_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)hci_cc_le_read_white_list_size (hdev, skb);break ; -case HCI_OP_LE_LTK_REPLY : -hci_cc_le_ltk_reply (hdev, skb); -break ; - -case HCI_OP_LE_LTK_NEG_REPLY : -hci_cc_le_ltk_neg_reply (hdev, skb); -break ; -case HCI_OP_LE_READ_SUPPORTED_STATES :hci_cc_le_read_supported_states (hdev, skb);break ;
@@ -2500,10 +2372,6 @@ static void hci_cmd_status_evt(struct hci_dev *hdev, struct sk_buff *skb)hci_cs_le_create_conn (hdev, ev->status);break ; -case HCI_OP_LE_START_ENC : -hci_cs_le_start_enc (hdev, ev->status); -break ; -case HCI_OP_CREATE_PHY_LINK :hci_cs_create_phylink (hdev, ev->status);break ;
@@ -2512,10 +2380,6 @@ static void hci_cmd_status_evt(struct hci_dev *hdev, struct sk_buff *skb)hci_cs_accept_phylink (hdev, ev->status);break ; -case HCI_OP_CREATE_LOGICAL_LINK : -hci_cs_create_logical_link (hdev, ev->status); -break ; -default :BT_DBG ("%s opcode 0x%4.4x" , hdev->name, opcode);break ;
@@ -3076,18 +2940,6 @@ unlock:hci_dev_unlock (hdev); } -static void hci_sync_conn_changed_evt (struct hci_dev *hdev,struct sk_buff *skb) -{ -BT_DBG ("%s" , hdev->name); -} - -static void hci_sniff_subrate_evt (struct hci_dev *hdev,struct sk_buff *skb) -{ -struct hci_ev_sniff_subrate *ev = (void *) skb->data; - -BT_DBG ("%s status 0x%2.2x" , hdev->name, ev->status); -} -static void hci_extended_inquiry_result_evt (struct hci_dev *hdev,struct sk_buff *skb) {
@@ -3815,14 +3667,6 @@ void hci_event_packet(struct hci_dev *hdev, struct sk_buff *skb)hci_remote_features_evt (hdev, skb);break ; -case HCI_EV_REMOTE_VERSION : -hci_remote_version_evt (hdev, skb); -break ; - -case HCI_EV_QOS_SETUP_COMPLETE : -hci_qos_setup_complete_evt (hdev, skb); -break ; -case HCI_EV_CMD_COMPLETE :hci_cmd_complete_evt (hdev, skb);break ;
@@ -3879,14 +3723,6 @@ void hci_event_packet(struct hci_dev *hdev, struct sk_buff *skb)hci_sync_conn_complete_evt (hdev, skb);break ; -case HCI_EV_SYNC_CONN_CHANGED : -hci_sync_conn_changed_evt (hdev, skb); -break ; - -case HCI_EV_SNIFF_SUBRATE : -hci_sniff_subrate_evt (hdev, skb); -break ; -case HCI_EV_EXTENDED_INQUIRY_RESULT :hci_extended_inquiry_result_evt (hdev, skb);break ;
Signature · 1 line
1.7.10.4