Bluetooth: Set the link for SCO connection

This patch sets the link policy for SCO/eSCO connection.

Signed-off-by: Sudha Bheemanna <b.sudha@samsung.com>
[add link policy setting in sco connection]
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
Signed-off-by: Amit Purwar <amit.purwar@samsung.com>
Signed-off-by: Wootak Jung <wootak.jung@samsung.com>
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Change-Id: I285b1f15404fe612f6e3a54881207dbcb373554d

diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index 1fdf4b905365eacbbbb423d84c3ab56dc18a3719..66e6a1285e6264c3717384fc6454ec70d80da222 100644 (file)
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -50,6 +50,16 @@ struct conn_handle_t {
        __u16 handle;
 };
 
+#ifdef TIZEN_BT
+static const struct sco_param esco_param_cvsd[] = {
+       { (EDR_ESCO_MASK & ~ESCO_2EV3) | SCO_ESCO_MASK | ESCO_EV3,
+                                     0x000a,   0x01 }, /* S3 */
+       { EDR_ESCO_MASK & ~ESCO_2EV3, 0x0007,   0x01 }, /* S2 */
+       { EDR_ESCO_MASK | ESCO_EV3,   0x0007,   0x01 }, /* S1 */
+       { EDR_ESCO_MASK | ESCO_HV3,   0xffff,   0x01 }, /* D1 */
+       { EDR_ESCO_MASK | ESCO_HV1,   0xffff,   0x01 }, /* D0 */
+};
+#else
 static const struct sco_param esco_param_cvsd[] = {
        { EDR_ESCO_MASK & ~ESCO_2EV3, 0x000a,   0x01 }, /* S3 */
        { EDR_ESCO_MASK & ~ESCO_2EV3, 0x0007,   0x01 }, /* S2 */
@@ -57,16 +67,25 @@ static const struct sco_param esco_param_cvsd[] = {
        { EDR_ESCO_MASK | ESCO_HV3,   0xffff,   0x01 }, /* D1 */
        { EDR_ESCO_MASK | ESCO_HV1,   0xffff,   0x01 }, /* D0 */
 };
+#endif
 
 static const struct sco_param sco_param_cvsd[] = {
        { EDR_ESCO_MASK | ESCO_HV3,   0xffff,   0xff }, /* D1 */
        { EDR_ESCO_MASK | ESCO_HV1,   0xffff,   0xff }, /* D0 */
 };
 
+#ifdef TIZEN_BT
+static const struct sco_param esco_param_msbc[] = {
+       { (EDR_ESCO_MASK & ~ESCO_2EV3) | ESCO_EV3,
+                                     0x000d,   0x02 }, /* T2 */
+       { EDR_ESCO_MASK & ~ESCO_2EV3, 0x000d,   0x02 }, /* T2 */
+};
+#else
 static const struct sco_param esco_param_msbc[] = {
        { EDR_ESCO_MASK & ~ESCO_2EV3, 0x000d,   0x02 }, /* T2 */
        { EDR_ESCO_MASK | ESCO_EV3,   0x0008,   0x02 }, /* T1 */
 };
+#endif
 
 /* This function requires the caller holds hdev->lock */
 static void hci_connect_le_scan_cleanup(struct hci_conn *conn, u8 status)

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 4eebc736d2c2f18c7cba4efbfbe2af35c3db253d..ea450a123585c83c73cc084730935b4e22990e84 100644 (file)
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -217,6 +217,10 @@ static u8 hci_cc_write_link_policy(struct hci_dev *hdev, void *data,
        struct hci_rp_write_link_policy *rp = data;
        struct hci_conn *conn;
        void *sent;
+#ifdef TIZEN_BT
+       struct hci_cp_write_link_policy cp;
+       struct hci_conn *sco_conn;
+#endif
 
        bt_dev_dbg(hdev, "status 0x%2.2x", rp->status);
 
@@ -233,6 +237,17 @@ static u8 hci_cc_write_link_policy(struct hci_dev *hdev, void *data,
        if (conn)
                conn->link_policy = get_unaligned_le16(sent + 2);
 
+#ifdef TIZEN_BT
+       sco_conn = hci_conn_hash_lookup_sco(hdev);
+       if (sco_conn && bacmp(&sco_conn->dst, &conn->dst) == 0 &&
+           conn->link_policy & HCI_LP_SNIFF) {
+               BT_ERR("SNIFF is not allowed during sco connection");
+               cp.handle = __cpu_to_le16(conn->handle);
+               cp.policy = __cpu_to_le16(conn->link_policy & ~HCI_LP_SNIFF);
+               hci_send_cmd(hdev, HCI_OP_WRITE_LINK_POLICY, sizeof(cp), &cp);
+       }
+#endif
+
        hci_dev_unlock(hdev);
 
        return rp->status;
@@ -3444,6 +3459,20 @@ static void hci_conn_request_evt(struct hci_dev *hdev, void *data,
        if (ie)
                memcpy(ie->data.dev_class, ev->dev_class, 3);
 
+#ifdef TIZEN_BT
+               if ((ev->link_type == SCO_LINK || ev->link_type == ESCO_LINK) &&
+                   hci_conn_hash_lookup_sco(hdev)) {
+                       struct hci_cp_reject_conn_req cp;
+
+                       bacpy(&cp.bdaddr, &ev->bdaddr);
+                       cp.reason = HCI_ERROR_REJ_LIMITED_RESOURCES;
+                       hci_send_cmd(hdev, HCI_OP_REJECT_CONN_REQ,
+                                    sizeof(cp), &cp);
+                       hci_dev_unlock(hdev);
+                       return;
+               }
+#endif
+
        conn = hci_conn_hash_lookup_ba(hdev, ev->link_type,
                        &ev->bdaddr);
        if (!conn) {

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 9333af047f7f3872d6c24a78019dad33b6816002..74142dd44fd2580873bde151e1a63473792ab6a5 100644 (file)
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -34,6 +34,7 @@
 #include <net/bluetooth/mgmt.h>
 #ifdef TIZEN_BT
 #include <net/bluetooth/mgmt_tizen.h>
+#include <net/bluetooth/sco.h>
 #endif
 
 #include "hci_request.h"
@@ -8830,6 +8831,61 @@ static int le_set_scan_params(struct sock *sk, struct hci_dev *hdev,
        return err;
 }
 
+static int set_voice_setting(struct sock *sk, struct hci_dev *hdev,
+               void *data, u16 len)
+{
+       struct mgmt_cp_set_voice_setting *cp = data;
+       struct hci_conn *conn;
+       struct hci_conn *sco_conn;
+
+       int err;
+
+       BT_DBG("%s", hdev->name);
+
+       if (!lmp_bredr_capable(hdev)) {
+               return mgmt_cmd_status(sk, hdev->id, MGMT_OP_SET_VOICE_SETTING,
+                               MGMT_STATUS_NOT_SUPPORTED);
+       }
+
+       hci_dev_lock(hdev);
+
+       conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &cp->bdaddr);
+       if (!conn) {
+               err = mgmt_cmd_complete(sk, hdev->id,
+                               MGMT_OP_SET_VOICE_SETTING, 0, NULL, 0);
+               goto unlock;
+       }
+
+       conn->voice_setting = cp->voice_setting;
+       conn->sco_role = cp->sco_role;
+
+       sco_conn = hci_conn_hash_lookup_sco(hdev);
+       if (sco_conn && bacmp(&sco_conn->dst, &cp->bdaddr) != 0) {
+               BT_ERR("There is other SCO connection.");
+               goto done;
+       }
+
+       if (conn->sco_role == MGMT_SCO_ROLE_HANDSFREE) {
+               if (conn->voice_setting == 0x0063)
+                       sco_connect_set_wbc(hdev);
+               else
+                       sco_connect_set_nbc(hdev);
+       } else {
+               if (conn->voice_setting == 0x0063)
+                       sco_connect_set_gw_wbc(hdev);
+               else
+                       sco_connect_set_gw_nbc(hdev);
+       }
+
+done:
+       err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_SET_VOICE_SETTING, 0,
+                       cp, sizeof(cp));
+
+unlock:
+       hci_dev_unlock(hdev);
+       return err;
+}
+
 void mgmt_hardware_error(struct hci_dev *hdev, u8 err_code)
 {
        struct mgmt_ev_hardware_error ev;
@@ -11192,6 +11248,7 @@ static const struct hci_mgmt_handler tizen_mgmt_handlers[] = {
        { le_conn_update,          MGMT_LE_CONN_UPDATE_SIZE },
        { set_manufacturer_data,   MGMT_SET_MANUFACTURER_DATA_SIZE },
        { le_set_scan_params,      MGMT_LE_SET_SCAN_PARAMS_SIZE },
+       { set_voice_setting,       MGMT_SET_VOICE_SETTING_SIZE },
 };
 #endif
 

diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
index c736186aba26beadccd76c66f0af72835d740551..6524cc962476092932b317a4e8541c49184894e0 100644 (file)
--- a/net/bluetooth/sco.c
+++ b/net/bluetooth/sco.c
@@ -33,6 +33,11 @@
 #include <net/bluetooth/hci_core.h>
 #include <net/bluetooth/sco.h>
 
+#ifdef TIZEN_BT
+#include <net/bluetooth/mgmt.h>
+#include <net/bluetooth/mgmt_tizen.h>
+#endif
+
 static bool disable_esco;
 
 static const struct proto_ops sco_sock_ops;
@@ -869,8 +874,15 @@ static int sco_sock_setsockopt(struct socket *sock, int level, int optname,
                }
 
                /* Explicitly check for these values */
+#ifdef TIZEN_BT
+               /* Codec defer accept */
+               if (voice.setting != (BT_VOICE_TRANSPARENT |
+                   BT_VOICE_CVSD_16BIT) &&
+                   voice.setting != BT_VOICE_CVSD_16BIT) {
+#else
                if (voice.setting != BT_VOICE_TRANSPARENT &&
                    voice.setting != BT_VOICE_CVSD_16BIT) {
+#endif
                        err = -EINVAL;
                        break;
                }
@@ -1252,6 +1264,10 @@ static int sco_sock_release(struct socket *sock)
                release_sock(sk);
        }
 
+#ifdef TIZEN_BT
+       /* SCO kernel panic fix */
+       bt_sock_unlink(&sco_sk_list, sk);
+#endif
        sock_orphan(sk);
        sco_sock_kill(sk);
        return err;
@@ -1278,7 +1294,12 @@ static void sco_conn_ready(struct sco_conn *conn)
                        return;
                }
 
+#ifdef TIZEN_BT
+               /* Multiple SCO accept feature */
+               parent = sco_get_sock_listen(&conn->hcon->dst);
+#else
                parent = sco_get_sock_listen(&conn->hcon->src);
+#endif
                if (!parent) {
                        sco_conn_unlock(conn);
                        return;
@@ -1316,6 +1337,131 @@ static void sco_conn_ready(struct sco_conn *conn)
        }
 }
 
+#ifdef TIZEN_BT
+/* WBC/NBC feature */
+void sco_connect_set_gw_nbc(struct hci_dev *hdev)
+{
+       struct hci_cp_write_voice_setting cp1;
+       struct hci_cp_bcm_wbs_req cp2;
+       struct hci_cp_i2c_pcm_req cp3;
+       struct hci_cp_sco_pcm_req cp4;
+
+       BT_DBG("Setting the NBC params, hdev = %p", hdev);
+
+       cp1.voice_setting = cpu_to_le16(0x0060);
+       hci_send_cmd(hdev, HCI_OP_WRITE_VOICE_SETTING, sizeof(cp1), &cp1);
+       hdev->voice_setting = cpu_to_le16(0x0060);
+
+       cp2.role = 0x00;  /* WbDisable */
+       cp2.pkt_type = cpu_to_le16(0x0002);
+       hci_send_cmd(hdev, HCI_BCM_ENABLE_WBS_REQ, sizeof(cp2), &cp2);
+
+       cp3.i2c_enable = 0x01;
+       cp3.is_master = 0x00;
+       cp3.pcm_rate = 0x00;
+       cp3.clock_rate = 0x01;
+       hci_send_cmd(hdev, HCI_BCM_I2C_PCM_REQ, sizeof(cp3), &cp3);
+
+       cp4.sco_routing = 0x00;
+       cp4.pcm_rate = 0x01;
+       cp4.frame_type = 0x00;
+       cp4.sync_mode = 0x00;
+       cp4.clock_mode = 0x00;
+       hci_send_cmd(hdev, HCI_BCM_SCO_PCM_REQ, sizeof(cp4), &cp4);
+}
+
+void sco_connect_set_gw_wbc(struct hci_dev *hdev)
+{
+       struct hci_cp_write_voice_setting cp1;
+       struct hci_cp_bcm_wbs_req cp2;
+       struct hci_cp_i2c_pcm_req cp3;
+       struct hci_cp_sco_pcm_req cp4;
+
+       BT_DBG("Setting the WBC params, hdev = %p", hdev);
+       cp1.voice_setting = cpu_to_le16(0x0003 | 0x0060);
+       hci_send_cmd(hdev, HCI_OP_WRITE_VOICE_SETTING, sizeof(cp1), &cp1);
+       hdev->voice_setting = cpu_to_le16(0x0003 | 0x0060);
+
+       cp2.role = 0x01; /* Enable */
+       cp2.pkt_type = cpu_to_le16(0x0002);
+       hci_send_cmd(hdev, HCI_BCM_ENABLE_WBS_REQ, sizeof(cp2), &cp2);
+
+       cp3.i2c_enable = 0x00;
+       cp3.is_master = 0x00;
+       cp3.pcm_rate = 0x01;
+       cp3.clock_rate = 0x02;
+       hci_send_cmd(hdev, HCI_BCM_I2C_PCM_REQ, sizeof(cp3), &cp3);
+
+       cp4.sco_routing = 0x00;
+       cp4.pcm_rate = 0x00;
+       cp4.frame_type = 0x00;
+       cp4.sync_mode = 0x00;
+       cp4.clock_mode = 0x00;
+       hci_send_cmd(hdev, HCI_BCM_SCO_PCM_REQ, sizeof(cp4), &cp4);
+}
+
+void sco_connect_set_nbc(struct hci_dev *hdev)
+{
+       struct hci_cp_write_voice_setting cp1;
+       struct hci_cp_bcm_wbs_req cp2;
+       struct hci_cp_i2c_pcm_req cp3;
+       struct hci_cp_sco_pcm_req cp4;
+
+       BT_DBG("Setting the NBC params, hdev = %p", hdev);
+
+       cp1.voice_setting = cpu_to_le16(0x0060);
+       hci_send_cmd(hdev, HCI_OP_WRITE_VOICE_SETTING, sizeof(cp1), &cp1);
+       hdev->voice_setting = cpu_to_le16(0x0060);
+
+       cp2.role = 0x00; /* WbDisable */
+       cp2.pkt_type = cpu_to_le16(0x0002);
+       hci_send_cmd(hdev, HCI_BCM_ENABLE_WBS_REQ, sizeof(cp2), &cp2);
+
+       cp3.i2c_enable = 0x00;
+       cp3.is_master = 0x00;
+       cp3.pcm_rate = 0x00;
+       cp3.clock_rate = 0x04;
+       hci_send_cmd(hdev, HCI_BCM_I2C_PCM_REQ, sizeof(cp3), &cp3);
+
+       cp4.sco_routing = 0x00;
+       cp4.pcm_rate = 0x04;
+       cp4.frame_type = 0x00;
+       cp4.sync_mode = 0x00;
+       cp4.clock_mode = 0x00;
+       hci_send_cmd(hdev, HCI_BCM_SCO_PCM_REQ, sizeof(cp4), &cp4);
+}
+
+void sco_connect_set_wbc(struct hci_dev *hdev)
+{
+       struct hci_cp_write_voice_setting cp1;
+       struct hci_cp_bcm_wbs_req cp2;
+       struct hci_cp_i2c_pcm_req cp3;
+       struct hci_cp_sco_pcm_req cp4;
+
+       BT_DBG("Setting the WBC params, hdev = %p", hdev);
+       cp1.voice_setting = cpu_to_le16(0x0003 | 0x0060);
+       hci_send_cmd(hdev, HCI_OP_WRITE_VOICE_SETTING, sizeof(cp1), &cp1);
+       hdev->voice_setting = cpu_to_le16(0x0003 | 0x0060);
+
+       cp2.role = 0x01; /* Enable */
+       cp2.pkt_type = cpu_to_le16(0x0002);
+       hci_send_cmd(hdev, HCI_BCM_ENABLE_WBS_REQ, sizeof(cp2), &cp2);
+
+       cp3.i2c_enable = 0x00;
+       cp3.is_master = 0x00;
+       cp3.pcm_rate = 0x01;
+       cp3.clock_rate = 0x04;
+       hci_send_cmd(hdev, HCI_BCM_I2C_PCM_REQ, sizeof(cp3), &cp3);
+
+       cp4.sco_routing = 0x00;
+       cp4.pcm_rate = 0x04;
+       cp4.frame_type = 0x00;
+       cp4.sync_mode = 0x00;
+       cp4.clock_mode = 0x00;
+       hci_send_cmd(hdev, HCI_BCM_SCO_PCM_REQ, sizeof(cp4), &cp4);
+}
+#endif
+
 /* ----- SCO interface with lower layer (HCI) ----- */
 int sco_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr, __u8 *flags)
 {
@@ -1330,8 +1476,14 @@ int sco_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr, __u8 *flags)
                if (sk->sk_state != BT_LISTEN)
                        continue;
 
+#ifdef TIZEN_BT
+               /* Multiple SCO accept feature */
+               if (!bacmp(&sco_pi(sk)->src, bdaddr) ||
+                   !bacmp(&sco_pi(sk)->src, BDADDR_ANY)) {
+#else
                if (!bacmp(&sco_pi(sk)->src, &hdev->bdaddr) ||
                    !bacmp(&sco_pi(sk)->src, BDADDR_ANY)) {
+#endif
                        lm |= HCI_LM_ACCEPT;
 
                        if (test_bit(BT_SK_DEFER_SETUP, &bt_sk(sk)->flags))
@@ -1341,6 +1493,36 @@ int sco_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr, __u8 *flags)
        }
        read_unlock(&sco_sk_list.lock);
 
+#ifdef TIZEN_BT
+       /* WBC/NBC feature */
+       if ((lm & HCI_LM_ACCEPT) && !hci_conn_hash_lookup_sco(hdev)) {
+               struct hci_conn *hcon_acl;
+
+               hcon_acl = hci_conn_hash_lookup_ba(hdev, ACL_LINK, bdaddr);
+               if (!hcon_acl) {
+                       BT_ERR("ACL doesn't alive. Use 0x%X",
+                              hdev->voice_setting);
+
+                       if (hdev->voice_setting == 0x0063)
+                               sco_connect_set_wbc(hdev);
+                       else
+                               sco_connect_set_nbc(hdev);
+               } else if (hcon_acl->sco_role == MGMT_SCO_ROLE_HANDSFREE) {
+                       BT_DBG("Handsfree SCO 0x%X", hcon_acl->voice_setting);
+                       if (hcon_acl->voice_setting == 0x0063)
+                               sco_connect_set_wbc(hdev);
+                       else
+                               sco_connect_set_nbc(hdev);
+               } else {
+                       BT_DBG("Gateway SCO 0x%X", hcon_acl->voice_setting);
+                       if (hcon_acl->voice_setting == 0x0063)
+                               sco_connect_set_gw_wbc(hdev);
+                       else
+                               sco_connect_set_gw_nbc(hdev);
+               }
+       }
+#endif
+
        return lm;
 }