clock: rename z_timer_cycle_get_32 -> sys_clock_cycle_get_32

This is another API that is being used in all timer drivers and is not
internal to the clock subsystem. Remove the leading z_ and make promote
it to a cross-subsystem API.

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2021-03-12 12:46:52 -05:00
commit 12b53d121e
34 changed files with 49 additions and 49 deletions

View file

@ -247,7 +247,7 @@ uint32_t sys_clock_elapsed(void)
return ret; return ret;
} }
uint32_t z_timer_cycle_get_32(void) uint32_t sys_clock_cycle_get_32(void)
{ {
k_spinlock_key_t key = k_spin_lock(&lock); k_spinlock_key_t key = k_spin_lock(&lock);
uint32_t ret = counter_sub(counter(), last_count) + last_count; uint32_t ret = counter_sub(counter(), last_count) + last_count;

View file

@ -30,12 +30,12 @@ config APIC_TIMER_IRQ_PRIORITY
This option specifies the IRQ priority used by the local APIC timer. This option specifies the IRQ priority used by the local APIC timer.
config APIC_TIMER_TSC config APIC_TIMER_TSC
bool "Use invariant TSC for z_timer_cycle_get_32()" bool "Use invariant TSC for sys_clock_cycle_get_32()"
help help
If your CPU supports invariant TSC, and you know the ratio of the If your CPU supports invariant TSC, and you know the ratio of the
TSC frequency to CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC (the local APIC TSC frequency to CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC (the local APIC
timer frequency), then enable this for a much faster and more timer frequency), then enable this for a much faster and more
accurate z_timer_cycle_get_32(). accurate sys_clock_cycle_get_32().
if APIC_TIMER_TSC if APIC_TIMER_TSC

View file

@ -49,7 +49,7 @@ int sys_clock_driver_init(const struct device *device)
return 0; return 0;
} }
uint32_t z_timer_cycle_get_32(void) uint32_t sys_clock_cycle_get_32(void)
{ {
/* Per the Altera Embedded IP Peripherals guide, you cannot /* Per the Altera Embedded IP Peripherals guide, you cannot
* use a timer instance for both the system clock and timestamps * use a timer instance for both the system clock and timestamps

View file

@ -16,7 +16,7 @@ BUILD_ASSERT(!IS_ENABLED(CONFIG_SMP), "APIC timer doesn't support SMP");
* This driver enables the local APIC as the Zephyr system timer. It supports * This driver enables the local APIC as the Zephyr system timer. It supports
* both legacy ("tickful") mode as well as TICKLESS_KERNEL. The driver will * both legacy ("tickful") mode as well as TICKLESS_KERNEL. The driver will
* work with any APIC that has the ARAT "always running APIC timer" feature * work with any APIC that has the ARAT "always running APIC timer" feature
* (CPUID 0x06, EAX bit 2); for the more accurate z_timer_cycle_get_32(), * (CPUID 0x06, EAX bit 2); for the more accurate sys_clock_cycle_get_32(),
* the invariant TSC feature (CPUID 0x80000007: EDX bit 8) is also required. * the invariant TSC feature (CPUID 0x80000007: EDX bit 8) is also required.
* (Ultimately systems with invariant TSCs should use a TSC-based driver, * (Ultimately systems with invariant TSCs should use a TSC-based driver,
* and the TSC-related parts should be stripped from this implementation.) * and the TSC-related parts should be stripped from this implementation.)
@ -31,7 +31,7 @@ BUILD_ASSERT(!IS_ENABLED(CONFIG_SMP), "APIC timer doesn't support SMP");
* by the local APIC timer block (before it gets to the timer divider). * by the local APIC timer block (before it gets to the timer divider).
* *
* CONFIG_APIC_TIMER_TSC=y enables the more accurate TSC-based cycle counter * CONFIG_APIC_TIMER_TSC=y enables the more accurate TSC-based cycle counter
* for z_timer_cycle_get_32(). This also requires the next options be set. * for sys_clock_cycle_get_32(). This also requires the next options be set.
* *
* CONFIG_APIC_TIMER_TSC_N=<n> * CONFIG_APIC_TIMER_TSC_N=<n>
* CONFIG_APIC_TIMER_TSC_M=<m> * CONFIG_APIC_TIMER_TSC_M=<m>
@ -187,7 +187,7 @@ uint32_t sys_clock_elapsed(void)
#ifdef CONFIG_APIC_TIMER_TSC #ifdef CONFIG_APIC_TIMER_TSC
uint32_t z_timer_cycle_get_32(void) uint32_t sys_clock_cycle_get_32(void)
{ {
uint64_t tsc = z_tsc_read(); uint64_t tsc = z_tsc_read();
uint32_t cycles; uint32_t cycles;
@ -198,7 +198,7 @@ uint32_t z_timer_cycle_get_32(void)
#else #else
uint32_t z_timer_cycle_get_32(void) uint32_t sys_clock_cycle_get_32(void)
{ {
uint32_t ret; uint32_t ret;
uint32_t ccr; uint32_t ccr;

View file

@ -437,7 +437,7 @@ uint32_t sys_clock_elapsed(void)
return cyc / CYC_PER_TICK; return cyc / CYC_PER_TICK;
} }
uint32_t z_timer_cycle_get_32(void) uint32_t sys_clock_cycle_get_32(void)
{ {
#if SMP_TIMER_DRIVER #if SMP_TIMER_DRIVER
return z_arc_connect_gfrc_read() - start_time; return z_arc_connect_gfrc_read() - start_time;

View file

@ -109,7 +109,7 @@ uint32_t sys_clock_elapsed(void)
return ret; return ret;
} }
uint32_t z_timer_cycle_get_32(void) uint32_t sys_clock_cycle_get_32(void)
{ {
return (uint32_t)arm_arch_timer_count(); return (uint32_t)arm_arch_timer_count();
} }

View file

@ -176,7 +176,7 @@ uint32_t sys_clock_elapsed(void)
return ret; return ret;
} }
uint32_t z_timer_cycle_get_32(void) uint32_t sys_clock_cycle_get_32(void)
{ {
return count32(); return count32();
} }

View file

@ -238,7 +238,7 @@ uint32_t sys_clock_elapsed(void)
return ret; return ret;
} }
uint32_t z_timer_cycle_get_32(void) uint32_t sys_clock_cycle_get_32(void)
{ {
return (AONRTCCurrent64BitValueGet() / RTC_COUNTS_PER_CYCLE) return (AONRTCCurrent64BitValueGet() / RTC_COUNTS_PER_CYCLE)
& 0xFFFFFFFF; & 0xFFFFFFFF;

View file

@ -238,7 +238,7 @@ uint32_t sys_clock_elapsed(void)
return cyc / CYC_PER_TICK; return cyc / CYC_PER_TICK;
} }
uint32_t z_timer_cycle_get_32(void) uint32_t sys_clock_cycle_get_32(void)
{ {
k_spinlock_key_t key = k_spin_lock(&lock); k_spinlock_key_t key = k_spin_lock(&lock);
uint32_t ret = elapsed() + cycle_count; uint32_t ret = elapsed() + cycle_count;

View file

@ -204,7 +204,7 @@ uint32_t sys_clock_elapsed(void)
return ret; return ret;
} }
uint32_t z_timer_cycle_get_32(void) uint32_t sys_clock_cycle_get_32(void)
{ {
return MAIN_COUNTER_REG; return MAIN_COUNTER_REG;
} }

View file

@ -240,7 +240,7 @@ uint32_t sys_clock_elapsed(void)
return ret; return ret;
} }
uint32_t z_timer_cycle_get_32(void) uint32_t sys_clock_cycle_get_32(void)
{ {
return get_timer_combine_count(CTIMER_HW_TIMER_INDEX); return get_timer_combine_count(CTIMER_HW_TIMER_INDEX);
} }

View file

@ -86,7 +86,7 @@ uint32_t sys_clock_elapsed(void)
return 0; return 0;
} }
uint32_t z_timer_cycle_get_32(void) uint32_t sys_clock_cycle_get_32(void)
{ {
volatile struct gptimer_regs *regs = get_regs(); volatile struct gptimer_regs *regs = get_regs();
volatile struct gptimer_timer_regs *tmr = &regs->timer[1]; volatile struct gptimer_timer_regs *tmr = &regs->timer[1];

View file

@ -39,7 +39,7 @@ static void litex_timer_irq_handler(const void *device)
irq_unlock(key); irq_unlock(key);
} }
uint32_t z_timer_cycle_get_32(void) uint32_t sys_clock_cycle_get_32(void)
{ {
static struct k_spinlock lock; static struct k_spinlock lock;
uint32_t timer_total; uint32_t timer_total;

View file

@ -286,7 +286,7 @@ uint32_t sys_clock_elapsed(void)
* z_impl_k_busy_wait calls here. This code path uses the value as uint32_t. * z_impl_k_busy_wait calls here. This code path uses the value as uint32_t.
* *
*/ */
uint32_t z_timer_cycle_get_32(void) uint32_t sys_clock_cycle_get_32(void)
{ {
uint32_t ret; uint32_t ret;
uint32_t ccr; uint32_t ccr;

View file

@ -27,7 +27,7 @@ static uint64_t last_tick_time;
* Return the current HW cycle counter * Return the current HW cycle counter
* (number of microseconds since boot in 32bits) * (number of microseconds since boot in 32bits)
*/ */
uint32_t z_timer_cycle_get_32(void) uint32_t sys_clock_cycle_get_32(void)
{ {
return hwm_get_time(); return hwm_get_time();
} }

View file

@ -254,7 +254,7 @@ uint32_t sys_clock_elapsed(void)
return (uint32_t)((current - cyc_sys_announced) / SYS_CYCLES_PER_TICK); return (uint32_t)((current - cyc_sys_announced) / SYS_CYCLES_PER_TICK);
} }
uint32_t z_timer_cycle_get_32(void) uint32_t sys_clock_cycle_get_32(void)
{ {
k_spinlock_key_t key = k_spin_lock(&lock); k_spinlock_key_t key = k_spin_lock(&lock);
uint64_t current = npcx_itim_get_sys_cyc64(); uint64_t current = npcx_itim_get_sys_cyc64();

View file

@ -393,7 +393,7 @@ uint32_t sys_clock_elapsed(void)
return ret; return ret;
} }
uint32_t z_timer_cycle_get_32(void) uint32_t sys_clock_cycle_get_32(void)
{ {
k_spinlock_key_t key = k_spin_lock(&lock); k_spinlock_key_t key = k_spin_lock(&lock);
uint32_t ret = counter_sub(counter(), last_count) + last_count; uint32_t ret = counter_sub(counter(), last_count) + last_count;

View file

@ -143,7 +143,7 @@ uint32_t sys_clock_elapsed(void)
return ret; return ret;
} }
uint32_t z_timer_cycle_get_32(void) uint32_t sys_clock_cycle_get_32(void)
{ {
return (uint32_t)mtime(); return (uint32_t)mtime();
} }

View file

@ -131,7 +131,7 @@ int sys_clock_driver_init(const struct device *unused)
return 0; return 0;
} }
uint32_t z_timer_cycle_get_32(void) uint32_t sys_clock_cycle_get_32(void)
{ {
return cycle_count + SYSTEM_TIMER_INSTANCE->CNR; return cycle_count + SYSTEM_TIMER_INSTANCE->CNR;
} }

