Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bluetooth: controller: Fix ull_conn LSTO for must_expire #30132

Merged
merged 1 commit into from Dec 7, 2020
Merged

Bluetooth: controller: Fix ull_conn LSTO for must_expire #30132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 7 additions & 0 deletions subsys/bluetooth/controller/ll_sw/ull_conn.c
View file
Open in desktop
Expand Up @@ -1084,7 +1084,14 @@ void ull_conn_done(struct node_rx_event_done *done)
}

/* Events elapsed used in timeout checks below */
#if defined(CONFIG_BT_CTLR_CONN_META)
/* If event has shallow expiry do not add latency, but rely on
* accumulated lazy count.
*/
latency_event = conn->common.is_must_expire ? 0 : lll->latency_event;
#else
latency_event = lll->latency_event;
#endif
elapsed_event = latency_event + 1;

/* Slave drift compensation calc and new latency or
Expand Down
3 changes: 3 additions & 0 deletions subsys/bluetooth/controller/ll_sw/ull_conn_types.h
View file
Open in desktop
Expand Up @@ -59,6 +59,9 @@ struct ll_conn {
union {
struct {
uint8_t fex_valid:1;
#if defined(CONFIG_BT_CTLR_CONN_META)
uint8_t is_must_expire:1;
#endif /* CONFIG_BT_CTLR_CONN_META */
} common;

#if defined(CONFIG_BT_PERIPHERAL)
Expand Down
3 changes: 3 additions & 0 deletions subsys/bluetooth/controller/ll_sw/ull_master.c
View file
Open in desktop
Expand Up @@ -751,6 +751,9 @@ void ull_master_ticker_cb(uint32_t ticks_at_expire, uint32_t remainder, uint16_t
return;
}

#if defined(CONFIG_BT_CTLR_CONN_META)
conn->common.is_must_expire = (lazy == TICKER_LAZY_MUST_EXPIRE);
#endif
/* If this is a must-expire callback, LLCP state machine does not need
* to know. Will be called with lazy > 0 when scheduled in air.
*/
Expand Down
3 changes: 3 additions & 0 deletions subsys/bluetooth/controller/ll_sw/ull_slave.c
View file
Open in desktop
Expand Up @@ -375,6 +375,9 @@ void ull_slave_ticker_cb(uint32_t ticks_at_expire, uint32_t remainder,
return;
}

#if defined(CONFIG_BT_CTLR_CONN_META)
conn->common.is_must_expire = (lazy == TICKER_LAZY_MUST_EXPIRE);
#endif
/* If this is a must-expire callback, LLCP state machine does not need
* to know. Will be called with lazy > 0 when scheduled in air.
*/
Expand Down