[nrf fromtree] samples: Bluetooth: hci_ipc: Enable HCI vendor-specific h/w error event

cvinayak · nordicjm · commit 9855f4e40f2f · 2025-10-29T07:21:27.000Z
Enable HCI vendor-specific h/w error event generation in samples and tests. Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no> (cherry picked from commit 29cf367) Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
diff --git a/doc/releases/migration-guide-4.3.rst b/doc/releases/migration-guide-4.3.rst
@@ -91,10 +91,13 @@ Bluetooth
 Bluetooth Controller
 ====================
 
-* The following Kconfig option have been renamed:
+* The following have been renamed:
 
     * :kconfig:option:`CONFIG_BT_CTRL_ADV_ADI_IN_SCAN_RSP` to
       :kconfig:option:`CONFIG_BT_CTLR_ADV_ADI_IN_SCAN_RSP`
+    * :c:struct:`bt_hci_vs_fata_error_cpu_data_cortex_m` to
+      :c:struct:`bt_hci_vs_fatal_error_cpu_data_cortex_m` and now contains the program counter
+      value.
 
 .. zephyr-keep-sorted-start re(^\w)
 
diff --git a/include/zephyr/bluetooth/hci_vs.h b/include/zephyr/bluetooth/hci_vs.h
@@ -225,7 +225,7 @@ struct bt_hci_evt_vs {
 #define BT_HCI_EVT_VS_ERROR_DATA_TYPE_STACK_FRAME   0x01
 #define BT_HCI_EVT_VS_ERROR_DATA_TYPE_CTRL_ASSERT   0x02
 #define BT_HCI_EVT_VS_ERROR_DATA_TYPE_TRACE         0x03
-struct bt_hci_vs_fata_error_cpu_data_cortex_m {
+struct bt_hci_vs_fatal_error_cpu_data_cortex_m {
 	uint32_t a1;
 	uint32_t a2;
 	uint32_t a3;
diff --git a/samples/bluetooth/hci_ipc/nrf5340_cpunet_bis-bt_ll_sw_split.conf b/samples/bluetooth/hci_ipc/nrf5340_cpunet_bis-bt_ll_sw_split.conf
@@ -44,8 +44,9 @@ CONFIG_BT_ISO_RX_BUF_COUNT=1
 
 # Controller
 CONFIG_BT_LL_SW_SPLIT=y
-CONFIG_BT_CTLR_ASSERT_HANDLER=y
 CONFIG_BT_CTLR_DTM_HCI=y
+CONFIG_BT_CTLR_ASSERT_HANDLER=y
+CONFIG_BT_HCI_VS_FATAL_ERROR=y
 
 # Rx ACL and Adv Reports
 CONFIG_BT_CTLR_RX_BUFFERS=9
diff --git a/samples/bluetooth/hci_ipc/nrf5340_cpunet_bt_mesh-bt_ll_sw_split.conf b/samples/bluetooth/hci_ipc/nrf5340_cpunet_bt_mesh-bt_ll_sw_split.conf
@@ -12,6 +12,8 @@ CONFIG_BT_MAX_CONN=16
 
 # Controller
 CONFIG_BT_LL_SW_SPLIT=y
+CONFIG_BT_CTLR_ASSERT_HANDLER=y
+CONFIG_BT_HCI_VS_FATAL_ERROR=y
 
 # Disable unused Bluetooth features
 CONFIG_BT_CTLR_DUP_FILTER_LEN=0
diff --git a/samples/bluetooth/hci_ipc/nrf5340_cpunet_cis-bt_ll_sw_split.conf b/samples/bluetooth/hci_ipc/nrf5340_cpunet_cis-bt_ll_sw_split.conf
@@ -43,8 +43,9 @@ CONFIG_BT_ISO_RX_BUF_COUNT=1
 
 # Controller
 CONFIG_BT_LL_SW_SPLIT=y
-CONFIG_BT_CTLR_ASSERT_HANDLER=y
 CONFIG_BT_CTLR_DTM_HCI=y
+CONFIG_BT_CTLR_ASSERT_HANDLER=y
+CONFIG_BT_HCI_VS_FATAL_ERROR=y
 
 # Rx ACL and Adv Reports
 CONFIG_BT_CTLR_RX_BUFFERS=9
diff --git a/samples/bluetooth/hci_ipc/nrf5340_cpunet_df-bt_ll_sw_split.conf b/samples/bluetooth/hci_ipc/nrf5340_cpunet_df-bt_ll_sw_split.conf
@@ -29,8 +29,9 @@ CONFIG_BT_MAX_CONN=2
 
 # Controller
 CONFIG_BT_LL_SW_SPLIT=y
-CONFIG_BT_CTLR_ASSERT_HANDLER=y
 CONFIG_BT_CTLR_DTM_HCI=y
+CONFIG_BT_CTLR_ASSERT_HANDLER=y
+CONFIG_BT_HCI_VS_FATAL_ERROR=y
 
 # Rx ACL and Adv Reports
 CONFIG_BT_CTLR_RX_BUFFERS=9
diff --git a/samples/bluetooth/hci_ipc/nrf5340_cpunet_iso-bt_ll_sw_split.conf b/samples/bluetooth/hci_ipc/nrf5340_cpunet_iso-bt_ll_sw_split.conf
@@ -53,8 +53,9 @@ CONFIG_BT_ISO_RX_BUF_COUNT=1
 
 # Controller
 CONFIG_BT_LL_SW_SPLIT=y
-CONFIG_BT_CTLR_ASSERT_HANDLER=y
 CONFIG_BT_CTLR_DTM_HCI=y
+CONFIG_BT_CTLR_ASSERT_HANDLER=y
+CONFIG_BT_HCI_VS_FATAL_ERROR=y
 
 # Rx ACL and Adv Reports
 CONFIG_BT_CTLR_RX_BUFFERS=9
diff --git a/samples/bluetooth/hci_ipc/nrf5340_cpunet_iso_broadcast-bt_ll_sw_split.conf b/samples/bluetooth/hci_ipc/nrf5340_cpunet_iso_broadcast-bt_ll_sw_split.conf
@@ -30,6 +30,8 @@ CONFIG_BT_ISO_RX_BUF_COUNT=1
 
 # ISO Broadcast Controller
 CONFIG_BT_LL_SW_SPLIT=y
+CONFIG_BT_CTLR_ASSERT_HANDLER=y
+CONFIG_BT_HCI_VS_FATAL_ERROR=y
 CONFIG_BT_CTLR_ADV_PERIODIC=y
 CONFIG_BT_CTLR_ADV_DATA_LEN_MAX=191
 CONFIG_BT_CTLR_ADV_ISO=y
diff --git a/samples/bluetooth/hci_ipc/nrf5340_cpunet_iso_central-bt_ll_sw_split.conf b/samples/bluetooth/hci_ipc/nrf5340_cpunet_iso_central-bt_ll_sw_split.conf
@@ -40,6 +40,8 @@ CONFIG_BT_ISO_RX_BUF_COUNT=1
 
 # Controller
 CONFIG_BT_LL_SW_SPLIT=y
+CONFIG_BT_CTLR_ASSERT_HANDLER=y
+CONFIG_BT_HCI_VS_FATAL_ERROR=y
 CONFIG_BT_CTLR_DATA_LENGTH_MAX=251
 CONFIG_BT_CTLR_SCAN_DATA_LEN_MAX=191
 
diff --git a/samples/bluetooth/hci_ipc/nrf5340_cpunet_iso_peripheral-bt_ll_sw_split.conf b/samples/bluetooth/hci_ipc/nrf5340_cpunet_iso_peripheral-bt_ll_sw_split.conf
@@ -40,6 +40,8 @@ CONFIG_BT_ISO_RX_BUF_COUNT=1
 
 # Controller
 CONFIG_BT_LL_SW_SPLIT=y
+CONFIG_BT_CTLR_ASSERT_HANDLER=y
+CONFIG_BT_HCI_VS_FATAL_ERROR=y
 CONFIG_BT_CTLR_DATA_LENGTH_MAX=251
 CONFIG_BT_CTLR_ADV_DATA_LEN_MAX=191
 
diff --git a/samples/bluetooth/hci_ipc/nrf5340_cpunet_iso_receive-bt_ll_sw_split.conf b/samples/bluetooth/hci_ipc/nrf5340_cpunet_iso_receive-bt_ll_sw_split.conf
@@ -22,6 +22,8 @@ CONFIG_BT_PERIPHERAL=n
 
 # ISO Receive Controller
 CONFIG_BT_LL_SW_SPLIT=y
+CONFIG_BT_CTLR_ASSERT_HANDLER=y
+CONFIG_BT_HCI_VS_FATAL_ERROR=y
 CONFIG_BT_CTLR_SYNC_PERIODIC=y
 CONFIG_BT_CTLR_SCAN_DATA_LEN_MAX=191
 CONFIG_BT_CTLR_SYNC_ISO=y
diff --git a/samples/bluetooth/hci_ipc/src/main.c b/samples/bluetooth/hci_ipc/src/main.c
@@ -307,7 +307,10 @@ void bt_ctlr_assert_handle(char *file, uint32_t line)
 	LOG_PANIC();
 
 	while (true) {
+		k_cpu_idle();
 	};
+
+	CODE_UNREACHABLE;
 }
 #endif /* CONFIG_BT_CTLR_ASSERT_HANDLER */
 
@@ -338,6 +341,7 @@ void k_sys_fatal_error_handler(unsigned int reason, const struct arch_esf *esf)
 	LOG_PANIC();
 
 	while (true) {
+		k_cpu_idle();
 	};
 
 	CODE_UNREACHABLE;
diff --git a/samples/bluetooth/hci_uart/overlay-all-bt_ll_sw_split.conf b/samples/bluetooth/hci_uart/overlay-all-bt_ll_sw_split.conf
@@ -28,8 +28,9 @@ CONFIG_BT_ISO_RX_BUF_COUNT=1
 
 # Controller
 CONFIG_BT_LL_SW_SPLIT=y
-CONFIG_BT_CTLR_ASSERT_HANDLER=y
 CONFIG_BT_CTLR_DTM_HCI=y
+CONFIG_BT_CTLR_ASSERT_HANDLER=y
+CONFIG_BT_HCI_VS_FATAL_ERROR=y
 
 # Rx ACL and Adv Reports
 CONFIG_BT_CTLR_RX_BUFFERS=9
diff --git a/subsys/bluetooth/controller/hci/hci.c b/subsys/bluetooth/controller/hci/hci.c
@@ -5273,9 +5273,9 @@ NET_BUF_POOL_FIXED_DEFINE(vs_err_tx_pool, 1, BT_BUF_EVT_RX_SIZE, 0, NULL);
  * the alias is defined here.
  */
 #if defined(CONFIG_CPU_CORTEX_M)
-typedef struct bt_hci_vs_fata_error_cpu_data_cortex_m bt_hci_vs_fatal_error_cpu_data;
+static struct net_buf *vs_err_evt_create(uint8_t subevt, uint8_t len);
 
-static void vs_err_fatal_cpu_data_fill(bt_hci_vs_fatal_error_cpu_data *cpu_data,
+static void vs_err_fatal_cpu_data_fill(struct bt_hci_vs_fatal_error_cpu_data_cortex_m *cpu_data,
 				       const struct arch_esf *esf)
 {
 	cpu_data->a1 = sys_cpu_to_le32(esf->basic.a1);
@@ -5287,7 +5287,35 @@ static void vs_err_fatal_cpu_data_fill(bt_hci_vs_fatal_error_cpu_data *cpu_data,
 	cpu_data->pc = sys_cpu_to_le32(esf->basic.pc);
 	cpu_data->xpsr = sys_cpu_to_le32(esf->basic.xpsr);
 }
-#endif /* CONFIG_CPU_CORTEX_M */
+
+struct net_buf *hci_vs_err_stack_frame(unsigned int reason, const struct arch_esf *esf)
+{
+	/* Prepare vendor specific HCI Fatal Error event */
+	struct bt_hci_vs_fatal_error_stack_frame *sf;
+	struct bt_hci_vs_fatal_error_cpu_data_cortex_m *cpu_data;
+	struct net_buf *buf;
+
+	buf = vs_err_evt_create(BT_HCI_EVT_VS_ERROR_DATA_TYPE_STACK_FRAME,
+				sizeof(*sf) + sizeof(*cpu_data));
+	if (buf != NULL) {
+		sf = net_buf_add(buf, (sizeof(*sf) + sizeof(*cpu_data)));
+		sf->reason = sys_cpu_to_le32(reason);
+		sf->cpu_type = BT_HCI_EVT_VS_ERROR_CPU_TYPE_CORTEX_M;
+
+		vs_err_fatal_cpu_data_fill((void *)sf->cpu_data, esf);
+	} else {
+		LOG_WRN("Can't create HCI Fatal Error event");
+	}
+
+	return buf;
+}
+
+#else /* !CONFIG_CPU_CORTEX_M */
+struct net_buf *hci_vs_err_stack_frame(unsigned int reason, const struct arch_esf *esf)
+{
+	return NULL;
+}
+#endif /* !CONFIG_CPU_CORTEX_M */
 
 static struct net_buf *vs_err_evt_create(uint8_t subevt, uint8_t len)
 {
@@ -5311,29 +5339,6 @@ static struct net_buf *vs_err_evt_create(uint8_t subevt, uint8_t len)
 	return buf;
 }
 
-struct net_buf *hci_vs_err_stack_frame(unsigned int reason, const struct arch_esf *esf)
-{
-	/* Prepare vendor specific HCI Fatal Error event */
-	struct bt_hci_vs_fatal_error_stack_frame *sf;
-	bt_hci_vs_fatal_error_cpu_data *cpu_data;
-	struct net_buf *buf;
-
-	buf = vs_err_evt_create(BT_HCI_EVT_VS_ERROR_DATA_TYPE_STACK_FRAME,
-				sizeof(*sf) + sizeof(*cpu_data));
-	if (buf != NULL) {
-		sf = net_buf_add(buf, (sizeof(*sf) + sizeof(*cpu_data)));
-		sf->reason = sys_cpu_to_le32(reason);
-		sf->cpu_type = BT_HCI_EVT_VS_ERROR_CPU_TYPE_CORTEX_M;
-
-		vs_err_fatal_cpu_data_fill(
-			(bt_hci_vs_fatal_error_cpu_data *)sf->cpu_data, esf);
-	} else {
-		LOG_ERR("Can't create HCI Fatal Error event");
-	}
-
-	return buf;
-}
-
 static struct net_buf *hci_vs_err_trace_create(uint8_t data_type,
 					       const char *file_path,
 					       uint32_t line, uint64_t pc)
