diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2021-07-19 10:52:20 +0200 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2023-07-14 12:21:33 +0200 |
commit | ac9c55b01766b0998beba9a20d446461429c4c9e (patch) | |
tree | 0055f7b28f1770ff180f6e1f252756b5320911e5 /bsps | |
parent | fc97810ce3dd0575bac10af31974dda9e8e4cbff (diff) |
bsp/leon3: LEON3_PLB_FREQUENCY_DEFINED_BY_GPTIMER
Diffstat (limited to 'bsps')
-rw-r--r-- | bsps/sparc/leon3/clock/ckinit.c | 9 | ||||
-rw-r--r-- | bsps/sparc/leon3/include/bsp/leon3.h | 27 | ||||
-rw-r--r-- | bsps/sparc/leon3/start/cpucounter.c | 8 |
3 files changed, 38 insertions, 6 deletions
diff --git a/bsps/sparc/leon3/clock/ckinit.c b/bsps/sparc/leon3/clock/ckinit.c index 9f45d9814b..66a79a6a42 100644 --- a/bsps/sparc/leon3/clock/ckinit.c +++ b/bsps/sparc/leon3/clock/ckinit.c @@ -44,12 +44,15 @@ #include <bsp/irq.h> #include <bsp/leon3.h> #include <rtems/rtems/intr.h> -#include <grlib/ambapp.h> #include <grlib/irqamp.h> #include <rtems/score/profiling.h> #include <rtems/score/sparcimpl.h> #include <rtems/timecounter.h> +#if !defined(LEON3_PLB_FREQUENCY_DEFINED_BY_GPTIMER) +#include <grlib/ambapp.h> +#endif + /* The LEON3 BSP Timer driver can rely on the Driver Manager if the * DrvMgr is initialized during startup. Otherwise the classic driver * must be used. @@ -218,7 +221,11 @@ static void leon3_clock_initialize(void) } else if (irqmp_ts != NULL) { /* Use the interrupt controller timestamp counter if available */ tc->tc_get_timecount = _SPARC_Get_timecount_up; +#if defined(LEON3_PLB_FREQUENCY_DEFINED_BY_GPTIMER) + tc->tc_frequency = leon3_processor_local_bus_frequency(); +#else tc->tc_frequency = ambapp_freq_get(ambapp_plb(), LEON3_Timer_Adev); +#endif leon3_tc_tick = leon3_tc_tick_irqmp_timestamp_init; diff --git a/bsps/sparc/leon3/include/bsp/leon3.h b/bsps/sparc/leon3/include/bsp/leon3.h index 1402dfca1b..599d616aaf 100644 --- a/bsps/sparc/leon3/include/bsp/leon3.h +++ b/bsps/sparc/leon3/include/bsp/leon3.h @@ -42,7 +42,9 @@ #include <bspopts.h> #include <bsp/irqimpl.h> +#if !defined(LEON3_PLB_FREQUENCY_DEFINED_BY_GPTIMER) #include <grlib/ambapp.h> +#endif #ifdef __cplusplus extern "C" { @@ -195,6 +197,25 @@ extern gptimer *LEON3_Timer_Regs; extern struct ambapp_dev *LEON3_Timer_Adev; /** + * @brief Gets the processor local bus frequency in Hz. + * + * @return Returns the frequency. + */ +static inline uint32_t leon3_processor_local_bus_frequency( void ) +{ +#if defined(LEON3_PLB_FREQUENCY_DEFINED_BY_GPTIMER) + return ( grlib_load_32( &LEON3_Timer_Regs->sreload ) + 1 ) * + LEON3_GPTIMER_0_FREQUENCY_SET_BY_BOOT_LOADER; +#else + /* + * For simplicity, assume that the interrupt controller uses the processor + * clock. This is at least true on the GR740. + */ + return ambapp_freq_get( ambapp_plb(), LEON3_IrqCtrl_Adev ); +#endif +} + +/** * @brief Gets the LEON up-counter low register (%ASR23) value. * * @return Returns the register value. @@ -257,11 +278,7 @@ static inline bool leon3_up_counter_is_available( void ) */ static inline uint32_t leon3_up_counter_frequency( void ) { - /* - * For simplicity, assume that the interrupt controller uses the processor - * clock. This is at least true on the GR740. - */ - return ambapp_freq_get( ambapp_plb(), LEON3_IrqCtrl_Adev ); + return leon3_processor_local_bus_frequency(); } /** diff --git a/bsps/sparc/leon3/start/cpucounter.c b/bsps/sparc/leon3/start/cpucounter.c index 5672cbbd45..57fd487009 100644 --- a/bsps/sparc/leon3/start/cpucounter.c +++ b/bsps/sparc/leon3/start/cpucounter.c @@ -66,7 +66,11 @@ static void leon3_counter_initialize(void) /* Enable interrupt timestamping for an arbitrary interrupt line */ grlib_store_32(&irqmp_ts->itstmpc, IRQAMP_ITSTMPC_TSISEL(1)); +#if defined(LEON3_PLB_FREQUENCY_DEFINED_BY_GPTIMER) + leon3_counter_frequency = leon3_processor_local_bus_frequency(); +#else leon3_counter_frequency = ambapp_freq_get(ambapp_plb(), LEON3_IrqCtrl_Adev); +#endif } else if (gpt != NULL) { gptimer_timer *timer; uint32_t tctrl; @@ -83,8 +87,12 @@ static void leon3_counter_initialize(void) tctrl |= GPTIMER_TCTRL_EN | GPTIMER_TCTRL_RS | GPTIMER_TCTRL_LD; grlib_store_32(&timer->tctrl, tctrl); +#if defined(LEON3_PLB_FREQUENCY_DEFINED_BY_GPTIMER) + leon3_counter_frequency = LEON3_GPTIMER_0_FREQUENCY_SET_BY_BOOT_LOADER; +#else leon3_counter_frequency = ambapp_freq_get(ambapp_plb(), LEON3_Timer_Adev) / (grlib_load_32(&gpt->sreload) + 1); +#endif } } |