Bluetooth: controller: Fix CIS establishment procedures

mtpr-ot · carlescufi · commit 371209441776 · 2023-02-10T15:28:35.000+01:00
Fixing typo in llcp_lp_cc_established revealed the need for completing
the CIS establishment procedure by additional call to local/remote
check_done function.

Fixed by exposing lr_check_done and rr_check_done with naming update and
calling after injecting the CIS_ESTABLISHED event.

Signed-off-by: Morten Priess &lt;mtpr@oticon.com&gt;
diff --git a/subsys/bluetooth/controller/ll_sw/ull_llcp.c b/subsys/bluetooth/controller/ll_sw/ull_llcp.c
@@ -1312,6 +1312,7 @@ void ull_cp_cc_established(struct ll_conn *conn, uint8_t error_code)
 	if (ctx && ctx->proc == PROC_CIS_CREATE) {
 		ctx->data.cis_create.error = error_code;
 		llcp_rp_cc_established(conn, ctx);
+		llcp_rr_check_done(conn, ctx);
 	}
 #endif /* CONFIG_BT_CTLR_PERIPHERAL_ISO */
 
@@ -1320,6 +1321,7 @@ void ull_cp_cc_established(struct ll_conn *conn, uint8_t error_code)
 	if (ctx && ctx->proc == PROC_CIS_CREATE) {
 		ctx->data.cis_create.error = error_code;
 		llcp_lp_cc_established(conn, ctx);
+		llcp_lr_check_done(conn, ctx);
 	}
 #endif /* CONFIG_BT_CTLR_CENTRAL_ISO */
 }
diff --git a/subsys/bluetooth/controller/ll_sw/ull_llcp_internal.h b/subsys/bluetooth/controller/ll_sw/ull_llcp_internal.h
@@ -524,6 +524,7 @@ void llcp_lr_complete(struct ll_conn *conn);
 void llcp_lr_connect(struct ll_conn *conn);
 void llcp_lr_disconnect(struct ll_conn *conn);
 void llcp_lr_abort(struct ll_conn *conn);
+void llcp_lr_check_done(struct ll_conn *conn, struct proc_ctx *ctx);
 
 /*
  * LLCP Remote Request
@@ -546,6 +547,7 @@ void llcp_rr_complete(struct ll_conn *conn);
 void llcp_rr_connect(struct ll_conn *conn);
 void llcp_rr_disconnect(struct ll_conn *conn);
 void llcp_rr_new(struct ll_conn *conn, struct node_rx_pdu *rx, bool valid_pdu);
+void llcp_rr_check_done(struct ll_conn *conn, struct proc_ctx *ctx);
 
 #if defined(CONFIG_BT_CTLR_LE_PING)
 /*
diff --git a/subsys/bluetooth/controller/ll_sw/ull_llcp_local.c b/subsys/bluetooth/controller/ll_sw/ull_llcp_local.c
@@ -46,7 +46,6 @@
 #include <soc.h>
 #include "hal/debug.h"
 
-static void lr_check_done(struct ll_conn *conn, struct proc_ctx *ctx);
 static struct proc_ctx *lr_dequeue(struct ll_conn *conn);
 
 /* LLCP Local Request FSM State */
@@ -72,7 +71,7 @@ enum {
 	LR_EVT_DISCONNECT,
 };
 
-static void lr_check_done(struct ll_conn *conn, struct proc_ctx *ctx)
+void llcp_lr_check_done(struct ll_conn *conn, struct proc_ctx *ctx)
 {
 	if (ctx->done) {
 		struct proc_ctx *ctx_header;
@@ -273,7 +272,7 @@ void llcp_lr_rx(struct ll_conn *conn, struct proc_ctx *ctx, struct node_rx_pdu *
 		break;
 	}
 
-	lr_check_done(conn, ctx);
+	llcp_lr_check_done(conn, ctx);
 }
 
 void llcp_lr_tx_ack(struct ll_conn *conn, struct proc_ctx *ctx, struct node_tx *tx)
@@ -306,7 +305,7 @@ void llcp_lr_tx_ack(struct ll_conn *conn, struct proc_ctx *ctx, struct node_tx *
 		break;
 		/* Ignore tx_ack */
 	}
-	lr_check_done(conn, ctx);
+	llcp_lr_check_done(conn, ctx);
 }
 
 void llcp_lr_tx_ntf(struct ll_conn *conn, struct proc_ctx *ctx)
