Bluetooth: Add asynchronous request support
Subsystems (2)
v2 cover Bluetooth: Add asynchronous request support
Hi,
Here's a v2 of the patch set with previous feedback taken into account.
One notable thing is with the request complete callback where I decided after all to ommit the last_opcode parameter. The reason for this is that it is indeed only used for logging in subsequent patches which is a bit redundant with the logs already existing in the other functions leading to the complete callback, and the same info is also available with tools like btmon. Furthermore, if some future piece of code really does end up needing this info it can always be dug out from hdev->sent_cmd.
Johan
----------------------------------------------------------------
Johan Hedberg (11):
Bluetooth: Rename hci_request to hci_req_sync
Bluetooth: Fix __hci_request() handling of empty requests
Bluetooth: Split HCI init sequence into three stages
Bluetooth: Add initial skeleton for asynchronous HCI requests
Bluetooth: Refactor HCI command skb creation
Bluetooth: Introduce new hci_req_add function
Bluetooth: Introduce a hci_req_from_skb function
Bluetooth: Add request cmd_complete and cmd_status functions
Bluetooth: Use async requests internally in hci_req_sync
Bluetooth: Remove unused hdev->init_last_cmd
Bluetooth: Remove empty HCI event handlers
include/net/bluetooth/bluetooth.h | 10 + include/net/bluetooth/hci_core.h | 16 +- net/bluetooth/hci_core.c | 673 +++++++++++++++++++++++++++++++------ net/bluetooth/hci_event.c | 504 +-------------------------- net/bluetooth/hci_sock.c | 3 +- 5 files changed, 603 insertions(+), 603 deletions(-)
PATCH v2 1/11 Bluetooth: Rename hci_request to hci_req_sync
From: Johan Hedberg <[email protected]>
We'll be introducing an async version of hci_request. To make things clear it makes sense to rename the existing API to have a _sync suffix.
--- net/bluetooth/hci_core.c | 49 +++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 24 deletions(-)
net/bluetooth/hci_core.c +25 -24
@@ -107,9 +107,9 @@ static void hci_req_cancel(struct hci_dev *hdev, int err) }/* Execute request and wait for completion. */ -static int __hci_request (struct hci_dev *hdev, -void (*req)(struct hci_dev *hdev,unsigned long opt), -unsigned long opt,__u32 timeout) +static int __hci_req_sync (struct hci_dev *hdev, +void (*req)(struct hci_dev *hdev,unsigned long opt), +unsigned long opt,__u32 timeout) {DECLARE_WAITQUEUE (wait, current);int err =0 ;
@@ -150,9 +150,9 @@ static int __hci_request(struct hci_dev *hdev,return err; } -static int hci_request (struct hci_dev *hdev, -void (*req)(struct hci_dev *hdev,unsigned long opt), -unsigned long opt,__u32 timeout) +static int hci_req_sync (struct hci_dev *hdev, +void (*req)(struct hci_dev *hdev,unsigned long opt), +unsigned long opt,__u32 timeout) {int ret;
@@ -161,7 +161,7 @@ static int hci_request(struct hci_dev *hdev,/* Serialize all requests */ hci_req_lock (hdev); - ret =__hci_request (hdev, req, opt, timeout); + ret =__hci_req_sync (hdev, req, opt, timeout);hci_req_unlock (hdev);return ret;
@@ -556,7 +556,8 @@ int hci_inquiry(void __user *arg) timeo = ir.length *msecs_to_jiffies (2000 );if (do_inquiry) { - err =hci_request (hdev, hci_inq_req, (unsigned long )&ir, timeo); + err =hci_req_sync (hdev, hci_inq_req, (unsigned long ) &ir, + timeo);if (err <0 ) goto done; }
@@ -737,7 +738,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_req_sync (hdev, hci_init_req,0 ,HCI_INIT_TIMEOUT );clear_bit (HCI_INIT , &hdev->flags); }
@@ -828,7 +829,7 @@ static int hci_dev_do_close(struct hci_dev *hdev)if (!test_bit (HCI_RAW , &hdev->flags) &&test_bit (HCI_QUIRK_RESET_ON_CLOSE , &hdev->quirks)) {set_bit (HCI_INIT , &hdev->flags); -__hci_request (hdev, hci_reset_req,0 ,HCI_CMD_TIMEOUT ); +__hci_req_sync (hdev, hci_reset_req,0 ,HCI_CMD_TIMEOUT );clear_bit (HCI_INIT , &hdev->flags); }
@@ -921,7 +922,7 @@ int hci_dev_reset(__u16 dev) hdev->acl_cnt =0 ; hdev->sco_cnt =0 ; hdev->le_cnt =0 ;if (!test_bit (HCI_RAW , &hdev->flags)) - ret =__hci_request (hdev, hci_reset_req,0 ,HCI_INIT_TIMEOUT ); + ret =__hci_req_sync (hdev, hci_reset_req,0 ,HCI_INIT_TIMEOUT ); done:hci_req_unlock (hdev);
@@ -960,8 +961,8 @@ int hci_dev_cmd(unsigned int cmd, void __user *arg)switch (cmd) {case HCISETAUTH : - err =hci_request (hdev, hci_auth_req, dr.dev_opt, -HCI_INIT_TIMEOUT ); + err =hci_req_sync (hdev, hci_auth_req, dr.dev_opt, +HCI_INIT_TIMEOUT );break ;case HCISETENCRYPT :
@@ -972,24 +973,24 @@ int hci_dev_cmd(unsigned int cmd, void __user *arg)if (!test_bit (HCI_AUTH , &hdev->flags)) {/* Auth must be enabled first */ - err =hci_request (hdev, hci_auth_req, dr.dev_opt, -HCI_INIT_TIMEOUT ); + err =hci_req_sync (hdev, hci_auth_req, dr.dev_opt, +HCI_INIT_TIMEOUT );if (err)break ; } - err =hci_request (hdev, hci_encrypt_req, dr.dev_opt, -HCI_INIT_TIMEOUT ); + err =hci_req_sync (hdev, hci_encrypt_req, dr.dev_opt, +HCI_INIT_TIMEOUT );break ;case HCISETSCAN : - err =hci_request (hdev, hci_scan_req, dr.dev_opt, -HCI_INIT_TIMEOUT ); + err =hci_req_sync (hdev, hci_scan_req, dr.dev_opt, +HCI_INIT_TIMEOUT );break ;case HCISETLINKPOL : - err =hci_request (hdev, hci_linkpol_req, dr.dev_opt, -HCI_INIT_TIMEOUT ); + err =hci_req_sync (hdev, hci_linkpol_req, dr.dev_opt, +HCI_INIT_TIMEOUT );break ;case HCISETLINKMODE :
@@ -1608,10 +1609,10 @@ static int hci_do_le_scan(struct hci_dev *hdev, u8 type, u16 interval,hci_req_lock (hdev); - err =__hci_request (hdev, le_scan_param_req, (unsigned long ) ¶m, - timeo); + err =__hci_req_sync (hdev, le_scan_param_req, (unsigned long ) ¶m, + timeo);if (!err) - err =__hci_request (hdev, le_scan_enable_req,0 , timeo); + err =__hci_req_sync (hdev, le_scan_enable_req,0 , timeo);hci_req_unlock (hdev);
Signature · 1 line
1.7.10.4
PATCH v2 2/11 Bluetooth: Fix __hci_request() handling of empty requests
In reply to Johan HedbergFrom: Johan Hedberg <[email protected]>
If a request callback doesn't send any commands __hci_req_sync() 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_req_sync(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 3/11 Bluetooth: Split HCI init sequence into three stages
In reply to Johan HedbergFrom: Johan Hedberg <[email protected]>
Having conditional 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_req_sync() call.
This also paves the way to the upcoming asynchronous request support swhich will also benefit by having a simpler implementation if it doesn't need to cater for requests that change on the fly.
--- net/bluetooth/hci_core.c | 274 ++++++++++++++++++++++++++++++++++++++++++++- net/bluetooth/hci_event.c | 255 +---------------------------------------- 2 files changed, 274 insertions(+), 255 deletions(-)
net/bluetooth/hci_core.c +272 -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,273 @@ 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 =0x01 ; + 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_req_sync (hdev, hci_init1_req,0 ,HCI_INIT_TIMEOUT ); +if (err <0 ) +return err; + +/* HCI_BREDR covers both single-mode LE, BR/EDR and dual-mode +* BR/EDR/LE type controllers. AMP controllers only need the +* first stage init. +*/ +if (hdev->dev_type !=HCI_BREDR ) +return 0 ; + + err =__hci_req_sync (hdev, hci_init2_req,0 ,HCI_INIT_TIMEOUT ); +if (err <0 ) +return err; + +return __hci_req_sync (hdev, hci_init3_req,0 ,HCI_INIT_TIMEOUT ); +} +static void hci_scan_req (struct hci_dev *hdev,unsigned long opt) {__u8 scan = opt;
@@ -746,7 +1016,7 @@ int hci_dev_open(__u16 dev)set_bit (HCI_INIT , &hdev->flags); hdev->init_last_cmd =0 ; - ret =__hci_req_sync (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
Marcel Holtmann
maintainerRe: [PATCH v2 03/11] Bluetooth: Split HCI init sequence into three stages
Hi Johan,
Quoted 62 lines
Having conditional command sending during a request has always been problematic and caused hacks like the
hdev->init_last_cmdvariable. This patch removes these conditionals and instead splits the init sequence into three stages, each with its own__hci_req_sync()call.This also paves the way to the upcoming asynchronous request support swhich will also benefit by having a simpler implementation if it doesn't need to cater for requests that change on the fly.
Signed-off-by Johan Hedberg <[email protected]>---
net/bluetooth/hci_core.c | 274 ++++++++++++++++++++++++++++++++++++++++++++- net/bluetooth/hci_event.c | 255 +---------------------------------------- 2 files changed, 274 insertions(+), 255 deletions(-)net/bluetooth/hci_core.c +24
-1@@ -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,273 @@ 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 ;
net/bluetooth/hci_core.c static void hci_init_req(struct hci_dev *hdev, unsigned long opt) · line 281
Quoted 10 lines
net/bluetooth/hci_core.c +10
-0+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); +}
I know this is not your fault, but please while at it, use 0x01 for all of the values that go directly onto the wire.
Regards
Marcel
PATCH v2 4/11 Bluetooth: Add initial skeleton for asynchronous HCI requests
In reply to Johan HedbergFrom: Johan Hedberg <[email protected]>
This patch adds the initial definitions and functions for asynchronous HCI requests. Asynchronous requests are essentially a group of HCI commands together with an optional completion callback. The request 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 request as well as the optional complete callback that should be used when the request is complete (this will be found in the last skb of the request).
--- include/net/bluetooth/bluetooth.h | 10 ++++++++++ include/net/bluetooth/hci_core.h | 8 ++++++++ net/bluetooth/hci_core.c | 30 ++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+)
include/net/bluetooth/bluetooth.h +10 -0
@@ -260,12 +260,22 @@ struct l2cap_ctrl {__u8 retries; }; +struct hci_dev ; + +typedef void (*hci_req_complete_t )(struct hci_dev *hdev,u8 status); + +struct hci_req_ctrl { +bool start; +hci_req_complete_t complete; +}; +struct bt_skb_cb {__u8 pkt_type;__u8 incoming;__u16 expect;__u8 force_active;struct l2cap_ctrl control; +struct hci_req_ctrl req; };#define bt_cb (skb) ((struct bt_skb_cb *)((skb)->cb))
include/net/bluetooth/hci_core.h +8 -0
@@ -1041,6 +1041,14 @@ 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_request { +struct hci_dev *hdev; +struct sk_buff_head cmd_q; +}; + +void hci_req_init (struct hci_request *req,struct hci_dev *hdev); +int hci_req_run (struct hci_request *req,hci_req_complete_t complete); +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 +30 -0
@@ -2439,6 +2439,36 @@ static int hci_send_frame(struct sk_buff *skb)return hdev->send (skb); } +void hci_req_init (struct hci_request *req,struct hci_dev *hdev) +{ +skb_queue_head_init (&req->cmd_q); + req->hdev = hdev; +} + +int hci_req_run (struct hci_request *req,hci_req_complete_t complete) +{ +struct hci_dev *hdev = req->hdev; +struct sk_buff *skb; +unsigned long flags; + +BT_DBG ("length %u" ,skb_queue_len (&req->cmd_q)); + +/* Do not allow empty requests */ +if (skb_queue_empty (&req->cmd_q)) +return -EINVAL ; + + skb =skb_peek_tail (&req->cmd_q); +bt_cb (skb)->req.complete = complete; + +spin_lock_irqsave (&hdev->cmd_q.lock, flags); +skb_queue_splice_tail (&req->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) {
Signature · 1 line
1.7.10.4
PATCH v2 5/11 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 asynchronous HCI requests.
--- net/bluetooth/hci_core.c | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-)
net/bluetooth/hci_core.c +20 -8
@@ -2469,20 +2469,16 @@ int hci_req_run(struct hci_request *req, hci_req_complete_t complete)return 0 ; } -/* Send HCI command */ -int hci_send_cmd (struct hci_dev *hdev,__u16 opcode,__u32 plen,void *param) +static struct sk_buff *hci_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);
@@ -2496,6 +2492,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 =hci_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 6/11 Bluetooth: Introduce new hci_req_add 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 asynchronous HCI request being build (inside struct hci_request).
This is the main function used for building asynchronous requests and there should be one or more calls to it between calls to hci_req_init and hci_req_run.
--- include/net/bluetooth/hci_core.h | 1 + net/bluetooth/hci_core.c | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+)
include/net/bluetooth/hci_core.h +1 -0
@@ -1048,6 +1048,7 @@ struct hci_request {void hci_req_init (struct hci_request *req,struct hci_dev *hdev);int hci_req_run (struct hci_request *req,hci_req_complete_t complete); +int hci_req_add (struct hci_request *req,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 +22 -0
@@ -2517,6 +2517,28 @@ int hci_send_cmd(struct hci_dev *hdev, __u16 opcode, __u32 plen, void *param)return 0 ; } +/* Queue a command to an asynchronous HCI request */ +int hci_req_add (struct hci_request *req,u16 opcode,u32 plen,void *param) +{ +struct hci_dev *hdev = req->hdev; +struct sk_buff *skb; + +BT_DBG ("%s opcode 0x%4.4x plen %d" , hdev->name, opcode, plen); + + skb =hci_prepare_cmd (hdev, opcode, plen, param); +if (!skb) { +BT_ERR ("%s no memory for command" , hdev->name); +return -ENOMEM ; + } + +if (skb_queue_empty (&req->cmd_q)) +bt_cb (skb)->req.start = true; + +skb_queue_tail (&req->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 7/11 Bluetooth: Introduce a hci_req_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 asynchronous HCI requests. This means that even single commands need to be dressed as requests. This patch introduces a new function to create a single-command request 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 | 10 ++++++++-- net/bluetooth/hci_sock.c | 3 +-- 3 files changed, 10 insertions(+), 4 deletions(-)
include/net/bluetooth/hci_core.h +1 -0
@@ -1049,6 +1049,7 @@ struct hci_request {void hci_req_init (struct hci_request *req,struct hci_dev *hdev);int hci_req_run (struct hci_request *req,hci_req_complete_t complete);int hci_req_add (struct hci_request *req,u16 opcode,u32 plen,void *param); +void hci_req_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 +8 -2
@@ -2469,6 +2469,13 @@ int hci_req_run(struct hci_request *req, hci_req_complete_t complete)return 0 ; } +void hci_req_from_skb (struct hci_dev *hdev,struct sk_buff *skb) +{ +bt_cb (skb)->req.start = true; +skb_queue_tail (&hdev->cmd_q, skb); +queue_work (hdev->workqueue, &hdev->cmd_work); +} +static struct sk_buff *hci_prepare_cmd (struct hci_dev *hdev,u16 opcode,u32 plen,void *param) {
@@ -2511,8 +2518,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_req_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_req_from_skb (hdev, skb); } }else {if (!capable (CAP_NET_RAW )) {
Signature · 1 line
1.7.10.4
Marcel Holtmann
maintainerRe: [PATCH v2 07/11] Bluetooth: Introduce a hci_req_from_skb function
Hi Johan,
Quoted 58 lines
To have a consistent content for
hdev->cmd_qall entries need to follow the semantics of asynchronous HCI requests. This means that even single commands need to be dressed as requests. This patch introduces a new function to create a single-command request and converts the two places needing this (hci_send_cmdandhci_sock_sendmsg) to use it.Signed-off-by Johan Hedberg <[email protected]>---
include/net/bluetooth/hci_core.h | 1 + net/bluetooth/hci_core.c | 10 ++++++++-- net/bluetooth/hci_sock.c | 3 +-- 3 files changed, 10 insertions(+), 4 deletions(-)include/net/bluetooth/hci_core.h +1
-0@@ -1049,6 +1049,7 @@ struct hci_request {void hci_req_init (struct hci_request *req,struct hci_dev *hdev);int hci_req_run (struct hci_request *req,hci_req_complete_t complete);int hci_req_add (struct hci_request *req,u16 opcode,u32 plen,void *param); +void hci_req_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 +8
-2@@ -2469,6 +2469,13 @@ int hci_req_run(struct hci_request *req, hci_req_complete_t complete)return 0 ; } +void hci_req_from_skb (struct hci_dev *hdev,struct sk_buff *skb) +{ +bt_cb (skb)->req.start = true; +skb_queue_tail (&hdev->cmd_q, skb); +queue_work (hdev->workqueue, &hdev->cmd_work); +} +static struct sk_buff *hci_prepare_cmd (struct hci_dev *hdev,u16 opcode,u32 plen,void *param) {@@ -2511,8 +2518,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_req_from_skb (hdev, skb);return 0 ; }net/bluetooth/hci_sock.c +0
-0
net/bluetooth/hci_sock.c static int hci_sock_sendmsg(struct kiocb *iocb, struct socket *sock, · line 865
Quoted 9 lines
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_req_from_skb (hdev, skb); } }else {if (!capable (CAP_NET_RAW )) {
I would actually prefer if we have less public functions. So do we really need the hci_req_from_skb() here or could we just inline it into the two locations and add a small comment that this is a request?
Regards
Marcel
PATCH v2 8/11 Bluetooth: Add request cmd_complete and cmd_status functions
In reply to Johan HedbergFrom: Johan Hedberg <[email protected]>
This patch introduces functions to process the HCI request 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 request functionality, 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 | 85 ++++++++++++++++++++++++++++++++++++++ net/bluetooth/hci_event.c | 7 ++++ 3 files changed, 94 insertions(+)
include/net/bluetooth/hci_core.h +2 -0
@@ -1050,6 +1050,8 @@ void hci_req_init(struct hci_request *req, struct hci_dev *hdev);int hci_req_run (struct hci_request *req,hci_req_complete_t complete);int hci_req_add (struct hci_request *req,u16 opcode,u32 plen,void *param);void hci_req_from_skb (struct hci_dev *hdev,struct sk_buff *skb); +void hci_req_cmd_complete (struct hci_dev *hdev,u16 opcode,u8 status); +void hci_req_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 +85 -0
91 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_req_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_req_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_req_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_req_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 9/11 Bluetooth: Use async requests internally in hci_req_sync
In reply to Johan HedbergFrom: Johan Hedberg <[email protected]>
This patch converts the hci_req_sync() procedure to internaly use the asynchronous HCI requests. The consequence is that hci_req_complete() becomes private to hci_core.c (the extra reset command handling needs to be moved into hci_req_cmd_complete) and the HCI driver init commands are run in their own async request prior to the main HCI init request.
--- include/net/bluetooth/hci_core.h | 2 - net/bluetooth/hci_core.c | 271 +++++++++++++++++++++----------------- net/bluetooth/hci_event.c | 78 +---------- 3 files changed, 156 insertions(+), 195 deletions(-)
include/net/bluetooth/hci_core.h +0 -2
@@ -1165,8 +1165,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 +152 -119
559 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
Marcel Holtmann
maintainerRe: [PATCH v2 09/11] Bluetooth: Use async requests internally in hci_req_sync
Hi Johan,
Quoted 5 lines
This patch converts the
hci_req_sync()procedure to internaly use the asynchronous HCI requests. The consequence is thathci_req_complete()becomes private tohci_core.c(the extra reset command handling needs to be moved intohci_req_cmd_complete) and the HCI driver init commands are run in their own async request prior to the main HCI init request.
since the change is rather large, I would be a bit more verbose with the commit message. Explain the piece in separate paragraphs.
Regards
Marcel
PATCH v2 10/11 Bluetooth: Remove unused hdev->init_last_cmd
In reply to Johan HedbergFrom: Johan Hedberg <[email protected]>
This variable is no longer needed (due to async HCI request support and the conversion of hci_req_sync to use it), so it can be safely removed.
--- include/net/bluetooth/hci_core.h | 2 -- net/bluetooth/hci_core.c | 6 ------ 2 files changed, 8 deletions(-)
include/net/bluetooth/hci_core.h +0 -2
@@ -248,8 +248,6 @@ struct hci_dev {__u32 req_status;__u32 req_result; -__u16 init_last_cmd; -struct list_head mgmt_pending;struct discovery_state discovery;
net/bluetooth/hci_core.c +0 -6
@@ -1015,10 +1015,7 @@ int hci_dev_open(__u16 dev)if (!test_bit (HCI_RAW , &hdev->flags)) {atomic_set (&hdev->cmd_cnt,1 );set_bit (HCI_INIT , &hdev->flags); - hdev->init_last_cmd =0 ; - ret =__hci_init (hdev); -clear_bit (HCI_INIT , &hdev->flags); }
@@ -2516,9 +2513,6 @@ int hci_send_cmd(struct hci_dev *hdev, __u16 opcode, __u32 plen, void *param)return -ENOMEM ; } -if (test_bit (HCI_INIT , &hdev->flags)) - hdev->init_last_cmd = opcode; -hci_req_from_skb (hdev, skb);return 0 ;
Signature · 1 line
1.7.10.4
PATCH v2 11/11 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
@@ -424,13 +424,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);
@@ -632,13 +625,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) {
@@ -701,29 +687,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) {
@@ -735,13 +698,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;
@@ -828,13 +784,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;
@@ -1015,26 +964,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) {
@@ -1565,11 +1494,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;
@@ -1611,11 +1535,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);
@@ -2172,17 +2091,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;
@@ -2270,10 +2178,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 ;
@@ -2306,10 +2210,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 ;
@@ -2322,26 +2222,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 ;
@@ -2366,10 +2250,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 ;
@@ -2402,14 +2282,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 ;
@@ -2501,10 +2373,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 ;
@@ -2513,10 +2381,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 ;
@@ -3077,18 +2941,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) {
@@ -3816,14 +3668,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 ;
@@ -3880,14 +3724,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
Marcel Holtmann
maintainerRe: [PATCH v2 11/11] Bluetooth: Remove empty HCI event handlers
Hi Johan,
Quoted 1 line
With the removal of
hci_req_complete()several HCI event handles have
nitpick here, it is handlers.
Quoted 4 lines
essentially become empty and can be removed. The only potential benefit of these could have been logging, but the
hci_event,hci_cmd_completeandhci_cmd_statusalready provide a log for events which they do not have an explicit handler for.
Regards
Marcel