Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

mpsl: fem: increase initialization priority #10120

Closed
wants to merge 3 commits into from
Closed

mpsl: fem: increase initialization priority #10120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
18ff8a1
mpsl: fem: increase initialization priority
Feb 1, 2023
cf9f435
mpsl: fem: add Kconfig for initialization priority
Feb 2, 2023
7975bd6
bluetooth: controller: add Kconfig for initialization priority
Feb 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions subsys/bluetooth/controller/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,13 @@ config BT_LL_SOFTDEVICE_BUILD_TYPE_LIB

endchoice

config BT_HCI_INIT_PRIORITY
int "Initialization priority of the HCI driver"
default KERNEL_INIT_PRIORITY_DEVICE
help
Set the initialization priority number. Do not mess with it unless
you know what you are doing.

# BT_HCI_TX_STACK_SIZE is declared in Zephyr and also here for a second time,
# for set the valid default size of the HCI Tx stack.
config BT_HCI_TX_STACK_SIZE
Expand Down
7 changes: 6 additions & 1 deletion subsys/bluetooth/controller/hci_driver.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -973,4 +973,9 @@ static int hci_driver_init(const struct device *unused)
return err;
}

SYS_INIT(hci_driver_init, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
#if defined(CONFIG_MPSL_FEM)
BUILD_ASSERT(CONFIG_MPSL_FEM_INIT_PRIORITY < CONFIG_BT_HCI_INIT_PRIORITY,
"HCI driver would be initialized before its dependency, MPSL FEM");
#endif /* defined(CONFIG_MPSL_FEM) */

SYS_INIT(hci_driver_init, POST_KERNEL, CONFIG_BT_HCI_INIT_PRIORITY);
7 changes: 7 additions & 0 deletions subsys/mpsl/fem/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,13 @@ config MPSL_FEM_SIMPLE_GPIO

endchoice # MPSL_FEM_CHOICE

config MPSL_FEM_INIT_PRIORITY
int "Initialization priority of the front-end module interface"
default KERNEL_INIT_PRIORITY_DEFAULT
help
Set the initialization priority number. Do not mess with it unless
you know what you are doing.

if (MPSL_FEM_NRF21540_GPIO || MPSL_FEM_NRF21540_GPIO_SPI) && MPSL_FEM

config MPSL_FEM_NRF21540_TX_GAIN_DB
Expand Down
4 changes: 2 additions & 2 deletions subsys/mpsl/fem/nrf21540_gpio/mpsl_fem_nrf21540_gpio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ static int mpsl_fem_init(const struct device *dev)
return fem_nrf21540_gpio_configure();
}

SYS_INIT(mpsl_fem_init, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
SYS_INIT(mpsl_fem_init, POST_KERNEL, CONFIG_MPSL_FEM_INIT_PRIORITY);

#else /* !defined(CONFIG_MPSL_FEM_PIN_FORWARDER) */

Expand Down Expand Up @@ -335,7 +335,7 @@ static int mpsl_fem_host_init(const struct device *dev)

}

SYS_INIT(mpsl_fem_host_init, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
SYS_INIT(mpsl_fem_host_init, PRE_KERNEL_1, CONFIG_MPSL_FEM_INIT_PRIORITY);

#endif /* !defined(CONFIG_MPSL_FEM_PIN_FORWARDER) */

Expand Down
2 changes: 1 addition & 1 deletion subsys/mpsl/fem/nrf21540_gpio_spi/mpsl_fem_nrf21540_gpio_spi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ static int mpsl_fem_init(const struct device *dev)
return fem_nrf21540_gpio_spi_configure();
}

SYS_INIT(mpsl_fem_init, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
SYS_INIT(mpsl_fem_init, POST_KERNEL, CONFIG_MPSL_FEM_INIT_PRIORITY);

#endif /* !defined(CONFIG_MPSL_FEM_PIN_FORWARDER) */

Expand Down
4 changes: 2 additions & 2 deletions subsys/mpsl/fem/simple_gpio/mpsl_fem_simple_gpio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ static int mpsl_fem_init(const struct device *dev)
return fem_simple_gpio_configure();
}

SYS_INIT(mpsl_fem_init, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE);
SYS_INIT(mpsl_fem_init, POST_KERNEL, CONFIG_MPSL_FEM_INIT_PRIORITY);

#else /* !defined(CONFIG_MPSL_FEM_PIN_FORWARDER) */

Expand All @@ -229,7 +229,7 @@ static int mpsl_fem_host_init(const struct device *dev)
return 0;
}

SYS_INIT(mpsl_fem_host_init, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
SYS_INIT(mpsl_fem_host_init, PRE_KERNEL_1, CONFIG_MPSL_FEM_INIT_PRIORITY);

#endif /* !defined(CONFIG_MPSL_FEM_PIN_FORWARDER) */

Expand Down