@@ -322,7 +321,7 @@ void llcp_lr_tx_ntf(struct ll_conn *conn, struct proc_ctx *ctx)
 		break;
 	}
 
-	lr_check_done(conn, ctx);
+	llcp_lr_check_done(conn, ctx);
 }
 
 static void lr_act_run(struct ll_conn *conn)
@@ -403,7 +402,7 @@ static void lr_act_run(struct ll_conn *conn)
 		break;
 	}
 
-	lr_check_done(conn, ctx);
+	llcp_lr_check_done(conn, ctx);
 }
 
 static void lr_act_complete(struct ll_conn *conn)
diff --git a/subsys/bluetooth/controller/ll_sw/ull_llcp_remote.c b/subsys/bluetooth/controller/ll_sw/ull_llcp_remote.c
@@ -47,7 +47,6 @@
 #include <soc.h>
 #include "hal/debug.h"
 
-static void rr_check_done(struct ll_conn *conn, struct proc_ctx *ctx);
 static struct proc_ctx *rr_dequeue(struct ll_conn *conn);
 static void rr_abort(struct ll_conn *conn);
 
@@ -110,7 +109,7 @@ static bool proc_with_instant(struct proc_ctx *ctx)
 	return 0U;
 }
 
-static void rr_check_done(struct ll_conn *conn, struct proc_ctx *ctx)
+void llcp_rr_check_done(struct ll_conn *conn, struct proc_ctx *ctx)
 {
 	if (ctx->done) {
 		struct proc_ctx *ctx_header;
@@ -289,7 +288,7 @@ void llcp_rr_rx(struct ll_conn *conn, struct proc_ctx *ctx, struct node_rx_pdu *
 		LL_ASSERT(0);
 		break;
 	}
-	rr_check_done(conn, ctx);
+	llcp_rr_check_done(conn, ctx);
 }
 
 void llcp_rr_tx_ack(struct ll_conn *conn, struct proc_ctx *ctx, struct node_tx *tx)
@@ -320,7 +319,7 @@ void llcp_rr_tx_ack(struct ll_conn *conn, struct proc_ctx *ctx, struct node_tx *
 		break;
 	}
 
-	rr_check_done(conn, ctx);
+	llcp_rr_check_done(conn, ctx);
 }
 
 void llcp_rr_tx_ntf(struct ll_conn *conn, struct proc_ctx *ctx)
@@ -341,7 +340,7 @@ void llcp_rr_tx_ntf(struct ll_conn *conn, struct proc_ctx *ctx)
 		break;
 	}
 
-	rr_check_done(conn, ctx);
+	llcp_rr_check_done(conn, ctx);
 }
 
 static void rr_act_run(struct ll_conn *conn)
@@ -421,7 +420,7 @@ static void rr_act_run(struct ll_conn *conn)
 		break;
 	}
 
-	rr_check_done(conn, ctx);
+	llcp_rr_check_done(conn, ctx);
 }
 
 static void rr_tx(struct ll_conn *conn, struct proc_ctx *ctx, uint8_t opcode)
@@ -894,7 +893,7 @@ void llcp_rr_new(struct ll_conn *conn, struct node_rx_pdu *rx, bool valid_pdu)
 	/* Prepare procedure */
 	llcp_rr_prepare(conn, rx);
 
-	rr_check_done(conn, ctx);
+	llcp_rr_check_done(conn, ctx);
 
 	/* Handle PDU */
 	ctx = llcp_rr_peek(conn);

