Skip to content

Commit 3bfeadf

Browse files
cvinayakcarlescufi
authored andcommitted
Bluetooth: Controller: Fix ULL_HIGH ticker operations count
Fix ULL_HIGH ticker operations count, it is discovered in new BabbleSim test implementations that mesh tests using Extended Advertising and Scanning enqueue upto 4 ticker operations before ULL_LOW ticker_job could process it. Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>
1 parent b757906 commit 3bfeadf

File tree

1 file changed

+10
-11
lines changed
  • subsys/bluetooth/controller/ll_sw

1 file changed

+10
-11
lines changed

subsys/bluetooth/controller/ll_sw/ull.c

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -278,22 +278,21 @@
278278

279279
#define TICKER_USER_ULL_LOW_OPS (1 + TICKER_USER_ULL_LOW_VENDOR_OPS + 1)
280280

281-
/* NOTE: When ULL_LOW priority is configured to lower than ULL_HIGH, then extra
282-
* ULL_HIGH operations queue elements are required to buffer the
283-
* requested ticker operations.
281+
/* NOTE: Extended Advertising needs one extra ticker operation being enqueued
282+
* for scheduling the auxiliary PDU reception while there can already
283+
* be three other operations being enqueued.
284+
*
285+
* This value also covers the case were initiator with 1M and Coded PHY
286+
* scan window is stopping the two scan tickers, stopping one scan stop
287+
* ticker and starting one new ticker for establishing an ACL connection.
284288
*/
285-
#if defined(CONFIG_BT_CENTRAL) && defined(CONFIG_BT_CTLR_ADV_EXT) && \
286-
defined(CONFIG_BT_CTLR_PHY_CODED)
289+
#if defined(CONFIG_BT_CTLR_ADV_EXT)
287290
#define TICKER_USER_ULL_HIGH_OPS (4 + TICKER_USER_ULL_HIGH_VENDOR_OPS + \
288291
TICKER_USER_ULL_HIGH_FLASH_OPS + 1)
289-
#else /* !CONFIG_BT_CENTRAL || !CONFIG_BT_CTLR_ADV_EXT ||
290-
* !CONFIG_BT_CTLR_PHY_CODED
291-
*/
292+
#else /* !CONFIG_BT_CTLR_ADV_EXT */
292293
#define TICKER_USER_ULL_HIGH_OPS (3 + TICKER_USER_ULL_HIGH_VENDOR_OPS + \
293294
TICKER_USER_ULL_HIGH_FLASH_OPS + 1)
294-
#endif /* !CONFIG_BT_CENTRAL || !CONFIG_BT_CTLR_ADV_EXT ||
295-
* !CONFIG_BT_CTLR_PHY_CODED
296-
*/
295+
#endif /* !CONFIG_BT_CTLR_ADV_EXT */
297296

298297
#define TICKER_USER_LLL_OPS (3 + TICKER_USER_LLL_VENDOR_OPS + 1)
299298

0 commit comments

Comments
 (0)