From patchwork Wed Oct 4 07:56:45 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: 731127 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 393B6E8FDD9 for ; Wed, 4 Oct 2023 07:57:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232694AbjJDH5I (ORCPT ); Wed, 4 Oct 2023 03:57:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37278 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241605AbjJDH5G (ORCPT ); Wed, 4 Oct 2023 03:57:06 -0400 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2071.outbound.protection.outlook.com [40.107.7.71]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5F51E10C for ; Wed, 4 Oct 2023 00:57:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TQOPZDG1fyK+uM9z74s0oGoH6yQpIaHJpHx/Lu6/gGY0dt4ScOWpoRN0NG0av/ePxQHS2EC19W4TlF5DbxhOozmh62+EdLVqVQRnzApipkn7ryc0DCcqbgE30IIIYaOB5ByZoCidxjGI5ugpLIjIoStvAKWNkuOhNofo5M6JmsfqUuv052ZNSVvsV+gFDta/8Dx+61alSlU8uIiwzVe+kEggx3DQnCUweNz/ScB4vPKzPlor2v+KJNziFIucFgDhbtVklPhWq978O2NP9WWVWjsXMui/i/uGQsymWNVCHhdu6qf+SURJmm4WMB0L9YnLIQlDxb6TmMVqBT0cHWJM8g== 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=DMlEELLegfSG03djlugf83MFZMCZWJRA4Bc/cctpaZsTvWJLpF7lvx9Zzebk15v72ANVEE494MJKtOc/JpH9plMCPws7GYX1o6qvh4MnEmoWq97KU9k7m5j65NlmalQW9ODR61h8q/8CzHvHOpIlspZQurdd0sbUVFXQC4eBRiARNG9rXwY9Zurxi1X90ilq27Zj/EwC6u8uoCkNFlhJI5rTcs8WLq8sIvbX3SM2JZL5/bzvOTlgbSZk8fi54wWUhXh/hlUiYGJjNy7exDH2YC/EEWZvSCpilo11O8mvMIrsO6Z+6YiuvD3NJQTLS5TVfcwDFZz3VSqF4ve1HFHVDQ== 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=PgYUG2xej9V6h3s/a6zTEeONstmgSVWnwbwbVYkoOKqshuc+H1NrpDNYEePQ+iV1kBnmcn/Ozv7zl1rz9Y3vdfPph1oACT6pc8G7ZKNpIGurEm3Us7qBZV3i5Z5nj+nwqvbSH2FD/q6JUSr/O4LWARUOd12EtMREzgOkThsMpyE= 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 AS5PR04MB10017.eurprd04.prod.outlook.com (2603:10a6:20b:67c::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.26; Wed, 4 Oct 2023 07:56:57 +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.6838.028; Wed, 4 Oct 2023 07:56:57 +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 1/2] transport: Update transport release flow for bcast src Date: Wed, 4 Oct 2023 10:56:45 +0300 Message-Id: <20231004075646.4277-2-silviu.barbulescu@nxp.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231004075646.4277-1-silviu.barbulescu@nxp.com> References: <20231004075646.4277-1-silviu.barbulescu@nxp.com> X-ClientProxiedBy: VI1P191CA0001.EURP191.PROD.OUTLOOK.COM (2603:10a6:800:1ba::11) To DBBPR04MB6331.eurprd04.prod.outlook.com (2603:10a6:10:ca::21) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DBBPR04MB6331:EE_|AS5PR04MB10017:EE_ X-MS-Office365-Filtering-Correlation-Id: c3e77c42-c144-4a44-15ea-08dbc4af7b65 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0z3hqUWka7xDR2uRdJp2FLRLgKJ+Ef5ekSwjYcXhP6t4lXAKmOne5sYNQBvlYxfRd5KQs2naIqoZl+buGaEVjMzAbJGFNcajiWL7syXCNVLx9Zg7xw5XDR4tNg/iP/bpZjBZf+P1WO/5qQDRHA/3/3/crqWv3TDET43lVBhw+d/2TxrZ4akqbMQRstlJK5R7eEewuEOwAXUBNajZcYw/Es+Ey8gmkjNCCntQLaypb1zwx/QPtx06ZU7LMGSBa6bEBlMGnRwXY69VcdnjoFY/C7fp1KB3KF9npRm5f/0xfPiXy0edJ4VQ2mmDxr+4gPS4yL68kDkEcdTXICwhcX7XJJXCHJRd42w1r5hNiWb408YH9t6MaGwDH4OFm4+eSu2TsIUlA53emqbXTpG1UzmccC5yU6zZ1AtnO2leZmJZnhM4Q1UNZI5GNpXY4QRItugDjgMn2ye1DMk3cPmjqUMR2QYwSYi1hrm7Kw8vujM0p0WlQaswsNDyzvOM0p2R+ZOWAAgIwY5Ig03JSxGhSL2QAbcyHYx5j1nP2xnTLyiDsRXbvqUYbEJWJImB5lXsEKRt 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)(136003)(39860400002)(346002)(396003)(376002)(366004)(230922051799003)(186009)(1800799009)(451199024)(64100799003)(83380400001)(6486002)(6666004)(478600001)(1076003)(15650500001)(2616005)(26005)(6506007)(6512007)(2906002)(5660300002)(6916009)(66556008)(4326008)(8676002)(86362001)(36756003)(66476007)(8936002)(41300700001)(66946007)(38100700002)(316002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ubXm3Alh9I9xXEGykRphqYdsXLIqEwWBH127Z0A3IrXlUG9eAsl7D7/4EpvZXOmHOeJWO+iJufST8bfj9MI64uZwDOi+8dERktR9i5s/rlLbeNq7mYeFouoCxRRI/F9sYS9rZIZw7zcfE68bPKwR+/c5m6qoSv8XDfyMmS2dtXRyKyb4yCEv73gS5akNgsmfeWD1UHsOFFuwqAbCHWLDNQ9Ph+tKPQ/TICi82yGrP5Zdi3BOhAtWMQPJxaLpNNn8RvQQrE8U19YVpowx1ecFWU0T+C2OVmiVFuIGreY9xftc4qJt5x1lCI8PrAOY3e3IPpEdky9shMy9njaRNI92nPyKfM+rgc3yLXYRJdSYrSZVd7IIIFyrhKijpyCOyi8LtfNKP+n/6QfqajfPlwwEsceb+ckbkUElGN1pN7V13Bv591WTjwLuyc7oeSfvFoKf08X8oGu5MOR6Yj9xHdQ3sb5EpUOLSHDY53GliLH7JNF8DTIdhUbZBZdfiSM+5C4r9ckwRnLKN7sV6xhffWHoQtJ9+GAyNVIeDOMmz5LockcttQ7lOt0E521VDzJ3tdSvMA5RmWqlv+3gNhmaMdNwFgh/MDg+OpskuQxtBMNffcY/U85lZWszr1qItnzOQmbljjOjxrLpgpO4E+cTh98yiAq1otaiQNiofYRuSlE6rTceI9JCZ4rOb850EtFKZXmwmZZVPxcGoBv4PpGB1KgN8qsWdQ0bTouDCj/xmqTwPsBSbYSJglFNuZ1ldksrFi0jJhbOratzCu0RkcAblyvqewx8LR36/978aNRdtT5AbJbSNanZ/JX5rgzxkfPM2S+Mc6HliNSXN1UeHyIy/7vMfojbE7iW7QjZ8Bm//8O/v6XCBuq8wcd/2Qx5KebA3Y+ZWzNTRx7KnrX+kZ2X5fW7a6ucKkMv5aWhPrFvMkVAhlxq7Zfim3YE6YzJX67EUJHDcy4cULwhAPikTafbev7ZP6jAvfoqYu8al290h9hBKfAt5/yLJ6JTOid5NV/YJi4eNzHs+u6S+L5ECkIvIg2wnGSRGhyKhkRgYQiNeWF7xRz1dYU2nQymlTjiLAs4fZWsqNUyAaq8Xc4M39e29dxfjno6IK48WGFwcJvhreVUwgidpWkbgMkzaWxQNnAuQeMaT7llrFDU3qgOjKoMjw0ancRxkxxHvGDXPc9JqFAUW6Hd5taPBjIzZSRERIM1veW1DAbju+50H64i5EaXv6QmVALGJf4VEjum3eieykP2Z5OzNriX2iSf2MZYEhR7kxeUcTHnTb+t0NsjXUlkXLE6r4/jKYRRaT+XsPqA77xvrt+WViNyYz0uO0Ito3XUHuiWAh5TCLM0By1ux+NGCSx42oNlRKuPH1yiblQ3zm5ihdkSBELyuchtnXROiGVqLVwWKkn7/ApGL8ohZUXqiV+fd7MPhkhVYzx2FJlLtOYpCJ0Nm05avfNvDDOB/SpbOZRqcyMniKiIKn7G5ad1JqctZeULivYD83ip5JKUGYmbRYK7iCd1IzBTnTtZv4/oq2aPMbnL5+wDDPV7lOS0sBFobVx7ymjgBBkyrrjOZj2HOR8zo4jEmgUR4L1a6x8/4O59t8J4l6cdD0VO/UayBOeQOg== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: c3e77c42-c144-4a44-15ea-08dbc4af7b65 X-MS-Exchange-CrossTenant-AuthSource: DBBPR04MB6331.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Oct 2023 07:56:57.3597 (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: 9uvvSteRdTqP21I5OhnVZWWXS7SyNvxvZo4ZEP+OV6DoIF9CaG7yZl+WmwVffZZHiv2jl5N51Z7Q8NeWGkoc5+IoAAZI2LU9l8YdBCYAudA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS5PR04MB10017 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 Wed Oct 4 07:56:46 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: 729367 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 8170FE8FDD9 for ; Wed, 4 Oct 2023 07:57:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241601AbjJDH5N (ORCPT ); Wed, 4 Oct 2023 03:57:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44818 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232790AbjJDH5L (ORCPT ); Wed, 4 Oct 2023 03:57:11 -0400 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2071.outbound.protection.outlook.com [40.107.7.71]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3B7B6E4 for ; Wed, 4 Oct 2023 00:57:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=i2PmiFm9MHWtG1xxe4ttFESF7Uf5iZFZ4BaM82UfafUtNp8J7oCf9YdqhShuTq1kDiuUbixIxxDw1GXA3j4wRww5rv525hw4xwZHPAwXZeawmnmiBEszxRbkSfGGdyvR3Lww7xtqCfBrqlBPsHFwRxVY/MLocWxbafpOKBRMyZ08f4r2LFDFhTfjlIcX87YRL0bleL5egYRhvUjuZJ1rAkGKVgbHaNBQYDN/iXsY0NxYvCRq8hE3FWGOKW+1l5GgcVs9Bg93FZ+ompE6YN2trukNu0ZJvalqVI/IvPixAEqX4B3ABKwNdVMjVcPyh2DE0w8WNEzZ48zBb1p7xwEPDw== 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=bjoWua641qedCEWGtFlZsLmxjDput7kF/KbAc55jiTt+BRz6V36GGZUB/c1N3BJolbI48qPkDBRaCHh0qQ0C7Z3L9v8Sj20H/oG9rFd1WygG43F4wAEhjKNnAcmVdx+b7MRt0+xdbp5cg99Ju7SKu2+GOgFQ84KrD+XhM4L0mx+NQCCqbjS8m8oMN7NwZ66qO/UMpUrW7ErpLtJ0uK11AR+0ga7PNbJzqqlveNOeF9hL26ueudUU3ZBgrUaASAk0LNl8HZ6Eec5b9XOJFzs9HwcKhfASC04VH0O5QH/lZBmP91qGacRiHYHXNE8+byv4hQXFK4UJRK0pW29pohLcLA== 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=qDmkQt/EOaWc0dJFry0B98d/hcm3DM0i4FMIf7exBHsd8b276OQ7a8rilPB/AavhhHpG1KtosQ2HPsa273hbVkJGEk5uul4TJW+uRmkGtSoaKRg/ClRid5sYsejndrVjSglyWr73B0EAMsfWOCnDr4Xc1SbuKz1EW69HTpdX9+c= 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 AS5PR04MB10017.eurprd04.prod.outlook.com (2603:10a6:20b:67c::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.26; Wed, 4 Oct 2023 07:57:01 +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.6838.028; Wed, 4 Oct 2023 07:57:01 +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: Wed, 4 Oct 2023 10:56:46 +0300 Message-Id: <20231004075646.4277-3-silviu.barbulescu@nxp.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231004075646.4277-1-silviu.barbulescu@nxp.com> References: <20231004075646.4277-1-silviu.barbulescu@nxp.com> X-ClientProxiedBy: VI1P191CA0003.EURP191.PROD.OUTLOOK.COM (2603:10a6:800:1ba::7) To DBBPR04MB6331.eurprd04.prod.outlook.com (2603:10a6:10:ca::21) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DBBPR04MB6331:EE_|AS5PR04MB10017:EE_ X-MS-Office365-Filtering-Correlation-Id: 128dd344-c52c-43b0-53ee-08dbc4af7db4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VZPdv1kvnKiMHb6tXGJSe3SnnVAKUoebXs+CULe/eSce7ZOvtNfESLDxBM1PWktzDQwAipLKsE6GHzk84BA71rPVslwuUnGgpUDz24U8YIRHNPp5M6KJb/0DvxAbSwqFa8MGyCqcFFlDhnMewYll64BRqsEHRDr4Uf2QdJOelbiN6Vfg/Ev/QuSOE/MDKpsVTRb66JINtbBpWuceJkW+LwdRUlSB0lNLQK1pfWPdN7JliBUU1ZAvuDGiGm7eubaHhoWs3YDLNo9HKwOhLxjSFTMS3vtyDLaJP1UtIf1pxlOl7GkwXTw8f71O/2krVLjwPFG0RE2q4TPdI2qitEcro36PAED3cC85nY7sGQq9Dina2ypplTWwxUsk3ZOtx80g/yLokXqHz7rJu1Fjcj9/BMYSQ+crAHAi0mb5rf9mDHRmx9QioQnl64oRIFSVi+hcN7WsWq8cmJIujFQnVvduum5dfuS9fKa2dixMIrL3PuQCyLPdxcMxvs32G0e3uq+4+qGw8iTKuLXmaLYCNQ8zw96hyqRcQSXPVGZ8oLIYKP/lDtlXsmeVV/5mrmrGowVX 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)(136003)(39860400002)(346002)(396003)(376002)(366004)(230922051799003)(186009)(1800799009)(451199024)(64100799003)(83380400001)(6486002)(6666004)(478600001)(1076003)(15650500001)(2616005)(26005)(6506007)(6512007)(2906002)(5660300002)(6916009)(66556008)(4326008)(8676002)(86362001)(36756003)(66476007)(8936002)(41300700001)(66946007)(38100700002)(316002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: B7j5al9ie2b8/H5hUaU5RMWkRh+5MUbxGg26ZE0J1r2JTdyxtll+kOPUrVX0fBtT6MuG0P77if0/OT/K273f9XHrGqKzc4AarzvLnkbr1KJdZ9htTb+9Yq3YzvlJvLpqs7KZYJJUY9I7MVy9sk87a6SGP05SFOPXRiYgPk5B5DnBPHLrqL93VhuPrRHvq+bfZrJagZ4DCGVGKeA0E3x0wqH0Vv1KdbB24koZIY7/EfK4ajtKgyITawlaIQbPsxzkS3tVtB42F++eEGIpvwfT1bkVRPqEboqo50uNRmg87INdvjq9IiuPMb7tZhod+K2a07SQqI/tSitPVKy2XajS1mwT74vHZElFpV7vBi9CnsdzM8OLqB1GGJsBDwO4tZj7GD1x72E9QrqxV6xDKMICElznLXU9oOjSE224s5jeb9sagUhWN0hxN8gpe1Skyjaq1B69gxpEcMIK0ZUaUuIOey02WPeZf5Gds63vlfU7kJ3AtgLywnuDJ22xly/Z118Srmeq0R8kprzqH6J3ny9WRt2VxZH4agLov4+GZQRF2lIh/ddCntGSTxokb7vq/AyvNrc1G7eRFJ56gNjDT3fJz/FNcIDW8uwgAB5iT1pggyc5zqLdzvMT2OpIUWPBjeVlw6ksgogL5bcCuupjYJVj8+IB1NKKTftkB+w4rkkJGYCqcU6xii9RAade+hQmI8EwAnCmwoaJ1lLea9aqYtPBkDGMG+Y1jnl9AwbZ1uJABOBm3tocLiO1hdVT1nr7jsyZvSrX7S3CgCeoxDbOcQ0o8NQpEtmfy9o1MHuNjrKKbq9/OTszBdaERCImqWsh3OnKGywF+0kZzH1RIFSAnBjgERgnSrcuCbdewZfpvKb9/SaUK50ZDsJ0imWmdNHvjKAJRMyVKujChZmFvchh3QBWpt2Pd5zxMuEOOAoczse8Qvs8V+enNwitItYop1Xtni97KdfIZJH+dhpRWL9Jchwjmo7tHigkz7hIjqGCjBsOCqDEQLgHEDMJDzQ/7PyVTBcebA02RmT9cS9ZO+mSprKvU2yvHQfJD/cKS1v5F/C8npnyTQa1H8AiPm2Ezp0koQMT6pcSKZcsv6NBmC8H5VAfZ35WycNkJTsjMHopb1u389/9qvFPg0jNWqqdMLJOZg4xet7EF7CWSKvxGz/5dBDYuLnQqB1AY4kLYyJiaQ0OgBCa3vFpqE4W5vcQ8weKLNxC9qib0rSYFF0eCz8W990MVhgzWk+dkJCo6U0FVD4l0eSnUQHdyNvh8HvfYXEMuIxCNe/ZBXRCspF60xOpZCun1WM4zI9OR2HYz7M6oESruKAUosUmrGniAoB8WeR00l7hpm8HyuS+Wg9dPrPXHLPevNx1Z/m4jJbcz93A7R/olKan1/YBiZYVx7MSNIlXIq3mMXMd6H8k2UZFjFo428LvbEdaenKfLfUOoo3++eka1P3IQoCBwEG/8yNlVtm5sx7BpcQW7h5mMjRgSrqD6M6HXg5oLVpeou40v3Gj9V776Gap+CblXPAOVZZJi98Fehp9jJwhUpZjWW8JQPziWob/RhVlI/Gtsukdhgs87/LXUsrKyd+OuW5B/yCCrdYP30smRY2kirCgElhAj6K3JerEDg== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 128dd344-c52c-43b0-53ee-08dbc4af7db4 X-MS-Exchange-CrossTenant-AuthSource: DBBPR04MB6331.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Oct 2023 07:57:01.1570 (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: 3JyB6f8eR70Xv7wCEhUne/oa5/5Bxt2JkjKAowZYrBEJtvUqr3iHlSRRTC3z8lQhHlBXsVGn51YC5vLdg6DzoHxRBzJ0xEi1Y/BhnYAaTJ0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS5PR04MB10017 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,