| Message ID | 20250224205439.18672-2-nishiyama.pedro@gmail.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Bluetooth: btusb: Fix regression in the initialization of fake Bluetooth controllers | expand |
| Context | Check | Description |
|---|---|---|
| tedd_an/pre-ci_am | success | Success |
| tedd_an/SubjectPrefix | success | Gitlint PASS |
| tedd_an/BuildKernel | success | BuildKernel PASS |
| tedd_an/CheckAllWarning | success | CheckAllWarning PASS |
| tedd_an/CheckSparse | success | CheckSparse PASS |
| tedd_an/BuildKernel32 | success | BuildKernel32 PASS |
| tedd_an/TestRunnerSetup | success | TestRunnerSetup PASS |
| tedd_an/TestRunner_l2cap-tester | success | TestRunner PASS |
| tedd_an/TestRunner_iso-tester | success | TestRunner PASS |
| tedd_an/TestRunner_bnep-tester | success | TestRunner PASS |
| tedd_an/TestRunner_mgmt-tester | success | TestRunner PASS |
| tedd_an/TestRunner_rfcomm-tester | success | TestRunner PASS |
| tedd_an/TestRunner_sco-tester | success | TestRunner PASS |
| tedd_an/TestRunner_ioctl-tester | success | TestRunner PASS |
| tedd_an/TestRunner_mesh-tester | success | TestRunner PASS |
| tedd_an/TestRunner_smp-tester | success | TestRunner PASS |
| tedd_an/TestRunner_userchan-tester | success | TestRunner PASS |
Hi Pedro, On Mon, Feb 24, 2025 at 3:54 PM Pedro Nishiyama <nishiyama.pedro@gmail.com> wrote: > > This adds quirks for broken READ_VOICE_SETTING and READ_PAGE_SCAN_TYPE. > > Signed-off-by: Pedro Nishiyama <nishiyama.pedro@gmail.com> > --- > include/net/bluetooth/hci.h | 16 ++++++++++++++++ > net/bluetooth/hci_sync.c | 6 ++++++ > 2 files changed, 22 insertions(+) > > diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h > index 0d51970d809f..b99818df8ee7 100644 > --- a/include/net/bluetooth/hci.h > +++ b/include/net/bluetooth/hci.h > @@ -354,6 +354,22 @@ enum { > * during the hdev->setup vendor callback. > */ > HCI_QUIRK_FIXUP_LE_EXT_ADV_REPORT_PHY, > + > + /* When this quirk is set, the HCI_OP_READ_VOICE_SETTING command is > + * skipped. This is required for a subset of the CSR controller clones > + * which erroneously claim to support it. > + * > + * This quirk must be set before hci_register_dev is called. > + */ > + HCI_QUIRK_BROKEN_READ_VOICE_SETTING, Lets split this in 2 parts, one for voice setting and another for page scan type. > + /* When this quirk is set, the HCI_OP_READ_PAGE_SCAN_TYPE command is > + * skipped. This is required for a subset of the CSR controller clones > + * which erroneously claim to support it. > + * > + * This quirk must be set before hci_register_dev is called. > + */ > + HCI_QUIRK_BROKEN_READ_PAGE_SCAN_TYPE, > }; > > /* HCI device flags */ > diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c > index dd770ef5ec36..e76012956020 100644 > --- a/net/bluetooth/hci_sync.c > +++ b/net/bluetooth/hci_sync.c > @@ -3696,6 +3696,9 @@ static int hci_read_local_name_sync(struct hci_dev *hdev) > /* Read Voice Setting */ > static int hci_read_voice_setting_sync(struct hci_dev *hdev) > { > + if (test_bit(HCI_QUIRK_BROKEN_READ_VOICE_SETTING, &hdev->quirks)) > + return 0; While at it I'd add the checking for the bit as well, that said perhaps we need to disable SCO link if voice settings cannot be read, is the controller able to create SCO connections? > return __hci_cmd_sync_status(hdev, HCI_OP_READ_VOICE_SETTING, > 0, NULL, HCI_CMD_TIMEOUT); > } > @@ -4132,6 +4135,9 @@ static int hci_read_page_scan_type_sync(struct hci_dev *hdev) > if (!(hdev->commands[13] & 0x01)) > return 0; > > + if (test_bit(HCI_QUIRK_BROKEN_READ_PAGE_SCAN_TYPE, &hdev->quirks)) > + return 0; > + > return __hci_cmd_sync_status(hdev, HCI_OP_READ_PAGE_SCAN_TYPE, > 0, NULL, HCI_CMD_TIMEOUT); > } > -- > 2.48.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=937249 ---Test result--- Test Summary: CheckPatch PENDING 0.18 seconds GitLint PENDING 0.16 seconds SubjectPrefix PASS 0.25 seconds BuildKernel PASS 24.16 seconds CheckAllWarning PASS 26.55 seconds CheckSparse PASS 31.43 seconds BuildKernel32 PASS 24.05 seconds TestRunnerSetup PASS 425.71 seconds TestRunner_l2cap-tester PASS 20.97 seconds TestRunner_iso-tester PASS 31.95 seconds TestRunner_bnep-tester PASS 4.78 seconds TestRunner_mgmt-tester PASS 120.52 seconds TestRunner_rfcomm-tester PASS 8.31 seconds TestRunner_sco-tester PASS 9.59 seconds TestRunner_ioctl-tester PASS 8.42 seconds TestRunner_mesh-tester PASS 6.15 seconds TestRunner_smp-tester PASS 7.27 seconds TestRunner_userchan-tester PASS 5.02 seconds IncrementalBuild PENDING 0.40 seconds Details ############################## Test: CheckPatch - PENDING Desc: Run checkpatch.pl script Output: ############################## Test: GitLint - PENDING Desc: Run gitlint Output: ############################## Test: IncrementalBuild - PENDING Desc: Incremental build with the patches in the series Output: --- Regards, Linux Bluetooth
Hi Luiz, On Mon, Feb 24, 2025 at 6:36 PM Luiz Augusto von Dentz <luiz.dentz@gmail.com> wrote: > > Hi Pedro, > > On Mon, Feb 24, 2025 at 3:54 PM Pedro Nishiyama > <nishiyama.pedro@gmail.com> wrote: > > > > This adds quirks for broken READ_VOICE_SETTING and READ_PAGE_SCAN_TYPE. > > > > Signed-off-by: Pedro Nishiyama <nishiyama.pedro@gmail.com> > > --- > > include/net/bluetooth/hci.h | 16 ++++++++++++++++ > > net/bluetooth/hci_sync.c | 6 ++++++ > > 2 files changed, 22 insertions(+) > > > > diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h > > index 0d51970d809f..b99818df8ee7 100644 > > --- a/include/net/bluetooth/hci.h > > +++ b/include/net/bluetooth/hci.h > > @@ -354,6 +354,22 @@ enum { > > * during the hdev->setup vendor callback. > > */ > > HCI_QUIRK_FIXUP_LE_EXT_ADV_REPORT_PHY, > > + > > + /* When this quirk is set, the HCI_OP_READ_VOICE_SETTING command is > > + * skipped. This is required for a subset of the CSR controller clones > > + * which erroneously claim to support it. > > + * > > + * This quirk must be set before hci_register_dev is called. > > + */ > > + HCI_QUIRK_BROKEN_READ_VOICE_SETTING, > > Lets split this in 2 parts, one for voice setting and another for page > scan type. > > > + /* When this quirk is set, the HCI_OP_READ_PAGE_SCAN_TYPE command is > > + * skipped. This is required for a subset of the CSR controller clones > > + * which erroneously claim to support it. > > + * > > + * This quirk must be set before hci_register_dev is called. > > + */ > > + HCI_QUIRK_BROKEN_READ_PAGE_SCAN_TYPE, > > }; > > > > /* HCI device flags */ > > diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c > > index dd770ef5ec36..e76012956020 100644 > > --- a/net/bluetooth/hci_sync.c > > +++ b/net/bluetooth/hci_sync.c > > @@ -3696,6 +3696,9 @@ static int hci_read_local_name_sync(struct hci_dev *hdev) > > /* Read Voice Setting */ > > static int hci_read_voice_setting_sync(struct hci_dev *hdev) > > { > > + if (test_bit(HCI_QUIRK_BROKEN_READ_VOICE_SETTING, &hdev->quirks)) > > + return 0; > > While at it I'd add the checking for the bit as well, that said > perhaps we need to disable SCO link if voice settings cannot be read, > is the controller able to create SCO connections? I did some tests on the version before the regression and with the patches. It is possible to create an SCO connection, but the connection is not usable. Before the regression there is no sound, and with the patches, dmesg is spammed with "Bluetooth: hci0: corrupted SCO packet". > > > return __hci_cmd_sync_status(hdev, HCI_OP_READ_VOICE_SETTING, > > 0, NULL, HCI_CMD_TIMEOUT); > > } > > @@ -4132,6 +4135,9 @@ static int hci_read_page_scan_type_sync(struct hci_dev *hdev) > > if (!(hdev->commands[13] & 0x01)) > > return 0; > > > > + if (test_bit(HCI_QUIRK_BROKEN_READ_PAGE_SCAN_TYPE, &hdev->quirks)) > > + return 0; > > + > > return __hci_cmd_sync_status(hdev, HCI_OP_READ_PAGE_SCAN_TYPE, > > 0, NULL, HCI_CMD_TIMEOUT); > > } > > -- > > 2.48.1 > > > > > -- > Luiz Augusto von Dentz -- Pedro Nishiyama
Hi Pedro, On Mon, Feb 24, 2025 at 7:27 PM Pedro Nishiyama <nishiyama.pedro@gmail.com> wrote: > > Hi Luiz, > > On Mon, Feb 24, 2025 at 6:36 PM Luiz Augusto von Dentz > <luiz.dentz@gmail.com> wrote: > > > > Hi Pedro, > > > > On Mon, Feb 24, 2025 at 3:54 PM Pedro Nishiyama > > <nishiyama.pedro@gmail.com> wrote: > > > > > > This adds quirks for broken READ_VOICE_SETTING and READ_PAGE_SCAN_TYPE. > > > > > > Signed-off-by: Pedro Nishiyama <nishiyama.pedro@gmail.com> > > > --- > > > include/net/bluetooth/hci.h | 16 ++++++++++++++++ > > > net/bluetooth/hci_sync.c | 6 ++++++ > > > 2 files changed, 22 insertions(+) > > > > > > diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h > > > index 0d51970d809f..b99818df8ee7 100644 > > > --- a/include/net/bluetooth/hci.h > > > +++ b/include/net/bluetooth/hci.h > > > @@ -354,6 +354,22 @@ enum { > > > * during the hdev->setup vendor callback. > > > */ > > > HCI_QUIRK_FIXUP_LE_EXT_ADV_REPORT_PHY, > > > + > > > + /* When this quirk is set, the HCI_OP_READ_VOICE_SETTING command is > > > + * skipped. This is required for a subset of the CSR controller clones > > > + * which erroneously claim to support it. > > > + * > > > + * This quirk must be set before hci_register_dev is called. > > > + */ > > > + HCI_QUIRK_BROKEN_READ_VOICE_SETTING, > > > > Lets split this in 2 parts, one for voice setting and another for page > > scan type. > > > > > + /* When this quirk is set, the HCI_OP_READ_PAGE_SCAN_TYPE command is > > > + * skipped. This is required for a subset of the CSR controller clones > > > + * which erroneously claim to support it. > > > + * > > > + * This quirk must be set before hci_register_dev is called. > > > + */ > > > + HCI_QUIRK_BROKEN_READ_PAGE_SCAN_TYPE, > > > }; > > > > > > /* HCI device flags */ > > > diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c > > > index dd770ef5ec36..e76012956020 100644 > > > --- a/net/bluetooth/hci_sync.c > > > +++ b/net/bluetooth/hci_sync.c > > > @@ -3696,6 +3696,9 @@ static int hci_read_local_name_sync(struct hci_dev *hdev) > > > /* Read Voice Setting */ > > > static int hci_read_voice_setting_sync(struct hci_dev *hdev) > > > { > > > + if (test_bit(HCI_QUIRK_BROKEN_READ_VOICE_SETTING, &hdev->quirks)) > > > + return 0; > > > > While at it I'd add the checking for the bit as well, that said > > perhaps we need to disable SCO link if voice settings cannot be read, > > is the controller able to create SCO connections? > > I did some tests on the version before the regression and with the patches. > It is possible to create an SCO connection, but the connection is not usable. > Before the regression there is no sound, and with the patches, dmesg > is spammed with "Bluetooth: hci0: corrupted SCO packet". Then perhaps we should disable SCO support if it doesn't support read voice settings. > > > > > return __hci_cmd_sync_status(hdev, HCI_OP_READ_VOICE_SETTING, > > > 0, NULL, HCI_CMD_TIMEOUT); > > > } > > > @@ -4132,6 +4135,9 @@ static int hci_read_page_scan_type_sync(struct hci_dev *hdev) > > > if (!(hdev->commands[13] & 0x01)) > > > return 0; > > > > > > + if (test_bit(HCI_QUIRK_BROKEN_READ_PAGE_SCAN_TYPE, &hdev->quirks)) > > > + return 0; > > > + > > > return __hci_cmd_sync_status(hdev, HCI_OP_READ_PAGE_SCAN_TYPE, > > > 0, NULL, HCI_CMD_TIMEOUT); > > > } > > > -- > > > 2.48.1 > > > > > > > > > -- > > Luiz Augusto von Dentz > > > -- > Pedro Nishiyama
Hello, On Tue, Feb 25, 2025 at 12:55 PM Luiz Augusto von Dentz <luiz.dentz@gmail.com> wrote: > > Hi Pedro, > > On Mon, Feb 24, 2025 at 7:27 PM Pedro Nishiyama > <nishiyama.pedro@gmail.com> wrote: > > > > Hi Luiz, > > > > On Mon, Feb 24, 2025 at 6:36 PM Luiz Augusto von Dentz > > <luiz.dentz@gmail.com> wrote: > > > > > > Hi Pedro, > > > > > > On Mon, Feb 24, 2025 at 3:54 PM Pedro Nishiyama > > > <nishiyama.pedro@gmail.com> wrote: > > > > > > > > This adds quirks for broken READ_VOICE_SETTING and READ_PAGE_SCAN_TYPE. > > > > > > > > Signed-off-by: Pedro Nishiyama <nishiyama.pedro@gmail.com> > > > > --- > > > > include/net/bluetooth/hci.h | 16 ++++++++++++++++ > > > > net/bluetooth/hci_sync.c | 6 ++++++ > > > > 2 files changed, 22 insertions(+) > > > > > > > > diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h > > > > index 0d51970d809f..b99818df8ee7 100644 > > > > --- a/include/net/bluetooth/hci.h > > > > +++ b/include/net/bluetooth/hci.h > > > > @@ -354,6 +354,22 @@ enum { > > > > * during the hdev->setup vendor callback. > > > > */ > > > > HCI_QUIRK_FIXUP_LE_EXT_ADV_REPORT_PHY, > > > > + > > > > + /* When this quirk is set, the HCI_OP_READ_VOICE_SETTING command is > > > > + * skipped. This is required for a subset of the CSR controller clones > > > > + * which erroneously claim to support it. > > > > + * > > > > + * This quirk must be set before hci_register_dev is called. > > > > + */ > > > > + HCI_QUIRK_BROKEN_READ_VOICE_SETTING, > > > > > > Lets split this in 2 parts, one for voice setting and another for page > > > scan type. > > > > > > > + /* When this quirk is set, the HCI_OP_READ_PAGE_SCAN_TYPE command is > > > > + * skipped. This is required for a subset of the CSR controller clones > > > > + * which erroneously claim to support it. > > > > + * > > > > + * This quirk must be set before hci_register_dev is called. > > > > + */ > > > > + HCI_QUIRK_BROKEN_READ_PAGE_SCAN_TYPE, > > > > }; > > > > > > > > /* HCI device flags */ > > > > diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c > > > > index dd770ef5ec36..e76012956020 100644 > > > > --- a/net/bluetooth/hci_sync.c > > > > +++ b/net/bluetooth/hci_sync.c > > > > @@ -3696,6 +3696,9 @@ static int hci_read_local_name_sync(struct hci_dev *hdev) > > > > /* Read Voice Setting */ > > > > static int hci_read_voice_setting_sync(struct hci_dev *hdev) > > > > { > > > > + if (test_bit(HCI_QUIRK_BROKEN_READ_VOICE_SETTING, &hdev->quirks)) > > > > + return 0; > > > > > > While at it I'd add the checking for the bit as well, that said > > > perhaps we need to disable SCO link if voice settings cannot be read, > > > is the controller able to create SCO connections? > > > > I did some tests on the version before the regression and with the patches. > > It is possible to create an SCO connection, but the connection is not usable. > > Before the regression there is no sound, and with the patches, dmesg > > is spammed with "Bluetooth: hci0: corrupted SCO packet". > > Then perhaps we should disable SCO support if it doesn't support read > voice settings. I'm having some trouble disabling SCO. We can't add BTUSB_BROKEN_ISOC to the drivers quirks because not all 0a12:0001 are clones with broken READ_VOICE_SETTING. The fake identification is done after the btusb_probe, and we set up the isoc during the btusb_probe. I'm not sure if removing the isoc device file and releasing its interface in the hdev->setup is actually safe. > > > > > > > > return __hci_cmd_sync_status(hdev, HCI_OP_READ_VOICE_SETTING, > > > > 0, NULL, HCI_CMD_TIMEOUT); > > > > } > > > > @@ -4132,6 +4135,9 @@ static int hci_read_page_scan_type_sync(struct hci_dev *hdev) > > > > if (!(hdev->commands[13] & 0x01)) > > > > return 0; > > > > > > > > + if (test_bit(HCI_QUIRK_BROKEN_READ_PAGE_SCAN_TYPE, &hdev->quirks)) > > > > + return 0; > > > > + > > > > return __hci_cmd_sync_status(hdev, HCI_OP_READ_PAGE_SCAN_TYPE, > > > > 0, NULL, HCI_CMD_TIMEOUT); > > > > } > > > > -- > > > > 2.48.1 > > > > > > > > > > > > > -- > > > Luiz Augusto von Dentz > > > > > > -- > > Pedro Nishiyama > > > > -- > Luiz Augusto von Dentz
Hi Pedro, On Wed, Feb 26, 2025 at 2:18 PM Pedro Nishiyama <nishiyama.pedro@gmail.com> wrote: > > Hello, > > On Tue, Feb 25, 2025 at 12:55 PM Luiz Augusto von Dentz > <luiz.dentz@gmail.com> wrote: > > > > Hi Pedro, > > > > On Mon, Feb 24, 2025 at 7:27 PM Pedro Nishiyama > > <nishiyama.pedro@gmail.com> wrote: > > > > > > Hi Luiz, > > > > > > On Mon, Feb 24, 2025 at 6:36 PM Luiz Augusto von Dentz > > > <luiz.dentz@gmail.com> wrote: > > > > > > > > Hi Pedro, > > > > > > > > On Mon, Feb 24, 2025 at 3:54 PM Pedro Nishiyama > > > > <nishiyama.pedro@gmail.com> wrote: > > > > > > > > > > This adds quirks for broken READ_VOICE_SETTING and READ_PAGE_SCAN_TYPE. > > > > > > > > > > Signed-off-by: Pedro Nishiyama <nishiyama.pedro@gmail.com> > > > > > --- > > > > > include/net/bluetooth/hci.h | 16 ++++++++++++++++ > > > > > net/bluetooth/hci_sync.c | 6 ++++++ > > > > > 2 files changed, 22 insertions(+) > > > > > > > > > > diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h > > > > > index 0d51970d809f..b99818df8ee7 100644 > > > > > --- a/include/net/bluetooth/hci.h > > > > > +++ b/include/net/bluetooth/hci.h > > > > > @@ -354,6 +354,22 @@ enum { > > > > > * during the hdev->setup vendor callback. > > > > > */ > > > > > HCI_QUIRK_FIXUP_LE_EXT_ADV_REPORT_PHY, > > > > > + > > > > > + /* When this quirk is set, the HCI_OP_READ_VOICE_SETTING command is > > > > > + * skipped. This is required for a subset of the CSR controller clones > > > > > + * which erroneously claim to support it. > > > > > + * > > > > > + * This quirk must be set before hci_register_dev is called. > > > > > + */ > > > > > + HCI_QUIRK_BROKEN_READ_VOICE_SETTING, > > > > > > > > Lets split this in 2 parts, one for voice setting and another for page > > > > scan type. > > > > > > > > > + /* When this quirk is set, the HCI_OP_READ_PAGE_SCAN_TYPE command is > > > > > + * skipped. This is required for a subset of the CSR controller clones > > > > > + * which erroneously claim to support it. > > > > > + * > > > > > + * This quirk must be set before hci_register_dev is called. > > > > > + */ > > > > > + HCI_QUIRK_BROKEN_READ_PAGE_SCAN_TYPE, > > > > > }; > > > > > > > > > > /* HCI device flags */ > > > > > diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c > > > > > index dd770ef5ec36..e76012956020 100644 > > > > > --- a/net/bluetooth/hci_sync.c > > > > > +++ b/net/bluetooth/hci_sync.c > > > > > @@ -3696,6 +3696,9 @@ static int hci_read_local_name_sync(struct hci_dev *hdev) > > > > > /* Read Voice Setting */ > > > > > static int hci_read_voice_setting_sync(struct hci_dev *hdev) > > > > > { > > > > > + if (test_bit(HCI_QUIRK_BROKEN_READ_VOICE_SETTING, &hdev->quirks)) > > > > > + return 0; > > > > > > > > While at it I'd add the checking for the bit as well, that said > > > > perhaps we need to disable SCO link if voice settings cannot be read, > > > > is the controller able to create SCO connections? > > > > > > I did some tests on the version before the regression and with the patches. > > > It is possible to create an SCO connection, but the connection is not usable. > > > Before the regression there is no sound, and with the patches, dmesg > > > is spammed with "Bluetooth: hci0: corrupted SCO packet". > > > > Then perhaps we should disable SCO support if it doesn't support read > > voice settings. > > I'm having some trouble disabling SCO. We can't add BTUSB_BROKEN_ISOC > to the drivers quirks because not all 0a12:0001 are clones with broken > READ_VOICE_SETTING. > The fake identification is done after the btusb_probe, and we set up > the isoc during the btusb_probe. > I'm not sure if removing the isoc device file and releasing its > interface in the hdev->setup is actually safe. Well I was not thinking of disabling the ISOC endpoint if that is what you meant by adding BTUSB_BROKEN_ISOC, but disabling/fail the creation of SCO sockets in the above layers if we detect the read voice setting is not working. > > > > > > > > > > > return __hci_cmd_sync_status(hdev, HCI_OP_READ_VOICE_SETTING, > > > > > 0, NULL, HCI_CMD_TIMEOUT); > > > > > } > > > > > @@ -4132,6 +4135,9 @@ static int hci_read_page_scan_type_sync(struct hci_dev *hdev) > > > > > if (!(hdev->commands[13] & 0x01)) > > > > > return 0; > > > > > > > > > > + if (test_bit(HCI_QUIRK_BROKEN_READ_PAGE_SCAN_TYPE, &hdev->quirks)) > > > > > + return 0; > > > > > + > > > > > return __hci_cmd_sync_status(hdev, HCI_OP_READ_PAGE_SCAN_TYPE, > > > > > 0, NULL, HCI_CMD_TIMEOUT); > > > > > } > > > > > -- > > > > > 2.48.1 > > > > > > > > > > > > > > > > > -- > > > > Luiz Augusto von Dentz > > > > > > > > > -- > > > Pedro Nishiyama > > > > > > > > -- > > Luiz Augusto von Dentz
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h index 0d51970d809f..b99818df8ee7 100644 --- a/include/net/bluetooth/hci.h +++ b/include/net/bluetooth/hci.h @@ -354,6 +354,22 @@ enum { * during the hdev->setup vendor callback. */ HCI_QUIRK_FIXUP_LE_EXT_ADV_REPORT_PHY, + + /* When this quirk is set, the HCI_OP_READ_VOICE_SETTING command is + * skipped. This is required for a subset of the CSR controller clones + * which erroneously claim to support it. + * + * This quirk must be set before hci_register_dev is called. + */ + HCI_QUIRK_BROKEN_READ_VOICE_SETTING, + + /* When this quirk is set, the HCI_OP_READ_PAGE_SCAN_TYPE command is + * skipped. This is required for a subset of the CSR controller clones + * which erroneously claim to support it. + * + * This quirk must be set before hci_register_dev is called. + */ + HCI_QUIRK_BROKEN_READ_PAGE_SCAN_TYPE, }; /* HCI device flags */ diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c index dd770ef5ec36..e76012956020 100644 --- a/net/bluetooth/hci_sync.c +++ b/net/bluetooth/hci_sync.c @@ -3696,6 +3696,9 @@ static int hci_read_local_name_sync(struct hci_dev *hdev) /* Read Voice Setting */ static int hci_read_voice_setting_sync(struct hci_dev *hdev) { + if (test_bit(HCI_QUIRK_BROKEN_READ_VOICE_SETTING, &hdev->quirks)) + return 0; + return __hci_cmd_sync_status(hdev, HCI_OP_READ_VOICE_SETTING, 0, NULL, HCI_CMD_TIMEOUT); } @@ -4132,6 +4135,9 @@ static int hci_read_page_scan_type_sync(struct hci_dev *hdev) if (!(hdev->commands[13] & 0x01)) return 0; + if (test_bit(HCI_QUIRK_BROKEN_READ_PAGE_SCAN_TYPE, &hdev->quirks)) + return 0; + return __hci_cmd_sync_status(hdev, HCI_OP_READ_PAGE_SCAN_TYPE, 0, NULL, HCI_CMD_TIMEOUT); }
This adds quirks for broken READ_VOICE_SETTING and READ_PAGE_SCAN_TYPE. Signed-off-by: Pedro Nishiyama <nishiyama.pedro@gmail.com> --- include/net/bluetooth/hci.h | 16 ++++++++++++++++ net/bluetooth/hci_sync.c | 6 ++++++ 2 files changed, 22 insertions(+)