Bluetooth: MGMT: Add conditions for setting HCI_CONN_FLAG_REMOTE_WAKEUP
Subsystems (2)
Luiz Augusto von Dentz
maintainerPATCH v2 1/2 Bluetooth: MGMT: Add conditions for setting HCI_CONN_FLAG_REMOTE_WAKEUP
From: Luiz Augusto von Dentz <[email protected]>
HCI_CONN_FLAG_REMOTE_WAKEUP can only be set if device can be programmed in the allowlist which in case of device using RPA requires LL Privacy support to be enabled.
--- net/bluetooth/mgmt.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
net/bluetooth/mgmt.c +18 -0
@@ -4529,6 +4529,23 @@ static int set_device_flags(struct sock *sk, struct hci_dev *hdev, void *data, params =hci_conn_params_lookup (hdev, &cp->addr.bdaddr,le_addr_type (cp->addr.type));if (params) { +DECLARE_BITMAP (flags, __HCI_CONN_NUM_FLAGS); + +bitmap_from_u64 (flags, current_flags); + +/* Devices using RPAs can only be programmed in the +* acceptlist LL Privacy has been enable otherwise they +* cannot mark HCI_CONN_FLAG_REMOTE_WAKEUP. +*/ +if (test_bit (HCI_CONN_FLAG_REMOTE_WAKEUP , flags) && + !use_ll_privacy (hdev) && +hci_find_irk_by_addr (hdev, ¶ms->addr, + params->addr_type)) { +bt_dev_warn (hdev, +"Cannot set wakeable for RPA" ); + goto unlock; + } +bitmap_from_u64 (params->flags, current_flags); status =MGMT_STATUS_SUCCESS ;
@@ -4545,6 +4562,7 @@ static int set_device_flags(struct sock *sk, struct hci_dev *hdev, void *data, } } +unlock:hci_dev_unlock (hdev); done:
Signature · 1 line
2.35.1
Luiz Augusto von Dentz
maintainerPATCH v2 2/2 Bluetooth: hci_sync: Fix attempting to suspend with unfiltered passive scan
From: Luiz Augusto von Dentz <[email protected]>
When suspending the passive scanning _must_ have its filter_policy set to 0x01 to use the accept list otherwise _any_ advertise report would end up waking up the system.
In order to fix the filter_policy the code now checks for hdev->suspended && HCI_CONN_FLAG_REMOTE_WAKEUP
first, since the MGMT_OP_SET_DEVICE_FLAGS will reject any attempt to set HCI_CONN_FLAG_REMOTE_WAKEUP when it cannot be programmed in the acceptlist, so it can return success causing the proper filter_policy to be used.
--- net/bluetooth/hci_sync.c | 58 +++++++++++++++++++++++++++++----------- 1 file changed, 43 insertions(+), 15 deletions(-)
net/bluetooth/hci_sync.c +43 -15
@@ -1664,20 +1664,19 @@ static int hci_le_add_accept_list_sync(struct hci_dev *hdev,struct hci_cp_le_add_to_accept_list cp;int err; +/* During suspend, only wakeable devices can be in acceptlist */ +if (hdev->suspended && + !test_bit (HCI_CONN_FLAG_REMOTE_WAKEUP , params->flags)) +return 0 ; +/* Select filter policy to accept all advertising */ if (*num_entries >= hdev->le_accept_list_size)return -ENOSPC ;/* Accept list can not be used with RPAs */ if (!use_ll_privacy (hdev) && -hci_find_irk_by_addr (hdev, ¶ms->addr, params->addr_type)) { +hci_find_irk_by_addr (hdev, ¶ms->addr, params->addr_type))return -EINVAL ; - } - -/* During suspend, only wakeable devices can be in acceptlist */ -if (hdev->suspended && - !test_bit (HCI_CONN_FLAG_REMOTE_WAKEUP , params->flags)) -return 0 ;/* Attempt to program the device in the resolving list first to avoid * having to rollback in case it fails since the resolving list is
@@ -4940,10 +4939,28 @@ static int hci_update_event_filter_sync(struct hci_dev *hdev)return 0 ; } +/* This function disables scan (BR and LE) and mark it as paused */ +static int hci_pause_scan_sync (struct hci_dev *hdev) +{ +if (hdev->scanning_paused) +return 0 ; + +/* Disable page scan if enabled */ +if (test_bit (HCI_PSCAN , &hdev->flags)) +hci_write_scan_enable_sync (hdev,SCAN_DISABLED ); + +hci_scan_disable_sync (hdev); + + hdev->scanning_paused = true; + +return 0 ; +} +/* This function performs the HCI suspend procedures in the follow order: * * Pause discovery (active scanning/inquiry) * Pause Directed Advertising/Advertising +* Pause Scanning (passive scanning in case discovery was not active) * Disconnect all connections * Set suspend_status to BT_SUSPEND_DISCONNECT if hdev cannot wakeup * otherwise:
@@ -4969,15 +4986,11 @@ int hci_suspend_sync(struct hci_dev *hdev)/* Pause other advertisements */ hci_pause_advertising_sync (hdev); -/* Disable page scan if enabled */ -if (test_bit (HCI_PSCAN , &hdev->flags)) -hci_write_scan_enable_sync (hdev,SCAN_DISABLED ); -/* Suspend monitor filters */ hci_suspend_monitor_sync (hdev);/* Prevent disconnects from causing scanning to be re-enabled */ - hdev->scanning_paused = true; +hci_pause_scan_sync (hdev);/* Soft disconnect everything (power off) */ err =hci_disconnect_all_sync (hdev,HCI_ERROR_REMOTE_POWER_OFF );
@@ -5048,6 +5061,22 @@ static void hci_resume_monitor_sync(struct hci_dev *hdev) } } +/* This function resume scan and reset paused flag */ +static int hci_resume_scan_sync (struct hci_dev *hdev) +{ +if (!hdev->scanning_paused) +return 0 ; + +hci_update_scan_sync (hdev); + +/* Reset passive scanning to normal */ +hci_update_passive_scan_sync (hdev); + + hdev->scanning_paused = false; + +return 0 ; +} +/* This function performs the HCI suspend procedures in the follow order: * * Restore event mask
@@ -5070,10 +5099,9 @@ int hci_resume_sync(struct hci_dev *hdev)/* Clear any event filters and restore scan state */ hci_clear_event_filter_sync (hdev); -hci_update_scan_sync (hdev); -/* Reset passive scanning to normal */ -hci_update_passive_scan_sync (hdev); +/* Resume scanning */ +hci_resume_scan_sync (hdev);/* Resume monitor filters */ hci_resume_monitor_sync (hdev);
Signature · 1 line
2.35.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=641172
---Test result---
Test Summary:
CheckPatch PASS 3.22 seconds GitLint FAIL 1.88 seconds SubjectPrefix PASS 1.70 seconds BuildKernel PASS 30.90 seconds BuildKernel32 PASS 27.89 seconds Incremental Build with patchesPASS 44.22 seconds TestRunner: Setup PASS 469.25 seconds TestRunner: l2cap-tester PASS 17.40 seconds TestRunner: bnep-tester PASS 6.07 seconds TestRunner: mgmt-tester PASS 101.55 seconds TestRunner: rfcomm-tester PASS 9.66 seconds TestRunner: sco-tester PASS 9.48 seconds TestRunner: smp-tester PASS 9.49 seconds TestRunner: userchan-tester PASS 6.37 seconds
Details
##############################
Test: GitLint - FAIL - 1.88 seconds
Run gitlint with rule in .gitlint
[v2,2/2] Bluetooth: hci_sync: Fix attempting to suspend with unfiltered passive scan
1: T1 Title exceeds max length (84>80): "[v2,2/2] Bluetooth: hci_sync: Fix attempting to suspend with unfiltered passive scan"
---
Regards,
Linux Bluetooth
This series was applied to bluetooth/bluetooth-next.git (master) by Marcel Holtmann <[email protected]>:
Hello:
This series was applied to bluetooth/bluetooth-next.git (master) by Marcel Holtmann <[email protected]>:
Quoted 10 lines · On Thu, 12 May 2022 15:31:33 -0700 you wrote:
From: Luiz Augusto von Dentz <[email protected]>
HCI_CONN_FLAG_REMOTE_WAKEUPcan only be set if device can be programmed in the allowlist which in case of device using RPA requires LL Privacy support to be enabled.Signed-off-by Luiz Augusto von Dentz <[email protected]>[...]
Here is the summary with links:
- [v2,1/2] Bluetooth: MGMT: Add conditions for setting HCI_CONN_FLAG_REMOTE_WAKEUP
https://git.kernel.org/bluetooth/bluetooth-next/c/a9a347655d22 - [v2,2/2] Bluetooth: hci_sync: Fix attempting to suspend with unfiltered passive scan https://git.kernel.org/bluetooth/bluetooth-next/c/3b42055388c3
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html