diff --git a/payloads/libpayload/Config.in b/payloads/libpayload/Config.in index 455d058dcc..40c57dcb06 100644 --- a/payloads/libpayload/Config.in +++ b/payloads/libpayload/Config.in @@ -442,6 +442,11 @@ config IPQ806X_TIMER_REG help Address of the register to read a free running timer value. +config IPROC_PERIPH_GLB_TIM_REG_BASE + hex "Cygnus timer base address" + depends on TIMER_CYGNUS + default 0x19020200 + config USB bool "USB Support" default n diff --git a/payloads/libpayload/drivers/timer/cygnus.c b/payloads/libpayload/drivers/timer/cygnus.c index 16035496b9..e627d3e532 100644 --- a/payloads/libpayload/drivers/timer/cygnus.c +++ b/payloads/libpayload/drivers/timer/cygnus.c @@ -18,12 +18,39 @@ */ #include +struct cygnus_timer { + u32 gtim_glob_low; + u32 gtim_glob_hi; + u32 gtim_glob_ctrl; +}; + +static struct cygnus_timer * const timer_ptr = + (void *)CONFIG_LP_IPROC_PERIPH_GLB_TIM_REG_BASE; + uint64_t timer_hz(void) { - return 0; + /* + * this is set up by coreboot as follows: + * + * PERIPH_CLOCK / + * (((TIMER_GLB_TIM_CTRL_PRESC & TIMER_GLB_TIM_CTRL_PRESC_MASK)>>8) + 1) + * + * where PERIPH_CLOCK is typically 500000000. + */ + return 500000000; } uint64_t timer_raw_value(void) { - return 0; + uint64_t cur_tick; + uint32_t count_h; + uint32_t count_l; + + do { + count_h = readl(&timer_ptr->gtim_glob_hi); + count_l = readl(&timer_ptr->gtim_glob_low); + cur_tick = readl(&timer_ptr->gtim_glob_hi); + } while (cur_tick != count_h); + + return (cur_tick << 32) + count_l; }