soc: st: stm32wba: hci_if: allow forcing ISR registration

Add parameter to the link_layer_register_isr() to force
or not the link layer isr registration in case of multiple
function calls

Update Bluetooth hci_stm32wba.c driver and
IEEE 802.15.4 ieee802154_stm32wba.c driver accordingly.

Signed-off-by: Vincent Tardy <[email protected]>

Author: vtardy-st

drivers/bluetooth/hci/hci_stm32wba.c

@@ -452,7 +452,7 @@ static int bt_hci_stm32wba_open(const struct device *dev, bt_hci_recv_t recv)
 	struct hci_data *data = dev->data;
 	int ret = 0;
 
-	link_layer_register_isr();
+	link_layer_register_isr(false);
 
 	ret = bt_ble_ctlr_init();
 	if (ret == 0) {
@@ -563,7 +563,7 @@ static int radio_pm_action(const struct device *dev, enum pm_device_action actio
 #if defined(CONFIG_PM_S2RAM)
 		if (LL_PWR_IsActiveFlag_SB() == 1U) {
 			/* Put the radio in active state */
-			link_layer_register_isr();
+			link_layer_register_isr(true);
 		}
 #endif /* CONFIG_PM_S2RAM */
 		LINKLAYER_PLAT_NotifyWFIExit();

drivers/ieee802154/ieee802154_stm32wba.c

@@ -686,7 +686,7 @@ static void stm32wba_802154_iface_init(struct net_if *iface)
 		.stm32wba_802154_ral_cbk_tx_ack_started = stm32wba_802154_tx_ack_started,
 	};
 
-	link_layer_register_isr();
+	link_layer_register_isr(false);
 
 #if !defined(CONFIG_NET_L2_CUSTOM_IEEE802154_STM32WBA)
 	ll_sys_thread_init();
@@ -995,7 +995,7 @@ static int radio_pm_action(const struct device *dev, enum pm_device_action actio
 		if (LL_PWR_IsActiveFlag_SB() == 1U) {
 			/* Put the radio in active state */
 			LL_AHB5_GRP1_EnableClock(LL_AHB5_GRP1_PERIPH_RADIO);
-			link_layer_register_isr();
+			link_layer_register_isr(true);
 		}
 		LINKLAYER_PLAT_NotifyWFIExit();
 		ll_sys_dp_slp_exit();

soc/st/stm32/stm32wbax/hci_if/linklayer_plat_adapt.c

@@ -38,6 +38,8 @@ static uint32_t primask_bit;
 /* Radio SW low ISR global variable */
 volatile uint8_t radio_sw_low_isr_is_running_high_prio;
 
+/* ISR registration state variable */
+static bool is_isr_registered;
 
 void LINKLAYER_PLAT_DelayUs(uint32_t delay)
 {
@@ -96,27 +98,33 @@ void radio_low_prio_isr(void)
 }
 
 
-void link_layer_register_isr(void)
+void link_layer_register_isr(bool force)
 {
-	ARM_IRQ_DIRECT_DYNAMIC_CONNECT(RADIO_INTR_NUM, 0, 0, reschedule);
 
-	/* Ensure the IRQ is disabled before enabling it at run time */
-	irq_disable(RADIO_INTR_NUM);
+	if (force || !is_isr_registered) {
 
-	irq_connect_dynamic(RADIO_INTR_NUM, RADIO_INTR_PRIO_HIGH_Z,
-			    (void (*)(const void *))radio_high_prio_isr, NULL, 0);
+		is_isr_registered = true;
 
-	irq_enable(RADIO_INTR_NUM);
+		ARM_IRQ_DIRECT_DYNAMIC_CONNECT(RADIO_INTR_NUM, 0, 0, reschedule);
 
-	ARM_IRQ_DIRECT_DYNAMIC_CONNECT(RADIO_SW_LOW_INTR_NUM, 0, 0, reschedule);
+		/* Ensure the IRQ is disabled before enabling it at run time */
+		irq_disable(RADIO_INTR_NUM);
 
-	/* Ensure the IRQ is disabled before enabling it at run time */
-	irq_disable(RADIO_SW_LOW_INTR_NUM);
+		irq_connect_dynamic(RADIO_INTR_NUM, RADIO_INTR_PRIO_HIGH_Z,
+				    (void (*)(const void *))radio_high_prio_isr, NULL, 0);
 
-	irq_connect_dynamic(RADIO_SW_LOW_INTR_NUM, RADIO_SW_LOW_INTR_PRIO,
-			    (void (*)(const void *))radio_low_prio_isr, NULL, 0);
+		irq_enable(RADIO_INTR_NUM);
 
-	irq_enable(RADIO_SW_LOW_INTR_NUM);
+		ARM_IRQ_DIRECT_DYNAMIC_CONNECT(RADIO_SW_LOW_INTR_NUM, 0, 0, reschedule);
+
+		/* Ensure the IRQ is disabled before enabling it at run time */
+		irq_disable(RADIO_SW_LOW_INTR_NUM);
+
+		irq_connect_dynamic(RADIO_SW_LOW_INTR_NUM, RADIO_SW_LOW_INTR_PRIO,
+				    (void (*)(const void *))radio_low_prio_isr, NULL, 0);
+
+		irq_enable(RADIO_SW_LOW_INTR_NUM);
+	}
 }
 
 

soc/st/stm32/stm32wbax/hci_if/linklayer_plat_local.h

@@ -8,6 +8,11 @@
 #ifndef _STM32WBA_LINK_LAYER_PLAT_LOCAL_H_
 #define _STM32WBA_LINK_LAYER_PLAT_LOCAL_H_
 
-void link_layer_register_isr(void);
+/*
+ * @brief  Link Layer ISR registration
+ * @param  force: force ISR registration even if already done before
+ * @retval None
+ */
+void link_layer_register_isr(bool force);
 
 #endif /* _STM32WBA_LINK_LAYER_PLAT_LOCAL_H_ */