From patchwork Mon Nov 15 06:49:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "K, Kiran" X-Patchwork-Id: 12618765 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2DA7FC433EF for ; Mon, 15 Nov 2021 06:44:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1648360F5B for ; Mon, 15 Nov 2021 06:44:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231137AbhKOGrV (ORCPT ); Mon, 15 Nov 2021 01:47:21 -0500 Received: from mga02.intel.com ([134.134.136.20]:7199 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229791AbhKOGrB (ORCPT ); Mon, 15 Nov 2021 01:47:01 -0500 X-IronPort-AV: E=McAfee;i="6200,9189,10168"; a="220598261" X-IronPort-AV: E=Sophos;i="5.87,235,1631602800"; d="scan'208";a="220598261" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Nov 2021 22:44:05 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.87,235,1631602800"; d="scan'208";a="453726014" Received: from intel-lenovo-legion-y540-15irh-pg0.iind.intel.com ([10.224.186.95]) by orsmga003.jf.intel.com with ESMTP; 14 Nov 2021 22:44:03 -0800 From: Kiran K To: linux-bluetooth@vger.kernel.org Cc: ravishankar.srivatsa@intel.com, chethan.tumkur.narayan@intel.com, luiz.von.dentz@intel.com, Kiran K Subject: [PATCH v3 13/13] Bluetooth: Implment MSFT avdtp close command Date: Mon, 15 Nov 2021 12:19:14 +0530 Message-Id: <20211115064914.2345-13-kiran.k@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211115064914.2345-1-kiran.k@intel.com> References: <20211115064914.2345-1-kiran.k@intel.com> Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org In a2dp offload use case, to tear down streaming, controller needs to sent MSFT avdtp close command. Allow BlueZ daemon to send MSFT avdtp close command via setsockopt. Signed-off-by: Kiran K Reviewed-by: Chethan T N Reviewed-by: Srivatsa Ravishankar --- include/net/bluetooth/bluetooth.h | 1 + include/net/bluetooth/hci.h | 6 ++++++ net/bluetooth/hci_codec.c | 15 +++++++++++++++ net/bluetooth/hci_codec.h | 1 + net/bluetooth/hci_event.c | 1 + net/bluetooth/l2cap_sock.c | 18 ++++++++++++++++++ 6 files changed, 42 insertions(+) diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h index 149b9958f304..a40ba8239189 100644 --- a/include/net/bluetooth/bluetooth.h +++ b/include/net/bluetooth/bluetooth.h @@ -180,6 +180,7 @@ struct bt_codecs { #define BT_MSFT_OPEN 20 #define BT_MSFT_START 21 #define BT_MSFT_SUSPEND 22 +#define BT_MSFT_CLOSE 23 __printf(1, 2) void bt_info(const char *fmt, ...); diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h index 70b9796a8493..35951ba5d8d3 100644 --- a/include/net/bluetooth/hci.h +++ b/include/net/bluetooth/hci.h @@ -2045,6 +2045,12 @@ struct msft_cp_avdtp_suspend { __le16 avdtp_handle; } __packed; +#define HCI_MSFT_AVDTP_CLOSE 0x0B +struct msft_cp_avdtp_close { + u8 sub_opcode; + __le16 avdtp_handle; +} __packed; + /* ---- HCI Events ---- */ #define HCI_EV_INQUIRY_COMPLETE 0x01 diff --git a/net/bluetooth/hci_codec.c b/net/bluetooth/hci_codec.c index b50dc20ca034..8a00cf6b7d2f 100644 --- a/net/bluetooth/hci_codec.c +++ b/net/bluetooth/hci_codec.c @@ -426,3 +426,18 @@ int hci_configure_msft_avdtp_suspend(struct hci_dev *hdev, struct sock *sk) return hci_send_cmd(hdev, HCI_MSFT_AVDTP_CMD, sizeof(cmd), &cmd); } + +int hci_configure_msft_avdtp_close(struct hci_dev *hdev, struct sock *sk) +{ + struct msft_cp_avdtp_close cmd; + + if (!bt_sk(sk)->avdtp_handle) + return -EBADFD; + + cmd.sub_opcode = HCI_MSFT_AVDTP_CLOSE; + cmd.avdtp_handle = cpu_to_le16(bt_sk(sk)->avdtp_handle); + + bt_sk(sk)->avdtp_handle = 0; + + return hci_send_cmd(hdev, HCI_MSFT_AVDTP_CMD, sizeof(cmd), &cmd); +} diff --git a/net/bluetooth/hci_codec.h b/net/bluetooth/hci_codec.h index d6dcd1a83059..933cd1df68f9 100644 --- a/net/bluetooth/hci_codec.h +++ b/net/bluetooth/hci_codec.h @@ -13,3 +13,4 @@ int hci_configure_msft_avdtp_open(struct hci_dev *hdev, struct l2cap_chan *chan, sockptr_t optval, int optlen, struct sock *sk); int hci_configure_msft_avdtp_start(struct hci_dev *hdev, struct sock *sk); int hci_configure_msft_avdtp_suspend(struct hci_dev *hdev, struct sock *sk); +int hci_configure_msft_avdtp_close(struct hci_dev *hdev, struct sock *sk); diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index ac35b0f6a203..0b267a97eb23 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -1494,6 +1494,7 @@ static void hci_cc_msft_avdtp_cmd(struct hci_dev *hdev, struct sk_buff *skb) case HCI_MSFT_AVDTP_START: case HCI_MSFT_AVDTP_SUSPEND: + case HCI_MSFT_AVDTP_CLOSE: break; default: diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c index bd8061604880..1ef76f34907c 100644 --- a/net/bluetooth/l2cap_sock.c +++ b/net/bluetooth/l2cap_sock.c @@ -1198,6 +1198,24 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, hci_dev_put(hdev); break; + case BT_MSFT_CLOSE: + hdev = hci_get_route(BDADDR_ANY, &chan->src, BDADDR_BREDR); + if (!hdev) { + err = -EBADFD; + break; + } + + if (!hci_dev_test_flag(hdev, HCI_OFFLOAD_CODECS_ENABLED) || + !hdev->get_data_path_id) { + err = -EOPNOTSUPP; + hci_dev_put(hdev); + break; + } + + err = hci_configure_msft_avdtp_close(hdev, sk); + hci_dev_put(hdev); + break; + default: err = -ENOPROTOOPT; break;