michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers/bluetooth: stm32wb: Allow sequential C2 start

Browse source 
Set up a c2_reset procedure in order to allow sequential
open/close/open calls and keep c2_reset done at init (required
for flash access).
Move reinit out of the reset procedure, so flash could be
accessed after bt_disable().

Signed-off-by: Erwan Gouriou <erwan.gouriou@linaro.org>
This commit is contained in:
Erwan Gouriou 2022-02-02 14:38:49 +01:00 • committed by Anas Nashif
commit 3a041ca5c8
1 changed files with 42 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

56
drivers/bluetooth/hci/ipm_stm32wb.c
View file

@ -77,6 +77,8 @@ K_FIFO_DEFINE(ipm_rx_events_fifo);
static K_KERNEL_STACK_DEFINE(ipm_rx_stack, CONFIG_BT_STM32_IPM_RX_STACK_SIZE); static K_KERNEL_STACK_DEFINE(ipm_rx_stack, CONFIG_BT_STM32_IPM_RX_STACK_SIZE);
static struct k_thread ipm_rx_thread_data; static struct k_thread ipm_rx_thread_data;
static bool c2_started_flag;
static void stm32wb_start_ble(void) static void stm32wb_start_ble(void)
{ {
SHCI_C2_Ble_Init_Cmd_Packet_t ble_init_cmd_packet = { SHCI_C2_Ble_Init_Cmd_Packet_t ble_init_cmd_packet = {
@ -527,10 +529,44 @@ static int bt_ipm_ble_init(void)
return 0; return 0;
} }
static int c2_reset(void)
{
start_ble_rf();
/* Take BLE out of reset */
ipcc_reset();
transport_init();
/* Device will let us know when it's ready */
if (k_sem_take(&c2_started, STM32WB_C2_LOCK_TIMEOUT)) {
return -ETIMEDOUT;
}
BT_DBG("C2 unlocked");
stm32wb_start_ble();
c2_started_flag = true;
return 0;
}
static int bt_ipm_open(void) static int bt_ipm_open(void)
{ {
int err; int err;
if (!c2_started_flag) {
/* C2 has been teared down. Reinit required */
SHCI_C2_Reinit();
while (LL_PWR_IsActiveFlag_C2DS() == 0) {
};
err = c2_reset();
if (err) {
return err;
}
}
/* Start RX thread */ /* Start RX thread */
k_thread_create(&ipm_rx_thread_data, ipm_rx_stack, k_thread_create(&ipm_rx_thread_data, ipm_rx_stack,
K_KERNEL_STACK_SIZEOF(ipm_rx_stack), K_KERNEL_STACK_SIZEOF(ipm_rx_stack),
@ -564,7 +600,7 @@ static int bt_ipm_close(void)
while (LL_PWR_IsActiveFlag_C2DS() == 0) { while (LL_PWR_IsActiveFlag_C2DS() == 0) {
}; };
SHCI_C2_Reinit(); c2_started_flag = false;
k_thread_abort(&ipm_rx_thread_data); k_thread_abort(&ipm_rx_thread_data);
@ -584,24 +620,16 @@ static const struct bt_hci_driver drv = {
static int _bt_ipm_init(const struct device *unused) static int _bt_ipm_init(const struct device *unused)
{ {
int err;
ARG_UNUSED(unused); ARG_UNUSED(unused);
bt_hci_driver_register(&drv); bt_hci_driver_register(&drv);
start_ble_rf(); err = c2_reset();
if (err) {
/* Take BLE out of reset */ return err;
ipcc_reset();
transport_init();
/* Device will let us know when it's ready */
if (k_sem_take(&c2_started, STM32WB_C2_LOCK_TIMEOUT)) {
return -ETIMEDOUT;
} }
BT_DBG("C2 unlocked");
stm32wb_start_ble();
return 0; return 0;
} }