Bluetooth: SCO: Add support for 16 bits transparent voice setting

The voice setting is used by sco_connect() or sco_conn_defer_accept()
after being set by sco_sock_setsockopt().

The PCM part of the voice setting is used for offload mode through PCM
chipset port.
This commits add support for mSBC 16 bits offloading, i.e. audio data
not transported over HCI.

The BCM4349B1 supports 16 bits transparent data on its I2S port.
If BT_VOICE_TRANSPARENT is used when accepting a SCO connection, this
gives only garbage audio while using BT_VOICE_TRANSPARENT_16BIT gives
correct audio.
This has been tested with connection to iPhone 14 and Samsung S24.

Fixes: ad10b1a48754 ("Bluetooth: Add Bluetooth socket voice option")
Signed-off-by: Frédéric Danis <frederic.danis@collabora.com>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h
index e6760c11f007752ff05792f1de09b70bfb57213c..435250c72d568453f28c89f0b17f8faf51b4ba55 100644 (file)
--- a/include/net/bluetooth/bluetooth.h
+++ b/include/net/bluetooth/bluetooth.h
@@ -123,6 +123,7 @@ struct bt_voice {
 
 #define BT_VOICE_TRANSPARENT                   0x0003
 #define BT_VOICE_CVSD_16BIT                    0x0060
+#define BT_VOICE_TRANSPARENT_16BIT             0x0063
 
 #define BT_SNDMTU              12
 #define BT_RCVMTU              13

diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
index 40c4957cfc0b87709b3f5f1fc41f8b852cddc4f3..aa7bfe26cb40f2b489b871ad4db7e0353bc42ecb 100644 (file)
--- a/net/bluetooth/sco.c
+++ b/net/bluetooth/sco.c
@@ -319,10 +319,13 @@ static int sco_connect(struct sock *sk)
        else
                type = SCO_LINK;
 
-       if (sco_pi(sk)->setting == BT_VOICE_TRANSPARENT &&
-           (!lmp_transp_capable(hdev) || !lmp_esco_capable(hdev))) {
-               err = -EOPNOTSUPP;
-               goto unlock;
+       switch (sco_pi(sk)->setting & SCO_AIRMODE_MASK) {
+       case SCO_AIRMODE_TRANSP:
+               if (!lmp_transp_capable(hdev) || !lmp_esco_capable(hdev)) {
+                       err = -EOPNOTSUPP;
+                       goto unlock;
+               }
+               break;
        }
 
        hcon = hci_connect_sco(hdev, type, &sco_pi(sk)->dst,
@@ -920,13 +923,6 @@ static int sco_sock_setsockopt(struct socket *sock, int level, int optname,
                if (err)
                        break;
 
-               /* Explicitly check for these values */
-               if (voice.setting != BT_VOICE_TRANSPARENT &&
-                   voice.setting != BT_VOICE_CVSD_16BIT) {
-                       err = -EINVAL;
-                       break;
-               }
-
                sco_pi(sk)->setting = voice.setting;
                hdev = hci_get_route(&sco_pi(sk)->dst, &sco_pi(sk)->src,
                                     BDADDR_BREDR);
@@ -934,9 +930,14 @@ static int sco_sock_setsockopt(struct socket *sock, int level, int optname,
                        err = -EBADFD;
                        break;
                }
-               if (enhanced_sync_conn_capable(hdev) &&
-                   voice.setting == BT_VOICE_TRANSPARENT)
-                       sco_pi(sk)->codec.id = BT_CODEC_TRANSPARENT;
+
+               switch (sco_pi(sk)->setting & SCO_AIRMODE_MASK) {
+               case SCO_AIRMODE_TRANSP:
+                       if (enhanced_sync_conn_capable(hdev))
+                               sco_pi(sk)->codec.id = BT_CODEC_TRANSPARENT;
+                       break;
+               }
+
                hci_dev_put(hdev);
                break;