From patchwork Tue Oct 10 14:49:16 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: 731501 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 ACEF0CD8C9B for ; Tue, 10 Oct 2023 14:49:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232834AbjJJOtd (ORCPT ); Tue, 10 Oct 2023 10:49:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60636 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232401AbjJJOtb (ORCPT ); Tue, 10 Oct 2023 10:49:31 -0400 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2043.outbound.protection.outlook.com [40.107.7.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6584A99 for ; Tue, 10 Oct 2023 07:49:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ctaAHbMwgs0LYQUUoG3o9ZGxOFldQKEoECzLoRiDYP1QriUUMCc35Vhuj1jFXfFYDIaE4NOjDZeFDD1BJaZCsSxyDELzkftZtPas4VjcUbIi/FmSV18Wm/empH+9Iz21010ociCHFu5cLZvLea4fX6KYnsGTQsznbVjJ2omwc4799CBOx7UjbsSHXsNeT7LmU7yYSJ/lzPFcRPjJS266bMiiLl6ZFjZPulAmFDqBjVhzBuRJwFPu+lWpPTV48BbsWTBLHNepHFOAxfTBiEa5qXqF3qxFKtKflH0bimKveD//bMopYRa4v1vQnxrqPRRDJBUNmBQgJqoS7KudS5X+AQ== 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=IVf4QIoFDeqUPxvH/Kr9F2bdv+w+zsmSmfow8iJdG53cnnqVFR4nET5Z9GQMJHjc9NbLN0bfnzAtt2uTKQIhtsNn806VBDHlWaumRxpcU7rJqPgBXm2jihc5BuH3ZtUmeUnfUWXOyfxKzVAw4WgqH/s+lqlGNiu0JB+Uo8YQUpip8snONhpynw6CyLCHvpn68/znSHDaD/TSMy9YxoDBUYyCteQppy86JGONHp0PHUIqTDffPFMPLZLKOjkNpySuJllVD841J2w/l8DnLk1xbnWeEvu4+s2Sn7UEQUpuOP6BV/0VSdFLRxLq1CilWWrvGnAGw4HeCngZcyxyJ4l86Q== 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=ftzd0PZJZd3VtbIjiVP9D7GnyaPZ4y8viet+MJ1OkIDfjU/kqy2H+okJY+y3S1bUAyKYuwU7vB/TwUxtNt2zxHWknIM10tW3ZhVpTP6dSdOoZmpNieoywUX34YCt0XQtlUgk8+BmkSXC+fuBaAKpXz7TFpuR3B77BZL4lHFj5Sc= 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:26 +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:26 +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: Tue, 10 Oct 2023 17:49:16 +0300 Message-Id: <20231010144917.4400-2-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: AM0PR02CA0003.eurprd02.prod.outlook.com (2603:10a6:208:3e::16) 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: 2dc024cb-5d6c-4ea5-d596-08dbc9a0193a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gk7wH7u2V8i8/kKTqxa55xuAFU3IhL3j2p7sBTcLm/sr7S/p/DVPvEI7nx9Hc6rzcLD4ttHqWvCE8LpGHfb5SdARMjg6LYZyELmP4z6ezVUzHvqrsI4QLmDwHVF4cnBZIkqqEyabXjkIhom7O7AIVx7FRHubEBuS9o6JRStZ/UP9BzsqN1UONipPP4VeY1X6RWnZftGDzoc4jv9IQogvM7hzwORo1ecPysxsecsrCfpuojauBW0DVYlLS6KQCYhx6J7/H0cv6CGS9A/+NfMmDUd6O2tILeE7dadvtYJGiMMOfU6fz6uIosRUlNWSHy8GhBCSyuRJSD3W8+XYfhXgD/8QW3wOx+AAHiU+zAcFgvYFUUjjkrNmFUURwC5aUXM0hAAGVkqBhiYhiWPkaN5YtvkwrLluVcXjjqcYKjed3/VvoqJZP1+uIU0GbMv73+57BiPuLZj4BFx3YU1y7/w/QgyEeRxj8S9QHmzb/EON+MKqUgFZvOc9FgPxz5qlp+RCO29VQCUMAnSHih+xrzC+obQ7+53zdyak+MJ+56XuOzvjxw2I/XmbQ/UYpisK2wk0 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: APLSy/cpazNwisUxbSb5nXeJ8AA7QrN7LjZlw2bZGXofBbxyJ9mroyrF+ZQmzFAPa883lLU7Q5zHxPyFRfCT0EWZvVHCTx6ArIgBDNv3cc382BYn422B23oVjgvYYADGxiRHBGPHNFIQRTWGIEXQkAo21Tp6eSSC/N5oTRGVlaOg65nCbLaShTeX6ftYZ7Jc/am7mbQ5T/hF2snfCgKL1K8K5XANn2QNJrrNFkTB2JdHSp89ye93RJ4M0AkhirX7VHlJqHWb4mAhHoMLXRwV4h5kNZasf1tUFHqqkapPPAQgl3LtnHMdpdivQo68u9mQvYvB8PwuYxM2hMgXwBvvl5UzfzJTZgi2Za0WnUEh//xA2Pal31GTWzJvkw23bm9qSBhac/265xCbfzbYtC7L4noGNoVi2zSN/4FVI+ehbaOrGQ7RVlPgaLAVktCRAzJCDiI+WFAowl347X3/jTg/X/Ol+2qMAwa0RJIKBMSsGdlnh1kYnPU0P4n6WHfvHtZdua7yVR5ucRYweomALPAt+08VSHM6vnQvjW6a9XuQ7Vly7hd3nZGUKiqwZkseyg8CNrwOwrLdgoeMIzusYYZpn3elU6WOU6/obN5AN9irmRYTDzs2tMKCcKxViDhHDAumzzpe/DRZbrFJ5zXy9uOegjKyhwc58eFaUSYGXpnA9U5xrntWXIhPcopaXCCMbgeoai7/ziSeAnWrZ8Mb1tJl8PQ+j+8l88cSuTzn788HG34aysePluumlqzK9v06sqIDjfCrof8AKxYoxxhonTwavLDTLmnKAlm/umWo8PPIAoaewHkLrHdYd3bVt3AWF1l3pizuUrkkFUB4i0qT05QchtH8OsbOxDTxbeqVGgRFLLj0iWUT2akl8hCg3ah6eg8e4RbYDc3b0gJHvnqpepMBRPd5HJADLXYQtitAo3xtEpluJK+vYGAhvWe6UNc4XMUVfeVvEx1+P/MOurn8hTUMhXun8xJ1O5leOKr7HgxydQtKucchFsUYj2UpsH0dTd4nTnR8qeRK+45/WGut6svQ+1QYDNZRSzlXcGfNHoh17DDM9cbrzyKikkTqqHuO8Uj4Ur8xcFj6lqz6+hbWtoufmWwQyUSSnKieSc/MwBUOhTsX1Jl+tj+cG4+qAPaLvW9EQWX1bsTGS4YqsYCgOvcmmj3pkHs4LAA33XLjL8IPqZOEspBJggIwmTDpJTqx+unxEniPe7f0urrVUUAINr3oCu5bVzFmWEbzESHK3nceZXDsAp+59zkRAJRja4cBU3svxNXZ7F2iPmyM7e7vMmh8nySQ9anWDumTmp08rYg7tiz9S8m/0UQaVrLMw02qvf+gb70Jw7V4oxsQ82tkSQ8eDTOZyx83ibiaui5CFhZh+3GijAwJPOMwxHDWdRCsnkWi4VrgFUzNNQOAbp4+cFgpRB1n2iC7Rw5iwt/J7A7plVv8mnuvejkDVDmilCiGADOfZ1kX2OSAF86it6Crcl6J6BOSariHcCeYckfFwmAhDJMphI01lCs1iaDlwnODcU8i4u33xPWdbvbg8DSNXGKY9d/JtfjpOd5sotZcK8stpxRSnASmrcYuVjVK6otsxgFB8CoqlA1im63wAALCHktyNA== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2dc024cb-5d6c-4ea5-d596-08dbc9a0193a 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:26.0618 (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: 3UDPRdLCeo8SztVEoWiIni3G6zPlV23d54tK4Bcsipl8HW2vGTUTCvwXMdyUdln6rJxQM2uE/3TUyBhBwCEEE9Mrwkzn3HXgf6g6WaMVJEk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB9220 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:52:42 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: 731499 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 4F163CD8C99 for ; Tue, 10 Oct 2023 14:53:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233385AbjJJOxN (ORCPT ); Tue, 10 Oct 2023 10:53:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33084 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233298AbjJJOxA (ORCPT ); Tue, 10 Oct 2023 10:53:00 -0400 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2055.outbound.protection.outlook.com [40.107.21.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0BE6710C for ; Tue, 10 Oct 2023 07:52:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=haxasE7MmfnXVnJhU8FPq7ysndNF5dOyVeioQksShjqMf0t8sQA5NXpa+i0SlennzSZcZORPpjMH4y/CXYxovEeNsAOyinh0EGOmTrU/BIsay96rMEEKwvWGoeSM0ft6OqJ3XNlIydF43EFa7eM/V1wEXHcEtlIfuOlo+zXCzr4MsyxklZaUQviL0a7EMAZlJ9IC65+annoGwYgDVTEaTdXYYgHj30gEY3cJNU4g/bDbHInTGnPHA7rrrI87JTLggYtE09LVQSgpn8eMrHSC0GyxiXE4BZpfQIpywRTTVR55RvB2Dmw9kOfleFzVa3Fo8nd3oSW9+YUN6T1rwsA73A== 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=cybh4iLjC/joc0EkTFIWkyhrdWPInWtOeoAicG/B+LZ5vbmz37LIEybxRRB0rQDj5kw0yNm0E+CqyoG3R31UwODAMWzO2zbQM3CQWIFURXoO78Fh2Ru1aKEMTnR0shh2aE7TSUP3yTqbIsWuB5dd+fw2F9sCCk/AzxQZ48EKXFUIbbDM418TKqUPwipDgMSdzQ9knNIYnY+8E1XwBqsfXQTHhfHu/h5vYcmDy4EKnsFPk+/WTeei7HzSAUeLZsEtNcdAv/wLVxbLKONaJm8mPkFwWpbdqm1mh6dxE95nNs1Ccn55lUUe3BFG9mUZqm+oNXB4MEPKMw2ZL5QrQAyrkA== 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=Xc3tLEVGIBrL+U/KRiVaNiCL4bNhqZsErXUQ+SzA+yW+pBI7xriJzwTpzcKc7N9fEe/bcQsD5wAqcG8UlqxNFVHiV3S0Il59xdpUufQ5dwZf7hPd8dBcx9pH+SFj6kAuvuv45CycdGelO9ihAksaGVFBjq8kU/M3Y047Tf+Cjxo= 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:55 +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:55 +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 2/2] bap:Update transport acquire/release flow for bcast src Date: Tue, 10 Oct 2023 17:52:42 +0300 Message-Id: <20231010145243.4441-3-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: AS9PR06CA0472.eurprd06.prod.outlook.com (2603:10a6:20b:49a::21) 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: c9d4070e-7af8-497a-1fc5-08dbc9a095ce X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: W5eMcAV+lfS5ukGiW0IsuVOuyvqpFA1jkzJo45DDf50tnY0SfciiRlqfiwAzOeTmZtMZvHNQLivpqx+RQxtSTvl4FzR3kdiUqWXLLYVUiB6Ne4UgTzHKX+ERejmxmkoWVsHcsBgx/s1DcY7z2NTsHOX3QAZW5Cyuu9nCKEgmsMCXXb7y7Rbw2OFxJmlAAi9YPQOoNlB1bEz0zkU4yVGMX9zujbVza5pn2QMAU+m98gNttuCsgsefM8P2+PaIsZOB3hjD39BNZmIU4jMneIoBCw1hYEtcDtf7PxRsoVGJzXrrqkb6I5U/fLRVE00DkeOs6dtkjLZFq+AGLefA/NpWjJN81IaiiRAIK8A0FTNbNgREyE+0Mai97I/SD4Tum1//y0OsJQzArgUKG8nu5Ix8eKrsPQWe3pX0PYa9LXbbxm/opCEEKJ0gCEj6KW9WHQ2n1YOPtnxkQeYnebCLH2qqChhywJGEQFrKftGUM6b81szHK+JwUL2i9PFD11AgfDRMUOyUmoDZDSo4nil2knO3x97iS+bPVdiyJAF5SKEZ5jiZWmBDeATLj+xutkbFTAF2 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: MF2xVqOwVYtI0QJGDUL4nujHwq8rAn1U5uZLZdXzgXfQtH0Abf1yY6NBsZ8XTSAxmg9ghZsiu6tJMfFAoQpSnfTuG9enMIZxkxJpQGznshhKajWkYiqfZBcuMFnbrdIpQmYytSwEUCbFsKWM3/Da2LXLiGQSSu2mmktFgke5Et2q0s39FpX0+LojxXIliz1OSYYBV0J2Ay8xGF/2QY6GtOsfIBi81CCJu8TjggrAQdfY1XuNXYjfCxTV3zn3e6SUhwCPLK8pGCy7cFs/bGyfWEFWgHZ14ClZTSXnBHtcwubxtJrWQyK7afId/EIEZ4qVCcQUUXpuMxiZV5FtstpJ0HaVN6kiLOJGP/tU2Ctl/6c8bMkGeGC1jnvNkwse0h+7qnwvvvnw9zSKvRggmL2IDVcOLnU5A2/Hu8EKTTslH+IXTVN5PzdZNZ1WhWXV7quyPVELVYK8Om7HHjmrW+gJ66UX61sqYlSffUkadjKGGZrSE1Ww1ldtzjjS1V52I785orW1ZG641nZ0LC1f8SRr2zGHh81u2qRpGL5ujo/Iz4m+A1QFqnxrTvZi++bQv48sY6kVRqP0Deb7KYvsD/+QitJDfBtfmX7Vv4JBftzVNfaflD0PdR6XiILOEH/PBu9/ujAY89Dfb4xqOvfW7vNjo4ZKnwLaPJw+o8c0/R/8uT6H6Aopb/4FUbSTiSCR8pow3RJoS2gyq+9V/ajvf3uZYOELKhyxrVvcNkEblQpKuoNQmx/LlP7K0QTVIPVI1CXp7pxTZQRfxCD/zsaFpONfza4TcBAd5eXozIFun/gJfo6PJbcBGHHbdkq0fS2pbGqS58Zqo57Qn+WPKE2HGkeRh4W+wLFhej5VCFwDznr2xDYYC04vu3ljEZSyNgcLNZV1zhpUJOxji5RGpDLENNMc7pexefJXXbqd+8lAEFJyq1pFuPGL+KR9JlLaQ7sMm1papZTZQnpXi/PZRtMgb5Wl7l1S/Z77TeVfuwNBoJf3rQjkrnfB2DoH2hw9MadYqYG7C7xX95H6+derGMZEQEKodnln7UkANOoWPaBHPk3IpY+pUrQybHo/t5Z0NDYc+S6S+C6XuXdhDG5Tcd2P9kBptjpAplsUMOuBeR6n1WE/N1EQJ9YcTdw3BU/UAXjEmyKxqyHL6bPYQVEmx+QoALfpLXbrGOQcd10MrmENwAPQG6g+XYVu64tPHn+F5Llq1RGyHmhh2A+bw2BzjGbNoJbO62xj9QEFNOq9+c11unBmlIQjCBjq1w85rJ67hveT8N4m1qPdcJfd6MasyCyj2bxz8KWiB7ky0Hy6c35i07dbir6mVdeBG60mZCy5nk+WghB1s1mVuMdS8rpTsgcTbr++cZMvq6LqkFvmf9sndrgpF1TemBgwfAgPEebbQI3LR5B+G4YCPu1AC3rMZ0ZNSesjfDQkYa2PiZEulMZSQZgqw5v2wA0hh7AIQ1mbu+PF0Pm9pkiq1cJGpEwZHUD16q5aQeZfK4cV7L+OpxXZJE/Xwwqh8uHiYxNdsgsHv8lSwahyVvQdok37T1Vtm1IXzoenkvbP6zuCCiKMRq4ymXdARGC64ecalMzaJE2spM6hBvYXbCfIpaSBiXFHv6SFZ+FlUg== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: c9d4070e-7af8-497a-1fc5-08dbc9a095ce 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:55.0133 (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: qwdAEXOldPubSiYqbOOMcMSunApkarg+6OxWNKTzJscTvMqZxsBmpPfmzESkUiOLvJIeUXW/7C1/UHQXmfuIGEmTD+8M7ae8BxXzbUpFW20= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB9792 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,