View file

@ -310,7 +310,7 @@ uint32_t sys_clock_elapsed(void)
#endif #endif
} }
uint32_t z_timer_cycle_get_32(void) uint32_t sys_clock_cycle_get_32(void)
{ {
/* Just return the absolute value of RTC cycle counter. */ /* Just return the absolute value of RTC cycle counter. */
return rtc_count(); return rtc_count();

View file

@ -59,7 +59,7 @@ static void lptim_irq_handler(const struct device *unused)
LL_LPTIM_ClearFLAG_ARRM(LPTIM1); LL_LPTIM_ClearFLAG_ARRM(LPTIM1);
/* increase the total nb of autoreload count /* increase the total nb of autoreload count
* used in the z_timer_cycle_get_32() function. * used in the sys_clock_cycle_get_32() function.
* Reading the CNT register gives a reliable value * Reading the CNT register gives a reliable value
*/ */
uint32_t autoreload = LL_LPTIM_GetAutoReload(LPTIM1) + 1; uint32_t autoreload = LL_LPTIM_GetAutoReload(LPTIM1) + 1;
@ -296,7 +296,7 @@ uint32_t sys_clock_elapsed(void)
return (uint32_t)(ret); return (uint32_t)(ret);
} }
uint32_t z_timer_cycle_get_32(void) uint32_t sys_clock_cycle_get_32(void)
{ {
/* just gives the accumulated count in a number of hw cycles */ /* just gives the accumulated count in a number of hw cycles */

View file

@ -189,7 +189,7 @@ uint32_t sys_clock_elapsed(void)
#endif #endif
} }
uint32_t z_timer_cycle_get_32(void) uint32_t sys_clock_cycle_get_32(void)
{ {
/* Return the current counter value */ /* Return the current counter value */
return read_count(); return read_count();

View file

@ -110,7 +110,7 @@ uint32_t sys_clock_elapsed(void)
return ret; return ret;
} }
uint32_t z_timer_cycle_get_32(void) uint32_t sys_clock_cycle_get_32(void)
{ {
return ccount(); return ccount();
} }

