Bluetooth: controller: openisa: sync with Nordic SW LL

There are some changes that were introduced to the Nordic SW LL,
and as such, in order to maintain compatibility, propragate them
to the OpenISA SW LL as well.

Signed-off-by: Alex Porosanu <[email protected]>

Author: alexandru-porosanu-nxp

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

@@ -387,8 +387,9 @@ static int prepare(lll_is_abort_cb_t is_abort_cb, lll_abort_cb_t abort_cb,
 		   lll_prepare_cb_t prepare_cb, int prio,
 		   struct lll_prepare_param *prepare_param, u8_t is_resume)
 {
-	struct lll_event *p;
 	u8_t idx = UINT8_MAX;
+	struct lll_event *p;
+	int ret, err;
 
 	/* Find the ready prepare in the pipeline */
 	p = ull_prepare_dequeue_iter(&idx);
@@ -407,7 +408,6 @@ static int prepare(lll_is_abort_cb_t is_abort_cb, lll_abort_cb_t abort_cb,
 		struct lll_event *next;
 		int resume_prio;
 #endif /* CONFIG_BT_CTLR_LOW_LAT */
-		int ret;
 
 		if (IS_ENABLED(CONFIG_BT_CTLR_LOW_LAT) && event.curr.param) {
 			/* early abort */
@@ -486,7 +486,16 @@ static int prepare(lll_is_abort_cb_t is_abort_cb, lll_abort_cb_t abort_cb,
 	event.curr.is_abort_cb = is_abort_cb;
 	event.curr.abort_cb = abort_cb;
 
-	return prepare_cb(prepare_param);
+	err = prepare_cb(prepare_param);
+
+	/* Stop running pre-empt timer, if any */
+	ret = ticker_stop(TICKER_INSTANCE_ID_CTLR, TICKER_USER_ID_LLL,
+			  TICKER_ID_LLL_PREEMPT, NULL, NULL);
+	LL_ASSERT((ret == TICKER_STATUS_SUCCESS) ||
+		  (ret == TICKER_STATUS_FAILURE) ||
+		  (ret == TICKER_STATUS_BUSY));
+
+	return err;
 }
 
 static int resume_enqueue(lll_prepare_cb_t resume_cb, int resume_prio)

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

@@ -361,7 +361,8 @@ static void isr_tx(void *param)
 	 */
 	radio_tmr_end_capture();
 
-	if (IS_ENABLED(CONFIG_BT_CTLR_SCAN_REQ_RSSI)) {
+	if (IS_ENABLED(CONFIG_BT_CTLR_SCAN_REQ_RSSI) ||
+	    IS_ENABLED(CONFIG_BT_CTLR_CONN_RSSI)) {
 		radio_rssi_measure();
 	}
 
@@ -716,6 +717,11 @@ static inline int isr_rx_pdu(struct lll_adv *lll,
 			lll_prof_cputime_capture();
 		}
 
+#if defined(CONFIG_BT_CTLR_CONN_RSSI)
+		if (rssi_ready) {
+			lll->conn->rssi_latest =  radio_rssi_get();
+		}
+#endif /* CONFIG_BT_CTLR_CONN_RSSI */
 		/* Stop further LLL radio events */
 		ret = lll_stop(lll);
 		LL_ASSERT(!ret);

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

@@ -536,76 +536,14 @@ void lll_conn_pdu_tx_prep(struct lll_conn *lll, struct pdu_data **pdu_data_tx)
 		p->len = lll->packet_tx_head_len - lll->packet_tx_head_offset;
 		p->md = 0;
 
-#if defined(CONFIG_BT_CTLR_DATA_LENGTH)
-#if defined(CONFIG_BT_CTLR_PHY)
-		switch (lll->phy_tx_time) {
-		default:
-		case BIT(0):
-			/* 1M PHY, 1us = 1 bit, hence divide by 8.
-			 * Deduct 10 bytes for preamble (1), access address (4),
-			 * header (2), and CRC (3).
-			 */
-			max_tx_octets = (lll->max_tx_time >> 3) - 10;
-			break;
-
-		case BIT(1):
-			/* 2M PHY, 1us = 2 bits, hence divide by 4.
-			 * Deduct 11 bytes for preamble (2), access address (4),
-			 * header (2), and CRC (3).
-			 */
-			max_tx_octets = (lll->max_tx_time >> 2) - 11;
-			break;
-
-#if defined(CONFIG_BT_CTLR_PHY_CODED)
-		case BIT(2):
-			if (lll->phy_flags & 0x01) {
-				/* S8 Coded PHY, 8us = 1 bit, hence divide by
-				 * 64.
-				 * Subtract time for preamble (80), AA (256),
-				 * CI (16), TERM1 (24), CRC (192) and
-				 * TERM2 (24), total 592 us.
-				 * Subtract 2 bytes for header.
-				 */
-				max_tx_octets = ((lll->max_tx_time - 592) >>
-						 6) - 2;
-			} else {
-				/* S2 Coded PHY, 2us = 1 bit, hence divide by
-				 * 16.
-				 * Subtract time for preamble (80), AA (256),
-				 * CI (16), TERM1 (24), CRC (48) and
-				 * TERM2 (6), total 430 us.
-				 * Subtract 2 bytes for header.
-				 */
-				max_tx_octets = ((lll->max_tx_time - 430) >>
-						 4) - 2;
-			}
-			break;
-#endif /* CONFIG_BT_CTLR_PHY_CODED */
-		}
-
-#if defined(CONFIG_BT_CTLR_LE_ENC)
-		if (lll->enc_tx) {
-			/* deduct the MIC */
-			max_tx_octets -= 4U;
-		}
-#endif /* CONFIG_BT_CTLR_LE_ENC */
-
-		if (max_tx_octets > lll->max_tx_octets) {
-			max_tx_octets = lll->max_tx_octets;
-		}
-#else /* !CONFIG_BT_CTLR_PHY */
-		max_tx_octets = lll->max_tx_octets;
-#endif /* !CONFIG_BT_CTLR_PHY */
-#else /* !CONFIG_BT_CTLR_DATA_LENGTH */
-		max_tx_octets = PDU_DC_PAYLOAD_SIZE_MIN;
-#endif /* !CONFIG_BT_CTLR_DATA_LENGTH */
+		max_tx_octets = ull_conn_lll_max_tx_octets_get(lll);
 
 		if (p->len > max_tx_octets) {
 			p->len = max_tx_octets;
 			p->md = 1;
 		}
 
-		if (link->next) {
+		if (link->next != lll->memq_tx.tail) {
 			p->md = 1;
 		}
 	}

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

@@ -85,7 +85,7 @@ static int prepare_cb(struct lll_prepare_param *prepare_param)
 	struct evt_hdr *evt;
 	u16_t event_counter;
 	u32_t remainder_us;
-	u8_t data_chan_use = 0;
+	u8_t data_chan_use;
 	u32_t remainder;
 	u16_t lazy;
 

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

@@ -704,7 +704,7 @@ static inline u32_t isr_rx_pdu(struct lll_scan *lll, u8_t devmatch_ok,
 		evt = HDR_LLL2EVT(lll);
 		if (pdu_end_us > (HAL_TICKER_TICKS_TO_US(evt->ticks_slot) -
 				  502 - EVENT_OVERHEAD_START_US -
-				  (EVENT_JITTER_US << 1))) {
+				  EVENT_TICKER_RES_MARGIN_US)) {
 			return -ETIME;
 		}
 
@@ -804,6 +804,12 @@ static inline u32_t isr_rx_pdu(struct lll_scan *lll, u8_t devmatch_ok,
 					 CONFIG_BT_CTLR_GPIO_PA_OFFSET);
 #endif /* CONFIG_BT_CTLR_GPIO_PA_PIN */
 
+#if defined(CONFIG_BT_CTLR_CONN_RSSI)
+		if (rssi_ready) {
+			lll_conn->rssi_latest =  radio_rssi_get();
+		}
+#endif /* CONFIG_BT_CTLR_CONN_RSSI */
+
 		/* block CPU so that there is no CRC error on pdu tx,
 		 * this is only needed if we want the CPU to sleep.
 		 * while(!radio_has_disabled())

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

@@ -84,7 +84,7 @@ static int prepare_cb(struct lll_prepare_param *prepare_param)
 	struct evt_hdr *evt;
 	u16_t event_counter;
 	u32_t remainder_us;
-	u8_t data_chan_use = 0;
+	u8_t data_chan_use;
 	u32_t remainder;
 	u32_t hcto;
 	u16_t lazy;
@@ -251,7 +251,7 @@ static int prepare_cb(struct lll_prepare_param *prepare_param)
 		LL_ASSERT(!ret);
 	}
 
-	DEBUG_RADIO_START_S(0);
+	DEBUG_RADIO_START_S(1);
 
 	return 0;
 }