Original file line number	Diff line number	Diff line change
`@@ -1312,6 +1312,7 @@ void ull_cp_cc_established(struct ll_conn *conn, uint8_t error_code)`
`1312`	`1312`	`if (ctx && ctx->proc == PROC_CIS_CREATE) {`
`1313`	`1313`	`ctx->data.cis_create.error = error_code;`
`1314`	`1314`	`llcp_rp_cc_established(conn, ctx);`
	`1315`	`+ llcp_rr_check_done(conn, ctx);`
`1315`	`1316`	`}`
`1316`	`1317`	`#endif /* CONFIG_BT_CTLR_PERIPHERAL_ISO */`
`1317`	`1318`
`@@ -1320,6 +1321,7 @@ void ull_cp_cc_established(struct ll_conn *conn, uint8_t error_code)`
`1320`	`1321`	`if (ctx && ctx->proc == PROC_CIS_CREATE) {`
`1321`	`1322`	`ctx->data.cis_create.error = error_code;`
`1322`	`1323`	`llcp_lp_cc_established(conn, ctx);`
	`1324`	`+ llcp_lr_check_done(conn, ctx);`
`1323`	`1325`	`}`
`1324`	`1326`	`#endif /* CONFIG_BT_CTLR_CENTRAL_ISO */`
`1325`	`1327`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,6 @@`
`46`	`46`	`#include <soc.h>`
`47`	`47`	`#include "hal/debug.h"`
`48`	`48`
`49`		`-static void lr_check_done(struct ll_conn conn, struct proc_ctx ctx);`
`50`	`49`	`static struct proc_ctx lr_dequeue(struct ll_conn conn);`
`51`	`50`
`52`	`51`	`/* LLCP Local Request FSM State */`
`@@ -72,7 +71,7 @@ enum {`
`72`	`71`	`LR_EVT_DISCONNECT,`
`73`	`72`	`};`
`74`	`73`
`75`		`-static void lr_check_done(struct ll_conn conn, struct proc_ctx ctx)`
	`74`	`+void llcp_lr_check_done(struct ll_conn conn, struct proc_ctx ctx)`
`76`	`75`	`{`
`77`	`76`	`if (ctx->done) {`
`78`	`77`	`struct proc_ctx *ctx_header;`
`@@ -273,7 +272,7 @@ void llcp_lr_rx(struct ll_conn conn, struct proc_ctx ctx, struct node_rx_pdu *`
`273`	`272`	`break;`
`274`	`273`	`}`
`275`	`274`
`276`		`- lr_check_done(conn, ctx);`
	`275`	`+ llcp_lr_check_done(conn, ctx);`
`277`	`276`	`}`
`278`	`277`
`279`	`278`	`void llcp_lr_tx_ack(struct ll_conn conn, struct proc_ctx ctx, struct node_tx *tx)`
`@@ -306,7 +305,7 @@ void llcp_lr_tx_ack(struct ll_conn conn, struct proc_ctx ctx, struct node_tx *`
`306`	`305`	`break;`
`307`	`306`	`/* Ignore tx_ack */`
`308`	`307`	`}`
`309`		`- lr_check_done(conn, ctx);`
	`308`	`+ llcp_lr_check_done(conn, ctx);`
`310`	`309`	`}`
`311`	`310`
`312`	`311`	`void llcp_lr_tx_ntf(struct ll_conn conn, struct proc_ctx ctx)`
`@@ -322,7 +321,7 @@ void llcp_lr_tx_ntf(struct ll_conn conn, struct proc_ctx ctx)`
`322`	`321`	`break;`
`323`	`322`	`}`
`324`	`323`
`325`		`- lr_check_done(conn, ctx);`
	`324`	`+ llcp_lr_check_done(conn, ctx);`
`326`	`325`	`}`
`327`	`326`
`328`	`327`	`static void lr_act_run(struct ll_conn *conn)`
`@@ -403,7 +402,7 @@ static void lr_act_run(struct ll_conn *conn)`
`403`	`402`	`break;`
`404`	`403`	`}`
`405`	`404`
`406`		`- lr_check_done(conn, ctx);`
	`405`	`+ llcp_lr_check_done(conn, ctx);`
