Bluetooth: Controller: Ticker next slot get to return remainder value

Updated ticker implementation to return remainder value for
a ticker when enumerating active tickers with time
reservations.

This is required to find offsets and to use the remainder
value to correctly calculate auxiliary offsets to the
microsecond resolution.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>

subsys/bluetooth/controller/Kconfig.ll_sw_split

@@ -198,7 +198,7 @@ config BT_CTLR_ADV_PDU_LINK
 
 config BT_CTLR_ADV_PDU_BACK2BACK
 	bool "Back-to-back transmission of extended advertising trains"
-	depends on BT_CTLR_ADV_EXT && BT_BROADCASTER
+	depends on BT_BROADCASTER && BT_CTLR_ADV_EXT
 	select BT_CTLR_ADV_PDU_LINK
 	help
 	  Enables transmission of AUX_CHAIN_IND in extended advertising train by
@@ -707,6 +707,14 @@ config BT_TICKER_LOW_LAT
 	  radio RX/TX. Enabling this option disables the ticker priority- and
 	  'must expire' features.
 
+config BT_TICKER_REMAINDER_GET
+	bool "Ticker Next Slot Get with Remainder"
+	default y if BT_BROADCASTER && BT_CTLR_ADV_EXT
+	help
+	  This option enables ticker interface to iterate through active
+	  ticker nodes, returning tick to expire and remainder from a reference
+	  tick.
+
 config BT_TICKER_LAZY_GET
 	bool "Ticker Next Slot Get with Lazy"
 	default y if BT_CTLR_ADV_PERIODIC

subsys/bluetooth/controller/ll_sw/ull_adv_iso.c

