Bluetooth: Controller: Update ull_disable with -EALREADY return

Update ull_disable implementation to return -EALREADY if
LLL event is already disabled.

Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>

Author: cvinayak

subsys/bluetooth/controller/ll_sw/ull.c

@@ -1702,6 +1702,7 @@ int ull_ticker_stop_with_mark(uint8_t ticker_handle, void *param,
 	uint32_t volatile ret_cb;
 	uint32_t ret;
 	void *mark;
+	int err;
 
 	mark = ull_disable_mark(param);
 	if (mark != param) {
@@ -1722,16 +1723,17 @@ int ull_ticker_stop_with_mark(uint8_t ticker_handle, void *param,
 		return -EALREADY;
 	}
 
-	ret = ull_disable(lll_disable);
-	if (ret) {
-		return -EBUSY;
-	}
+	err = ull_disable(lll_disable);
 
 	mark = ull_disable_unmark(param);
 	if (mark != param) {
 		return -ENOLCK;
 	}
 
+	if (err && (err != -EALREADY)) {
+		return err;
+	}
+
 	return 0;
 }
 
@@ -1761,8 +1763,8 @@ int ull_disable(void *lll)
 	uint32_t ret;
 
 	hdr = HDR_LLL2ULL(lll);
-	if (!hdr || !ull_ref_get(hdr)) {
-		return 0;
+	if (!ull_ref_get(hdr)) {
+		return -EALREADY;
 	}
 
 	k_sem_init(&sem, 0, 1);
@@ -1780,7 +1782,7 @@ int ull_disable(void *lll)
 	 * care.
 	 */
 	if (!ull_ref_get(hdr)) {
-		return 0;
+		return -EALREADY;
 	}
 
 	mfy.param = lll;

subsys/bluetooth/controller/ll_sw/ull_adv.c

@@ -2523,8 +2523,9 @@ static inline uint8_t disable(uint8_t handle)
 {
 	uint32_t volatile ret_cb;
 	struct ll_adv_set *adv;
-	void *mark;
 	uint32_t ret;
+	void *mark;
+	int err;
 
 	adv = ull_adv_is_enabled_get(handle);
 	if (!adv) {
@@ -2585,8 +2586,8 @@ static inline uint8_t disable(uint8_t handle)
 		return BT_HCI_ERR_CMD_DISALLOWED;
 	}
 
-	ret = ull_disable(&adv->lll);
-	LL_ASSERT(!ret);
+	err = ull_disable(&adv->lll);
+	LL_ASSERT(!err || (err == -EALREADY));
 
 	mark = ull_disable_unmark(adv);
 	LL_ASSERT(mark == adv);
@@ -2596,13 +2597,12 @@ static inline uint8_t disable(uint8_t handle)
 
 	if (lll_aux) {
 		struct ll_adv_aux_set *aux;
-		uint8_t err;
 
 		aux = HDR_LLL2ULL(lll_aux);
 
 		err = ull_adv_aux_stop(aux);
-		if (err) {
-			return err;
+		if (err && (err != -EALREADY)) {
+			return BT_HCI_ERR_CMD_DISALLOWED;
 		}
 	}
 #endif /* CONFIG_BT_CTLR_ADV_EXT && (CONFIG_BT_CTLR_ADV_AUX_SET > 0) */

subsys/bluetooth/controller/ll_sw/ull_adv_aux.c

@@ -1073,7 +1073,7 @@ uint32_t ull_adv_aux_start(struct ll_adv_aux_set *aux, uint32_t ticks_anchor,
 	return ret;
 }
 
-uint8_t ull_adv_aux_stop(struct ll_adv_aux_set *aux)
+int ull_adv_aux_stop(struct ll_adv_aux_set *aux)
 {
 	uint8_t aux_handle;
 	int err;
@@ -1084,7 +1084,7 @@ uint8_t ull_adv_aux_stop(struct ll_adv_aux_set *aux)
 					aux, &aux->lll);
 	LL_ASSERT(err == 0 || err == -EALREADY);
 	if (err) {
-		return BT_HCI_ERR_CMD_DISALLOWED;
+		return err;
 	}
 
 	aux->is_started = 0U;

subsys/bluetooth/controller/ll_sw/ull_adv_internal.h

@@ -83,7 +83,7 @@ uint32_t ull_adv_aux_start(struct ll_adv_aux_set *aux, uint32_t ticks_anchor,
 			   uint32_t ticks_slot_overhead);
 
 /* helper function to stop auxiliary advertising */
-uint8_t ull_adv_aux_stop(struct ll_adv_aux_set *aux);
+int ull_adv_aux_stop(struct ll_adv_aux_set *aux);
 
 /* helper function to acquire and initialize auxiliary advertising instance */
 struct ll_adv_aux_set *ull_adv_aux_acquire(struct lll_adv *lll);