Commit 19fe1028 authored by Vinayak Kariappa Chettimada's avatar Vinayak Kariappa Chettimada Committed by Carles Cufi
Browse files

Bluetooth: Controller: Propagate ticks_drift in the ticker callback 



The ticker `ticks_drift` is propagated via the ticker
elapsed callback, in order to provide necessary information
to correctly calculate total elapsed durations by states and
roles that use ticker extensions to mitigate scheduling
collisions by drifting within a permitted window.

Signed-off-by: default avatarVinayak Kariappa Chettimada <vich@nordicsemi.no>
parent b01b5f67

drivers/flash/soc_flash_nrf_ticker.c

+5 −2
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ static inline int _ticker_stop(uint8_t inst_idx, uint8_t u_id, uint8_t tic_id) 
}



static void time_slot_callback_work(uint32_t ticks_at_expire,

				    uint32_t ticks_drift,

				    uint32_t remainder,

				    uint16_t lazy, uint8_t force,

				    void *context)
@@ -120,6 +121,7 @@ static void time_slot_delay(uint32_t ticks_at_expire, uint32_t ticks_delay, 
}



static void time_slot_callback_abort(uint32_t ticks_at_expire,

				     uint32_t ticks_drift,

				     uint32_t remainder,

				     uint16_t lazy, uint8_t force,

				     void *context)
@@ -132,13 +134,14 @@ static void time_slot_callback_abort(uint32_t ticks_at_expire, 
}



static void time_slot_callback_prepare(uint32_t ticks_at_expire,

				       uint32_t ticks_drift,

				       uint32_t remainder,

				       uint16_t lazy, uint8_t force,

				       void *context)

