michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers/entropy: stm32: Convert driver to dt based configuration

Browse source 
Convert stm32 entropy driver to configuration based on device tree.
Select HAS_DTS_ENTROPY symbols and configure CONFIG_ENTROPY_NAME
in fixup files.

Since rng node is not enabled (or available) on all boards, it could
happen that symbol ENTROPY_STM32_RNG is not enabled and hence
ENTROPY_HAS_DRIVER not selected which ends up with a symbol
ENTROPY_NAME defined throufg Kconfig selection. Thus, in fixup file,
CONFIG_ENTROPY_NAME is defined only if not already defined.

Additionally, update boards that used to configure entropy by default.
On these boards, enable rng device in device tree and remove Kconfig
related configuration (which should not be part of default
configuration).

Signed-off-by: Erwan Gouriou <erwan.gouriou@linaro.org>
This commit is contained in:
Erwan Gouriou 2020-04-03 11:55:50 +02:00 • committed by Kumar Gala
commit 92c4092283
11 changed files with 35 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
boards/arm/olimex_stm32_e407/olimex_stm32_e407.dts
View file

@ -60,6 +60,10 @@
status = "okay";
};
&rng {
status = "okay";
};
/* Only one interface should be enabled at a time: usbotg_fs or usbotg_hs */
usb_otg1: &usbotg_fs {
status = "disabled";

2
boards/arm/olimex_stm32_e407/olimex_stm32_e407_defconfig
View file

@ -36,5 +36,3 @@ CONFIG_CLOCK_STM32_PLL_Q_DIVISOR=7
CONFIG_CLOCK_STM32_AHB_PRESCALER=1
CONFIG_CLOCK_STM32_APB1_PRESCALER=4
CONFIG_CLOCK_STM32_APB2_PRESCALER=2
CONFIG_ENTROPY_GENERATOR=y

4
boards/arm/olimex_stm32_h407/olimex_stm32_h407.dts
View file

@ -59,3 +59,7 @@
&rtc {
status = "okay";
};
&rng {
status = "okay";
};

5
boards/arm/olimex_stm32_h407/olimex_stm32_h407_defconfig
View file

@ -36,8 +36,3 @@ CONFIG_CLOCK_STM32_PLL_Q_DIVISOR=7
CONFIG_CLOCK_STM32_AHB_PRESCALER=1
CONFIG_CLOCK_STM32_APB1_PRESCALER=4
CONFIG_CLOCK_STM32_APB2_PRESCALER=2
CONFIG_ENTROPY_GENERATOR=y
CONFIG_ENTROPY_NAME="ENTROPY_0"
CONFIG_TEST_RANDOM_GENERATOR=y
CONFIG_TIMER_RANDOM_GENERATOR=y

4
boards/arm/olimex_stm32_p405/olimex_stm32_p405.dts
View file

@ -55,3 +55,7 @@
bus-speed = <125000>;
status = "okay";
};
&rng {
status = "okay";
};

1
drivers/entropy/Kconfig.stm32
View file

@ -8,6 +8,7 @@ config ENTROPY_STM32_RNG
depends on SOC_FAMILY_STM32
select ENTROPY_HAS_DRIVER
select USE_STM32_LL_RNG
select HAS_DTS_ENTROPY
help
This option enables the RNG processor, which is a entropy number
generator, based on a continuous analog noise, that provides

20
drivers/entropy/entropy_stm32.c
View file

@ -4,6 +4,8 @@
* SPDX-License-Identifier: Apache-2.0
*/
#define DT_DRV_COMPAT st_stm32_rng
#include <kernel.h>
#include <device.h>
#include <drivers/entropy.h>
@ -17,14 +19,6 @@
#include <drivers/clock_control.h>
#include <drivers/clock_control/stm32_clock_control.h>
#if !defined(CONFIG_SOC_SERIES_STM32L4X) && !defined(CONFIG_SOC_SERIES_STM32F4X) && !defined(CONFIG_SOC_SERIES_STM32F7X) && !defined(CONFIG_SOC_SERIES_STM32G4X)
#error RNG only available on STM32F4, STM32F7, STM32L4 and STM32G4 series
#elif defined(CONFIG_SOC_STM32F401XE)
#error RNG not available on STM32F401 based SoCs
#elif defined(CONFIG_SOC_STM32F411XE)
#error RNG not available on STM32F411 based SoCs
#else
struct entropy_stm32_rng_dev_cfg {
struct stm32_pclken pclken;
};
@ -209,18 +203,16 @@ static const struct entropy_driver_api entropy_stm32_rng_api = {
};
static const struct entropy_stm32_rng_dev_cfg entropy_stm32_rng_config = {
.pclken = { .bus = STM32_CLOCK_BUS_AHB2,
.enr = LL_AHB2_GRP1_PERIPH_RNG },
.pclken = { .bus = DT_INST_CLOCKS_CELL(0, bus),
.enr = DT_INST_CLOCKS_CELL(0, bits) },
};
static struct entropy_stm32_rng_dev_data entropy_stm32_rng_data = {
.rng = RNG,
.rng = (RNG_TypeDef *)DT_INST_REG_ADDR(0),
};
DEVICE_AND_API_INIT(entropy_stm32_rng, CONFIG_ENTROPY_NAME,
DEVICE_AND_API_INIT(entropy_stm32_rng, DT_INST_LABEL(0),
entropy_stm32_rng_init,
&entropy_stm32_rng_data, &entropy_stm32_rng_config,
PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
&entropy_stm32_rng_api);
#endif

4
soc/arm/st_stm32/stm32f4/dts_fixup.h
View file

@ -210,4 +210,8 @@
#define DT_FLASH_DEV_NAME DT_LABEL(DT_INST(0, st_stm32f4_flash_controller))
#ifndef CONFIG_ENTROPY_NAME
#define CONFIG_ENTROPY_NAME DT_LABEL(DT_INST(0, st_stm32_rng))
#endif
/* End of SoC Level DTS fixup file */

4
soc/arm/st_stm32/stm32f7/dts_fixup.h
View file

@ -69,4 +69,8 @@
#define DT_ADC_1_NAME DT_ST_STM32_ADC_40012000_LABEL
#ifndef CONFIG_ENTROPY_NAME
#define CONFIG_ENTROPY_NAME DT_LABEL(DT_INST(0, st_stm32_rng))
#endif
/* End of SoC Level DTS fixup file */

4
soc/arm/st_stm32/stm32g4/dts_fixup.h
View file

@ -44,4 +44,8 @@
#define DT_WDT_0_NAME DT_LABEL(DT_INST(0, st_stm32_watchdog))
#ifndef CONFIG_ENTROPY_NAME
#define CONFIG_ENTROPY_NAME DT_LABEL(DT_INST(0, st_stm32_rng))
#endif
/* End of SoC Level DTS fixup file */

4
soc/arm/st_stm32/stm32l4/dts_fixup.h
View file

@ -74,4 +74,8 @@
#define DT_LPTIM_1_CLOCK_BITS DT_ST_STM32_TIMERS_40007C00_CLOCK_BITS_0
#define DT_LPTIM_1_CLOCK_BUS DT_ST_STM32_TIMERS_40007C00_CLOCK_BUS_0
#ifndef CONFIG_ENTROPY_NAME
#define CONFIG_ENTROPY_NAME DT_LABEL(DT_INST(0, st_stm32_rng))
#endif
/* End of SoC Level DTS fixup file */