Received-SPF: pass (google.com: domain of linux-bluetooth+bounces-4006-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
From: Vlad Pruteanu <vlad.pruteanu@nxp.com>
To: linux-bluetooth@vger.kernel.org
Cc: claudia.rosu@nxp.com,
	mihai-octavian.urzica@nxp.com,
	silviu.barbulescu@nxp.com,
	iulia.tanasescu@nxp.com,
	andrei.istodorescu@nxp.com,
	luiz.dentz@gmail.com,
	Vlad Pruteanu <vlad.pruteanu@nxp.com>
Subject: [PATCH BlueZ v2 1/4] bap: Initialize bap_data for scanned device in bap_bcast_probe
Date: Wed, 24 Apr 2024 17:07:38 +0300
Message-Id: <20240424140741.73899-2-vlad.pruteanu@nxp.com>
In-Reply-To: <20240424140741.73899-1-vlad.pruteanu@nxp.com>
References: <20240424140741.73899-1-vlad.pruteanu@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?Dhfp+G7rw2hMODpPi/78Nn5qZsUf3UWLwfFIF3fseGcWLFzaIuaOi61N2h9j?=
 =?us-ascii?Q?RW3OEezwKKYTMCOspwtp90tjg6oZmnQv/Oj4mqUNEdfVBhQtq9yGvL+DvuSO?=
 =?us-ascii?Q?5Bq0KG9vyOm6JoU/cl3ECHyuRgyKsJNjqJES+PYi9ivRYe+PmSgpFWzmF9FV?=
 =?us-ascii?Q?lKhaKo/CfccnM4Bo3psj1EQN6NtPkWP8IpmnpX3Ht1e1JvE+mJLLhlXzCcvf?=
 =?us-ascii?Q?8BWQHQ7ppy1r8Dhpha475Km1jSw96zVT2RlxT5SFu7HF2maGD0RXg2grol8N?=
 =?us-ascii?Q?aY/uf7593VnbQ1EPuotf4L2VmrhO2MEguHW7GYYLFynW0MBUdFcB64oMPV67?=
 =?us-ascii?Q?tInMBNoh90F1nKeL/Drc01rACOwwINnwplFrTKC0CugR1JlUE1eDBbq9yQpL?=
 =?us-ascii?Q?ZynK8htXHIA5h43MO1HGNczuL+p845huUeUNf6siNWzAwjrPGiCT4lf6QftA?=
 =?us-ascii?Q?0D1gegNQB7M/gzjJsSu1YwT87frhIk5NMv0U4l1IavXNevgTrbAg/kGDHTXS?=
 =?us-ascii?Q?gZNIg8cvtkfQzc8Ot7OXZMYnwsQGBFrwWOCSiRyoSz1/XcFOQkda3nENsd8J?=
 =?us-ascii?Q?VGelBgUC9ZBoVgbQ+47mBOkYySq+h+8SmjgvtkvaKgueIzMrGtDpQmr+6pRa?=
 =?us-ascii?Q?b46TbdoZJ6JIyahRta7Q1vUdc0CDkEviYz63KVNHTZKzXZA/+q/4B4m3mSW7?=
 =?us-ascii?Q?LglZ5NBhC4qf7ai/PjhddHf1YoXYb4HpOzpFKuBXDaxeWDsK4g40jisL7i9d?=
 =?us-ascii?Q?zAMKbetHUyrivUvrL7aBbHGMB5UTabQu2wZOVpcIPIN70dodAiyX4gLIFMsi?=
 =?us-ascii?Q?AzXJj8HTXZ7E2ymGExIDhf3CStEwpGEkVT8mPPV7Vx0XzW+1XLLZhJw6oOZI?=
 =?us-ascii?Q?emgFLwvZkl1HYJ1y9QdpvlsmqXP+TH/1GE0+2QegxLikEaqJKPQwDxmWOgLc?=
 =?us-ascii?Q?Tc4Qpe0iFSh5gRVWzaWA9a9+xo92Rfc+tmMIFydHSdd75PVzQQjQbSPWSIqu?=
 =?us-ascii?Q?tVKP91FqsMx6YdswPoppzFvqZqYjua+W0w1/Tg4BNMd0OHEHHIlPnA7zi1vM?=
 =?us-ascii?Q?HP4DwoPng+1+d/JluUFWLFwvr2THut29Xyj6pBRBbvvowSGJGLMwn8WqXgG2?=
 =?us-ascii?Q?Cdu7VZqY9QopQKAgZB+b/yIchPy9bR+8i8L76fo6oOfQNcox6ERvXWLM/kF5?=
 =?us-ascii?Q?J8jri+MFc7RICeisEnyqBDFjxiEtNJO3zYdP5dGnESzIava/dX54tO+rBL7H?=
 =?us-ascii?Q?eh7auqzguG61eaWAdFxC9f/eSmT3mBhlgmp5iGbuOMxIWzDx3bNgU3hPA4Sn?=
 =?us-ascii?Q?NZBrSBpv4UanfhrIxnt5lBB3+S1p3ozwWm3I6i1qIwMUplfJ/nyHD48rBQH0?=
 =?us-ascii?Q?FrREjt9BYIGDp9+BH5V+//+Jy3J3XFntfyCPrsugunR7S/848mrWNlgEnpny?=
 =?us-ascii?Q?sR45oX1jy4f3Y/nCnRZ3GeLCoLT759O+ZJDtGGAZZMgjDZt645bj4XLGdCVl?=
 =?us-ascii?Q?6nZpP4BXwo1dBpPmPRFNBIfUTZrsdXbxiO8oC/H5ERnioTLpHmZTshuYxQIh?=
 =?us-ascii?Q?LIpWv7BPEIn1QpjVR4l7sTyyT8FK/WOxS7fM/OYr?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: c099fa30-8806-4a9b-a4f5-08dc6467f81a
X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB5384.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Apr 2024 14:08:08.7938
 (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: /E0htAGBbVdaD1qceMRoXPvGUOAOfXykcpEQ8jldWomp5cSUD/A4Zu++DpM3rAR6LpvLvxODcyurozYZaRYDCg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR04MB8582

By moving the bap_data initialization for a scanned device to
bap_adapter_probe() the adapter field of bap_data will already be set when
short_lived_pa_sync is called. When adapter will be changed for
bap_adapter, this will help eliminate an additional queue search (in
short_lived_pa_sync).
---
 profiles/audio/bap.c | 62 ++++++++++++++++++++++----------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/profiles/audio/bap.c b/profiles/audio/bap.c
index ff6d6d881..9e93906ca 100644
--- a/profiles/audio/bap.c
+++ b/profiles/audio/bap.c
@@ -2768,43 +2768,13 @@ static void bap_detached(struct bt_bap *bap, void *user_data)
 static int short_lived_pa_sync(struct bap_bcast_pa_req *req)
 {
 	struct btd_service *service = req->data.service;
-	struct btd_device *device = btd_service_get_device(service);
-	struct btd_adapter *adapter = device_get_adapter(device);
-	struct btd_gatt_database *database = btd_adapter_get_database(adapter);
 	struct bap_data *data = btd_service_get_user_data(service);
 	GError *err = NULL;
 
-	if (data) {
+	if (data->listen_io) {
 		DBG("Already probed");
 		return -1;
 	}
-	data = bap_data_new(device);
-	data->service = service;
-	data->adapter = adapter;
-	data->device = device;
-	data->bap = bt_bap_new(btd_gatt_database_get_db(database),
-			btd_gatt_database_get_db(database));
-	if (!data->bap) {
-		error("Unable to create BAP instance");
-		free(data);
-		return -EINVAL;
-	}
-
-	if (!bt_bap_attach(data->bap, NULL)) {
-		error("BAP unable to attach");
-		return -EINVAL;
-	}
-
-	bap_data_add(data);
-
-	data->ready_id = bt_bap_ready_register(data->bap, bap_ready, service,
-								NULL);
-	data->state_id = bt_bap_state_register(data->bap, bap_state_bcast,
-					bap_connecting_bcast, data, NULL);
-	data->pac_id = bt_bap_pac_register(data->bap, pac_added_broadcast,
-				pac_removed_broadcast, data, NULL);
-
-	bt_bap_set_user_data(data->bap, service);
 
 	DBG("Create PA sync with this source");
 	req->in_progress = TRUE;
@@ -2925,14 +2895,44 @@ static int bap_bcast_probe(struct btd_service *service)
 {
 	struct btd_device *device = btd_service_get_device(service);
 	struct btd_adapter *adapter = device_get_adapter(device);
+	struct btd_gatt_database *database = btd_adapter_get_database(adapter);
 	struct bap_bcast_pa_req *pa_req =
 			new0(struct bap_bcast_pa_req, 1);
+	struct bap_data *data;
 
 	if (!btd_adapter_has_exp_feature(adapter, EXP_FEAT_ISO_SOCKET)) {
 		error("BAP requires ISO Socket which is not enabled");
 		return -ENOTSUP;
 	}
 
+	data = bap_data_new(device);
+	data->service = service;
+	data->adapter = adapter;
+	data->device = device;
+	data->bap = bt_bap_new(btd_gatt_database_get_db(database),
+			btd_gatt_database_get_db(database));
+	if (!data->bap) {
+		error("Unable to create BAP instance");
+		free(data);
+		return -EINVAL;
+	}
+
+	if (!bt_bap_attach(data->bap, NULL)) {
+		error("BAP unable to attach");
+		return -EINVAL;
+	}
+
+	bap_data_add(data);
+
+	data->ready_id = bt_bap_ready_register(data->bap, bap_ready, service,
+								NULL);
+	data->state_id = bt_bap_state_register(data->bap, bap_state_bcast,
+					bap_connecting_bcast, data, NULL);
+	data->pac_id = bt_bap_pac_register(data->bap, pac_added_broadcast,
+				pac_removed_broadcast, data, NULL);
+
+	bt_bap_set_user_data(data->bap, service);
+
 	/* First time initialize the queue and start the idle timer */
 	if (bcast_pa_requests == NULL) {
 		bcast_pa_requests = queue_new();
-- 
2.40.1