Bluetooth: hci_sync: fix BR/EDR wakeup bug

Commit Message

[e-mail] Dec. 18, 2023, 10:24 a.m. UTC

From: clancy shang <[e-mail]>

when Bluetooth set the event mask and enter suspend, the controller
has hci mode change event coming, it cause controller can not enter
sleep mode. so it should to set the hci mode change event mask before
enter suspend.

Signed-off-by: clancy shang <[e-mail]>
---
 net/bluetooth/hci_sync.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

Comments

[e-mail] Dec. 18, 2023, 11 a.m. UTC | #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=810984

---Test result---

Test Summary:
CheckPatch                    PASS      0.49 seconds
GitLint                       PASS      0.23 seconds
SubjectPrefix                 PASS      0.09 seconds
BuildKernel                   PASS      27.50 seconds
CheckAllWarning               PASS      30.48 seconds
CheckSparse                   PASS      35.67 seconds
CheckSmatch                   PASS      98.12 seconds
BuildKernel32                 PASS      26.65 seconds
TestRunnerSetup               PASS      422.81 seconds
TestRunner_l2cap-tester       PASS      22.82 seconds
TestRunner_iso-tester         PASS      44.30 seconds
TestRunner_bnep-tester        PASS      7.30 seconds
TestRunner_mgmt-tester        PASS      160.21 seconds
TestRunner_rfcomm-tester      PASS      10.54 seconds
TestRunner_sco-tester         PASS      15.86 seconds
TestRunner_ioctl-tester       PASS      11.74 seconds
TestRunner_mesh-tester        PASS      8.62 seconds
TestRunner_smp-tester         PASS      9.47 seconds
TestRunner_userchan-tester    PASS      7.24 seconds
IncrementalBuild              PASS      25.96 seconds



---
Regards,
Linux Bluetooth

[e-mail] Dec. 19, 2023, 6:28 p.m. UTC | #2

Hello:

This patch was applied to bluetooth/bluetooth-next.git (master)
by Luiz Augusto von Dentz <[e-mail]>:

On Mon, 18 Dec 2023 18:24:17 +0800 you wrote:
> From: clancy shang <[e-mail]>
> 
> when Bluetooth set the event mask and enter suspend, the controller
> has hci mode change event coming, it cause controller can not enter
> sleep mode. so it should to set the hci mode change event mask before
> enter suspend.
> 
> [...]

Here is the summary with links:
  - Bluetooth: hci_sync: fix BR/EDR wakeup bug
    https://git.kernel.org/bluetooth/bluetooth-next/c/1e961bd261a6

You are awesome, thank you!

Patch

diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c
index d85a7091a116..97284d9b2a2e 100644
--- a/net/bluetooth/hci_sync.c
+++ b/net/bluetooth/hci_sync.c
@@ -3800,12 +3800,14 @@  static int hci_set_event_mask_sync(struct hci_dev *hdev)
 	if (lmp_bredr_capable(hdev)) {
 		events[4] |= 0x01; /* Flow Specification Complete */
 
-		/* Don't set Disconnect Complete when suspended as that
-		 * would wakeup the host when disconnecting due to
-		 * suspend.
+		/* Don't set Disconnect Complete and mode change when
+		 * suspended as that would wakeup the host when disconnecting
+		 * due to suspend.
 		 */
-		if (hdev->suspended)
+		if (hdev->suspended) {
 			events[0] &= 0xef;
+			events[2] &= 0xf7;
+		}
 	} else {
 		/* Use a different default for LE-only devices */
 		memset(events, 0, sizeof(events));