* [PATCH v3 1/3] Bluetooth: HCI: Add HCI_QUIRK_BROKEN_ENHANCED_SETUP_SYNC_CONN quirk
@ 2022-03-30 18:25 Luiz Augusto von Dentz
2022-03-30 18:25 ` [PATCH v3 2/3] Bluetooth: Print broken quirks Luiz Augusto von Dentz
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Luiz Augusto von Dentz @ 2022-03-30 18:25 UTC (permalink / raw)
To: linux-bluetooth
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This adds HCI_QUIRK_BROKEN_ENHANCED_SETUP_SYNC_CONN quirk which can be
used to mark HCI_Enhanced_Setup_Synchronous_Connection as broken even
if its support command bit are set since some controller report it as
supported but the command don't work properly with some configurations
(e.g. BT_VOICE_TRANSPARENT/mSBC).
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
---
v3: Make HCI_QUIRK_BROKEN macro expand quirk name and address other comments
from v2.
v2: Change hci_broken/hci_quirk_broken and HCI_BROKEN/HCI_QUIRK_BROKEN and add
patch 3/3 setting HCI_QUIRK_BROKEN_ENHANCED_SETUP_SYNC_CONN for QCA
controllers.
include/net/bluetooth/hci.h | 9 +++++++++
include/net/bluetooth/hci_core.h | 8 ++++++--
net/bluetooth/hci_conn.c | 2 +-
net/bluetooth/sco.c | 2 +-
4 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index 5cb095b09a94..8bb81ea4d286 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -265,6 +265,15 @@ enum {
* runtime suspend, because event filtering takes place there.
*/
HCI_QUIRK_BROKEN_FILTER_CLEAR_ALL,
+
+ /*
+ * When this quirk is set, disables the use of
+ * HCI_OP_ENHANCED_SETUP_SYNC_CONN command to setup SCO connections.
+ *
+ * This quirk can be set before hci_register_dev is called or
+ * during the hdev->setup vendor callback.
+ */
+ HCI_QUIRK_BROKEN_ENHANCED_SETUP_SYNC_CONN,
};
/* HCI device flags */
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index d5377740e99c..59815df1272a 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -1492,8 +1492,12 @@ void hci_conn_del_sysfs(struct hci_conn *conn);
#define privacy_mode_capable(dev) (use_ll_privacy(dev) && \
(hdev->commands[39] & 0x04))
-/* Use enhanced synchronous connection if command is supported */
-#define enhanced_sco_capable(dev) ((dev)->commands[29] & 0x08)
+/* Use enhanced synchronous connection if command is supported and its quirk
+ * has not been set.
+ */
+#define enhanced_sync_conn_capable(dev) \
+ (((dev)->commands[29] & 0x08) && \
+ !test_bit(HCI_QUIRK_BROKEN_ENHANCED_SETUP_SYNC_CONN, &(dev)->quirks))
/* Use ext scanning if set ext scan param and ext scan enable is supported */
#define use_ext_scan(dev) (((dev)->commands[37] & 0x20) && \
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index 84312c836549..cd51bf2a709b 100644
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -481,7 +481,7 @@ static bool hci_setup_sync_conn(struct hci_conn *conn, __u16 handle)
bool hci_setup_sync(struct hci_conn *conn, __u16 handle)
{
- if (enhanced_sco_capable(conn->hdev))
+ if (enhanced_sync_conn_capable(conn->hdev))
return hci_enhanced_setup_sync_conn(conn, handle);
return hci_setup_sync_conn(conn, handle);
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
index 8eabf41b2993..2a58c7d88433 100644
--- a/net/bluetooth/sco.c
+++ b/net/bluetooth/sco.c
@@ -885,7 +885,7 @@ static int sco_sock_setsockopt(struct socket *sock, int level, int optname,
err = -EBADFD;
break;
}
- if (enhanced_sco_capable(hdev) &&
+ if (enhanced_sync_conn_capable(hdev) &&
voice.setting == BT_VOICE_TRANSPARENT)
sco_pi(sk)->codec.id = BT_CODEC_TRANSPARENT;
hci_dev_put(hdev);
--
2.35.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v3 2/3] Bluetooth: Print broken quirks
2022-03-30 18:25 [PATCH v3 1/3] Bluetooth: HCI: Add HCI_QUIRK_BROKEN_ENHANCED_SETUP_SYNC_CONN quirk Luiz Augusto von Dentz
@ 2022-03-30 18:25 ` Luiz Augusto von Dentz
2022-04-01 17:29 ` Marcel Holtmann
2022-03-30 18:25 ` [PATCH v3 3/3] Bluetooth: btusb: Set HCI_QUIRK_BROKEN_ENHANCED_SETUP_SYNC_CONN for QCA Luiz Augusto von Dentz
2022-03-30 19:10 ` [v3,1/3] Bluetooth: HCI: Add HCI_QUIRK_BROKEN_ENHANCED_SETUP_SYNC_CONN quirk bluez.test.bot
2 siblings, 1 reply; 8+ messages in thread
From: Luiz Augusto von Dentz @ 2022-03-30 18:25 UTC (permalink / raw)
To: linux-bluetooth
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This prints warnings for controllers setting broken quirks to increase
their visibility and warn about broken controllers firmware that
probably needs updates to behave properly.
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
---
net/bluetooth/hci_sync.c | 53 +++++++++++++++++++++++++++++++++++++---
1 file changed, 49 insertions(+), 4 deletions(-)
diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c
index 8f4c5698913d..e97880d7bdb2 100644
--- a/net/bluetooth/hci_sync.c
+++ b/net/bluetooth/hci_sync.c
@@ -3825,6 +3825,54 @@ static int hci_init_sync(struct hci_dev *hdev)
return 0;
}
+#define HCI_QUIRK_BROKEN(_quirk, _desc) { HCI_QUIRK_BROKEN_##_quirk, _desc }
+
+static const struct {
+ unsigned long quirk;
+ const char *desc;
+} hci_broken_table[] = {
+ HCI_QUIRK_BROKEN(LOCAL_COMMANDS,
+ "HCI Read Local Supported Commands not supported"),
+ HCI_QUIRK_BROKEN(STORED_LINK_KEY,
+ "HCI Delete Stored Link Key command is advertised, "
+ "but not supported."),
+ HCI_QUIRK_BROKEN(ERR_DATA_REPORTING,
+ "HCI Read Default Erroneous Data Reporting command is "
+ "advertised, but not supported."),
+ HCI_QUIRK_BROKEN(READ_TRANSMIT_POWER,
+ "HCI Read Transmit Power Level command is advertised, "
+ "but not supported."),
+ HCI_QUIRK_BROKEN(FILTER_CLEAR_ALL,
+ "HCI Set Event Filter command not supported."),
+ HCI_QUIRK_BROKEN(ENHANCED_SETUP_SYNC_CONN,
+ "HCI Enhanced Setup Synchronous Connection command is "
+ "advertised, but not supported.")
+};
+
+static int hci_dev_setup_sync(struct hci_dev *hdev)
+{
+ size_t i;
+
+ bt_dev_dbg(hdev, "");
+
+ hci_sock_dev_event(hdev, HCI_DEV_SETUP);
+
+ if (hdev->setup) {
+ int ret;
+
+ ret = hdev->setup(hdev);
+ if (ret)
+ return ret;
+ }
+
+ for (i = 0; i < ARRAY_SIZE(hci_broken_table); i++) {
+ if (test_bit(hci_broken_table[i].quirk, &hdev->quirks))
+ bt_dev_warn(hdev, "%s", hci_broken_table[i].desc);
+ }
+
+ return 0;
+}
+
int hci_dev_open_sync(struct hci_dev *hdev)
{
int ret = 0;
@@ -3887,10 +3935,7 @@ int hci_dev_open_sync(struct hci_dev *hdev)
test_bit(HCI_QUIRK_NON_PERSISTENT_SETUP, &hdev->quirks)) {
bool invalid_bdaddr;
- hci_sock_dev_event(hdev, HCI_DEV_SETUP);
-
- if (hdev->setup)
- ret = hdev->setup(hdev);
+ ret = hci_dev_setup_sync(hdev);
/* The transport driver can set the quirk to mark the
* BD_ADDR invalid before creating the HCI device or in
--
2.35.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v3 3/3] Bluetooth: btusb: Set HCI_QUIRK_BROKEN_ENHANCED_SETUP_SYNC_CONN for QCA
2022-03-30 18:25 [PATCH v3 1/3] Bluetooth: HCI: Add HCI_QUIRK_BROKEN_ENHANCED_SETUP_SYNC_CONN quirk Luiz Augusto von Dentz
2022-03-30 18:25 ` [PATCH v3 2/3] Bluetooth: Print broken quirks Luiz Augusto von Dentz
@ 2022-03-30 18:25 ` Luiz Augusto von Dentz
2022-04-01 17:30 ` Marcel Holtmann
2022-03-30 19:10 ` [v3,1/3] Bluetooth: HCI: Add HCI_QUIRK_BROKEN_ENHANCED_SETUP_SYNC_CONN quirk bluez.test.bot
2 siblings, 1 reply; 8+ messages in thread
From: Luiz Augusto von Dentz @ 2022-03-30 18:25 UTC (permalink / raw)
To: linux-bluetooth
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This sets HCI_QUIRK_BROKEN_ENHANCED_SETUP_SYNC_CONN for QCA controllers
since SCO appear to not work when using HCI_OP_ENHANCED_SETUP_SYNC_CONN.
Link: https://bugzilla.kernel.org/show_bug.cgi?id=215576
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
---
drivers/bluetooth/btusb.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 50df417207af..2470c3d4ef0f 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -3335,6 +3335,9 @@ static int btusb_setup_qca(struct hci_dev *hdev)
msleep(QCA_BT_RESET_WAIT_MS);
}
+ /* https://bugzilla.kernel.org/show_bug.cgi?id=215576 */
+ set_bit(HCI_QUIRK_BROKEN_ENHANCED_SETUP_SYNC_CONN, &hdev->quirks);
+
return 0;
}
--
2.35.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* RE: [v3,1/3] Bluetooth: HCI: Add HCI_QUIRK_BROKEN_ENHANCED_SETUP_SYNC_CONN quirk
2022-03-30 18:25 [PATCH v3 1/3] Bluetooth: HCI: Add HCI_QUIRK_BROKEN_ENHANCED_SETUP_SYNC_CONN quirk Luiz Augusto von Dentz
2022-03-30 18:25 ` [PATCH v3 2/3] Bluetooth: Print broken quirks Luiz Augusto von Dentz
2022-03-30 18:25 ` [PATCH v3 3/3] Bluetooth: btusb: Set HCI_QUIRK_BROKEN_ENHANCED_SETUP_SYNC_CONN for QCA Luiz Augusto von Dentz
@ 2022-03-30 19:10 ` bluez.test.bot
2 siblings, 0 replies; 8+ messages in thread
From: bluez.test.bot @ 2022-03-30 19:10 UTC (permalink / raw)
To: linux-bluetooth, luiz.dentz
[-- Attachment #1: Type: text/plain, Size: 2490 bytes --]
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=627595
---Test result---
Test Summary:
CheckPatch FAIL 3.86 seconds
GitLint PASS 3.01 seconds
SubjectPrefix PASS 2.73 seconds
BuildKernel PASS 35.53 seconds
BuildKernel32 PASS 31.77 seconds
Incremental Build with patchesPASS 57.23 seconds
TestRunner: Setup PASS 520.37 seconds
TestRunner: l2cap-tester PASS 16.62 seconds
TestRunner: bnep-tester PASS 6.67 seconds
TestRunner: mgmt-tester PASS 107.83 seconds
TestRunner: rfcomm-tester PASS 8.50 seconds
TestRunner: sco-tester PASS 8.32 seconds
TestRunner: smp-tester PASS 8.34 seconds
TestRunner: userchan-tester PASS 6.95 seconds
Details
##############################
Test: CheckPatch - FAIL - 3.86 seconds
Run checkpatch.pl script with rule in .checkpatch.conf
[v3,2/3] Bluetooth: Print broken quirks\WARNING:SPLIT_STRING: quoted string split across lines
#109: FILE: net/bluetooth/hci_sync.c:3838:
+ "HCI Delete Stored Link Key command is advertised, "
+ "but not supported."),
WARNING:SPLIT_STRING: quoted string split across lines
#112: FILE: net/bluetooth/hci_sync.c:3841:
+ "HCI Read Default Erroneous Data Reporting command is "
+ "advertised, but not supported."),
WARNING:SPLIT_STRING: quoted string split across lines
#115: FILE: net/bluetooth/hci_sync.c:3844:
+ "HCI Read Transmit Power Level command is advertised, "
+ "but not supported."),
WARNING:SPLIT_STRING: quoted string split across lines
#120: FILE: net/bluetooth/hci_sync.c:3849:
+ "HCI Enhanced Setup Synchronous Connection command is "
+ "advertised, but not supported.")
total: 0 errors, 4 warnings, 0 checks, 65 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/12796216.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.
---
Regards,
Linux Bluetooth
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v3 2/3] Bluetooth: Print broken quirks
2022-03-30 18:25 ` [PATCH v3 2/3] Bluetooth: Print broken quirks Luiz Augusto von Dentz
@ 2022-04-01 17:29 ` Marcel Holtmann
2022-04-01 21:01 ` Luiz Augusto von Dentz
0 siblings, 1 reply; 8+ messages in thread
From: Marcel Holtmann @ 2022-04-01 17:29 UTC (permalink / raw)
To: Luiz Augusto von Dentz; +Cc: linux-bluetooth
Hi Luiz,
> This prints warnings for controllers setting broken quirks to increase
> their visibility and warn about broken controllers firmware that
> probably needs updates to behave properly.
>
> Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
> ---
> net/bluetooth/hci_sync.c | 53 +++++++++++++++++++++++++++++++++++++---
> 1 file changed, 49 insertions(+), 4 deletions(-)
>
> diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c
> index 8f4c5698913d..e97880d7bdb2 100644
> --- a/net/bluetooth/hci_sync.c
> +++ b/net/bluetooth/hci_sync.c
> @@ -3825,6 +3825,54 @@ static int hci_init_sync(struct hci_dev *hdev)
> return 0;
> }
>
> +#define HCI_QUIRK_BROKEN(_quirk, _desc) { HCI_QUIRK_BROKEN_##_quirk, _desc }
> +
> +static const struct {
> + unsigned long quirk;
> + const char *desc;
> +} hci_broken_table[] = {
> + HCI_QUIRK_BROKEN(LOCAL_COMMANDS,
> + "HCI Read Local Supported Commands not supported"),
> + HCI_QUIRK_BROKEN(STORED_LINK_KEY,
> + "HCI Delete Stored Link Key command is advertised, "
> + "but not supported."),
> + HCI_QUIRK_BROKEN(ERR_DATA_REPORTING,
> + "HCI Read Default Erroneous Data Reporting command is "
> + "advertised, but not supported."),
> + HCI_QUIRK_BROKEN(READ_TRANSMIT_POWER,
> + "HCI Read Transmit Power Level command is advertised, "
> + "but not supported."),
> + HCI_QUIRK_BROKEN(FILTER_CLEAR_ALL,
> + "HCI Set Event Filter command not supported."),
> + HCI_QUIRK_BROKEN(ENHANCED_SETUP_SYNC_CONN,
> + "HCI Enhanced Setup Synchronous Connection command is "
> + "advertised, but not supported.")
> +};
> +
> +static int hci_dev_setup_sync(struct hci_dev *hdev)
> +{
> + size_t i;
> +
> + bt_dev_dbg(hdev, "");
> +
> + hci_sock_dev_event(hdev, HCI_DEV_SETUP);
> +
> + if (hdev->setup) {
> + int ret;
> +
> + ret = hdev->setup(hdev);
> + if (ret)
> + return ret;
> + }
> +
> + for (i = 0; i < ARRAY_SIZE(hci_broken_table); i++) {
> + if (test_bit(hci_broken_table[i].quirk, &hdev->quirks))
> + bt_dev_warn(hdev, "%s", hci_broken_table[i].desc);
> + }
> +
> + return 0;
> +}
> +
> int hci_dev_open_sync(struct hci_dev *hdev)
> {
> int ret = 0;
> @@ -3887,10 +3935,7 @@ int hci_dev_open_sync(struct hci_dev *hdev)
> test_bit(HCI_QUIRK_NON_PERSISTENT_SETUP, &hdev->quirks)) {
> bool invalid_bdaddr;
>
> - hci_sock_dev_event(hdev, HCI_DEV_SETUP);
> -
> - if (hdev->setup)
> - ret = hdev->setup(hdev);
> + ret = hci_dev_setup_sync(hdev);
just put the code here instead of creating another helper function.
Regards
Marcel
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v3 3/3] Bluetooth: btusb: Set HCI_QUIRK_BROKEN_ENHANCED_SETUP_SYNC_CONN for QCA
2022-03-30 18:25 ` [PATCH v3 3/3] Bluetooth: btusb: Set HCI_QUIRK_BROKEN_ENHANCED_SETUP_SYNC_CONN for QCA Luiz Augusto von Dentz
@ 2022-04-01 17:30 ` Marcel Holtmann
2022-04-01 21:05 ` Luiz Augusto von Dentz
0 siblings, 1 reply; 8+ messages in thread
From: Marcel Holtmann @ 2022-04-01 17:30 UTC (permalink / raw)
To: Luiz Augusto von Dentz; +Cc: linux-bluetooth
Hi Luiz,
> This sets HCI_QUIRK_BROKEN_ENHANCED_SETUP_SYNC_CONN for QCA controllers
> since SCO appear to not work when using HCI_OP_ENHANCED_SETUP_SYNC_CONN.
>
> Link: https://bugzilla.kernel.org/show_bug.cgi?id=215576
> Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
> ---
> drivers/bluetooth/btusb.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
> index 50df417207af..2470c3d4ef0f 100644
> --- a/drivers/bluetooth/btusb.c
> +++ b/drivers/bluetooth/btusb.c
> @@ -3335,6 +3335,9 @@ static int btusb_setup_qca(struct hci_dev *hdev)
> msleep(QCA_BT_RESET_WAIT_MS);
> }
>
> + /* https://bugzilla.kernel.org/show_bug.cgi?id=215576 */
I dislike having a link here. Just describe what is going on.
> + set_bit(HCI_QUIRK_BROKEN_ENHANCED_SETUP_SYNC_CONN, &hdev->quirks);
> +
> return 0;
> }
Regards
Marcel
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v3 2/3] Bluetooth: Print broken quirks
2022-04-01 17:29 ` Marcel Holtmann
@ 2022-04-01 21:01 ` Luiz Augusto von Dentz
0 siblings, 0 replies; 8+ messages in thread
From: Luiz Augusto von Dentz @ 2022-04-01 21:01 UTC (permalink / raw)
To: Marcel Holtmann; +Cc: linux-bluetooth
Hi Marcel,
On Fri, Apr 1, 2022 at 10:29 AM Marcel Holtmann <marcel@holtmann.org> wrote:
>
> Hi Luiz,
>
> > This prints warnings for controllers setting broken quirks to increase
> > their visibility and warn about broken controllers firmware that
> > probably needs updates to behave properly.
> >
> > Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
> > ---
> > net/bluetooth/hci_sync.c | 53 +++++++++++++++++++++++++++++++++++++---
> > 1 file changed, 49 insertions(+), 4 deletions(-)
> >
> > diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c
> > index 8f4c5698913d..e97880d7bdb2 100644
> > --- a/net/bluetooth/hci_sync.c
> > +++ b/net/bluetooth/hci_sync.c
> > @@ -3825,6 +3825,54 @@ static int hci_init_sync(struct hci_dev *hdev)
> > return 0;
> > }
> >
> > +#define HCI_QUIRK_BROKEN(_quirk, _desc) { HCI_QUIRK_BROKEN_##_quirk, _desc }
> > +
> > +static const struct {
> > + unsigned long quirk;
> > + const char *desc;
> > +} hci_broken_table[] = {
> > + HCI_QUIRK_BROKEN(LOCAL_COMMANDS,
> > + "HCI Read Local Supported Commands not supported"),
> > + HCI_QUIRK_BROKEN(STORED_LINK_KEY,
> > + "HCI Delete Stored Link Key command is advertised, "
> > + "but not supported."),
> > + HCI_QUIRK_BROKEN(ERR_DATA_REPORTING,
> > + "HCI Read Default Erroneous Data Reporting command is "
> > + "advertised, but not supported."),
> > + HCI_QUIRK_BROKEN(READ_TRANSMIT_POWER,
> > + "HCI Read Transmit Power Level command is advertised, "
> > + "but not supported."),
> > + HCI_QUIRK_BROKEN(FILTER_CLEAR_ALL,
> > + "HCI Set Event Filter command not supported."),
> > + HCI_QUIRK_BROKEN(ENHANCED_SETUP_SYNC_CONN,
> > + "HCI Enhanced Setup Synchronous Connection command is "
> > + "advertised, but not supported.")
> > +};
> > +
> > +static int hci_dev_setup_sync(struct hci_dev *hdev)
> > +{
> > + size_t i;
> > +
> > + bt_dev_dbg(hdev, "");
> > +
> > + hci_sock_dev_event(hdev, HCI_DEV_SETUP);
> > +
> > + if (hdev->setup) {
> > + int ret;
> > +
> > + ret = hdev->setup(hdev);
> > + if (ret)
> > + return ret;
> > + }
> > +
> > + for (i = 0; i < ARRAY_SIZE(hci_broken_table); i++) {
> > + if (test_bit(hci_broken_table[i].quirk, &hdev->quirks))
> > + bt_dev_warn(hdev, "%s", hci_broken_table[i].desc);
> > + }
> > +
> > + return 0;
> > +}
> > +
> > int hci_dev_open_sync(struct hci_dev *hdev)
> > {
> > int ret = 0;
> > @@ -3887,10 +3935,7 @@ int hci_dev_open_sync(struct hci_dev *hdev)
> > test_bit(HCI_QUIRK_NON_PERSISTENT_SETUP, &hdev->quirks)) {
> > bool invalid_bdaddr;
> >
> > - hci_sock_dev_event(hdev, HCI_DEV_SETUP);
> > -
> > - if (hdev->setup)
> > - ret = hdev->setup(hdev);
> > + ret = hci_dev_setup_sync(hdev);
>
> just put the code here instead of creating another helper function.
Ive added another function since hci_dev_open_sync is quite big
already and it easier to find out where we call ->setup if it is a
separated function that does perform all the necessary checks and set
HCI_DEV_SETUP, I was actually considering moving the whole block under
the if statement so we avoid this weird goto setup_failed, but perhaps
you want any rewrite to be on its own patch to make it easier to
bisect?
> Regards
>
> Marcel
>
--
Luiz Augusto von Dentz
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v3 3/3] Bluetooth: btusb: Set HCI_QUIRK_BROKEN_ENHANCED_SETUP_SYNC_CONN for QCA
2022-04-01 17:30 ` Marcel Holtmann
@ 2022-04-01 21:05 ` Luiz Augusto von Dentz
0 siblings, 0 replies; 8+ messages in thread
From: Luiz Augusto von Dentz @ 2022-04-01 21:05 UTC (permalink / raw)
To: Marcel Holtmann; +Cc: linux-bluetooth
Hi Marcel,
On Fri, Apr 1, 2022 at 10:30 AM Marcel Holtmann <marcel@holtmann.org> wrote:
>
> Hi Luiz,
>
> > This sets HCI_QUIRK_BROKEN_ENHANCED_SETUP_SYNC_CONN for QCA controllers
> > since SCO appear to not work when using HCI_OP_ENHANCED_SETUP_SYNC_CONN.
> >
> > Link: https://bugzilla.kernel.org/show_bug.cgi?id=215576
> > Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
> > ---
> > drivers/bluetooth/btusb.c | 3 +++
> > 1 file changed, 3 insertions(+)
> >
> > diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
> > index 50df417207af..2470c3d4ef0f 100644
> > --- a/drivers/bluetooth/btusb.c
> > +++ b/drivers/bluetooth/btusb.c
> > @@ -3335,6 +3335,9 @@ static int btusb_setup_qca(struct hci_dev *hdev)
> > msleep(QCA_BT_RESET_WAIT_MS);
> > }
> >
> > + /* https://bugzilla.kernel.org/show_bug.cgi?id=215576 */
>
> I dislike having a link here. Just describe what is going on.
Fair enough I will include the description of the problem instead of
just having the link.
> > + set_bit(HCI_QUIRK_BROKEN_ENHANCED_SETUP_SYNC_CONN, &hdev->quirks);
> > +
> > return 0;
> > }
>
> Regards
>
> Marcel
>
--
Luiz Augusto von Dentz
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2022-04-01 21:05 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-30 18:25 [PATCH v3 1/3] Bluetooth: HCI: Add HCI_QUIRK_BROKEN_ENHANCED_SETUP_SYNC_CONN quirk Luiz Augusto von Dentz
2022-03-30 18:25 ` [PATCH v3 2/3] Bluetooth: Print broken quirks Luiz Augusto von Dentz
2022-04-01 17:29 ` Marcel Holtmann
2022-04-01 21:01 ` Luiz Augusto von Dentz
2022-03-30 18:25 ` [PATCH v3 3/3] Bluetooth: btusb: Set HCI_QUIRK_BROKEN_ENHANCED_SETUP_SYNC_CONN for QCA Luiz Augusto von Dentz
2022-04-01 17:30 ` Marcel Holtmann
2022-04-01 21:05 ` Luiz Augusto von Dentz
2022-03-30 19:10 ` [v3,1/3] Bluetooth: HCI: Add HCI_QUIRK_BROKEN_ENHANCED_SETUP_SYNC_CONN quirk bluez.test.bot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).