Clean-up stale/unused hci_request.c code
Subsystems (2)
v3 cover Clean-up stale/unused hci_request.c code
This will be a growing patch-set of conversions and dead-code removal towards the goal of retiring hci_request.c
The patch sets will be split amoung the work queues and delayed work queues as initialized in hci_request_setup(), with the ultimate goal of eliminating hci_request.c entirely.
v2: Published
v3: Continuing work. This does include one conversion (SCO configure_datapath) that has been tested with mgmt-tester and sco-tester, but has not been tested with a controller with an off-loadable codec.
Brian Gix (4):
Bluetooth: Convert le_scan_disable timeout to hci_sync
Bluetooth: Rework le_scan_restart for hci_sync
Bluetooth: Delete unused hci_req_stop_discovery()
Bluetooth: Convert SCO configure_datapath to hci_sync
net/bluetooth/hci_conn.c | 85 +++++++++-- net/bluetooth/hci_request.c | 282 +----------------------------------- net/bluetooth/hci_request.h | 4 - net/bluetooth/hci_sync.c | 148 +++++++++++++++++++ 4 files changed, 223 insertions(+), 296 deletions(-)
Signature · 1 line
2.37.1
PATCH v3 1/4 Bluetooth: Convert le_scan_disable timeout to hci_sync
The le_scan_disable timeout was being performed on the deprecated hci_request.c mechanism. This timeout is performed in hci_sync.c
--- net/bluetooth/hci_request.c | 98 +------------------------------------ net/bluetooth/hci_sync.c | 73 +++++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 97 deletions(-)
net/bluetooth/hci_request.c +1 -97
@@ -269,6 +269,7 @@ void hci_req_add_ev(struct hci_request *req, u16 opcode, u32 plen,void hci_req_add (struct hci_request *req,u16 opcode,u32 plen,const void *param) { +bt_dev_dbg (req->hdev,"HCI_REQ-0x%4.4x" , opcode);hci_req_add_ev (req, opcode, plen, param,0 ); }
@@ -1974,101 +1975,6 @@ int hci_abort_conn(struct hci_conn *conn, u8 reason)return 0 ; } -static int le_scan_disable (struct hci_request *req,unsigned long opt) -{ -hci_req_add_le_scan_disable (req, false); -return 0 ; -} - -static int bredr_inquiry (struct hci_request *req,unsigned long opt) -{ -u8 length = opt; -const u8 giac[3 ] = {0x33 ,0x8b ,0x9e }; -const u8 liac[3 ] = {0x00 ,0x8b ,0x9e }; -struct hci_cp_inquiry cp; - -if (test_bit (HCI_INQUIRY , &req->hdev->flags)) -return 0 ; - -bt_dev_dbg (req->hdev,"" ); - -hci_dev_lock (req->hdev); -hci_inquiry_cache_flush (req->hdev); -hci_dev_unlock (req->hdev); - -memset (&cp,0 ,sizeof (cp)); - -if (req->hdev->discovery.limited) -memcpy (&cp.lap, liac,sizeof (cp.lap)); -else -memcpy (&cp.lap, giac,sizeof (cp.lap)); - - cp.length = length; - -hci_req_add (req,HCI_OP_INQUIRY ,sizeof (cp), &cp); - -return 0 ; -} - -static void le_scan_disable_work (struct work_struct *work) -{ - struct hci_dev *hdev = container_of(work, struct hci_dev, - le_scan_disable.work); -u8 status; - -bt_dev_dbg (hdev,"" ); - -if (!hci_dev_test_flag (hdev,HCI_LE_SCAN )) -return ; - -cancel_delayed_work (&hdev->le_scan_restart); - -hci_req_sync (hdev, le_scan_disable,0 ,HCI_CMD_TIMEOUT , &status); -if (status) { -bt_dev_err (hdev,"failed to disable LE scan: status 0x%02x" , - status); -return ; - } - - hdev->discovery.scan_start =0 ; - -/* If we were running LE only scan, change discovery state. If -* we were running both LE and BR/EDR inquiry simultaneously, -* and BR/EDR inquiry is already finished, stop discovery, -* otherwise BR/EDR inquiry will stop discovery when finished. -* If we will resolve remote device name, do not change -* discovery state. -*/ - -if (hdev->discovery.type ==DISCOV_TYPE_LE ) - goto discov_stopped; - -if (hdev->discovery.type !=DISCOV_TYPE_INTERLEAVED ) -return ; - -if (test_bit (HCI_QUIRK_SIMULTANEOUS_DISCOVERY , &hdev->quirks)) { -if (!test_bit (HCI_INQUIRY , &hdev->flags) && - hdev->discovery.state !=DISCOVERY_RESOLVING ) - goto discov_stopped; - -return ; - } - -hci_req_sync (hdev, bredr_inquiry,DISCOV_INTERLEAVED_INQUIRY_LEN , -HCI_CMD_TIMEOUT , &status); -if (status) { -bt_dev_err (hdev,"inquiry failed: status 0x%02x" , status); - goto discov_stopped; - } - -return ; - -discov_stopped: -hci_dev_lock (hdev); -hci_discovery_set_state (hdev,DISCOVERY_STOPPED ); -hci_dev_unlock (hdev); -} -static int le_scan_restart (struct hci_request *req,unsigned long opt) {struct hci_dev *hdev = req->hdev;
@@ -2252,7 +2158,6 @@ int hci_req_configure_datapath(struct hci_dev *hdev, struct bt_codec *codec)void hci_request_setup (struct hci_dev *hdev) { -INIT_DELAYED_WORK (&hdev->le_scan_disable, le_scan_disable_work);INIT_DELAYED_WORK (&hdev->le_scan_restart, le_scan_restart_work);INIT_DELAYED_WORK (&hdev->adv_instance_expire, adv_timeout_expire);INIT_DELAYED_WORK (&hdev->interleave_scan, interleave_scan_work);
@@ -2262,7 +2167,6 @@ void hci_request_cancel_all(struct hci_dev *hdev) {__hci_cmd_sync_cancel (hdev,ENODEV ); -cancel_delayed_work_sync (&hdev->le_scan_disable);cancel_delayed_work_sync (&hdev->le_scan_restart);if (hdev->adv_instance_timeout) {
net/bluetooth/hci_sync.c +73 -0
91 lines not on this page · raw message
Signature · 1 line
2.37.1
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=663264
---Test result---
Test Summary:
CheckPatch FAIL 7.47 seconds GitLint PASS 3.87 seconds SubjectPrefix PASS 3.45 seconds BuildKernel PASS 31.82 seconds BuildKernel32 PASS 27.62 seconds Incremental Build with patchesPASS 68.28 seconds TestRunner: Setup PASS 456.12 seconds TestRunner: l2cap-tester PASS 16.76 seconds TestRunner: bnep-tester PASS 6.28 seconds TestRunner: mgmt-tester PASS 98.34 seconds TestRunner: rfcomm-tester PASS 9.62 seconds TestRunner: sco-tester PASS 9.38 seconds TestRunner: smp-tester PASS 9.51 seconds TestRunner: userchan-tester PASS 6.91 seconds
Details
##############################
Test: CheckPatch - FAIL - 7.47 seconds
Run checkpatch.pl script with rule in .checkpatch.conf
[v3,4/4] Bluetooth: Convert SCO configure_datapath to hci_sync\CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #128: FILE: net/bluetooth/hci_conn.c:354:
+ err = __hci_cmd_sync_status(hdev, HCI_CONFIGURE_DATA_PATH,
+ sizeof(*cmd) + vnd_len, cmd, HCI_CMD_TIMEOUT);
total: 0 errors, 0 warnings, 1 checks, 200 lines checked
NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or --fix-inplace.
/github/workspace/src/12929916.patch has style problems, please review.
NOTE: Ignored message types: UNKNOWN_COMMIT_ID
NOTE: If any of the errors are false positives, please report
them to the maintainer, see CHECKPATCH in MAINTAINERS.
---
Regards,
Linux Bluetooth
PATCH v3 2/4 Bluetooth: Rework le_scan_restart for hci_sync
In reply to Brian Gixle_scan_restart delayed work queue was running as a deprecated hci_request instead of on the newer thread-safe hci_sync mechanism.
--- net/bluetooth/hci_request.c | 89 ------------------------------------- net/bluetooth/hci_sync.c | 75 +++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 89 deletions(-)
net/bluetooth/hci_request.c +0 -89
@@ -1975,92 +1975,6 @@ int hci_abort_conn(struct hci_conn *conn, u8 reason)return 0 ; } -static int le_scan_restart (struct hci_request *req,unsigned long opt) -{ -struct hci_dev *hdev = req->hdev; - -/* If controller is not scanning we are done. */ -if (!hci_dev_test_flag (hdev,HCI_LE_SCAN )) -return 0 ; - -if (hdev->scanning_paused) { -bt_dev_dbg (hdev,"Scanning is paused for suspend" ); -return 0 ; - } - -hci_req_add_le_scan_disable (req, false); - -if (use_ext_scan (hdev)) { -struct hci_cp_le_set_ext_scan_enable ext_enable_cp; - -memset (&ext_enable_cp,0 ,sizeof (ext_enable_cp)); - ext_enable_cp.enable =LE_SCAN_ENABLE ; - ext_enable_cp.filter_dup =LE_SCAN_FILTER_DUP_ENABLE ; - -hci_req_add (req,HCI_OP_LE_SET_EXT_SCAN_ENABLE , -sizeof (ext_enable_cp), &ext_enable_cp); - }else { -struct hci_cp_le_set_scan_enable cp; - -memset (&cp,0 ,sizeof (cp)); - cp.enable =LE_SCAN_ENABLE ; - cp.filter_dup =LE_SCAN_FILTER_DUP_ENABLE ; -hci_req_add (req,HCI_OP_LE_SET_SCAN_ENABLE ,sizeof (cp), &cp); - } - -return 0 ; -} - -static void le_scan_restart_work (struct work_struct *work) -{ - struct hci_dev *hdev = container_of(work, struct hci_dev, - le_scan_restart.work); -unsigned long timeout, duration, scan_start, now; -u8 status; - -bt_dev_dbg (hdev,"" ); - -hci_req_sync (hdev, le_scan_restart,0 ,HCI_CMD_TIMEOUT , &status); -if (status) { -bt_dev_err (hdev,"failed to restart LE scan: status %d" , - status); -return ; - } - -hci_dev_lock (hdev); - -if (!test_bit (HCI_QUIRK_STRICT_DUPLICATE_FILTER , &hdev->quirks) || - !hdev->discovery.scan_start) - goto unlock; - -/* When the scan was started, hdev->le_scan_disable has been queued -* after duration from scan_start. During scan restart this job -* has been canceled, and we need to queue it again after proper -* timeout, to make sure that scan does not run indefinitely. -*/ - duration = hdev->discovery.scan_duration; - scan_start = hdev->discovery.scan_start; - now = jiffies; -if (now - scan_start <= duration) { -int elapsed; - -if (now >= scan_start) - elapsed = now - scan_start; -else - elapsed =ULONG_MAX - scan_start + now; - - timeout = duration - elapsed; - }else { - timeout =0 ; - } - -queue_delayed_work (hdev->req_workqueue, - &hdev->le_scan_disable, timeout); - -unlock: -hci_dev_unlock (hdev); -} -bool hci_req_stop_discovery (struct hci_request *req) {struct hci_dev *hdev = req->hdev;
@@ -2158,7 +2072,6 @@ int hci_req_configure_datapath(struct hci_dev *hdev, struct bt_codec *codec)void hci_request_setup (struct hci_dev *hdev) { -INIT_DELAYED_WORK (&hdev->le_scan_restart, le_scan_restart_work);INIT_DELAYED_WORK (&hdev->adv_instance_expire, adv_timeout_expire);INIT_DELAYED_WORK (&hdev->interleave_scan, interleave_scan_work); }
@@ -2167,8 +2080,6 @@ void hci_request_cancel_all(struct hci_dev *hdev) {__hci_cmd_sync_cancel (hdev,ENODEV ); -cancel_delayed_work_sync (&hdev->le_scan_restart); -if (hdev->adv_instance_timeout) {cancel_delayed_work_sync (&hdev->adv_instance_expire); hdev->adv_instance_timeout =0 ;
net/bluetooth/hci_sync.c +75 -0
93 lines not on this page · raw message
Signature · 1 line
2.37.1
PATCH v3 3/4 Bluetooth: Delete unused hci_req_stop_discovery()
In reply to Brian Gixhci_req_stop_discovery has been deprecated in favor of hci_stop_discovery_sync() as part of transition to hci_sync.c
--- net/bluetooth/hci_request.c | 48 ------------------------------------- net/bluetooth/hci_request.h | 2 -- 2 files changed, 50 deletions(-)
net/bluetooth/hci_request.c +0 -48
@@ -1975,54 +1975,6 @@ int hci_abort_conn(struct hci_conn *conn, u8 reason)return 0 ; } -bool hci_req_stop_discovery (struct hci_request *req) -{ -struct hci_dev *hdev = req->hdev; -struct discovery_state *d = &hdev->discovery; -struct hci_cp_remote_name_req_cancel cp; -struct inquiry_entry *e; -bool ret = false; - -bt_dev_dbg (hdev,"state %u" , hdev->discovery.state); - -if (d->state ==DISCOVERY_FINDING || d->state ==DISCOVERY_STOPPING ) { -if (test_bit (HCI_INQUIRY , &hdev->flags)) -hci_req_add (req,HCI_OP_INQUIRY_CANCEL ,0 ,NULL ); - -if (hci_dev_test_flag (hdev,HCI_LE_SCAN )) { -cancel_delayed_work (&hdev->le_scan_disable); -cancel_delayed_work (&hdev->le_scan_restart); -hci_req_add_le_scan_disable (req, false); - } - - ret = true; - }else { -/* Passive scanning */ -if (hci_dev_test_flag (hdev,HCI_LE_SCAN )) { -hci_req_add_le_scan_disable (req, false); - ret = true; - } - } - -/* No further actions needed for LE-only discovery */ -if (d->type ==DISCOV_TYPE_LE ) -return ret; - -if (d->state ==DISCOVERY_RESOLVING || d->state ==DISCOVERY_STOPPING ) { - e =hci_inquiry_cache_lookup_resolve (hdev,BDADDR_ANY , -NAME_PENDING ); -if (!e) -return ret; - -bacpy (&cp.bdaddr, &e->data.bdaddr); -hci_req_add (req,HCI_OP_REMOTE_NAME_REQ_CANCEL ,sizeof (cp), - &cp); - ret = true; - } - -return ret; -} -static void config_data_path_complete (struct hci_dev *hdev,u8 status,u16 opcode) {
net/bluetooth/hci_request.h +0 -2
@@ -113,8 +113,6 @@ int hci_get_random_address(struct hci_dev *hdev, bool require_privacy,void __hci_req_update_class (struct hci_request *req);/* Returns true if HCI commands were queued */ -bool hci_req_stop_discovery (struct hci_request *req); -int hci_req_configure_datapath (struct hci_dev *hdev,struct bt_codec *codec);void __hci_req_update_scan (struct hci_request *req);
Signature · 1 line
2.37.1
PATCH v3 4/4 Bluetooth: Convert SCO configure_datapath to hci_sync
In reply to Brian GixRecoding HCI cmds to offload SCO codec to use hci_sync mechanism rather than deprecated hci_request mechanism.
--- net/bluetooth/hci_conn.c | 85 ++++++++++++++++++++++++++++++++----- net/bluetooth/hci_request.c | 47 -------------------- net/bluetooth/hci_request.h | 2 - 3 files changed, 74 insertions(+), 60 deletions(-)
net/bluetooth/hci_conn.c +74 -11
@@ -44,6 +44,11 @@ struct sco_param {u8 retrans_effort; }; +struct conn_handle_t { +struct hci_conn *conn; +__u16 handle; +}; +static const struct sco_param esco_param_cvsd[] = { {EDR_ESCO_MASK & ~ESCO_2EV3 ,0x000a ,0x01 },/* S3 */ {EDR_ESCO_MASK & ~ESCO_2EV3 ,0x0007 ,0x01 },/* S2 */
@@ -316,17 +321,59 @@ static bool find_next_esco_param(struct hci_conn *conn,return conn->attempt <= size; } -static bool hci_enhanced_setup_sync_conn (struct hci_conn *conn,__u16 handle) +static int configure_datapath_sync (struct hci_dev *hdev,struct bt_codec *codec) { -struct hci_dev *hdev = conn->hdev; +int err; +__u8 vnd_len, *vnd_data =NULL ; +struct hci_op_configure_data_path *cmd =NULL ; + + err = hdev->get_codec_config_data (hdev,ESCO_LINK , codec, &vnd_len, + &vnd_data); +if (err <0 ) + goto error; + + cmd =kzalloc (sizeof (*cmd) + vnd_len,GFP_KERNEL ); +if (!cmd) { + err = -ENOMEM ; + goto error; + } + + err = hdev->get_data_path_id (hdev, &cmd->data_path_id); +if (err <0 ) + goto error; + + cmd->vnd_len = vnd_len; +memcpy (cmd->vnd_data, vnd_data, vnd_len); + + cmd->direction =0x00 ; +__hci_cmd_sync_status (hdev,HCI_CONFIGURE_DATA_PATH , +sizeof (*cmd) + vnd_len, cmd,HCI_CMD_TIMEOUT ); + + cmd->direction =0x01 ; + err =__hci_cmd_sync_status (hdev,HCI_CONFIGURE_DATA_PATH , +sizeof (*cmd) + vnd_len, cmd,HCI_CMD_TIMEOUT ); +error: + +kfree (cmd); +kfree (vnd_data); +return err; +} + +static int hci_enhanced_setup_sync (struct hci_dev *hdev,void *data) +{ +struct conn_handle_t *conn_handle = data; +struct hci_conn *conn = conn_handle->conn; +__u16 handle = conn_handle->handle;struct hci_cp_enhanced_setup_sync_conn cp;const struct sco_param *param; +kfree (conn_handle); +bt_dev_dbg (hdev,"hcon %p" , conn);/* for offload use case, codec needs to configured before opening SCO */ if (conn->codec.data_path) -hci_req_configure_datapath (hdev, &conn->codec); +configure_datapath_sync (hdev, &conn->codec); conn->state =BT_CONNECT ; conn->out = true;
@@ -344,7 +391,7 @@ static bool hci_enhanced_setup_sync_conn(struct hci_conn *conn, __u16 handle)case BT_CODEC_MSBC :if (!find_next_esco_param (conn, esco_param_msbc,ARRAY_SIZE (esco_param_msbc))) -return false; +return -EINVAL ; param = &esco_param_msbc[conn->attempt -1 ]; cp.tx_coding_format.id =0x05 ;
@@ -396,11 +443,11 @@ static bool hci_enhanced_setup_sync_conn(struct hci_conn *conn, __u16 handle)if (lmp_esco_capable (conn->link)) {if (!find_next_esco_param (conn, esco_param_cvsd,ARRAY_SIZE (esco_param_cvsd))) -return false; +return -EINVAL ; param = &esco_param_cvsd[conn->attempt -1 ]; }else {if (conn->attempt >ARRAY_SIZE (sco_param_cvsd)) -return false; +return -EINVAL ; param = &sco_param_cvsd[conn->attempt -1 ]; } cp.tx_coding_format.id =2 ;
@@ -423,7 +470,7 @@ static bool hci_enhanced_setup_sync_conn(struct hci_conn *conn, __u16 handle) cp.out_transport_unit_size =16 ;break ;default : -return false; +return -EINVAL ; } cp.retrans_effort = param->retrans_effort;
@@ -431,9 +478,9 @@ static bool hci_enhanced_setup_sync_conn(struct hci_conn *conn, __u16 handle) cp.max_latency =__cpu_to_le16 (param->max_latency);if (hci_send_cmd (hdev,HCI_OP_ENHANCED_SETUP_SYNC_CONN ,sizeof (cp), &cp) <0 ) -return false; +return -EIO ; -return true; +return 0 ; }static bool hci_setup_sync_conn (struct hci_conn *conn,__u16 handle)
@@ -490,8 +537,24 @@ static bool hci_setup_sync_conn(struct hci_conn *conn, __u16 handle)bool hci_setup_sync (struct hci_conn *conn,__u16 handle) { -if (enhanced_sync_conn_capable (conn->hdev)) -return hci_enhanced_setup_sync_conn (conn, handle); +int result; +struct conn_handle_t *conn_handle; + +if (enhanced_sync_conn_capable (conn->hdev)) { + conn_handle =kzalloc (sizeof (*conn_handle),GFP_KERNEL ); + +if (!conn_handle) +return false; + + conn_handle->conn = conn; + conn_handle->handle = handle; + result =hci_cmd_sync_queue (conn->hdev, hci_enhanced_setup_sync, + conn_handle,NULL ); +if (result <0 ) +kfree (conn_handle); + +return result ==0 ; + }return hci_setup_sync_conn (conn, handle); }
net/bluetooth/hci_request.c +0 -47
53 lines not on this page · raw message
net/bluetooth/hci_request.h +0 -2
@@ -113,8 +113,6 @@ int hci_get_random_address(struct hci_dev *hdev, bool require_privacy,void __hci_req_update_class (struct hci_request *req);/* Returns true if HCI commands were queued */ -int hci_req_configure_datapath (struct hci_dev *hdev,struct bt_codec *codec); -void __hci_req_update_scan (struct hci_request *req); int hci_update_random_address(struct hci_request *req, bool require_privacy,
Signature · 1 line
2.37.1