michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Controller: Fix ISO Sync Receiver time reservations

Browse source 
Fix ISO Sync Receiver time reservation calculation to use
peer broadcasted bis_spacing and sub_interval, instead of
incorrectly calculating using local implementation used
tMSS value.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2024-11-03 04:55:16 +01:00 • committed by Benjamin Cabé
commit 396692c723
1 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

28
subsys/bluetooth/controller/ll_sw/ull_sync_iso.c
View file

@ -417,8 +417,6 @@ void ull_sync_iso_setup(struct ll_sync_iso_set *sync_iso,
struct pdu_big_info *bi;
uint32_t ready_delay_us;
uint32_t ticks_expire;
uint32_t ctrl_spacing;
uint32_t pdu_spacing;
uint32_t interval_us;
uint32_t ticks_diff;
struct pdu_adv *pdu;
@ -581,11 +579,6 @@ void ull_sync_iso_setup(struct ll_sync_iso_set *sync_iso,
interval_us -= lll->window_widening_periodic_us;
/* Calculate ISO Receiver BIG event timings */
pdu_spacing = PDU_BIS_US(lll->max_pdu, lll->enc, lll->phy,
PHY_FLAGS_S8) +
EVENT_MSS_US;
ctrl_spacing = PDU_BIS_US(sizeof(struct pdu_big_ctrl), lll->enc,
lll->phy, PHY_FLAGS_S8);
/* Number of maximum BISes to sync from the first BIS to sync */
/* NOTE: When ULL scheduling is implemented for subevents, then update
@ -605,26 +598,39 @@ void ull_sync_iso_setup(struct ll_sync_iso_set *sync_iso,
*/
if (IS_ENABLED(CONFIG_BT_CTLR_SYNC_ISO_RESERVE_MAX)) {
/* Maximum time reservation for both sequential and interleaved
uint32_t ctrl_spacing_us;
/* Maximum time reservation for sequential and interleaved
* packing.
*/
slot_us = (pdu_spacing * lll->nse * num_bis) + ctrl_spacing;
if (lll->bis_spacing >= (lll->sub_interval * lll->nse)) {
slot_us = lll->sub_interval * lll->nse * num_bis;
} else {
slot_us = lll->bis_spacing * lll->nse * num_bis;
}
ctrl_spacing_us = PDU_BIS_US(sizeof(struct pdu_big_ctrl),
lll->enc, lll->phy, PHY_FLAGS_S8);
slot_us += ctrl_spacing_us;
} else if (lll->bis_spacing >= (lll->sub_interval * lll->nse)) {
/* Time reservation omitting PTC subevents in sequential
* packing.
*/
slot_us = pdu_spacing * ((lll->nse * num_bis) - lll->ptc);
slot_us = lll->sub_interval * ((lll->nse * num_bis) - lll->ptc);
} else {
/* Time reservation omitting PTC subevents in interleaved
* packing.
*/
slot_us = pdu_spacing * ((lll->nse - lll->ptc) * num_bis);
slot_us = lll->bis_spacing * ((lll->nse - lll->ptc) * num_bis);
}
/* Add radio ready delay */
slot_us += ready_delay_us;
slot_us += lll->window_widening_periodic_us << 1U;
slot_us += EVENT_JITTER_US << 1U;
slot_us += EVENT_TICKER_RES_MARGIN_US << 2U;
/* Add implementation defined radio event overheads */
if (IS_ENABLED(CONFIG_BT_CTLR_EVENT_OVERHEAD_RESERVE_MAX)) {