View file

@ -21,11 +21,11 @@ extern "C" {
#ifndef _ASMLANGUAGE #ifndef _ASMLANGUAGE
extern unsigned int z_arc_cpu_sleep_mode; extern unsigned int z_arc_cpu_sleep_mode;
extern uint32_t z_timer_cycle_get_32(void); extern uint32_t sys_clock_cycle_get_32(void);
static inline uint32_t arch_k_cycle_get_32(void) static inline uint32_t arch_k_cycle_get_32(void)
{ {
return z_timer_cycle_get_32(); return sys_clock_cycle_get_32();
} }
#endif #endif

View file

@ -19,11 +19,11 @@ extern "C" {
#endif #endif
#ifndef _ASMLANGUAGE #ifndef _ASMLANGUAGE
extern uint32_t z_timer_cycle_get_32(void); extern uint32_t sys_clock_cycle_get_32(void);
static inline uint32_t arch_k_cycle_get_32(void) static inline uint32_t arch_k_cycle_get_32(void)
{ {
return z_timer_cycle_get_32(); return sys_clock_cycle_get_32();
} }
static ALWAYS_INLINE void arch_nop(void) static ALWAYS_INLINE void arch_nop(void)

View file

@ -20,11 +20,11 @@ extern "C" {
#endif #endif
#ifndef _ASMLANGUAGE #ifndef _ASMLANGUAGE
extern uint32_t z_timer_cycle_get_32(void); extern uint32_t sys_clock_cycle_get_32(void);
static inline uint32_t arch_k_cycle_get_32(void) static inline uint32_t arch_k_cycle_get_32(void)
{ {
return z_timer_cycle_get_32(); return sys_clock_cycle_get_32();
} }
static ALWAYS_INLINE void arch_nop(void) static ALWAYS_INLINE void arch_nop(void)

View file

@ -171,11 +171,11 @@ enum nios2_exception_cause {
BIT(NIOS2_EXCEPTION_ECC_DATA_ERR)) BIT(NIOS2_EXCEPTION_ECC_DATA_ERR))
extern uint32_t z_timer_cycle_get_32(void); extern uint32_t sys_clock_cycle_get_32(void);
static inline uint32_t arch_k_cycle_get_32(void) static inline uint32_t arch_k_cycle_get_32(void)
{ {
return z_timer_cycle_get_32(); return sys_clock_cycle_get_32();
} }
static ALWAYS_INLINE void arch_nop(void) static ALWAYS_INLINE void arch_nop(void)

View file

@ -44,11 +44,11 @@ struct __esf {
typedef struct __esf z_arch_esf_t; typedef struct __esf z_arch_esf_t;
extern uint32_t z_timer_cycle_get_32(void); extern uint32_t sys_clock_cycle_get_32(void);
static inline uint32_t arch_k_cycle_get_32(void) static inline uint32_t arch_k_cycle_get_32(void)
{ {
return z_timer_cycle_get_32(); return sys_clock_cycle_get_32();
} }
static ALWAYS_INLINE void arch_nop(void) static ALWAYS_INLINE void arch_nop(void)

View file

@ -347,11 +347,11 @@ static ALWAYS_INLINE void arch_nop(void)
__asm__ volatile("nop"); __asm__ volatile("nop");
} }
extern uint32_t z_timer_cycle_get_32(void); extern uint32_t sys_clock_cycle_get_32(void);
static inline uint32_t arch_k_cycle_get_32(void) static inline uint32_t arch_k_cycle_get_32(void)
{ {
return z_timer_cycle_get_32(); return sys_clock_cycle_get_32();
} }
#ifdef CONFIG_USERSPACE #ifdef CONFIG_USERSPACE

View file

@ -92,11 +92,11 @@ static ALWAYS_INLINE void arch_nop(void)
__asm__ volatile ("nop"); __asm__ volatile ("nop");
} }
extern uint32_t z_timer_cycle_get_32(void); extern uint32_t sys_clock_cycle_get_32(void);
static inline uint32_t arch_k_cycle_get_32(void) static inline uint32_t arch_k_cycle_get_32(void)
{ {
return z_timer_cycle_get_32(); return sys_clock_cycle_get_32();
} }

