[nrf fromtree] Bluetooth: Controller: Handle overlapping CIG and ACL

If the CIG and ACL overlap each other when the CIS is starting
zephyr will assert on negative time, so fit this special case.

Signed-off-by: Lars Segerlund <[email protected]>
(cherry picked from commit fc813d9556a4e354256981f3e43aa3d3325f37b6)
Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>

Author: segerlund

subsys/bluetooth/controller/ll_sw/ull_conn_iso.c

@@ -979,6 +979,17 @@ void ull_conn_iso_start(struct ll_conn *conn, uint16_t cis_handle,
 				lost_cig_events = 1U;
 				cis_offset = cis->offset + iso_interval_us - acl_latency_us;
 			}
+			/* Correct the cis_offset to next CIG event, if the ACL and CIG overlaps.
+			 * ACL radio event at the instant was skipped and a relative CIS offset at
+			 * the current ACL event has been calculated. But the current ACL event
+			 * is partially overlapping with the other of CISes (not yet established) in
+			 * the CIG event. Hence, lets establish the CIS at the next ISO interval so
+			 * as to have a positive CIG event offset.
+			 */
+			if (cis_offset < (cig->sync_delay - cis->sync_delay)) {
+				cis_offset += iso_interval_us;
+				lost_cig_events++;
+			}
 
 			cis->lll.event_count_prepare += lost_cig_events;