@@ -960,7 +960,7 @@ static void mfy_iso_offset_get(void *param)
 		ret = ticker_next_slot_get_ext(TICKER_INSTANCE_ID_CTLR,
 					       TICKER_USER_ID_ULL_LOW,
 					       &id, &ticks_current,
-					       &ticks_to_expire, &lazy,
+					       &ticks_to_expire, NULL, &lazy,
 					       NULL, NULL,
 					       ticker_op_cb, (void *)&ret_cb);
 		if (ret == TICKER_STATUS_BUSY) {

subsys/bluetooth/controller/ll_sw/ull_adv_sync.c

@@ -1809,7 +1809,7 @@ static void mfy_sync_offset_get(void *param)
 		ret = ticker_next_slot_get_ext(TICKER_INSTANCE_ID_CTLR,
 					       TICKER_USER_ID_ULL_LOW,
 					       &id, &ticks_current,
-					       &ticks_to_expire, &lazy,
+					       &ticks_to_expire, NULL, &lazy,
 					       NULL, NULL,
 					       ticker_op_cb, (void *)&ret_cb);
 		if (ret == TICKER_STATUS_BUSY) {

subsys/bluetooth/controller/ll_sw/ull_sched.c

@@ -686,7 +686,7 @@ static uint8_t after_match_slot_get(uint8_t user_id, uint32_t ticks_slot_abs,
 #if defined(CONFIG_BT_TICKER_NEXT_SLOT_GET_MATCH)
 		ret = ticker_next_slot_get_ext(TICKER_INSTANCE_ID_CTLR, user_id,
 					       &ticker_id, ticks_anchor,
-					       &ticks_to_expire,
+					       &ticks_to_expire, NULL,
 					       NULL, /* lazy */
 					       ticker_match_op_cb,
 					       NULL, /* match_op_context */

subsys/bluetooth/controller/ticker/ticker.c

@@ -181,6 +181,9 @@ struct ticker_user_op_slot_get {
 	uint8_t  *ticker_id;
 	uint32_t *ticks_current;
 	uint32_t *ticks_to_expire;
+#if defined(CONFIG_BT_TICKER_REMAINDER_GET)
+	uint32_t *remainder;
+#endif /* CONFIG_BT_TICKER_REMAINDER_GET */
 #if defined(CONFIG_BT_TICKER_LAZY_GET)
 	uint16_t *lazy;
 #endif /* CONFIG_BT_TICKER_LAZY_GET */
@@ -385,10 +388,11 @@ static uint8_t ticker_by_slot_get(struct ticker_node *node, uint8_t ticker_id_he
  * @internal
  */
 static void ticker_by_next_slot_get(struct ticker_instance *instance,
-				    uint8_t *ticker_id_head, uint32_t *ticks_current,
+				    uint8_t *ticker_id_head,
+				    uint32_t *ticks_current,
 				    uint32_t *ticks_to_expire,
 				    ticker_op_match_func fp_match_op_func,
-				    void *match_op_context,
+				    void *match_op_context, uint32_t *remainder,
 				    uint16_t *lazy)
 {
 	struct ticker_node *ticker;
@@ -453,6 +457,13 @@ static void ticker_by_next_slot_get(struct ticker_instance *instance,
 	if (_ticker_id_head != TICKER_NULL) {
 		/* Add ticks for found ticker */
 		_ticks_to_expire += ticker->ticks_to_expire;
+
+#if defined(CONFIG_BT_TICKER_REMAINDER_GET)
+		if (remainder) {
+			*remainder = ticker->remainder_current;
+		}
+#endif /* CONFIG_BT_TICKER_REMAINDER_GET */
+
 #if defined(CONFIG_BT_TICKER_LAZY_GET)
 		if (lazy) {
 			*lazy = ticker->lazy_current;
@@ -2262,6 +2273,11 @@ static inline void ticker_job_op_inquire(struct ticker_instance *instance,
 #else
 					NULL, NULL,
 #endif
+#if defined(CONFIG_BT_TICKER_REMAINDER_GET)
+					uop->params.slot_get.remainder,
+#else /* !CONFIG_BT_TICKER_REMAINDER_GET */
+					NULL,
+#endif /* !CONFIG_BT_TICKER_REMAINDER_GET */
 #if defined(CONFIG_BT_TICKER_LAZY_GET)
 					uop->params.slot_get.lazy);
 #else /* !CONFIG_BT_TICKER_LAZY_GET */
@@ -3057,21 +3073,26 @@ uint32_t ticker_next_slot_get(uint8_t instance_index, uint8_t user_id,
 			      ticker_op_func fp_op_func, void *op_context)
 {
 #if defined(CONFIG_BT_TICKER_LAZY_GET) || \
+	defined(CONFIG_BT_TICKER_REMAINDER_GET) || \
 	defined(CONFIG_BT_TICKER_NEXT_SLOT_GET_MATCH)
 	return ticker_next_slot_get_ext(instance_index, user_id, ticker_id,
 					ticks_current, ticks_to_expire, NULL,
-					NULL, NULL,
+					NULL, NULL, NULL, fp_op_func,
-					fp_op_func, op_context);
+					op_context);
 }
 
 uint32_t ticker_next_slot_get_ext(uint8_t instance_index, uint8_t user_id,
 				  uint8_t *ticker_id, uint32_t *ticks_current,
-				  uint32_t *ticks_to_expire, uint16_t *lazy,
+				  uint32_t *ticks_to_expire,
+				  uint32_t *remainder, uint16_t *lazy,
 				  ticker_op_match_func fp_match_op_func,
 				  void *match_op_context,
 				  ticker_op_func fp_op_func, void *op_context)
 {
-#endif /* CONFIG_BT_TICKER_LAZY_GET || CONFIG_BT_TICKER_NEXT_SLOT_GET_MATCH */
+#endif /* CONFIG_BT_TICKER_LAZY_GET ||
+	* CONFIG_BT_TICKER_REMAINDER_GET ||
+	* CONFIG_BT_TICKER_NEXT_SLOT_GET_MATCH
+	*/
 	struct ticker_instance *instance = &_instance[instance_index];
 	struct ticker_user_op *user_op;
 	struct ticker_user *user;
@@ -3094,6 +3115,9 @@ uint32_t ticker_next_slot_get_ext(uint8_t instance_index, uint8_t user_id,
 	user_op->params.slot_get.ticker_id = ticker_id;
 	user_op->params.slot_get.ticks_current = ticks_current;
 	user_op->params.slot_get.ticks_to_expire = ticks_to_expire;
+#if defined(CONFIG_BT_TICKER_REMAINDER_GET)
+	user_op->params.slot_get.remainder = remainder;
+#endif /* CONFIG_BT_TICKER_REMAINDER_GET */
 #if defined(CONFIG_BT_TICKER_LAZY_GET)
 	user_op->params.slot_get.lazy = lazy;
 #endif /* CONFIG_BT_TICKER_LAZY_GET */

subsys/bluetooth/controller/ticker/ticker.h

@@ -157,7 +157,8 @@ uint32_t ticker_next_slot_get(uint8_t instance_index, uint8_t user_id,
 			      ticker_op_func fp_op_func, void *op_context);
 uint32_t ticker_next_slot_get_ext(uint8_t instance_index, uint8_t user_id,
 				  uint8_t *ticker_id, uint32_t *ticks_current,
-				  uint32_t *ticks_to_expire, uint16_t *lazy,
+				  uint32_t *ticks_to_expire,
+				  uint32_t *remainder, uint16_t *lazy,
 				  ticker_op_match_func fp_op_match_func,
 				  void *match_op_context,
 				  ticker_op_func fp_op_func, void *op_context);