Skip to content

Commit

Permalink
[nrf noup] soc: nordic: nrf54l Fix for wait lasting half expected time
Browse files Browse the repository at this point in the history
Noup as it patches code that does not exist in zephyr
arch_busy_wait and k_busy_wait waited half the expected time
due to SystemCoreClock being set back to the default value when ns
builds. Changed to rely on device tree as to avoid
hardcoded clock frequencies

Signed-off-by: Dag Erik Gjørvad <[email protected]>
  • Loading branch information
degjorva authored and jukkar committed Dec 16, 2024
1 parent e3e053f commit 665aba4
Showing 1 changed file with 13 additions and 4 deletions.
17 changes: 13 additions & 4 deletions soc/nordic/nrf54l/soc.c
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,13 @@ LOG_MODULE_REGISTER(soc, CONFIG_SOC_LOG_LEVEL);
#define HFXO_NODE DT_NODELABEL(hfxo)
#endif

/* Building for cpuflpr with ns uses cpu_1 instead of cpu_0 */
#if DT_PROP(DT_PATH(cpus, cpu_0), clock_frequency)
#define DEVICE_DT_CLOCK_FREQ DT_PROP(DT_PATH(cpus, cpu_0), clock_frequency)
#elif DT_PROP(DT_PATH(cpus, cpu_1), clock_frequency)
#define DEVICE_DT_CLOCK_FREQ DT_PROP(DT_PATH(cpus, cpu_1), clock_frequency)
#endif

#if defined(NRF_APPLICATION)
static inline void power_and_clock_configuration(void)
{
Expand Down Expand Up @@ -172,16 +179,18 @@ int nordicsemi_nrf54l_init(void)
/* Update the SystemCoreClock global variable with current core clock
* retrieved from hardware state.
*/
#if !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE) || defined(__NRF_TFM__)
/* Currently not supported for non-secure */
SystemCoreClockUpdate();
#endif

#ifdef __NRF_TFM__
/* TF-M enables the instruction cache from target_cfg.c, so we
* don't need to enable it here.
*/
#else

/* Update SystemCoreClock in Zephyr based on device tree to avoid SystemCoreClock
* being overwritten with default value when initializing with TF-M
*/
SystemCoreClock = DEVICE_DT_CLOCK_FREQ;

/* Enable ICACHE */
sys_cache_instr_enable();
#endif
Expand Down

0 comments on commit 665aba4

Please sign in to comment.