View file

@ -246,11 +246,11 @@ extern "C" {
extern void arch_irq_enable(unsigned int irq); extern void arch_irq_enable(unsigned int irq);
extern void arch_irq_disable(unsigned int irq); extern void arch_irq_disable(unsigned int irq);
extern uint32_t z_timer_cycle_get_32(void); extern uint32_t sys_clock_cycle_get_32(void);
static inline uint32_t arch_k_cycle_get_32(void) static inline uint32_t arch_k_cycle_get_32(void)
{ {
return z_timer_cycle_get_32(); return sys_clock_cycle_get_32();
} }
static ALWAYS_INLINE bool arch_irq_unlocked(unsigned int key) static ALWAYS_INLINE bool arch_irq_unlocked(unsigned int key)

View file

@ -56,11 +56,11 @@ extern void z_irq_spurious(const void *unused);
#define XTENSA_ERR_NORET #define XTENSA_ERR_NORET
extern uint32_t z_timer_cycle_get_32(void); extern uint32_t sys_clock_cycle_get_32(void);
static inline uint32_t arch_k_cycle_get_32(void) static inline uint32_t arch_k_cycle_get_32(void)
{ {
return z_timer_cycle_get_32(); return sys_clock_cycle_get_32();
} }
static ALWAYS_INLINE void arch_nop(void) static ALWAYS_INLINE void arch_nop(void)

View file

@ -718,9 +718,9 @@ enum usdhc_reset {
static void usdhc_millsec_delay(unsigned int cycles_to_wait) static void usdhc_millsec_delay(unsigned int cycles_to_wait)
{ {
unsigned int start = z_timer_cycle_get_32(); unsigned int start = sys_clock_cycle_get_32();
while (z_timer_cycle_get_32() - start < (cycles_to_wait * 1000)) while (sys_clock_cycle_get_32() - start < (cycles_to_wait * 1000))
; ;
} }

View file

@ -29,7 +29,7 @@ static uint32_t sync(const struct device *cmos)
} }
} while (last == this); } while (last == this);
return z_timer_cycle_get_32(); return sys_clock_cycle_get_32();
} }
void timer(void) void timer(void)