Message ID | 20230531085759.2803-2-johan+linaro@kernel.org |
---|---|
State | Accepted |
Commit | 4a3c39cbee7c33cf70ae6d0301f1076a7810381a |
Headers | show |
Series | Bluetooth: fix bdaddr quirks | expand |
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=752636 ---Test result--- Test Summary: CheckPatch FAIL 1.67 seconds GitLint FAIL 0.82 seconds SubjectPrefix PASS 0.20 seconds BuildKernel PASS 32.16 seconds CheckAllWarning PASS 35.70 seconds CheckSparse PASS 40.62 seconds CheckSmatch PASS 110.56 seconds BuildKernel32 PASS 31.75 seconds TestRunnerSetup PASS 452.79 seconds TestRunner_l2cap-tester PASS 17.51 seconds TestRunner_iso-tester FAIL 23.43 seconds TestRunner_bnep-tester PASS 5.67 seconds TestRunner_mgmt-tester PASS 116.32 seconds TestRunner_rfcomm-tester PASS 9.11 seconds TestRunner_sco-tester PASS 8.39 seconds TestRunner_ioctl-tester PASS 9.81 seconds TestRunner_mesh-tester PASS 7.18 seconds TestRunner_smp-tester PASS 8.32 seconds TestRunner_userchan-tester PASS 6.05 seconds IncrementalBuild PASS 34.63 seconds Details ############################## Test: CheckPatch - FAIL Desc: Run checkpatch.pl script Output: [RESEND,1/2] Bluetooth: fix debugfs registration WARNING: Possible unwrapped commit description (prefer a maximum 75 chars per line) #82: debugfs: File 'quirk_simultaneous_discovery' in directory 'hci0' already present! total: 0 errors, 1 warnings, 0 checks, 16 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/src/13261771.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. ############################## Test: GitLint - FAIL Desc: Run gitlint Output: [RESEND,1/2] Bluetooth: fix debugfs registration WARNING: I3 - ignore-body-lines: gitlint will be switching from using Python regex 'match' (match beginning) to 'search' (match anywhere) semantics. Please review your ignore-body-lines.regex option accordingly. To remove this warning, set general.regex-style-search=True. More details: https://jorisroovers.github.io/gitlint/configuration/#regex-style-search 12: B3 Line contains hard tab characters (\t): " debugfs: File 'features' in directory 'hci0' already present!" 13: B3 Line contains hard tab characters (\t): " debugfs: File 'manufacturer' in directory 'hci0' already present!" 14: B3 Line contains hard tab characters (\t): " debugfs: File 'hci_version' in directory 'hci0' already present!" 15: B3 Line contains hard tab characters (\t): " ..." 16: B1 Line exceeds max length (82>80): " debugfs: File 'quirk_simultaneous_discovery' in directory 'hci0' already present!" 16: B3 Line contains hard tab characters (\t): " debugfs: File 'quirk_simultaneous_discovery' in directory 'hci0' already present!" [RESEND,2/2] Bluetooth: hci_qca: fix debugfs registration WARNING: I3 - ignore-body-lines: gitlint will be switching from using Python regex 'match' (match beginning) to 'search' (match anywhere) semantics. Please review your ignore-body-lines.regex option accordingly. To remove this warning, set general.regex-style-search=True. More details: https://jorisroovers.github.io/gitlint/configuration/#regex-style-search 10: B3 Line contains hard tab characters (\t): " debugfs: Directory 'ibs' with parent 'hci0' already present!" 15: B3 Line contains hard tab characters (\t): "Cc: stable@vger.kernel.org # 4.20" ############################## Test: TestRunner_iso-tester - FAIL Desc: Run iso-tester with test-runner Output: Total: 80, Passed: 75 (93.8%), Failed: 5, Not Run: 0 Failed Test Cases ISO AC 6(i) - Success Failed 0.225 seconds ISO AC 7(i) - Success Failed 0.226 seconds ISO AC 8(i) - Success Failed 0.232 seconds ISO AC 9(i) - Success Failed 0.232 seconds ISO AC 11(i) - Success Failed 0.224 seconds --- Regards, Linux Bluetooth
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h index 07df96c47ef4..872dcb91a540 100644 --- a/include/net/bluetooth/hci.h +++ b/include/net/bluetooth/hci.h @@ -350,6 +350,7 @@ enum { enum { HCI_SETUP, HCI_CONFIG, + HCI_DEBUGFS_CREATED, HCI_AUTO_OFF, HCI_RFKILLED, HCI_MGMT, diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c index 647a8ce54062..0efc2253265e 100644 --- a/net/bluetooth/hci_sync.c +++ b/net/bluetooth/hci_sync.c @@ -4543,6 +4543,9 @@ static int hci_init_sync(struct hci_dev *hdev) !hci_dev_test_flag(hdev, HCI_CONFIG)) return 0; + if (hci_dev_test_and_set_flag(hdev, HCI_DEBUGFS_CREATED)) + return 0; + hci_debugfs_create_common(hdev); if (lmp_bredr_capable(hdev))
Since commit ec6cef9cd98d ("Bluetooth: Fix SMP channel registration for unconfigured controllers") the debugfs interface for unconfigured controllers will be created when the controller is configured. There is however currently nothing preventing a controller from being configured multiple time (e.g. setting the device address using btmgmt) which results in failed attempts to register the already registered debugfs entries: debugfs: File 'features' in directory 'hci0' already present! debugfs: File 'manufacturer' in directory 'hci0' already present! debugfs: File 'hci_version' in directory 'hci0' already present! ... debugfs: File 'quirk_simultaneous_discovery' in directory 'hci0' already present! Add a controller flag to avoid trying to register the debugfs interface more than once. Fixes: ec6cef9cd98d ("Bluetooth: Fix SMP channel registration for unconfigured controllers") Cc: stable@vger.kernel.org # 4.0 Signed-off-by: Johan Hovold <johan+linaro@kernel.org> --- include/net/bluetooth/hci.h | 1 + net/bluetooth/hci_sync.c | 3 +++ 2 files changed, 4 insertions(+)