{

#if defined(CONFIG_BT_CTLR_LOW_LAT)

	time_slot_callback_abort(ticks_at_expire, remainder, lazy, force,

				 context);

	time_slot_callback_abort(ticks_at_expire, ticks_drift, remainder, lazy,

				 force, context);

#else /* !CONFIG_BT_CTLR_LOW_LAT */

	time_slot_delay(ticks_at_expire,

			HAL_TICKER_US_TO_TICKS(FLASH_RADIO_ABORT_DELAY_US),

subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c

+6 −4
Original line number Diff line number Diff line
@@ -72,8 +72,9 @@ static void isr_race(void *param); 
static uint32_t preempt_ticker_start(struct lll_event *prev,

				     struct lll_event *next);

static uint32_t preempt_ticker_stop(void);

static void preempt_ticker_cb(uint32_t ticks_at_expire, uint32_t remainder,

			      uint16_t lazy, uint8_t force, void *param);

static void preempt_ticker_cb(uint32_t ticks_at_expire, uint32_t ticks_drift,

			      uint32_t remainder, uint16_t lazy, uint8_t force,

			      void *param);

static void preempt(void *param);

#else /* CONFIG_BT_CTLR_LOW_LAT */

#if (CONFIG_BT_CTLR_LLL_PRIO == CONFIG_BT_CTLR_ULL_LOW_PRIO)
@@ -857,8 +858,9 @@ static uint32_t preempt_ticker_stop(void) 
	return ret;

}



static void preempt_ticker_cb(uint32_t ticks_at_expire, uint32_t remainder,

			       uint16_t lazy, uint8_t force, void *param)

static void preempt_ticker_cb(uint32_t ticks_at_expire, uint32_t ticks_drift,

			      uint32_t remainder, uint16_t lazy, uint8_t force,

			      void *param)

{

	static memq_link_t link;

	static struct mayfly mfy = {0, 0, &link, NULL, preempt};

subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan.c

+5 −4
Original line number Diff line number Diff line
@@ -54,8 +54,9 @@ static int common_prepare_cb(struct lll_prepare_param *p, bool is_resume); 
static int is_abort_cb(void *next, void *curr,

		       lll_prepare_cb_t *resume_cb);

static void abort_cb(struct lll_prepare_param *prepare_param, void *param);

static void ticker_stop_cb(uint32_t ticks_at_expire, uint32_t remainder, uint16_t lazy,

			   uint8_t force, void *param);

static void ticker_stop_cb(uint32_t ticks_at_expire, uint32_t ticks_drift,

			   uint32_t remainder, uint16_t lazy, uint8_t force,

			   void *param);

static void ticker_op_start_cb(uint32_t status, void *param);

static void isr_rx(void *param);

static void isr_tx(void *param);
@@ -593,8 +594,8 @@ static void abort_cb(struct lll_prepare_param *prepare_param, void *param) 
	lll_done(param);

}



static void ticker_stop_cb(uint32_t ticks_at_expire, uint32_t remainder, uint16_t lazy,

			   uint8_t force, void *param)

static void ticker_stop_cb(uint32_t ticks_at_expire, uint32_t ticks_drift,

			   uint32_t remainder, uint16_t lazy, uint8_t force, void *param)

{

	radio_isr_set(isr_done_cleanup, param);

	radio_disable();

subsys/bluetooth/controller/ll_sw/openisa/lll/lll.c

+6 −4
Original line number Diff line number Diff line
@@ -66,8 +66,9 @@ static void ticker_start_op_cb(uint32_t status, void *param); 
static void ticker_start_next_op_cb(uint32_t status, void *param);

static uint32_t preempt_ticker_start(struct lll_event *event,

				     ticker_op_func op_cb);

static void preempt_ticker_cb(uint32_t ticks_at_expire, uint32_t remainder,

			      uint16_t lazy, uint8_t force, void *param);

static void preempt_ticker_cb(uint32_t ticks_at_expire, uint32_t ticks_drift,

			      uint32_t remainder, uint16_t lazy, uint8_t force,

			      void *param);

static void preempt(void *param);

#else /* CONFIG_BT_CTLR_LOW_LAT */

#if (CONFIG_BT_CTLR_LLL_PRIO == CONFIG_BT_CTLR_ULL_LOW_PRIO)
@@ -670,8 +671,9 @@ static uint32_t preempt_ticker_start(struct lll_event *event, 
	return ret;

}



static void preempt_ticker_cb(uint32_t ticks_at_expire, uint32_t remainder,

			       uint16_t lazy, uint8_t force, void *param)

static void preempt_ticker_cb(uint32_t ticks_at_expire, uint32_t ticks_drift,

			      uint32_t remainder, uint16_t lazy, uint8_t force,

			      void *param)

{

	static memq_link_t link;

	static struct mayfly mfy = {0, 0, &link, NULL, preempt};

subsys/bluetooth/controller/ll_sw/openisa/lll/lll_scan.c

+6 −4
Original line number Diff line number Diff line
@@ -43,8 +43,9 @@ static int init_reset(void); 
static int prepare_cb(struct lll_prepare_param *prepare_param);

static int is_abort_cb(void *next, void *curr, lll_prepare_cb_t *resume_cb);

static void abort_cb(struct lll_prepare_param *prepare_param, void *param);

static void ticker_stop_cb(uint32_t ticks_at_expire, uint32_t remainder, uint16_t lazy,

			   uint8_t force, void *param);

static void ticker_stop_cb(uint32_t ticks_at_expire, uint32_t ticks_drift,

			   uint32_t remainder, uint16_t lazy, uint8_t force,

			   void *param);

static void ticker_op_start_cb(uint32_t status, void *param);

static void isr_rx(void *param);

static void isr_tx(void *param);
@@ -329,8 +330,9 @@ static void abort_cb(struct lll_prepare_param *prepare_param, void *param) 
	lll_done(param);

}



static void ticker_stop_cb(uint32_t ticks_at_expire, uint32_t remainder, uint16_t lazy,

			   uint8_t force, void *param)

static void ticker_stop_cb(uint32_t ticks_at_expire, uint32_t ticks_drift,

			   uint32_t remainder, uint16_t lazy, uint8_t force,

			   void *param)

{

	radio_isr_set(isr_cleanup, param);

	radio_disable();

CRA Git | Maintained and supported by SUSTech CRA and CCSE