Bluetooth: Support querying for WBS support through MGMT

This patch provides a mechanism for MGMT interface client to query the
capability of the controller to support WBS.

Signed-off-by: Alain Michaud <alainm@chromium.org>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index b34a71716fe1eecec7d9adab8d829b3a6b370116..48e78fdc8e83e07004ffe4dd41cea82e65be8c34 100644 (file)
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -3867,6 +3867,9 @@ static int btusb_probe(struct usb_interface *intf,
        if (id->driver_info & BTUSB_BROKEN_ISOC)
                data->isoc = NULL;
 
+       if (id->driver_info & BTUSB_WIDEBAND_SPEECH)
+               set_bit(HCI_QUIRK_WIDE_BAND_SPEECH_SUPPORTED, &hdev->quirks);
+
        if (id->driver_info & BTUSB_DIGIANSWER) {
                data->cmdreq_type = USB_TYPE_VENDOR;
                set_bit(HCI_QUIRK_RESET_ON_CLOSE, &hdev->quirks);

diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index 27b6363dd9c6f80695c38ab9c9d241df4095ce54..0b3ebd35681d6f77910de7958b67f8ac3d09a301 100644 (file)
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -205,6 +205,15 @@ enum {
         *
         */
        HCI_QUIRK_NON_PERSISTENT_SETUP,
+
+       /* When this quirk is set, wide band speech is supported by
+        * the driver since no reliable mechanism exist to report
+        * this from the hardware, a driver flag is use to convey
+        * this support
+        *
+        * This quirk must be set before hci_register_dev is called.
+        */
+       HCI_QUIRK_WIDE_BAND_SPEECH_SUPPORTED,
 };
 
 /* HCI device flags */

diff --git a/include/net/bluetooth/mgmt.h b/include/net/bluetooth/mgmt.h
index a90666af05bd0136ab6bcb88231da89321876ea5..f69f88e8e109d2733dab6529d51d975b086b21e7 100644 (file)
--- a/include/net/bluetooth/mgmt.h
+++ b/include/net/bluetooth/mgmt.h
@@ -101,7 +101,8 @@ struct mgmt_rp_read_index_list {
 #define MGMT_SETTING_PRIVACY           0x00002000
 #define MGMT_SETTING_CONFIGURATION     0x00004000
 #define MGMT_SETTING_STATIC_ADDRESS    0x00008000
-#define MGMT_SETTING_PHY_CONFIGURATION  0x00010000
+#define MGMT_SETTING_PHY_CONFIGURATION 0x00010000
+#define MGMT_SETTING_WIDE_BAND_SPEECH  0x00020000
 
 #define MGMT_OP_READ_INFO              0x0004
 #define MGMT_READ_INFO_SIZE            0

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 3074363c68df5547cbdf688a3b6c3d383764bb84..1002c657768a070b889a31dca82c813a709c564e 100644 (file)
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -762,6 +762,10 @@ static u32 get_supported_settings(struct hci_dev *hdev)
 
                if (lmp_sc_capable(hdev))
                        settings |= MGMT_SETTING_SECURE_CONN;
+
+               if (test_bit(HCI_QUIRK_WIDE_BAND_SPEECH_SUPPORTED,
+                            &hdev->quirks))
+                       settings |= MGMT_SETTING_WIDE_BAND_SPEECH;
        }
 
        if (lmp_le_capable(hdev)) {