arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-27 01:48:17 +00:00
Code Issues Releases Wiki Activity

clock updates (#21)

Browse Source
This commit is contained in:
mcudev 2017-10-06 05:09:22 -04:00 committed by Pavol Rusnak
parent 02fb442fd1
commit a381819ad1
6 changed files with 34 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
embed/boardloader/startup.s
View File

@ -393,6 +393,8 @@ memset_reg:
.global reset_handler .global reset_handler
.type reset_handler, STT_FUNC .type reset_handler, STT_FUNC
reset_handler: reset_handler:
bl SystemInit
// wipe memory to remove any possible vestiges of sensitive data // wipe memory to remove any possible vestiges of sensitive data
ldr r0, =ccmram_start // r0 - point to beginning of CCMRAM ldr r0, =ccmram_start // r0 - point to beginning of CCMRAM
ldr r1, =ccmram_end // r1 - point to byte after the end of CCMRAM ldr r1, =ccmram_end // r1 - point to byte after the end of CCMRAM
@ -410,9 +412,6 @@ reset_handler:
ldr r2, =data_size // size in bytes ldr r2, =data_size // size in bytes
bl memcpy bl memcpy
// CMSIS initialization
bl SystemInit
// enter the application code // enter the application code
bl main bl main

2
embed/bootloader/startup.S
View File

@ -113,8 +113,6 @@ LoopFillZerobss:
cmp r2, r3 cmp r2, r3
bcc FillZerobss bcc FillZerobss
/* Call the clock system initialization function.*/
bl SystemInit
/* Call static constructors */ /* Call static constructors */
/*bl __libc_init_array*/ /*bl __libc_init_array*/
/* Call the application's entry point.*/ /* Call the application's entry point.*/

7
embed/firmware/main.c
View File

@ -23,12 +23,17 @@
bool firmware_standalone(void) bool firmware_standalone(void)
{ {
// linker script defined symbol -- reference 3.5.5 in GNU linker manual
extern const uint32_t _flash_start; extern const uint32_t _flash_start;
return _flash_start == 0x0800000; return &_flash_start == ((uint32_t *) 0x0800000);
} }
int main(void) { int main(void) {
if (firmware_standalone()) {
SystemInit();
}
periph_init(); periph_init();
pendsv_init(); pendsv_init();

2
embed/firmware/startup.S
View File

@ -113,8 +113,6 @@ LoopFillZerobss:
cmp r2, r3 cmp r2, r3
bcc FillZerobss bcc FillZerobss
/* Call the clock system initialization function.*/
bl SystemInit
/* Call static constructors */ /* Call static constructors */
/*bl __libc_init_array*/ /*bl __libc_init_array*/
/* Call the application's entry point.*/ /* Call the application's entry point.*/

11
embed/trezorhal/common.c
View File

@ -29,8 +29,6 @@ void __attribute__((noreturn)) nlr_jump_fail(void *val) {
__fatal_error("uncaught exception", __FILE__, __LINE__, __FUNCTION__); __fatal_error("uncaught exception", __FILE__, __LINE__, __FUNCTION__);
} }
extern void SystemClock_Config(void);
void periph_init(void) { void periph_init(void) {
// STM32F4xx HAL library initialization: // STM32F4xx HAL library initialization:
@ -40,21 +38,12 @@ void periph_init(void) {
// - global MSP (MCU Support Package) initialization // - global MSP (MCU Support Package) initialization
HAL_Init(); HAL_Init();
// Set the system clock to be HSE
SystemClock_Config();
// Enable CSS (Clock Security System)
HAL_RCC_EnableCSS();
// Enable GPIO clocks // Enable GPIO clocks
__HAL_RCC_GPIOA_CLK_ENABLE(); __HAL_RCC_GPIOA_CLK_ENABLE();
__HAL_RCC_GPIOB_CLK_ENABLE(); __HAL_RCC_GPIOB_CLK_ENABLE();
__HAL_RCC_GPIOC_CLK_ENABLE(); __HAL_RCC_GPIOC_CLK_ENABLE();
__HAL_RCC_GPIOD_CLK_ENABLE(); __HAL_RCC_GPIOD_CLK_ENABLE();
// Enable the CCM RAM
__HAL_RCC_CCMDATARAMEN_CLK_ENABLE();
// Clear the reset flags // Clear the reset flags
PWR->CR |= PWR_CR_CSBF; PWR->CR |= PWR_CR_CSBF;
RCC->CSR |= RCC_CSR_RMVF; RCC->CSR |= RCC_CSR_RMVF;

59
embed/trezorhal/stm32_system.c
View File

@ -89,8 +89,8 @@
#include STM32_HAL_H #include STM32_HAL_H
#define MICROPY_HW_CLK_PLLM (8) #define MICROPY_HW_CLK_PLLM (4)
#define MICROPY_HW_CLK_PLLN (336) #define MICROPY_HW_CLK_PLLN (168)
#define MICROPY_HW_CLK_PLLP (RCC_PLLP_DIV2) #define MICROPY_HW_CLK_PLLP (RCC_PLLP_DIV2)
#define MICROPY_HW_CLK_PLLQ (7) #define MICROPY_HW_CLK_PLLQ (7)
#define MICROPY_HW_CLK_LAST_FREQ (1) #define MICROPY_HW_CLK_LAST_FREQ (1)
@ -170,7 +170,7 @@ const uint32_t MSIRangeTable[12] = {100000, 200000, 400000, 800000, 1000000, 200
is no need to call the 2 first functions listed above, since SystemCoreClock is no need to call the 2 first functions listed above, since SystemCoreClock
variable is updated automatically. variable is updated automatically.
*/ */
uint32_t SystemCoreClock = 16000000; uint32_t SystemCoreClock = 168000000;
/** /**
* @} * @}
@ -197,36 +197,29 @@ const uint32_t MSIRangeTable[12] = {100000, 200000, 400000, 800000, 1000000, 200
*/ */
void SystemInit(void) void SystemInit(void)
{ {
/* FPU settings ------------------------------------------------------------*/ // set flash wait states for an increasing HCLK frequency -- reference RM0090 section 3.5.1
#if (__FPU_PRESENT == 1) && (__FPU_USED == 1) FLASH->ACR = FLASH_ACR_LATENCY_5WS;
SCB->CPACR |= ((3UL << 10*2)|(3UL << 11*2)); /* set CP10 and CP11 Full Access */ // configure main PLL; assumes HSE is 8 MHz; this should evaluate to 0x27402a04 -- reference RM0090 section 7.3.2
#endif RCC->PLLCFGR = (RCC_PLLCFGR_RST_VALUE & ~RCC_PLLCFGR_PLLQ & ~RCC_PLLCFGR_PLLSRC & ~RCC_PLLCFGR_PLLP & ~RCC_PLLCFGR_PLLN & ~RCC_PLLCFGR_PLLM)
/* Reset the RCC clock configuration to the default reset state ------------*/ | (7 << RCC_PLLCFGR_PLLQ_Pos) // Q = 7
| RCC_PLLCFGR_PLLSRC_HSE // PLLSRC = HSE
/* Set HSION bit */ | (0 << RCC_PLLCFGR_PLLP_Pos) // P = 2 (two bits, 00 means PLLP = 2)
RCC->CR |= CONFIG_RCC_CR_1ST; | (168 << RCC_PLLCFGR_PLLN_Pos) // N = 168
| (4 << RCC_PLLCFGR_PLLM_Pos); // M = 4
/* Reset CFGR register */ // enable clock security system, HSE clock, and main PLL
RCC->CFGR = 0x00000000; RCC->CR |= RCC_CR_CSSON | RCC_CR_HSEON | RCC_CR_PLLON;
// wait until PLL and HSE ready
/* Reset HSEON, CSSON and PLLON bits */ while((RCC->CR & (RCC_CR_PLLRDY | RCC_CR_HSERDY)) != (RCC_CR_PLLRDY | RCC_CR_HSERDY));
RCC->CR &= ~ CONFIG_RCC_CR_2ND; // APB2=2, APB1=4, AHB=1, system clock = main PLL
RCC->CFGR = RCC_CFGR_PPRE2_DIV2 | RCC_CFGR_PPRE1_DIV4 | RCC_CFGR_HPRE_DIV1 | RCC_CFGR_SW_PLL;
/* Reset PLLCFGR register */ // wait until PLL is system clock
RCC->PLLCFGR = CONFIG_RCC_PLLCFGR; while((RCC->CFGR & RCC_CFGR_SWS) != RCC_CFGR_SWS_PLL);
// turn off the HSI as it is now unused (it will be turned on again automatically if a clock security failure occurs)
/* Reset HSEBYP bit */ RCC->CR &= ~RCC_CR_HSION;
RCC->CR &= (uint32_t)0xFFFBFFFF; // enable full access to the fpu coprocessor
#if (__FPU_PRESENT == 1) && (__FPU_USED == 1)
/* Disable all interrupts */ SCB->CPACR |= ((3UL << 10*2)|(3UL << 11*2)); /* set CP10 and CP11 Full Access */
#if defined(MCU_SERIES_F4) || defined(MCU_SERIES_F7) #endif
RCC->CIR = 0x00000000;
#elif defined(MCU_SERIES_L4)
RCC->CIER = 0x00000000;
#endif
/* dpgeorge: enable 8-byte stack alignment for IRQ handlers, in accord with EABI */
SCB->CCR |= SCB_CCR_STKALIGN_Msk;
} }