Bluetooth: Controller: Fix DF for per adv chains scanning

This updates DF to properly receive CTE in per adv chains scanning.

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

Author: andrzej-kaczmarek

samples/bluetooth/direction_finding_connectionless_rx/boards/nrf52833dk_nrf52833.conf

@@ -10,3 +10,5 @@ CONFIG_BT_CTLR_DF=y
 # Disable Direction Fiding TX mode
 CONFIG_BT_CTLR_DF_ANT_SWITCH_TX=n
 CONFIG_BT_CTLR_DF_ADV_CTE_TX=n
+
+CONFIG_BT_CTLR_DF_PER_SCAN_CTE_NUM_MAX=16

subsys/bluetooth/controller/Kconfig.df

@@ -163,6 +163,16 @@ config BT_CTLR_DF_PER_ADV_CTE_NUM_MAX
 	  periodic advertising chain. The range is taken from BT Core spec 5.1, Vol 4 Part E
 	  section 7.8.82 HCI_LE_Set_Connectionless_IQ_Sampling_Enable Max_Sampled_CTEs parameter.
 
+config BT_CTLR_DF_PER_SCAN_CTE_NUM_MAX
+	int "Maximum number of received PDUs with Constant Tone Extension in connectionless mode"
+	depends on BT_CTLR_DF_SCAN_CTE_RX
+	range 1 16
+	default 16
+	help
+	  Maximum supported number of PDUs, that have Constant Tone Extension, received in single
+	  periodic advertising chain. The range is taken from BT Core spec 5.1, Vol 4 Part E
+	  section 7.8.82 HCI_LE_Set_Connectionless_IQ_Sampling_Enable Max_Sampled_CTEs parameter.
+
 config BT_CTLR_DF_DEBUG_ENABLE
 	bool "Bluetooth Direction Finding debug support enable"
 	help

subsys/bluetooth/controller/ll_sw/ull.c

@@ -687,11 +687,6 @@ void ll_reset(void)
 	LL_ASSERT(!err);
 #endif /* CONFIG_BT_CTLR_ADV_ISO */
 
-#if defined(CONFIG_BT_CTLR_DF)
-	err = ull_df_reset();
-	LL_ASSERT(!err);
-#endif
-
 #if defined(CONFIG_BT_CONN)
 #if defined(CONFIG_BT_CENTRAL)
 	/* Reset initiator */
@@ -800,6 +795,15 @@ void ll_reset(void)
 	/* Common to init and reset */
 	err = init_reset();
 	LL_ASSERT(!err);
+
+#if defined(CONFIG_BT_CTLR_DF)
+	/* Direction Finding has to be reset after ull init_reset call because
+	 *  it uses mem_link_rx for node_rx_iq_report. The mem_linx_rx is reset
+	 *  in common ull init_reset.
+	 */
+	err = ull_df_reset();
+	LL_ASSERT(!err);
+#endif
 }
 
 /**

subsys/bluetooth/controller/ll_sw/ull_df_types.h

@@ -27,8 +27,8 @@ enum df_switch_sample_support {
  * - for LLL -> ULL
  * - for ULL -> LL(HCI).
  */
-#if defined(CONFIG_BT_PER_ADV_SYNC_MAX)
-#define IQ_REPORT_CNT (CONFIG_BT_PER_ADV_SYNC_MAX * 2)
+#if defined(CONFIG_BT_PER_ADV_SYNC_MAX) && defined(CONFIG_BT_CTLR_DF_PER_SCAN_CTE_NUM_MAX)
+#define IQ_REPORT_CNT (CONFIG_BT_PER_ADV_SYNC_MAX * CONFIG_BT_CTLR_DF_PER_SCAN_CTE_NUM_MAX * 2)
 #else
 #define IQ_REPORT_CNT 0
 #endif