Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp1661010pxj; Wed, 19 May 2021 10:52:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyRn/gvFun5ot+qy84jqL5S+ES2JXjLb0iqintmpsTlM3EdIbpWobyOXpN6CV9vwNwwSiRW X-Received: by 2002:a50:fb16:: with SMTP id d22mr283972edq.88.1621446765802; Wed, 19 May 2021 10:52:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621446765; cv=none; d=google.com; s=arc-20160816; b=GZBTBfJXBDDoCazACJmOFSbXqkM6CQ8HBvV27Tnlpozu+yVLF6NvdAMaeKPM4RoNnY cZyxUeEpd1klqTftBvRP2etwt5BNms1w0XAqwmaPIxxHb9xeQkhI39PAiluu39uKE0MM TrAkm3gm+CNxjGqI/8ZhqZW78HYwsIFff2Rp5RDZeYZznDnV1HSqLohSeU/P4I9LXE4q paVuTBTjgfyk6Apcm4G1C9GmU8fvvr8Vamk9jw7WkKD9JM71HZztv5I244sVTOV8F3DU egw+n+HCn3FIkWCMsxVpGEHPGde1LAF1y5f7I/tGUJkYXm85nUSCMk+DViE3Ln+FMN25 TVKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:ironport-sdr:ironport-sdr; bh=GkOsO4nL1UD1wJ3FLmi77jHrjOhQvOv9aaP9WHb/dyM=; b=srejtGzbPjf4Zs0gQM1SqGTdXhtfKbvIU6/TKHj916o8nqO70Y5v8gYsEYO+xjcckm EGlztMoNj3wdVVjhRQ//iq5XZGKKEOMn2v0a0mXAjW1Lw+zsAHrnYkzb3Fec6jvYXyB7 G8oUhFY80t6M9qldkkDHuaJR650pL7rwO9q9MiMCeoABqD+PFT06FY2IIQ0SI8cnDpCG TLPFB2k/BYWs+OWA/zuAmyD0VzSN1mT/v8sod9C2IkfawvROhtVBKZ+uua/ah2LBSLup DP/hPb8zg1hDclNIMxrpW+XufRwrTVPtL4yzByD+surR1958zxglVuVOQsOuQNWnSCx7 MbzA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a4si290600ejc.644.2021.05.19.10.52.22; Wed, 19 May 2021 10:52:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241237AbhERKkW (ORCPT + 99 others); Tue, 18 May 2021 06:40:22 -0400 Received: from mga02.intel.com ([134.134.136.20]:23245 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348570AbhERKkR (ORCPT ); Tue, 18 May 2021 06:40:17 -0400 IronPort-SDR: rVk3adEx858blpj7Af5zMYqYTtai2UN2fSJpMPUmEX+LjKDiSQFsb85xN88DZ1wAZuau6s4b9P l+/QTZDwpMpw== X-IronPort-AV: E=McAfee;i="6200,9189,9987"; a="187804826" X-IronPort-AV: E=Sophos;i="5.82,309,1613462400"; d="scan'208";a="187804826" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 May 2021 03:38:58 -0700 IronPort-SDR: ttiaaHMj6T+53x3Tj5raqSLVaFTdB09CH8dqs2CsUnpoSDPMSQdS3H+eqn4Y6B37U01gRHvicv Jv26mlVXfhSw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,309,1613462400"; d="scan'208";a="433017872" Received: from intel-lenovo-legion-y540-15irh-pg0.iind.intel.com ([10.224.186.95]) by orsmga007.jf.intel.com with ESMTP; 18 May 2021 03:38:56 -0700 From: Kiran K To: linux-bluetooth@vger.kernel.org Cc: ravishankar.srivatsa@intel.com, chethan.tumkur.narayan@intel.com, Kiran K Subject: [PATCH v8 7/9] Bluetooth: Add BT_CODEC option for setsockopt over SCO Date: Tue, 18 May 2021 16:12:30 +0530 Message-Id: <20210518104232.5431-7-kiran.k@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210518104232.5431-1-kiran.k@intel.com> References: <20210518104232.5431-1-kiran.k@intel.com> Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org Add BT_CODEC option on setsockopt system call to allow user space audio modules to set codec. Driver also configures codec if non-HCI data is selected. Signed-off-by: Kiran K Reviewed-by: Chethan T N Reviewed-by: Srivatsa Ravishankar --- include/net/bluetooth/bluetooth.h | 2 + net/bluetooth/sco.c | 63 +++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h index 1840756958ce..0e8802d09068 100644 --- a/include/net/bluetooth/bluetooth.h +++ b/include/net/bluetooth/bluetooth.h @@ -173,6 +173,8 @@ struct bt_codecs { struct bt_codec codecs[]; } __packed; +#define CODING_FORMAT_CVSD 0x02 + __printf(1, 2) void bt_info(const char *fmt, ...); __printf(1, 2) diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c index d66293d1cba4..d59f30fc4b9f 100644 --- a/net/bluetooth/sco.c +++ b/net/bluetooth/sco.c @@ -67,6 +67,7 @@ struct sco_pinfo { __u32 flags; __u16 setting; __u8 cmsg_mask; + struct bt_codec codec; struct sco_conn *conn; }; @@ -438,6 +439,7 @@ static void __sco_sock_close(struct sock *sk) sock_set_flag(sk, SOCK_ZAPPED); break; } + } /* Must be called on unlocked socket. */ @@ -499,6 +501,10 @@ static struct sock *sco_sock_alloc(struct net *net, struct socket *sock, sk->sk_state = BT_OPEN; sco_pi(sk)->setting = BT_VOICE_CVSD_16BIT; + sco_pi(sk)->codec.id = CODING_FORMAT_CVSD; + sco_pi(sk)->codec.cid = 0xffff; + sco_pi(sk)->codec.vid = 0xffff; + sco_pi(sk)->codec.data_path = 0x00; timer_setup(&sk->sk_timer, sco_sock_timeout, 0); @@ -808,6 +814,9 @@ static int sco_sock_setsockopt(struct socket *sock, int level, int optname, struct sock *sk = sock->sk; int len, err = 0; struct bt_voice voice; + struct bt_codecs *codecs; + struct hci_dev *hdev; + __u8 buffer[255]; u32 opt; BT_DBG("sk %p", sk); @@ -870,6 +879,60 @@ static int sco_sock_setsockopt(struct socket *sock, int level, int optname, sco_pi(sk)->cmsg_mask &= SCO_CMSG_PKT_STATUS; break; + case BT_CODEC: + if (sk->sk_state != BT_OPEN && sk->sk_state != BT_BOUND && + sk->sk_state != BT_CONNECT2) { + err = -EINVAL; + break; + } + + hdev = hci_get_route(&sco_pi(sk)->dst, &sco_pi(sk)->src, BDADDR_BREDR); + if (!hdev) { + err = -EBADFD; + break; + } + + if (!test_bit(HCI_QUIRK_HFP_OFFLOAD_CODECS_SUPPORTED, &hdev->quirks)) { + err = -EOPNOTSUPP; + break; + } + + if (optlen < sizeof(struct bt_codecs) || optlen > 255) { + err = -EINVAL; + break; + } + + if (copy_from_sockptr(buffer, optval, optlen)) { + err = -EFAULT; + break; + } + + codecs = (void *)buffer; + + if (codecs->num_codecs > 1) { + err = -EINVAL; + break; + } + + if (codecs->codecs[0].data_path) { + if (!hdev->configure_data_path) { + err = -EOPNOTSUPP; + break; + } + err = hdev->configure_data_path(hdev, SCO_LINK, + codecs->codecs); + if (err < 0) + break; + + if (codecs->codecs[0].id == 0xff) { + sco_pi(sk)->codec.cid = codecs->codecs[0].cid; + sco_pi(sk)->codec.vid = codecs->codecs[0].vid; + } + } + sco_pi(sk)->codec.id = codecs->codecs[0].id; + sco_pi(sk)->codec.data_path = codecs->codecs[0].data_path; + break; + default: err = -ENOPROTOOPT; break; -- 2.17.1