Bluetooth: mgmt: Fix limited discoverable off timeout

Commit Message

Frédéric Danis Jan. 22, 2024, 4:04 p.m. UTC

LIMITED_DISCOVERABLE flag is not reset from Class of Device and
advertisement on limited discoverable timeout. This prevents to pass PTS
test GAP/DISC/LIMM/BV-02-C

Calling set_discoverable_sync as when the limited discovery is set
correctly update the Class of Device and advertisement.

Signed-off-by: Frédéric Danis <[e-mail]>
---
 net/bluetooth/mgmt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

[e-mail] Jan. 22, 2024, 4:31 p.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=818687

---Test result---

Test Summary:
CheckPatch                    PASS      0.88 seconds
GitLint                       PASS      0.28 seconds
SubjectPrefix                 PASS      0.09 seconds
BuildKernel                   FAIL      20.44 seconds
CheckAllWarning               FAIL      22.80 seconds
CheckSparse                   FAIL      26.30 seconds
CheckSmatch                   FAIL      64.41 seconds
BuildKernel32                 FAIL      19.74 seconds
TestRunnerSetup               FAIL      416.70 seconds
TestRunner_l2cap-tester       FAIL      0.11 seconds
TestRunner_iso-tester         FAIL      0.87 seconds
TestRunner_bnep-tester        FAIL      0.25 seconds
TestRunner_mgmt-tester        FAIL      0.12 seconds
TestRunner_rfcomm-tester      FAIL      0.76 seconds
TestRunner_sco-tester         FAIL      0.46 seconds
TestRunner_ioctl-tester       FAIL      0.10 seconds
TestRunner_mesh-tester        FAIL      0.10 seconds
TestRunner_smp-tester         FAIL      5.88 seconds
TestRunner_userchan-tester    FAIL      3.92 seconds
IncrementalBuild              FAIL      30.22 seconds

Details
##############################
Test: BuildKernel - FAIL
Desc: Build Kernel for Bluetooth
Output:

net/bluetooth/mgmt.c: In function ‘discov_off’:
net/bluetooth/mgmt.c:1066:27: error: ‘set_discoverable_sync’ undeclared (first use in this function); did you mean ‘hci_update_discoverable_sync’?
 1066 |  hci_cmd_sync_queue(hdev, set_discoverable_sync, NULL, NULL);
      |                           ^~~~~~~~~~~~~~~~~~~~~
      |                           hci_update_discoverable_sync
net/bluetooth/mgmt.c:1066:27: note: each undeclared identifier is reported only once for each function it appears in
make[4]: *** [scripts/Makefile.build:243: net/bluetooth/mgmt.o] Error 1
make[3]: *** [scripts/Makefile.build:480: net/bluetooth] Error 2
make[2]: *** [scripts/Makefile.build:480: net] Error 2
make[2]: *** Waiting for unfinished jobs....
make[1]: *** [/github/workspace/src/src/Makefile:1911: .] Error 2
make: *** [Makefile:234: __sub-make] Error 2
##############################
Test: CheckAllWarning - FAIL
Desc: Run linux kernel with all warning enabled
Output:

net/bluetooth/mgmt.c: In function ‘discov_off’:
net/bluetooth/mgmt.c:1066:27: error: ‘set_discoverable_sync’ undeclared (first use in this function); did you mean ‘hci_update_discoverable_sync’?
 1066 |  hci_cmd_sync_queue(hdev, set_discoverable_sync, NULL, NULL);
      |                           ^~~~~~~~~~~~~~~~~~~~~
      |                           hci_update_discoverable_sync
net/bluetooth/mgmt.c:1066:27: note: each undeclared identifier is reported only once for each function it appears in
make[4]: *** [scripts/Makefile.build:243: net/bluetooth/mgmt.o] Error 1
make[3]: *** [scripts/Makefile.build:480: net/bluetooth] Error 2
make[2]: *** [scripts/Makefile.build:480: net] Error 2
make[2]: *** Waiting for unfinished jobs....
make[1]: *** [/github/workspace/src/src/Makefile:1911: .] Error 2
make: *** [Makefile:234: __sub-make] Error 2
##############################
Test: CheckSparse - FAIL
Desc: Run sparse tool with linux kernel
Output:

net/bluetooth/af_bluetooth.c:223:25: warning: context imbalance in 'bt_accept_enqueue' - different lock contexts for basic block
drivers/bluetooth/hci_ag6xx.c:257:24: warning: restricted __le32 degrades to integer
drivers/bluetooth/hci_mrvl.c:170:23: warning: restricted __le16 degrades to integer
drivers/bluetooth/hci_mrvl.c:203:23: warning: restricted __le16 degrades to integer
net/bluetooth/hci_event.c: note: in included file (through include/net/bluetooth/hci_core.h):
./include/net/bluetooth/hci.h:2673:47: warning: array of flexible structures
./include/net/bluetooth/hci.h:2759:43: warning: array of flexible structures
net/bluetooth/mgmt.c: In function ‘discov_off’:
net/bluetooth/mgmt.c:1066:27: error: ‘set_discoverable_sync’ undeclared (first use in this function); did you mean ‘hci_update_discoverable_sync’?
 1066 |  hci_cmd_sync_queue(hdev, set_discoverable_sync, NULL, NULL);
      |                           ^~~~~~~~~~~~~~~~~~~~~
      |                           hci_update_discoverable_sync
net/bluetooth/mgmt.c:1066:27: note: each undeclared identifier is reported only once for each function it appears in
make[4]: *** [scripts/Makefile.build:243: net/bluetooth/mgmt.o] Error 1
make[3]: *** [scripts/Makefile.build:480: net/bluetooth] Error 2
make[2]: *** [scripts/Makefile.build:480: net] Error 2
make[2]: *** Waiting for unfinished jobs....
drivers/bluetooth/hci_nokia.c:284:23: warning: incorrect type in assignment (different base types)
drivers/bluetooth/hci_nokia.c:284:23:    expected unsigned short [usertype] baud
drivers/bluetooth/hci_nokia.c:284:23:    got restricted __le16 [usertype]
drivers/bluetooth/hci_nokia.c:287:26: warning: incorrect type in assignment (different base types)
drivers/bluetooth/hci_nokia.c:287:26:    expected unsigned short [usertype] sys_clk
drivers/bluetooth/hci_nokia.c:287:26:    got restricted __le16 [usertype]
make[1]: *** [/github/workspace/src/src/Makefile:1911: .] Error 2
make: *** [Makefile:234: __sub-make] Error 2
##############################
Test: CheckSmatch - FAIL
Desc: Run smatch tool with source
Output:

net/bluetooth/hci_event.c: note: in included file (through include/net/bluetooth/hci_core.h):
./include/net/bluetooth/hci.h:2673:47: warning: array of flexible structures
./include/net/bluetooth/hci.h:2759:43: warning: array of flexible structures
net/bluetooth/mgmt.c: In function ‘discov_off’:
net/bluetooth/mgmt.c:1066:27: error: ‘set_discoverable_sync’ undeclared (first use in this function); did you mean ‘hci_update_discoverable_sync’?
 1066 |  hci_cmd_sync_queue(hdev, set_discoverable_sync, NULL, NULL);
      |                           ^~~~~~~~~~~~~~~~~~~~~
      |                           hci_update_discoverable_sync
net/bluetooth/mgmt.c:1066:27: note: each undeclared identifier is reported only once for each function it appears in
make[4]: *** [scripts/Makefile.build:243: net/bluetooth/mgmt.o] Error 1
make[3]: *** [scripts/Makefile.build:480: net/bluetooth] Error 2
make[2]: *** [scripts/Makefile.build:480: net] Error 2
make[2]: *** Waiting for unfinished jobs....
make[1]: *** [/github/workspace/src/src/Makefile:1911: .] Error 2
make: *** [Makefile:234: __sub-make] Error 2
##############################
Test: BuildKernel32 - FAIL
Desc: Build 32bit Kernel for Bluetooth
Output:

net/bluetooth/mgmt.c: In function ‘discov_off’:
net/bluetooth/mgmt.c:1066:27: error: ‘set_discoverable_sync’ undeclared (first use in this function); did you mean ‘hci_update_discoverable_sync’?
 1066 |  hci_cmd_sync_queue(hdev, set_discoverable_sync, NULL, NULL);
      |                           ^~~~~~~~~~~~~~~~~~~~~
      |                           hci_update_discoverable_sync
net/bluetooth/mgmt.c:1066:27: note: each undeclared identifier is reported only once for each function it appears in
make[4]: *** [scripts/Makefile.build:243: net/bluetooth/mgmt.o] Error 1
make[3]: *** [scripts/Makefile.build:480: net/bluetooth] Error 2
make[2]: *** [scripts/Makefile.build:480: net] Error 2
make[2]: *** Waiting for unfinished jobs....
make[1]: *** [/github/workspace/src/src/Makefile:1911: .] Error 2
make: *** [Makefile:234: __sub-make] Error 2
##############################
Test: TestRunnerSetup - FAIL
Desc: Setup kernel and bluez for test-runner
Output:
Kernel: 
net/bluetooth/mgmt.c: In function ‘discov_off’:
net/bluetooth/mgmt.c:1066:27: error: ‘set_discoverable_sync’ undeclared (first use in this function); did you mean ‘hci_update_discoverable_sync’?
 1066 |  hci_cmd_sync_queue(hdev, set_discoverable_sync, NULL, NULL);
      |                           ^~~~~~~~~~~~~~~~~~~~~
      |                           hci_update_discoverable_sync
net/bluetooth/mgmt.c:1066:27: note: each undeclared identifier is reported only once for each function it appears in
make[4]: *** [scripts/Makefile.build:243: net/bluetooth/mgmt.o] Error 1
make[3]: *** [scripts/Makefile.build:480: net/bluetooth] Error 2
make[2]: *** [scripts/Makefile.build:480: net] Error 2
make[2]: *** Waiting for unfinished jobs....
make[1]: *** [/github/workspace/src/src/Makefile:1911: .] Error 2
make: *** [Makefile:234: __sub-make] Error 2
##############################
Test: TestRunner_l2cap-tester - FAIL
Desc: Run l2cap-tester with test-runner
Output:

Could not access KVM kernel module: No such file or directory
qemu-system-x86_64: failed to initialize KVM: No such file or directory
qemu-system-x86_64: Back to tcg accelerator
qemu: could not open kernel file '/github/workspace/src/src/arch/x86/boot/bzImage': No such file or directory
##############################
Test: TestRunner_iso-tester - FAIL
Desc: Run iso-tester with test-runner
Output:

Could not access KVM kernel module: No such file or directory
qemu-system-x86_64: failed to initialize KVM: No such file or directory
qemu-system-x86_64: Back to tcg accelerator
qemu: could not open kernel file '/github/workspace/src/src/arch/x86/boot/bzImage': No such file or directory
##############################
Test: TestRunner_bnep-tester - FAIL
Desc: Run bnep-tester with test-runner
Output:

Could not access KVM kernel module: No such file or directory
qemu-system-x86_64: failed to initialize KVM: No such file or directory
qemu-system-x86_64: Back to tcg accelerator
qemu: could not open kernel file '/github/workspace/src/src/arch/x86/boot/bzImage': No such file or directory
##############################
Test: TestRunner_mgmt-tester - FAIL
Desc: Run mgmt-tester with test-runner
Output:

Could not access KVM kernel module: No such file or directory
qemu-system-x86_64: failed to initialize KVM: No such file or directory
qemu-system-x86_64: Back to tcg accelerator
qemu: could not open kernel file '/github/workspace/src/src/arch/x86/boot/bzImage': No such file or directory
##############################
Test: TestRunner_rfcomm-tester - FAIL
Desc: Run rfcomm-tester with test-runner
Output:

Could not access KVM kernel module: No such file or directory
qemu-system-x86_64: failed to initialize KVM: No such file or directory
qemu-system-x86_64: Back to tcg accelerator
qemu: could not open kernel file '/github/workspace/src/src/arch/x86/boot/bzImage': No such file or directory
##############################
Test: TestRunner_sco-tester - FAIL
Desc: Run sco-tester with test-runner
Output:

Could not access KVM kernel module: No such file or directory
qemu-system-x86_64: failed to initialize KVM: No such file or directory
qemu-system-x86_64: Back to tcg accelerator
qemu: could not open kernel file '/github/workspace/src/src/arch/x86/boot/bzImage': No such file or directory
##############################
Test: TestRunner_ioctl-tester - FAIL
Desc: Run ioctl-tester with test-runner
Output:

Could not access KVM kernel module: No such file or directory
qemu-system-x86_64: failed to initialize KVM: No such file or directory
qemu-system-x86_64: Back to tcg accelerator
qemu: could not open kernel file '/github/workspace/src/src/arch/x86/boot/bzImage': No such file or directory
##############################
Test: TestRunner_mesh-tester - FAIL
Desc: Run mesh-tester with test-runner
Output:

Could not access KVM kernel module: No such file or directory
qemu-system-x86_64: failed to initialize KVM: No such file or directory
qemu-system-x86_64: Back to tcg accelerator
qemu: could not open kernel file '/github/workspace/src/src/arch/x86/boot/bzImage': No such file or directory
##############################
Test: TestRunner_smp-tester - FAIL
Desc: Run smp-tester with test-runner
Output:

Could not access KVM kernel module: No such file or directory
qemu-system-x86_64: failed to initialize KVM: No such file or directory
qemu-system-x86_64: Back to tcg accelerator
qemu: could not open kernel file '/github/workspace/src/src/arch/x86/boot/bzImage': No such file or directory
##############################
Test: TestRunner_userchan-tester - FAIL
Desc: Run userchan-tester with test-runner
Output:

Could not access KVM kernel module: No such file or directory
qemu-system-x86_64: failed to initialize KVM: No such file or directory
qemu-system-x86_64: Back to tcg accelerator
qemu: could not open kernel file '/github/workspace/src/src/arch/x86/boot/bzImage': No such file or directory
##############################
Test: IncrementalBuild - FAIL
Desc: Incremental build with the patches in the series
Output:
Bluetooth: mgmt: Fix limited discoverable off timeout

net/bluetooth/mgmt.c: In function ‘discov_off’:
net/bluetooth/mgmt.c:1066:27: error: ‘set_discoverable_sync’ undeclared (first use in this function); did you mean ‘hci_update_discoverable_sync’?
 1066 |  hci_cmd_sync_queue(hdev, set_discoverable_sync, NULL, NULL);
      |                           ^~~~~~~~~~~~~~~~~~~~~
      |                           hci_update_discoverable_sync
net/bluetooth/mgmt.c:1066:27: note: each undeclared identifier is reported only once for each function it appears in
make[4]: *** [scripts/Makefile.build:243: net/bluetooth/mgmt.o] Error 1
make[3]: *** [scripts/Makefile.build:480: net/bluetooth] Error 2
make[2]: *** [scripts/Makefile.build:480: net] Error 2
make[2]: *** Waiting for unfinished jobs....
make[1]: *** [/github/workspace/src/src/Makefile:1911: .] Error 2
make: *** [Makefile:234: __sub-make] Error 2


---
Regards,
Linux Bluetooth

Patch

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 173986f3405f..c5022c90584c 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -1063,7 +1063,7 @@  static void discov_off(struct work_struct *work)
 	hci_dev_clear_flag(hdev, HCI_DISCOVERABLE);
 	hdev->discov_timeout = 0;
 
-	hci_update_discoverable(hdev);
+	hci_cmd_sync_queue(hdev, set_discoverable_sync, NULL, NULL);
 
 	mgmt_new_settings(hdev);