Bluetooth: Controller: Store parent lll struct in aux context

We use 1st node enqueued in aux context to retrieve lll scan/sync
struct, but that only works if we buffer PDUs in aux context. It's
better to store parent lll struct as explicit member in aux context
as this also works if we skip buffering.

Signed-off-by: Andrzej Kaczmarek <[email protected]>

Author: andrzej-kaczmarek

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

@@ -50,6 +50,7 @@
 #include <ull_scan_types.h>
 #include <ull_scan_internal.h>
 #include <ull_sync_types.h>
+#include <ull_sync_internal.h>
 #include "hal/debug.h"
 
 static int init_reset(void);
@@ -264,7 +265,7 @@ static int prepare_cb(struct lll_prepare_param *p)
 
 	lll = p->param;
 	aux_set = HDR_LLL2ULL(lll);
-	scan_set = HDR_LLL2ULL(aux_set->rx_head->rx_ftr.param);
+	scan_set = HDR_LLL2ULL(aux_set->parent);
 	scan_set = ull_scan_is_valid_get(scan_set);
 
 	if (scan_set) {
@@ -289,7 +290,7 @@ static int prepare_cb(struct lll_prepare_param *p)
 	} else {
 		/* We are in sync context */
 		scan_lll = NULL;
-		sync_set = HDR_LLL2ULL(aux_set->rx_head->rx_ftr.param);
+		sync_set = HDR_LLL2ULL(aux_set->parent);
 		sync_lll = &sync_set->lll;
 		LL_ASSERT(sync_lll);
 	}
@@ -633,7 +634,7 @@ static void isr_rx_ull_schedule(void *param)
 
 	lll_aux = param;
 	aux = HDR_LLL2ULL(lll_aux);
-	param_lll = aux->rx_head->rx_ftr.param;
+	param_lll = aux->parent;
 
 	if (ull_scan_is_valid_get(HDR_LLL2ULL(param_lll))) {
 		lll = param_lll;

subsys/bluetooth/controller/ll_sw/ull_scan_aux.c

@@ -138,7 +138,7 @@ void ull_scan_aux_setup(memq_link_t *link, struct node_rx_hdr *rx)
 			lll_aux = ftr->param;
 			aux = HDR_LLL2ULL(lll_aux);
 			/* FIXME: pick the aux somehow */
-			lll = aux->rx_head->rx_ftr.param;
+			lll = aux->parent;
 		} else if (ull_scan_is_valid_get(HDR_LLL2ULL(ftr->param))) {
 			/* Node that does not have valid aux context but has
 			 * valid scan set was scheduled from LLL. We can
@@ -151,7 +151,7 @@ void ull_scan_aux_setup(memq_link_t *link, struct node_rx_hdr *rx)
 			LL_ASSERT(lll_aux);
 
 			aux = HDR_LLL2ULL(lll_aux);
-			LL_ASSERT(lll == aux->rx_head->rx_ftr.param);
+			LL_ASSERT(lll == aux->parent);
 		} else {
 			/* If none of the above, node is part of sync scanning
 			 */
@@ -366,6 +366,8 @@ void ull_scan_aux_setup(memq_link_t *link, struct node_rx_hdr *rx)
 
 		ull_hdr_init(&aux->ull);
 		lll_hdr_init(lll_aux, aux);
+
+		aux->parent = lll ? (void *)lll : (void *)lll_sync;
 	}
 
 	/* Enqueue the rx in aux context */

subsys/bluetooth/controller/ll_sw/ull_scan_types.h

@@ -41,6 +41,9 @@ struct ll_scan_aux_set {
 	struct ull_hdr      ull;
 	struct lll_scan_aux lll;
 
+	/* lll_scan or lll_sync */
+	void *parent;
+
 	struct node_rx_hdr *rx_head;
 	struct node_rx_hdr *rx_last;
 };