Received-SPF: pass (google.com: domain of linux-bluetooth+bounces-4008-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 3/4] bap: Improve handling of pa_req timer
Date: Wed, 24 Apr 2024 17:07:40 +0300
Message-Id: <20240424140741.73899-4-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?jc54cLoifD6GtifKKo960YvY8r2yivYu+OY1CvnuU0oQj0FlDgzbnHSq1zdb?=
 =?us-ascii?Q?QOXGh3FAD2NDfUkisJvlYhXje3V1zRl6Un8deVRei5OyZ5sMAKsfFi2UCcY+?=
 =?us-ascii?Q?uZklhy2ksDSUhHG3F8z7Q9D1pSm21LQuGt93994qUuPzZIaw1W6XSybJl8D+?=
 =?us-ascii?Q?rodcGq9I94jNLbY/Mx52rAiwdzfL3o+in+uWq9xXBuWO+roZ/GVJLL+DO8Jl?=
 =?us-ascii?Q?RwP+13AnWE7YNFfvjzZy1/MN09V/Zb8OFjzzJAvavBgxu1BezelhbrDO5qer?=
 =?us-ascii?Q?3I/vU4ELD/18dGXJkcKdvbfdfl+gK+ETHCadskGZ4a05jjjvQiDTmOf8Fs96?=
 =?us-ascii?Q?0FpsTryTUgrlsNOiif54SWaBTq+u6fn+2yDrsjNyPOPknyz71te2s2DpLkY8?=
 =?us-ascii?Q?fpdvRdhtb/qOX/sksHIKnViiw/xm8wW02bzA+/5LwWCMwcpqa4ENjMRSeQ38?=
 =?us-ascii?Q?BNJTmRAoiq39fqG3YzPqH09pzf6LlP9HPabIyvMz0+E3b7JdOJUgg1YSMmyU?=
 =?us-ascii?Q?QHXMxs53tAa8QcpT97FvxG63ZHyh2Pa/KT2djWL1VsgZnNjwNq3nUTPIi63h?=
 =?us-ascii?Q?DRmGK75HCxPgafhWGp2lZlXNi4WbS/z7yttP4pJUjGloFAyIKxha14499z8h?=
 =?us-ascii?Q?pfYZr5n805SbdbvjOWAtql3eLIouTkqVwJdjugxbO/U9Ru2tyEf+jVp1vnIe?=
 =?us-ascii?Q?K4A6dI7OVpt+h235dNb5EzicBt2cKVYz5R92Nex0lfoiW6ZoQnd1vLpNaV5o?=
 =?us-ascii?Q?BeS5UnvcCqrwJLHNxzgp8CitE4Ya9ULMnMRTRTPkI1E/sH4bwqI/o2AE+Xo3?=
 =?us-ascii?Q?7wzP+aSgrjdiUGbQhXikAPpX1ysP8410x9rTOhBQenohSGX0KgPHBMvHSnvq?=
 =?us-ascii?Q?eA5R+IqS3cCQHg/72YihMg3Pjh51wwpuPax0H0jgg4S3i7WshLHJV58a6LgY?=
 =?us-ascii?Q?PEK5IPkT/rkZ5Uj1RZzW64fjRhHpYx2IIgYx5U/7nNgxo9v5ZEEXDz8WVb0K?=
 =?us-ascii?Q?4vxLjB6LhK09UDQHfSQNdWW3eU0LKdPUFuMEbNOuw3pG3LAs5/Gd/Vfj3gj8?=
 =?us-ascii?Q?HRJ+eXb0jrmf9cXEVQriitvryK6B/VwbVxpMofy7d4b1eM77ZVz3uNMSS1iT?=
 =?us-ascii?Q?3aMExEyN7HU5rXRTBfi1b3E276MgPvj1bWFzYnMaVi0Zqm8CasZwAahw4C0R?=
 =?us-ascii?Q?Ihc+N8WpeuYP+bn+0BFrHiuwyERljZXCDG4Y5eYPZQAcpLj0qdLU2iU81N3U?=
 =?us-ascii?Q?7JpzdCP51xn7wXtIpeuiOffZ7lcVxMFfP+pGmtcPEr8Hgw1765LaGFD2wAR4?=
 =?us-ascii?Q?3e9jZbwuhe8dcE17+j15W5ahCneVqUM1Vb/1cB3JZbBeclkpfKDG7bid+poM?=
 =?us-ascii?Q?1EFpAyELm+RPABLyMpj8GDC2ZJdtpISpVGz/Xdgxa/3poUZFJOkqzGQrA8SM?=
 =?us-ascii?Q?cWCgAThnA1tU05tAx93k+/GSShtoMAsdRDZYtkQO0eLm+yGfO390MgUBYEtt?=
 =?us-ascii?Q?R7Uu2MTpYIHw+Av9ESj/YiEpwPPOQ1YTAB2+G+8ykawgC5w/+SMxBsVT5GeB?=
 =?us-ascii?Q?t5hOkviuuGONwIzEzkOAfSocaYXa4gzo953d5dsk?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 929cf3d1-9bd4-40bc-a0cc-08dc6467fc73
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:16.1334
 (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: tmYm8PK5cpSfWliSsB+r3IaYXGg5hxhraEboVpRkOYc6hDrxShW4tbnsfxi+cy+jjbufIOvIZLOQWn7n7vl0QA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR04MB8582

The patch handles timers on a per adapter basis.

The timer is now also started on setup_accept_io_broadcast, so
BAP_PA_BIG_SYNC_REQ can be treated if the timer is stopped in the meantime.
The timer is stopped if the bap_adapter's pa_req queue is empty.
A pa_timer_id equal to 0 means that the timer is stopped.
---
 profiles/audio/bap.c | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/profiles/audio/bap.c b/profiles/audio/bap.c
index d8cd05f26..ab0b96222 100644
--- a/profiles/audio/bap.c
+++ b/profiles/audio/bap.c
@@ -2087,6 +2087,14 @@ static gboolean pa_idle_timer(gpointer user_data)
 				pa_and_big_sync(req);
 				break;
 			}
+		else {
+			/* pa_req queue is empty, stop the timer by returning
+			 * FALSE and set the pa_timer_id to 0. This will later
+			 * be used to check if the timer is active.
+			 */
+			bap_adapter->pa_timer_id = 0;
+			return FALSE;
+		}
 	}
 
 	return TRUE;
@@ -2098,9 +2106,17 @@ static void setup_accept_io_broadcast(struct bap_data *data,
 	struct bap_bcast_pa_req *pa_req = new0(struct bap_bcast_pa_req, 1);
 	struct bap_adapter *bap_adapter = data->bap_adapter;
 
+	/* Timer could be stopped if all the short lived requests were treated.
+	 * Check the state of the timer and turn it on so that this requests
+	 * can also be treated.
+	 */
+	if (bap_adapter->pa_timer_id == 0)
+		bap_adapter->pa_timer_id = g_timeout_add_seconds(
+		PA_IDLE_TIMEOUT, pa_idle_timer, bap_adapter);
+
 	/* Add this request to the PA queue.
-	 * We don't need to check the queue here and the timer, as we cannot
-	 * have BAP_PA_BIG_SYNC_REQ before a short PA (BAP_PA_SHORT_REQ)
+	 * We don't need to check the queue here, as we cannot have
+	 * BAP_PA_BIG_SYNC_REQ before a short PA (BAP_PA_SHORT_REQ)
 	 */
 	pa_req->type = BAP_PA_BIG_SYNC_REQ;
 	pa_req->in_progress = FALSE;
-- 
2.40.1