`407`	`406`	`}`
`408`	`407`
`409`	`408`	`static void lr_act_complete(struct ll_conn *conn)`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,6 @@`
`47`	`47`	`#include <soc.h>`
`48`	`48`	`#include "hal/debug.h"`
`49`	`49`
`50`		`-static void rr_check_done(struct ll_conn conn, struct proc_ctx ctx);`
`51`	`50`	`static struct proc_ctx rr_dequeue(struct ll_conn conn);`
`52`	`51`	`static void rr_abort(struct ll_conn *conn);`
`53`	`52`
`@@ -110,7 +109,7 @@ static bool proc_with_instant(struct proc_ctx *ctx)`
`110`	`109`	`return 0U;`
`111`	`110`	`}`
`112`	`111`
`113`		`-static void rr_check_done(struct ll_conn conn, struct proc_ctx ctx)`
	`112`	`+void llcp_rr_check_done(struct ll_conn conn, struct proc_ctx ctx)`
`114`	`113`	`{`
`115`	`114`	`if (ctx->done) {`
`116`	`115`	`struct proc_ctx *ctx_header;`
`@@ -289,7 +288,7 @@ void llcp_rr_rx(struct ll_conn conn, struct proc_ctx ctx, struct node_rx_pdu *`
`289`	`288`	`LL_ASSERT(0);`
`290`	`289`	`break;`
`291`	`290`	`}`
`292`		`- rr_check_done(conn, ctx);`
	`291`	`+ llcp_rr_check_done(conn, ctx);`
`293`	`292`	`}`
`294`	`293`
`295`	`294`	`void llcp_rr_tx_ack(struct ll_conn conn, struct proc_ctx ctx, struct node_tx *tx)`
`@@ -320,7 +319,7 @@ void llcp_rr_tx_ack(struct ll_conn conn, struct proc_ctx ctx, struct node_tx *`
`320`	`319`	`break;`
`321`	`320`	`}`
`322`	`321`
`323`		`- rr_check_done(conn, ctx);`
	`322`	`+ llcp_rr_check_done(conn, ctx);`
`324`	`323`	`}`
`325`	`324`
`326`	`325`	`void llcp_rr_tx_ntf(struct ll_conn conn, struct proc_ctx ctx)`
`@@ -341,7 +340,7 @@ void llcp_rr_tx_ntf(struct ll_conn conn, struct proc_ctx ctx)`
`341`	`340`	`break;`
`342`	`341`	`}`
`343`	`342`
`344`		`- rr_check_done(conn, ctx);`
	`343`	`+ llcp_rr_check_done(conn, ctx);`
`345`	`344`	`}`
`346`	`345`
`347`	`346`	`static void rr_act_run(struct ll_conn *conn)`
`@@ -421,7 +420,7 @@ static void rr_act_run(struct ll_conn *conn)`
`421`	`420`	`break;`
`422`	`421`	`}`
`423`	`422`
`424`		`- rr_check_done(conn, ctx);`
	`423`	`+ llcp_rr_check_done(conn, ctx);`
`425`	`424`	`}`
`426`	`425`
`427`	`426`	`static void rr_tx(struct ll_conn conn, struct proc_ctx ctx, uint8_t opcode)`
`@@ -894,7 +893,7 @@ void llcp_rr_new(struct ll_conn conn, struct node_rx_pdu rx, bool valid_pdu)`
`894`	`893`	`/* Prepare procedure */`
`895`	`894`	`llcp_rr_prepare(conn, rx);`
`896`	`895`
`897`		`- rr_check_done(conn, ctx);`
	`896`	`+ llcp_rr_check_done(conn, ctx);`
`898`	`897`
`899`	`898`	`/* Handle PDU */`
`900`	`899`	`ctx = llcp_rr_peek(conn);`