michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: controller: LLCP and ISOAL Fixes for EBQ LL tests

Browse source 
- Prioritize CIS_REQ handling in (old) LLCP
- Reject if CIS_REQ uses exisiting CIS ID

These fixes prevent assertions in /LL/CIS/PER/BV-38-C.

Signed-off-by: Morten Priess <mtpr@oticon.com>
This commit is contained in:
Morten Priess 2022-04-13 15:13:21 +02:00 • committed by Carles Cufí
commit 3d4215d6a3
2 changed files with 34 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

54
subsys/bluetooth/controller/ll_sw/ull_conn.c
View file

@ -1113,6 +1113,21 @@ int ull_conn_llcp(struct ll_conn *conn, uint32_t ticks_at_expire, uint16_t lazy)
conn->llcp_type = LLCP_CONN_UPD; conn->llcp_type = LLCP_CONN_UPD;
conn->llcp_ack -= 2U; conn->llcp_ack -= 2U;
#if defined(CONFIG_BT_CTLR_PERIPHERAL_ISO)
} else if (conn->llcp_cis.req != conn->llcp_cis.ack) {
if (conn->llcp_cis.state == LLCP_CIS_STATE_RSP_WAIT) {
const struct lll_conn *lll = &conn->lll;
uint16_t event_counter;
/* Calculate current event counter */
event_counter = lll->event_counter +
lll->latency_prepare + lazy;
/* Handle CIS response */
event_send_cis_rsp(conn, event_counter);
}
#endif /* CONFIG_BT_CTLR_PERIPHERAL_ISO */
/* check if feature exchange procedure is requested */ /* check if feature exchange procedure is requested */
} else if (conn->llcp_feature.ack != conn->llcp_feature.req) { } else if (conn->llcp_feature.ack != conn->llcp_feature.req) {
/* handle feature exchange state machine */ /* handle feature exchange state machine */
@ -1152,27 +1167,6 @@ int ull_conn_llcp(struct ll_conn *conn, uint32_t ticks_at_expire, uint16_t lazy)
/* handle PHY Upd state machine */ /* handle PHY Upd state machine */
event_phy_req_prep(conn); event_phy_req_prep(conn);
#endif /* CONFIG_BT_CTLR_PHY */ #endif /* CONFIG_BT_CTLR_PHY */
#if defined(CONFIG_BT_CTLR_PERIPHERAL_ISO)
} else if (conn->llcp_cis.req != conn->llcp_cis.ack) {
struct lll_conn *lll = &conn->lll;
uint16_t event_counter;
/* Calculate current event counter */
event_counter = lll->event_counter +
lll->latency_prepare + lazy;
if (conn->llcp_cis.state == LLCP_CIS_STATE_RSP_WAIT) {
/* Handle CIS response */
event_send_cis_rsp(conn, event_counter);
} else if (conn->llcp_cis.state ==
LLCP_CIS_STATE_INST_WAIT) {
/* Start CIS peripheral */
event_peripheral_iso_prep(conn,
event_counter,
ticks_at_expire);
}
#endif /* CONFIG_BT_CTLR_PERIPHERAL_ISO */
} }
} }
@ -1347,6 +1341,24 @@ int ull_conn_llcp(struct ll_conn *conn, uint32_t ticks_at_expire, uint16_t lazy)
} }
} }
#if defined(CONFIG_BT_CTLR_PERIPHERAL_ISO)
/* In any state, allow processing of CIS peripheral waiting for
* instant.
*/
if (conn->llcp_cis.state == LLCP_CIS_STATE_INST_WAIT) {
const struct lll_conn *lll = &conn->lll;
uint16_t event_counter;
/* Calculate current event counter */
event_counter = lll->event_counter +
lll->latency_prepare + lazy;
event_peripheral_iso_prep(conn, event_counter,
ticks_at_expire);
}
#endif /* CONFIG_BT_CTLR_PERIPHERAL_ISO */
return 0; return 0;
#else /* CONFIG_BT_LL_SW_LLCP_LEGACY */ #else /* CONFIG_BT_LL_SW_LLCP_LEGACY */
LL_ASSERT(conn->lll.handle != LLL_HANDLE_INVALID); LL_ASSERT(conn->lll.handle != LLL_HANDLE_INVALID);

2
subsys/bluetooth/controller/ll_sw/ull_peripheral_iso.c
View file

@ -122,7 +122,7 @@ uint8_t ull_peripheral_iso_acquire(struct ll_conn *acl,
for (handle = LL_CIS_HANDLE_BASE; handle <= LAST_VALID_CIS_HANDLE; handle++) { for (handle = LL_CIS_HANDLE_BASE; handle <= LAST_VALID_CIS_HANDLE; handle++) {
cis = ll_iso_stream_connected_get(handle); cis = ll_iso_stream_connected_get(handle);
if (cis && cis->cis_id == req->cis_id) { if (cis && cis->group && cis->cis_id == req->cis_id) {
/* CIS ID already in use */ /* CIS ID already in use */
return BT_HCI_ERR_INVALID_LL_PARAM; return BT_HCI_ERR_INVALID_LL_PARAM;
} }