lkml.org 
[lkml]   [2022]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.17 147/772] Bluetooth: HCI: Add HCI_QUIRK_BROKEN_ENHANCED_SETUP_SYNC_CONN quirk
    Date
    From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

    [ Upstream commit 05abad857277dda198063017b00ba5b9fed2c0cb ]

    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>
    Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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 69ef31cea582..62a9bb022aed 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 131514913430..49a88b2f4678 100644
    --- a/include/net/bluetooth/hci_core.h
    +++ b/include/net/bluetooth/hci_core.h
    @@ -1483,8 +1483,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


    \
     
     \ /
      Last update: 2022-06-07 22:39    [W:4.023 / U:0.504 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site