From patchwork Tue Oct 10 14:52:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Silviu Florian Barbulescu X-Patchwork-Id: 732161 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BA2D1CD8C9D for ; Tue, 10 Oct 2023 14:53:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233148AbjJJOxC (ORCPT ); Tue, 10 Oct 2023 10:53:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42964 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233240AbjJJOw4 (ORCPT ); Tue, 10 Oct 2023 10:52:56 -0400 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2084.outbound.protection.outlook.com [40.107.21.84]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7569BCC for ; Tue, 10 Oct 2023 07:52:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PpJfqqhgPaE2DZRoH8OhMd+/Q5KUY5+AEDn9mt9uPW/I5gbh2a+5AYZe6oVIWUnZkwZEPgFEz+NO1H7SFDcfwneT7kvVjB/t+ffUllKM5ze0vjk+gbmsp5abZ8jrgpQWPcGCkr/Oz9Ex6aol2uC+WZXWINVag8CUGSpLjDkBham7rqTjiGJWliza36FJUMJr+hDQMy2cJAQs0rmHVmEC+86ZOGVLvqXYqGpEB/ukjRMSdcWRKBSvsy52JGNLmPoK4zGC5rL1XCLvDGV+X7oVv0uY9Fa6ncgK/u49L1YgeeGZL2WV8XHdx6ts6thaArzBQOAaBCWEFCxIHjgJqCWPDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Pe8RH2KKM8pNSyxDUQftOk8izU4bvea8Fz6bk8NNC2g=; b=F5AI9sQGoTpLhZYhTJIkrIRkGmnE4WH+8Fn/xMUPHcycZ03kZNSdjR7cbEcd9ZN+ROZ831CFS8wVUS7zbHefIBySypDioEoVrotowFVgybBGOdLOUz3/AEoDhtf1T/rP1THXVtWWIZVzX1Yu7wFGQUUvae9nJGer3WR9lDqaJY/XcsxPke7bYCWsE1Vr50FpS1ff6VkrPJY85PhfulOKol/L1lhMIUBBCmbK+CLTV5dIN/z71vLYK58NA4y4cJt8fl9M9/EQ8L1AggQq9lCWKnfzztvygPDowF43qVly91vXwdt8r0J+NxK1Ra6n5TkWZOjQ1F/fwA0rhY14+An2Lg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Pe8RH2KKM8pNSyxDUQftOk8izU4bvea8Fz6bk8NNC2g=; b=HaWA6Jvqw6DfH/bOJNSfJqAbpDFzFG9rN/BFUv5krJ+B42NF1t/1uxvQk2tYNRkZF0olSyPljahL76h8hhVu3ofDhqPq6TclSCzVB9pvAXrotC/9NtEZZtBeQGnTMDPUZQbkxPxPUIKrY4TxxhcmBUAVuo3IwybRo7D2wSdXj5k= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from DBBPR04MB6331.eurprd04.prod.outlook.com (2603:10a6:10:ca::21) by DB9PR04MB9792.eurprd04.prod.outlook.com (2603:10a6:10:4c2::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.41; Tue, 10 Oct 2023 14:52:51 +0000 Received: from DBBPR04MB6331.eurprd04.prod.outlook.com ([fe80::c031:474b:cd00:5f95]) by DBBPR04MB6331.eurprd04.prod.outlook.com ([fe80::c031:474b:cd00:5f95%4]) with mapi id 15.20.6863.032; Tue, 10 Oct 2023 14:52:51 +0000 From: Silviu Florian Barbulescu To: linux-bluetooth@vger.kernel.org Cc: luiz.dentz@gmail.com, claudia.rosu@nxp.com, mihai-octavian.urzica@nxp.com, silviu.barbulescu@nxp.com, vlad.pruteanu@nxp.com, andrei.istodorescu@nxp.com, iulia.tanasescu@nxp.com Subject: [PATCH v3 1/2] transport: Update transport release flow for bcast src Date: Tue, 10 Oct 2023 17:52:41 +0300 Message-Id: <20231010145243.4441-2-silviu.barbulescu@nxp.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231010145243.4441-1-silviu.barbulescu@nxp.com> References: <20231010145243.4441-1-silviu.barbulescu@nxp.com> X-ClientProxiedBy: AM8P189CA0021.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:218::26) To DBBPR04MB6331.eurprd04.prod.outlook.com (2603:10a6:10:ca::21) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DBBPR04MB6331:EE_|DB9PR04MB9792:EE_ X-MS-Office365-Filtering-Correlation-Id: 1a0db67a-6a4e-4004-e1f2-08dbc9a0937e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +2BEzTK+beRznvIzpnAcPSFIYWWolokNzlTwTcsb5ob8MQgOlJY75vlPLa06JV72MLYgmueJoB3SQ9fT4CGlRAGwppNXQ4VgDdWmpW5zglqEwgiK3fIjqcCOgIkeDZRms+TEgZroYppcrhSv7r29OmHT2kdPxnobNiSqcJEzKow9IbvNiftGfvAmc7XkEQXQtzP26j4bRrAe3+l4qODJ/npEozLtiJJ8QtH5m077zvuUGC4Oucwb+GkeyodA9gd85YAcrQ9+jGonJzqZU7sgOtmcs0AScm8Hstbb+RjQ0ExlEKEnysdK9Q8AoLHp13UUe/2kWtcg107POPoJI+cqv4zBDtxbWSlSiD3pRdqANYwgToAo68AQPCF8PVAnjEMc1wcvtlo8fQjjJKTaPuRXx/V5tlyiIIeAko2HyrPUJN2bPsGS/vyom3a5Wx3HhkxRKcElAqUM8vSSm+nfEzkADpr4pwj9AJFSdwCTXVx5bTmtumt1gFfLckaD9Zf3u9NMJkkVmnDYkJ8rg7tUQw7ac6b/22v7haj9dbXD9KLOvz3CSC3Cowcpka1R6/suyFPu X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DBBPR04MB6331.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(39860400002)(346002)(376002)(136003)(366004)(396003)(230922051799003)(186009)(64100799003)(1800799009)(451199024)(478600001)(4326008)(8676002)(8936002)(6512007)(6506007)(6666004)(6486002)(6916009)(1076003)(316002)(2616005)(15650500001)(41300700001)(38100700002)(86362001)(26005)(2906002)(5660300002)(36756003)(83380400001)(66476007)(66946007)(66556008); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: VyNcMyPGwMzymyngEB0UTVmQIxdz3SmsgN2CLPMTMhmUyEfSWsZgGjhRAunigF50dI029QfNRSBlMxvT3bUK4gCes3ttqIXjljVCxRhdZPbsCEKTPwU51C79kaRHQmvQ2GaBz0umV2uuPEEhPtG84ExCePv8Xvrthv1P+RxIWmV0RdHFi6VhQu2KthT1NQqjhve6ay9/dnmLKSKR6NFiLz3PrYCZA8jJaiwGIz086GvSzPXgOHNGlBpl1D4Zn8Z2YjRMCrs56nfHJgqVSLa5JmE295ceoQIAyjkA4wTOVqkb47NYRXdRwE8dxt2xzzDzKUCrm9HD6rFaPhCwFUvNvBvpkuqpSYi65JC3c0Nl1VGDQroNLH9p80Vk7/dTHCYexYXZzE/HmFiWT79L2aifWyGnXp6zpb4pG4zDBhts/rJxg389eIk08/0fBQmdwoe8mMtNCaVS3o9aqBRs3XkPHfcbvDKQTzQDuNOqnTKu9kLahNOULdtmpU8AKcletFRxX7Djwl0Uvq1i6pvGWGnmoxfkwXPAxF58ib6w+iZtuhINJF339o2Xk74WgHR3e9evXhOSJxufItLwo2BLaXBLp88SEDPENmO7m/otKc/9cAsg05WA4xv6yRbWteLX/LQxPk1aW6vAmhYcF+hfhKJADdxQBgfnvIcaD6RN2HV81Et7Yxbi+IbWlBB8iYf/dcFLsAqkCsMR+dVW84cWQmmrFUSSUDF6YBW2/VBX83V9Kcjf6ytqdXsUgN0zVWwVo+vV5eFpSSHkj9VNq0StUbO1Cn+gYDB3N2lHCx6ZxrszdzKFIuATpTrLf3QQzvO5HWtFvQAajeyWPu7flI9hUf1m/mbITzJ6Z07i96FjP01efbxRGutbQOvIg+nHsB9gMREDnC9u5R8tsIP8GKyN2URnOC+W5hn1GYYiLyUnYx7g/Jl57SCxQdqAaNHY7bXWIMBLXJhfVfifD4Lg0SgtxPQvBe5+kCWejqWopF2qFbTKjKNc5D3wOk91Ih+xsYZT6SyJ44hhOjMWNzR30htkfvuOX0ZPgwYwrLnboj1VaPXSWL9kQywsIyqAYuX3hhGrfI9bKx7R/mt06kbmT1DFLEjCbShHsaEJviPsPPWL9H7mredX5nPO4KpYApScWHZslJg34TNi6htx/zqLS2jC+WxswODmHY/pcGiUix69GCz38lY1pKGZtiX4YFtW9llxnCZodnZGXocS7sPTSukqTcqf94gg2k3OZiYNFD5A9PMGHCwOp4uH9AsAA45A2KJk5v6h3WH1RLIe7L82eqd+Nwp6RViTKnONh4EuNM7SWSL7/7NZ7RBzCzWg75Zzwgw95I+R99QUMz94I2b7AbzbiTppcMnbYs4iebSQAwzcuLTlO3amRZWfd5FHbFWcCfHF+vTNL5hXEnqfeVAvpWhQ2DZV4azAosSNWIB6cIOz7bs0KoEA/QBLr7E3IBNKYYnFzVHaLaxgezAPu0VtIQ9YIq3fxX+fFDH3cCPIL0I/nvx6yhrpzLnYcs8q9foIXUBwDD6Q/TwJToTtZ7TadY0XdCJN8sFK9RnkkFIaMC8M+jBoSTN5TeRXYsrLnLB88Wa8CQ4dX5jqNj5lNdI0ZM/PXk7CBA== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1a0db67a-6a4e-4004-e1f2-08dbc9a0937e X-MS-Exchange-CrossTenant-AuthSource: DBBPR04MB6331.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Oct 2023 14:52:51.1081 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 0ADeGQRxjNsEn6fUZ0xC33CGQLsNU2Tmq6/e8/xZEP3heWab3vxm6D383Bg2KDwyCVe/u+0hfJ7tLi+abY9wHco9ZwyM54tPwQs+eJf0ju8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB9792 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org Update transport release flow for broadcast source --- profiles/audio/transport.c | 65 ++++++++++++++++++++++---------------- 1 file changed, 38 insertions(+), 27 deletions(-) diff --git a/profiles/audio/transport.c b/profiles/audio/transport.c index 1e03b7b51..23ea267f6 100644 --- a/profiles/audio/transport.c +++ b/profiles/audio/transport.c @@ -606,11 +606,38 @@ static DBusMessage *try_acquire(DBusConnection *conn, DBusMessage *msg, return NULL; } +static void bap_stop_complete(struct bt_bap_stream *stream, + uint8_t code, uint8_t reason, + void *user_data) +{ + struct media_owner *owner = user_data; + struct media_request *req = owner->pending; + struct media_transport *transport = owner->transport; + + /* Release always succeeds */ + if (req) { + req->id = 0; + media_request_reply(req, 0); + media_owner_remove(owner); + } + + transport_set_state(transport, TRANSPORT_STATE_IDLE); + media_transport_remove_owner(transport); +} + +static void bap_disable_complete(struct bt_bap_stream *stream, + uint8_t code, uint8_t reason, + void *user_data) +{ + bap_stop_complete(stream, code, reason, user_data); +} + static DBusMessage *release(DBusConnection *conn, DBusMessage *msg, void *data) { struct media_transport *transport = data; struct media_owner *owner = transport->owner; + struct bap_transport *bap = transport->data; const char *sender; struct media_request *req; guint id; @@ -642,6 +669,11 @@ static DBusMessage *release(DBusConnection *conn, DBusMessage *msg, req = media_request_create(msg, id); media_owner_add(owner, req); + if (bt_bap_stream_get_type(bap->stream) == + BT_BAP_STREAM_TYPE_BCAST) { + bap_disable_complete(bap->stream, 0x00, 0x00, owner); + } + return NULL; } @@ -1370,32 +1402,6 @@ static guint resume_bap(struct media_transport *transport, return id; } -static void bap_stop_complete(struct bt_bap_stream *stream, - uint8_t code, uint8_t reason, - void *user_data) -{ - struct media_owner *owner = user_data; - struct media_request *req = owner->pending; - struct media_transport *transport = owner->transport; - - /* Release always succeeds */ - if (req) { - req->id = 0; - media_request_reply(req, 0); - media_owner_remove(owner); - } - - transport_set_state(transport, TRANSPORT_STATE_IDLE); - media_transport_remove_owner(transport); -} - -static void bap_disable_complete(struct bt_bap_stream *stream, - uint8_t code, uint8_t reason, - void *user_data) -{ - bap_stop_complete(stream, code, reason, user_data); -} - static guint suspend_bap(struct media_transport *transport, struct media_owner *owner) { @@ -1499,9 +1505,14 @@ static void bap_state_changed(struct bt_bap_stream *stream, uint8_t old_state, return; break; case BT_BAP_STREAM_STATE_STREAMING: - if (bt_bap_stream_io_dir(stream) == BT_BAP_BCAST_SOURCE) + if ((bt_bap_stream_io_dir(stream) == BT_BAP_BCAST_SOURCE) || + (bt_bap_stream_io_dir(stream) == BT_BAP_BCAST_SINK)) bap_update_bcast_qos(transport); break; + case BT_BAP_STREAM_STATE_RELEASING: + if (bt_bap_stream_io_dir(stream) == BT_BAP_BCAST_SINK) + return; + break; } io = bt_bap_stream_get_io(stream); From patchwork Tue Oct 10 14:49:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Silviu Florian Barbulescu X-Patchwork-Id: 732162 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1FAECCD8C99 for ; Tue, 10 Oct 2023 14:49:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233004AbjJJOti (ORCPT ); Tue, 10 Oct 2023 10:49:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60680 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232969AbjJJOte (ORCPT ); Tue, 10 Oct 2023 10:49:34 -0400 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2044.outbound.protection.outlook.com [40.107.7.44]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9EC7699 for ; Tue, 10 Oct 2023 07:49:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=URthfT2OydaW9TiPDrDhG/3dpjprycDVm1H3sGVC9et9Rvb5BhjtjbWsEbDM6n+vbBiF/ZNc3FLclbdogqXs9m94QZQfald51pWJ2W6YRI8jhnJl+c2WurwNcGOj5WR8WtX80VWhQ0X0/vDYTUyErSxIH3odReTbIX7zuDxKDVLH06Yad4Ujue4JBS1iVL5XjpbZw8xmV3lXc/V5pkDaOcSr92NCFZ+w3iXi5DHmWnfX1uMA+wd979ZU4OHXdATEI5Cd58M7RFYQKjdPXhewXV4uDhB1R9yNBQwdGZrUXE8JpH09/h6ChkOwgDixRPsazBieIlHL0E96KASR8N8QnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=qQEKcbv4EmQpgK4zMsnFK42Il+sX6r/sky8pm3IZU8A=; b=JyiQ+dJB2PVlu1Q8rbQR/8f7FDlQW4r17o5DitB5ozv76/FLbDMWWpvX6L6gxx0sVT5J+qtofYK9I/5Q8TqhQDF0RW0zhQCPf9H+lQ6N2eBbmS4SBSeQl5NWlNv3EgByK07n3Nde26Vx5E1kvT9n5VantqSvXIpLnDjehInW8Zr2FkhI+C2YuY/adFVmlQcdJ/iWvK9+KLLUhk+RlRQy7+N6fMnWkUniOct8uT7W4gzlfmE6hGUKfB+ygz2RVijpCNnNJ6gCQBXj3r5uLr3qTUiW8SzBDpBuZgBr7r14dVyMnB5Bk8RZiiH2/doL9WYtKhOOCnu5ym/vvY6RLQ5FZA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=qQEKcbv4EmQpgK4zMsnFK42Il+sX6r/sky8pm3IZU8A=; b=Oalwvog8E6ADjPoKM30BnumpGNtTB1d4VR2K9F/Q4vHlX9gri+rBDWKPMQsyOrZ2Fk2HnV4Zwm27zy2MI+Q9T4tQLjsJvnCacS6dZkHwBd9phRpyl4xm6u3Dr5hAS/tZnwITRFwBb6hiv/HTWdzx3bZJA4FTeBJVPh4tiujyPS8= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from DBBPR04MB6331.eurprd04.prod.outlook.com (2603:10a6:10:ca::21) by PAXPR04MB9220.eurprd04.prod.outlook.com (2603:10a6:102:228::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.38; Tue, 10 Oct 2023 14:49:29 +0000 Received: from DBBPR04MB6331.eurprd04.prod.outlook.com ([fe80::c031:474b:cd00:5f95]) by DBBPR04MB6331.eurprd04.prod.outlook.com ([fe80::c031:474b:cd00:5f95%4]) with mapi id 15.20.6863.032; Tue, 10 Oct 2023 14:49:29 +0000 From: Silviu Florian Barbulescu To: linux-bluetooth@vger.kernel.org Cc: claudia.rosu@nxp.com, mihai-octavian.urzica@nxp.com, silviu.barbulescu@nxp.com, vlad.pruteanu@nxp.com, andrei.istodorescu@nxp.com, iulia.tanasescu@nxp.com Subject: [PATCH v3 2/2] bap:Update transport acquire/release flow for bcast src Date: Tue, 10 Oct 2023 17:49:17 +0300 Message-Id: <20231010144917.4400-3-silviu.barbulescu@nxp.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231010144917.4400-1-silviu.barbulescu@nxp.com> References: <20231010144917.4400-1-silviu.barbulescu@nxp.com> X-ClientProxiedBy: AM0PR02CA0029.eurprd02.prod.outlook.com (2603:10a6:208:3e::42) To DBBPR04MB6331.eurprd04.prod.outlook.com (2603:10a6:10:ca::21) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DBBPR04MB6331:EE_|PAXPR04MB9220:EE_ X-MS-Office365-Filtering-Correlation-Id: 2976391c-18d9-4ade-52b5-08dbc9a01b47 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Q9FBKuQDwnZ9deZze3wklI+rL5gH+OQVldNoc8OvB//MhELCD2X4bpIvCfEhBio9RJ6XpdC+UTtt2UeYLKBtGro4SbvV2xW4J8qHMhrZeWzSFBFNlvYvR9HKcbkweKweNj+YBpu3UYtDQ3XqhuAwED3o7rm5CC1ORMFCRv+PSCqJFFNA4X9IMDnpMtZDfCZJ6URf4GLjr+6vqCle8a2cyOtVmP3rdfydcwZPTJ2PTtEbThaazaY1CxOje92ZLnVxfoMXYPxQRwAc1q2S6xMdKnsoLkW/oscLwvdA77bc3k8woEjt9Xic8JF4UD6dGITGcESYwM0ei61FzeUy67S7WYkdHmZm5iuyAJhWEZQZUA3aiNPiQr/yodncGKpdELj+hZxcHM5F64EtPHHVgySZIe9SEs+nzc1XU+G8TuGXJDjPSDcUV3bufGyOuElRNEGurz/+SavmrxrnnbxU5MW1x4NKxTYDM35oK9koWydRvhmuaFe7FIDaWOexL2pZtEf041J1Aj6/cPm+6kpXh9xJpHiCqEz+z6psg8MBjJxp48bqWvwvw1L434+XvnzOMkZU X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DBBPR04MB6331.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(39860400002)(346002)(136003)(396003)(366004)(376002)(230922051799003)(64100799003)(186009)(1800799009)(451199024)(6512007)(1076003)(6506007)(2616005)(478600001)(6486002)(6666004)(83380400001)(26005)(15650500001)(2906002)(5660300002)(66556008)(66476007)(66946007)(6916009)(8676002)(8936002)(4326008)(316002)(41300700001)(36756003)(38100700002)(86362001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: WUpLKJ9W2QPqCd9OkBMeeC8X+UauCKCs+awjXaVOych5tw7PJ3B7TDedCiJeN7tbdRenR2UW0RLUn/wduFoGeoQiNjGDMltkTMvZFvwMmgBNr3nA0/HmVOPkam+uamUd1PalaDRugM8tdZa9UttVd2Mf0gbPj8OQ9n403oPxFACg23sUngR9UD16AuM0SuSje64vUxMgB3+o6rHlFgziJhwV4Oh+h+0zbmFsYmEqBksJJcqM0f3rlBHNEyLPrOasiJc5hAI+8un551gRBqXZZkkhlJj4BOcV0HvOXXPZNVKCVPBq5nqPpiTFOl4hBfgAW1VBi4uHoejPPyyBd+og7SCqeW51Y3AgNP7wI85308/ucnikz0fVgqWd6TJKwUB1yTKy4QUbpPHzLIOv/mXXp2X9INXi0yTOKXvKA1oOnFUQVu4BAgIYoCJkErKXYOSUu4rySqXSSAZEBrp/10ZhZpjoQ+FISeZNP0ZVLOfqfnWvzcjqqfJSe6WrTEhxgvwy43hW5U/932ZUUwY3vctCm55dL15xGIOvdCG/tZP6VT58FI49xyCPFN+EFKRcHPHEfwZha8EN7KjbraURNH40L+N9CFZRYV2F5578YPXhQVocc7OIOsdeZ3PeAVgmGLmylMyeO2BbC2TPWHK4PB6rdmLgOAE9Yih/vJ3shOnADt9xVravjHtXaQiFQdIc+c6Dz7vIoYFGfK8OOp+Cm1mkbIeomFqGBGv8SD4GexNNuOFaX0PPnBbfCtOt8saW2CFtzMDYGh1kEc/vzaN3uo0fWNLo4iDhUXzbSsta5acqlOtPEYYWJc/qdCY+8SaEuQIJGgD3PtE4KzHpchgBirAKDhpkhdzYJYZQ0/5CmhF1NzTIYze1SMqiPj1cZU2cqJZYAJOhLRQQtR/7cJ756+AUw/zOqt5sp58CRvl3PhrzPclm0b2ZuU2ckcCRfp4hwcRgT0HOHm4a6dfQQwsWmZKEN033oiNJaEGhgJZWW7qyTDvZdxJDBmblIdlf5y0EXkDc2F33Ifyrv420tNwT1gkzW9ynffsoR8oCC/yHFftUubKIU0OW+eF9T5MeYToay1gybt9XWr1YrA4XAv2bbq4DIO7Qib93lwz3m6aDnxUWDp0safY6iXua0oQge1bHXphsZVce/3tmYRZtz/dK1FXOeRSmHcD7lNLFZ63XePWWow3FGgdHz2Os3u+GD6kPPLgHQd9vWz52Q0wt15bYhs7zKxj9lUyaLAzOln5unWzbav82PzCxtC+WBjMj+0/q46axO0oPUAY/Z+9wyjXqZdF5OZB3JX6Twh9mROZNEw7ym7rGLoJabUhdca8Jh6YcNdhmn4cNdlBCoA2s9Ph8jAxi1MjynLyFb8Z3sW9elKarai48SS8R5zKLeHGiBimjj2i7Hbb/Lns+qXypyeWOub4PISdZ9/nWhFMYc5Eq1XEqnKX16Z7TV2i3AcDkORNawMtrSNGfScWgm7/pgoSf9MQ316ujZNM8DFejrL2XO4d9DacMRW+qhuWV1cz0MRoNdBRa1Qh74oqUL7iTPkfMQR3Kf/2nngQoMJbJct/wfERasn3D9KKPlKJXrRNwqrnOVOlOYcqyKcLUCA7qrEh6kAk2kw== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2976391c-18d9-4ade-52b5-08dbc9a01b47 X-MS-Exchange-CrossTenant-AuthSource: DBBPR04MB6331.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Oct 2023 14:49:29.3926 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 5exuOPswI4NaNiyNMme/BMJ4b1jZg4SJ4BCC8G4JeNWdlTN/Jtc31YqMQovZYJ6cJ3eKVEB+gv9n3TkJRwXQN++aJST1x8yxPq4VkDCSCLM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB9220 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org Update transport acquire/release flow for BAP bcast source --- profiles/audio/bap.c | 51 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 44 insertions(+), 7 deletions(-) diff --git a/profiles/audio/bap.c b/profiles/audio/bap.c index 48a1a4f86..f23e04f00 100644 --- a/profiles/audio/bap.c +++ b/profiles/audio/bap.c @@ -1312,6 +1312,32 @@ static struct bap_ep *bap_find_ep_by_stream(struct bap_data *data, return NULL; } +static void iso_connect_bcast_cb(GIOChannel *chan, GError *err, + gpointer user_data) +{ + struct bt_bap_stream *stream = user_data; + int fd; + + if (err) { + error("%s", err->message); + bt_bap_stream_set_io(stream, -1); + return; + } + + DBG("ISO connected"); + + fd = g_io_channel_unix_get_fd(chan); + + if (bt_bap_stream_set_io(stream, fd)) { + bt_bap_stream_start(stream, NULL, NULL); + g_io_channel_set_close_on_unref(chan, FALSE); + return; + } + + error("Unable to set IO"); + bt_bap_stream_set_io(stream, -1); +} + static void iso_connect_cb(GIOChannel *chan, GError *err, gpointer user_data) { struct bt_bap_stream *stream = user_data; @@ -1560,6 +1586,17 @@ static gboolean bap_io_disconnected(GIOChannel *io, GIOCondition cond, return FALSE; } +static void bap_connect_bcast_io_cb(GIOChannel *chan, GError *err, + gpointer user_data) +{ + struct bap_ep *ep = user_data; + + if (!ep->stream) + return; + + iso_connect_bcast_cb(chan, err, ep->stream); +} + static void bap_connect_io_cb(GIOChannel *chan, GError *err, gpointer user_data) { struct bap_ep *ep = user_data; @@ -1661,7 +1698,7 @@ static void bap_connect_io_broadcast(struct bap_data *data, struct bap_ep *ep, DBG("ep %p stream %p ", ep, stream); ba2str(btd_adapter_get_address(adapter), addr); - io = bt_io_connect(bap_connect_io_cb, ep, NULL, &err, + io = bt_io_connect(bap_connect_bcast_io_cb, ep, NULL, &err, BT_IO_OPT_SOURCE_BDADDR, btd_adapter_get_address(adapter), BT_IO_OPT_DEST_BDADDR, @@ -1887,18 +1924,16 @@ static void bap_state(struct bt_bap_stream *stream, uint8_t old_state, } break; case BT_BAP_STREAM_STATE_QOS: - bap_create_io(data, ep, stream, true); + if (bt_bap_stream_get_type(stream) == + BT_BAP_STREAM_TYPE_UCAST) { + bap_create_io(data, ep, stream, true); + } break; case BT_BAP_STREAM_STATE_ENABLING: if (ep) bap_create_io(data, ep, stream, false); break; case BT_BAP_STREAM_STATE_STREAMING: - if (bt_bap_stream_get_type(stream) == - BT_BAP_STREAM_TYPE_BCAST) { - if (ep) - bap_create_io(data, ep, stream, false); - } break; } } @@ -2116,6 +2151,8 @@ static void bap_connecting(struct bt_bap_stream *stream, bool state, int fd, ep->qos.bcast.big = qos.bcast.big; ep->qos.bcast.bis = qos.bcast.bis; + bt_bap_stream_config(ep->stream, &ep->qos, + ep->caps, NULL, NULL); } DBG("stream %p fd %d: BIG 0x%02x BIS 0x%02x", stream, fd,