andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Using CMSIS conventions, more clock improvements. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@14378 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
This commit is contained in:
Giovanni Di Sirio 2021-05-15 16:36:49 +00:00
parent bae760ccff
commit e578d34b07
13 changed files with 64 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
os/hal/ports/STM32/LLD/RCCv1/stm32_bd.inc
View File

@ -45,7 +45,7 @@
/** /**
* @brief Initializes the backup domain. * @brief Initializes the backup domain.
*/ */
static inline void bd_init(void) { __STATIC_INLINE void bd_init(void) {
uint32_t bdcr; uint32_t bdcr;
/* Current settings.*/ /* Current settings.*/
@ -71,7 +71,7 @@ static inline void bd_init(void) {
* @note WARNING! Changing RTC clock source impossible without reset * @note WARNING! Changing RTC clock source impossible without reset
* of the whole BKP domain. * of the whole BKP domain.
*/ */
static inline void bd_reset(void) { __STATIC_INLINE void bd_reset(void) {
/* Reset BKP domain if different clock source selected.*/ /* Reset BKP domain if different clock source selected.*/
if ((RCC->BDCR & STM32_RTCSEL_MASK) != STM32_RTCSEL) { if ((RCC->BDCR & STM32_RTCSEL_MASK) != STM32_RTCSEL) {

28
os/hal/ports/STM32/LLD/RCCv1/stm32_hse.inc
View File

@ -89,18 +89,28 @@
/* Driver local functions. */ /* Driver local functions. */
/*===========================================================================*/ /*===========================================================================*/
__STATIC_INLINE void hse_enable(void) {
static inline void hse_init(void) { #if defined(STM32_HSE_BYPASS)
/* HSE Bypass case.*/
RCC->CR |= RCC_CR_HSEON | RCC_CR_HSEBYP;
#else
RCC->CR |= RCC_CR_HSEON;
#endif
while ((RCC->CR & RCC_CR_HSERDY) == 0U) {
/* Waiting for HSE activation.*/
}
}
__STATIC_INLINE void hse_disable(void) {
RCC->CR &= ~RCC_CR_HSEON;
}
__STATIC_INLINE void hse_init(void) {
#if STM32_HSE_ENABLED #if STM32_HSE_ENABLED
#if defined(STM32_HSE_BYPASS) hse_enable();
/* HSE Bypass.*/
RCC->CR |= RCC_CR_HSEON | RCC_CR_HSEBYP;
#endif
/* HSE activation.*/
RCC->CR |= RCC_CR_HSEON;
while ((RCC->CR & RCC_CR_HSERDY) == 0U) {
}
#endif #endif
} }

2
os/hal/ports/STM32/LLD/RCCv1/stm32_hse32.inc
View File

@ -85,7 +85,7 @@
/* Driver local functions. */ /* Driver local functions. */
/*===========================================================================*/ /*===========================================================================*/
static inline void hse32_init(void) { __STATIC_INLINE void hse32_init(void) {
#if STM32_HSE32_ENABLED #if STM32_HSE32_ENABLED

19
os/hal/ports/STM32/LLD/RCCv1/stm32_hsi16.inc
View File

@ -57,13 +57,24 @@
/* Driver local functions. */ /* Driver local functions. */
/*===========================================================================*/ /*===========================================================================*/
static inline void hsi16_init(void) { __STATIC_INLINE void hsi16_enable(void) {
RCC->CR |= RCC_CR_HSION;
while ((RCC->CR & RCC_CR_HSIRDY) == 0U) {
/* Waiting for HSI16 activation.*/
}
}
__STATIC_INLINE void hsi16_disable(void) {
RCC->CR &= ~RCC_CR_HSION;
}
__STATIC_INLINE void hsi16_init(void) {
#if STM32_HSI16_ENABLED #if STM32_HSI16_ENABLED
/* HSI activation.*/ /* HSI activation.*/
RCC->CR |= RCC_CR_HSION; hsi16_enable();
while ((RCC->CR & RCC_CR_HSIRDY) == 0U) {
}
#endif #endif
} }

2
os/hal/ports/STM32/LLD/RCCv1/stm32_hsi48.inc
View File

@ -61,7 +61,7 @@
/* Driver local functions. */ /* Driver local functions. */
/*===========================================================================*/ /*===========================================================================*/
static inline void hsi48_init(void) { __STATIC_INLINE void hsi48_init(void) {
#if STM32_HSI48_ENABLED #if STM32_HSI48_ENABLED
/* HSI activation.*/ /* HSI activation.*/

2
os/hal/ports/STM32/LLD/RCCv1/stm32_lse.inc
View File

@ -87,7 +87,7 @@
/* Driver local functions. */ /* Driver local functions. */
/*===========================================================================*/ /*===========================================================================*/
static inline void lse_init(void) { __STATIC_INLINE void lse_init(void) {
#if STM32_LSE_ENABLED #if STM32_LSE_ENABLED
/* LSE activation.*/ /* LSE activation.*/

2
os/hal/ports/STM32/LLD/RCCv1/stm32_lsi.inc
View File

@ -92,7 +92,7 @@
/* Driver local functions. */ /* Driver local functions. */
/*===========================================================================*/ /*===========================================================================*/
static inline void lsi_init(void) { __STATIC_INLINE void lsi_init(void) {
#if STM32_LSI_ENABLED #if STM32_LSI_ENABLED
/* LSI activation.*/ /* LSI activation.*/

4
os/hal/ports/STM32/LLD/RCCv1/stm32_msi.inc
View File

@ -165,7 +165,7 @@
/* Driver local functions. */ /* Driver local functions. */
/*===========================================================================*/ /*===========================================================================*/
static inline void msi_reset(void) { __STATIC_INLINE void msi_reset(void) {
/* Resetting to the MSI clock in case we come here after an initialization, /* Resetting to the MSI clock in case we come here after an initialization,
because a debugger for example.*/ because a debugger for example.*/
@ -181,7 +181,7 @@ static inline void msi_reset(void) {
} }
} }
static inline void msi_init(void) { __STATIC_INLINE void msi_init(void) {
uint32_t cr, csr; uint32_t cr, csr;
/* Initial clocks setup and wait for MSI stabilization, the MSI clock is /* Initial clocks setup and wait for MSI stabilization, the MSI clock is

15
os/hal/ports/STM32/LLD/RCCv1/stm32_pll.inc
View File

@ -319,7 +319,14 @@
/* Driver local functions. */ /* Driver local functions. */
/*===========================================================================*/ /*===========================================================================*/
static inline void pll_init(void) { __STATIC_INLINE void pll_wait_lock(void) {
while ((RCC->CR & RCC_CR_PLLRDY) == 0U) {
/* Waiting for PLL lock.*/
}
}
__STATIC_INLINE void pll_init(void) {
#if STM32_ACTIVATE_PLL #if STM32_ACTIVATE_PLL
/* PLL activation.*/ /* PLL activation.*/
@ -330,13 +337,11 @@ static inline void pll_init(void) {
STM32_PLLM | STM32_PLLSRC; STM32_PLLM | STM32_PLLSRC;
RCC->CR |= RCC_CR_PLLON; RCC->CR |= RCC_CR_PLLON;
/* Waiting for PLL lock.*/ pll_wait_lock();
while ((RCC->CR & RCC_CR_PLLRDY) == 0U)
;
#endif #endif
} }
static inline void pll_deinit(void) { __STATIC_INLINE void pll_deinit(void) {
#if STM32_ACTIVATE_PLL #if STM32_ACTIVATE_PLL
/* PLL de-activation.*/ /* PLL de-activation.*/

4
os/hal/ports/STM32/LLD/RCCv1/stm32_pll_v2.inc
View File

@ -321,7 +321,7 @@
/* Driver local functions. */ /* Driver local functions. */
/*===========================================================================*/ /*===========================================================================*/
static inline void pll_init(void) { __STATIC_INLINE void pll_init(void) {
#if STM32_ACTIVATE_PLL #if STM32_ACTIVATE_PLL
/* PLLM and PLLSRC are common to all PLLs.*/ /* PLLM and PLLSRC are common to all PLLs.*/
@ -340,7 +340,7 @@ static inline void pll_init(void) {
#endif #endif
} }
static inline void pll_deinit(void) { __STATIC_INLINE void pll_deinit(void) {
/* PLL de-activation.*/ /* PLL de-activation.*/
RCC->PLLCFGR &= ~RCC_CR_PLLON; RCC->PLLCFGR &= ~RCC_CR_PLLON;

4
os/hal/ports/STM32/LLD/RCCv1/stm32_pllsai1.inc
View File

@ -323,7 +323,7 @@
/* Driver local functions. */ /* Driver local functions. */
/*===========================================================================*/ /*===========================================================================*/
static inline void pllsai1_init(void) { __STATIC_INLINE void pllsai1_init(void) {
#if STM32_ACTIVATE_PLLSAI1 #if STM32_ACTIVATE_PLLSAI1
/* PLLSAI1 activation.*/ /* PLLSAI1 activation.*/
@ -340,7 +340,7 @@ static inline void pllsai1_init(void) {
#endif #endif
} }
static inline void pllsai1_deinit(void) { __STATIC_INLINE void pllsai1_deinit(void) {
#if STM32_ACTIVATE_PLLSAI1 #if STM32_ACTIVATE_PLLSAI1
/* PLLSAI1 de-activation.*/ /* PLLSAI1 de-activation.*/

4
os/hal/ports/STM32/LLD/RCCv1/stm32_pllsai2.inc
View File

@ -323,7 +323,7 @@
/* Driver local functions. */ /* Driver local functions. */
/*===========================================================================*/ /*===========================================================================*/
static inline void pllsai2_init(void) { __STATIC_INLINE void pllsai2_init(void) {
#if STM32_ACTIVATE_PLLSAI2 #if STM32_ACTIVATE_PLLSAI2
/* PLLSAI2 activation.*/ /* PLLSAI2 activation.*/
@ -340,7 +340,7 @@ static inline void pllsai2_init(void) {
#endif #endif
} }
static inline void pllsai2_deinit(void) { __STATIC_INLINE void pllsai2_deinit(void) {
#if STM32_ACTIVATE_PLLSAI2 #if STM32_ACTIVATE_PLLSAI2
/* PLLSAI2 de-activation.*/ /* PLLSAI2 de-activation.*/

23
os/hal/ports/STM32/STM32G4xx/hal_lld.c
View File

@ -216,7 +216,7 @@ __STATIC_INLINE void bd_init(void) {
* *
* @notapi * @notapi
*/ */
bool hal_lld_clock_check_tree(const halclkcfg_t *ccp) { static bool hal_lld_clock_check_tree(const halclkcfg_t *ccp) {
static const uint32_t hprediv[16] = {1U, 1U, 1U, 1U, 1U, 1U, 1U, 1U, static const uint32_t hprediv[16] = {1U, 1U, 1U, 1U, 1U, 1U, 1U, 1U,
2U, 4U, 8U, 16U, 64U, 128U, 256U, 512U}; 2U, 4U, 8U, 16U, 64U, 128U, 256U, 512U};
static const uint32_t pprediv[16] = {1U, 1U, 1U, 1U, 2U, 4U, 8U, 16U}; static const uint32_t pprediv[16] = {1U, 1U, 1U, 1U, 2U, 4U, 8U, 16U};
@ -443,10 +443,7 @@ bool hal_lld_clock_raw_switch(const halclkcfg_t *ccp) {
} }
/* Making sure HSI16 is activated.*/ /* Making sure HSI16 is activated.*/
RCC->CR |= RCC_CR_HSION; hsi16_enable();
while ((RCC->CR & RCC_CR_HSIRDY) == 0U) {
/* Waiting for HSI16 activation.*/
}
/* Disabling boost mode.*/ /* Disabling boost mode.*/
PWR->CR5 = PWR_CR5_R1MODE; PWR->CR5 = PWR_CR5_R1MODE;
@ -460,15 +457,9 @@ bool hal_lld_clock_raw_switch(const halclkcfg_t *ccp) {
/* Resetting flash ACR settings to the default value.*/ /* Resetting flash ACR settings to the default value.*/
FLASH->ACR = 0x00040601U; FLASH->ACR = 0x00040601U;
/* HSE setup.*/ /* HSE setup, if required, before starting the PLL.*/
if ((ccp->rcc_cr & RCC_CR_HSEON) == 0U) { if ((ccp->rcc_cr & RCC_CR_HSEON) != 0U) {
RCC->CR &= ~RCC_CR_HSEON; hse_enable();
}
else {
RCC->CR |= RCC_CR_HSEON;
while ((RCC->CR & RCC_CR_HSERDY) == 0U) {
/* Waiting for HSE activation.*/
}
} }
/* PLL setup.*/ /* PLL setup.*/
@ -479,9 +470,7 @@ bool hal_lld_clock_raw_switch(const halclkcfg_t *ccp) {
/* PLL activation polling if required.*/ /* PLL activation polling if required.*/
if ((ccp->rcc_cr & RCC_CR_PLLON) != 0U) { if ((ccp->rcc_cr & RCC_CR_PLLON) != 0U) {
while ((RCC->CR & RCC_CR_PLLRDY) == 0U) { pll_wait_lock();
/* Waiting for PLL lock.*/
}
} }
/* MCO and bus dividers first.*/ /* MCO and bus dividers first.*/