|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] Re: [Minios-devel] [UNIKRAFT PATCH v2 2/2] plat/common: Split ARM generic timer implementation
Hi Justin,
Thanks for the comments. Just sent a new version. Some answers to your
questions inline.
Best,
Santiago
On 24.10.19, 04:26, "Justin He (Arm Technology China)" <Justin.He@xxxxxxx>
wrote:
Hi Santiago
Thanks for supporting Unikrafting running on Respberry Pi 3.
Please see my comments inline.
> -----Original Message-----
> From: Minios-devel <minios-devel-bounces@xxxxxxxxxxxxxxxxxxxx> On Behalf
> Of Santiago Pagani
> Sent: Monday, October 21, 2019 8:14 PM
> To: minios-devel@xxxxxxxxxxxxx
> Cc: Costin Lupu <costin.lupu@xxxxxxxxx>; Santiago Pagani
> <santiago.pagani@xxxxxxxxx>
> Subject: [Minios-devel] [UNIKRAFT PATCH v2 2/2] plat/common: Split ARM
> generic timer implementation
>
> Split the ARM generic timer implementation in two files,
> such that we reduce code duplication in future platform
> specific timer implementation. For example, the
> Raspberry Pi 3 will have its own versions of:
> - void generic_timer_mask_irq(void)
> - void generic_timer_unmask_irq(void)
> - uint32_t generic_timer_get_frequency(int fdt_timer __unused)
> - void time_block_until(__snsec until)
> - void ukplat_time_init(void)
> including some SoC specific code.
>
Maybe you still need to split this patch into smaller pieces.
Patch 1: just move the common codes to generic_timer.c
P
> Signed-off-by: Santiago Pagani <santiago.pagani@xxxxxxxxx>
> ---
> plat/common/arm/generic_timer.c | 303
> ++++++++++++++++++++++++++++++++
> plat/common/arm/time.c | 259 +--------------------------
> plat/common/include/arm/time.h | 9 +
> plat/kvm/Makefile.uk | 1 +
> 4 files changed, 321 insertions(+), 251 deletions(-)
> create mode 100644 plat/common/arm/generic_timer.c
>
> diff --git a/plat/common/arm/generic_timer.c
> b/plat/common/arm/generic_timer.c
> new file mode 100644
> index 00000000..2fa24c4d
> --- /dev/null
> +++ b/plat/common/arm/generic_timer.c
> @@ -0,0 +1,303 @@
> +/* SPDX-License-Identifier: BSD-3-Clause */
> +/*
> + * Authors: Wei Chen <Wei.Chen@xxxxxxx>
> + *
> + * Copyright (c) 2018, Arm Ltd. All rights reserved.
> + *
> + * Redistribution and use in source and binary forms, with or without
> + * modification, are permitted provided that the following conditions
> + * are met:
> + *
> + * 1. Redistributions of source code must retain the above copyright
> + * notice, this list of conditions and the following disclaimer.
> + * 2. Redistributions in binary form must reproduce the above copyright
> + * notice, this list of conditions and the following disclaimer in the
> + * documentation and/or other materials provided with the
distribution.
> + * 3. Neither the name of the copyright holder nor the names of its
> + * contributors may be used to endorse or promote products derived
> from
> + * this software without specific prior written permission.
> + *
> + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
> CONTRIBUTORS "AS IS"
> + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
> LIMITED TO, THE
> + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
> PARTICULAR PURPOSE
> + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
> CONTRIBUTORS BE
> + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
> + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
> PROCUREMENT OF
> + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
> BUSINESS
> + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
> WHETHER IN
> + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
> OTHERWISE)
> + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
> ADVISED OF THE
> + * POSSIBILITY OF SUCH DAMAGE.
> + *
> + * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
> + */
> +#include <stdlib.h>
> +//#include <libfdt.h>
> +//#include <ofw/fdt.h>
Nits, remove the commented lines
> +#include <uk/assert.h>
> +#include <uk/plat/time.h>
> +#include <uk/plat/lcpu.h>
> +#include <uk/plat/irq.h>
> +#include <uk/bitops.h>
> +#include <cpu.h>
> +#include <ofw/gic_fdt.h>
> +#include <irq.h>
> +#include <gic/gic-v2.h>
> +#include <arm/time.h>
> +
> +/* TODO: For now this file is KVM dependent. As soon as we have more
> + * Arm platforms that are using this file, we need to introduce a
> + * portable way to handover the DTB entry point to common platform code
> */
> +//#include <kvm/config.h>
Ditto
> +
> +uint64_t boot_ticks;
> +static uint32_t counter_freq;
> +
> +
Nits: double blank lines
> +/* Shift factor for converting ticks to ns */
> +static uint8_t counter_shift_to_ns;
> +
> +/* Shift factor for converting ns to ticks */
> +static uint8_t counter_shift_to_tick;
> +
> +/* Multiplier for converting counter ticks to nsecs */
> +static uint32_t ns_per_tick;
> +
> +/* Multiplier for converting nsecs to counter ticks */
> +static uint32_t tick_per_ns;
> +
> +/*
> + * The maximum time range in seconds which can be converted by
> multiplier
> + * and shift factors. This will guarantee the converted value not to
exceed
> + * 64-bit unsigned integer. Increase the time range will reduce the
accuracy
> + * of conversion, because we will get smaller multiplier and shift
factors.
> + * In this case, we selected 3600s as the time range.
> + */
> +#define __MAX_CONVERT_SECS (3600UL)
> +#define __MAX_CONVERT_NS (3600UL*NSEC_PER_SEC)
> +static uint64_t max_convert_ticks = ~0UL;
> +
> +/* How many nanoseconds per second */
> +#define NSEC_PER_SEC ukarch_time_sec_to_nsec(1)
> +
> +static inline uint64_t ticks_to_ns(uint64_t ticks)
> +{
> + UK_ASSERT(ticks <= max_convert_ticks);
> +
> + return (ns_per_tick * ticks) >> counter_shift_to_ns;
> +}
> +
> +static inline uint64_t ns_to_ticks(uint64_t ns)
> +{
> + UK_ASSERT(ns <= __MAX_CONVERT_NS);
> +
> + return (tick_per_ns * ns) >> counter_shift_to_tick;
> +}
> +
> +/*
> + * Calculate multiplier/shift factors for scaled math.
> + */
> +static void calculate_mult_shift(uint32_t *mult, uint8_t *shift,
> + uint64_t from, uint64_t to)
> +{
> + uint64_t tmp;
> + uint32_t sft, sftacc = 32;
> +
> + /*
> + * Calculate the shift factor which is limiting the conversion
> + * range:
> + */
> + tmp = ((uint64_t)__MAX_CONVERT_SECS * from) >> 32;
> + while (tmp) {
> + tmp >>= 1;
> + sftacc--;
> + }
> +
> +
> + /*
> + * Calculate shift factor (S) and scaling multiplier (M).
> + *
> + * (S) needs to be the largest shift factor (<= max_shift) where
> + * the result of the M calculation below fits into uint32_t
> + * without truncation.
> + *
> + * multiplier = (target << shift) / source
> + */
> + for (sft = 32; sft > 0; sft--) {
> + tmp = (uint64_t) to << sft;
> +
> + /* Ensuring we round to nearest when calculating the
> + * multiplier
> + */
> + tmp += from / 2;
> + tmp /= from;
> + if ((tmp >> sftacc) == 0)
> + break;
> + }
> + *mult = tmp;
> + *shift = sft;
> +}
> +
> +void generic_timer_enable(void)
> +{
> + set_el0(cntv_ctl, get_el0(cntv_ctl) | GT_TIMER_ENABLE);
> +
> + /* Ensure the write of sys register is visible */
> + isb();
> +}
> +
> +static inline void generic_timer_disable(void)
> +{
> + set_el0(cntv_ctl, get_el0(cntv_ctl) & ~GT_TIMER_ENABLE);
> +
> + /* Ensure the write of sys register is visible */
> + isb();
> +}
> +
> +static inline void generic_timer_clear_irq(void)
> +{
> + set_el0(cntv_ctl, get_el0(cntv_ctl) & ~GT_TIMER_IRQ_STATUS);
> +
> + /* Ensure the write of sys register is visible */
> + isb();
> +}
> +
> +static inline void generic_timer_update_compare(uint64_t new_val)
> +{
> + set_el0(cntv_cval, new_val);
> +
There is a tab in your patch here ^
> + /* Ensure the write of sys register is visible */
> + isb();
> +}
> +
> +#ifdef CONFIG_ARM64_ERRATUM_858921
> +/*
> + * The errata #858921 describes that Cortex-A73 (r0p0 - r0p2) counter
> + * read can return a wrong value when the counter crosses a 32bit
> boundary.
> + * But newer Cortex-A73 are not affected.
> + *
> + * The workaround involves performing the read twice, compare bit[32] of
> + * the two read values. If bit[32] is different, keep the first value,
> + * otherwise keep the second value.
> + */
> +uint64_t generic_timer_get_ticks(void)
> +{
> + uint64_t val_1st, val_2nd;
> +
> + val_1st = get_el0(cntvct);
> + val_2nd = get_el0(cntvct);
> + return (((val_1st ^ val_2nd) >> 32) & 1) ? val_1st : val_2nd;
> +}
> +#else
> +uint64_t generic_timer_get_ticks(void)
> +{
> + return get_el0(cntvct);
> +}
> +#endif
> +
> +/*
> + * monotonic_clock(): returns # of nanoseconds passed since
> + * generic_timer_time_init()
> + */
> +static inline __nsec generic_timer_monotonic(void)
> +{
> + return (__nsec)ticks_to_ns(generic_timer_get_ticks() - boot_ticks);
> +}
> +
> +/*
> + * Return epoch offset (wall time offset to monotonic clock start).
> + */
> +static inline uint64_t generic_timer_epochoffset(void)
> +{
> + return 0;
> +}
> +
> +/*
> + * Returns early if any interrupts are serviced, or if the requested
delay is
> + * too short. Must be called with interrupts disabled, will enable
interrupts
> + * "atomically" during idle loop.
> + *
> + * This function must be called only from the scheduler. It will screw
> + * your system if you do otherwise. And, there is no reason you
> + * actually want to use it anywhere else. THIS IS NOT A YIELD or any
> + * kind of mutex_lock. It will simply halt the cpu, not allowing any
> + * other thread to execute.
> + */
> +void generic_timer_cpu_block_until(uint64_t until_ns)
> +{
> + uint64_t now_ns, until_ticks;
Seems you removed the UK_ASSERT(ukplat_lcpu_irqs_disabled()); here?
Is there any specific reason?
I can put the assert back with your fix for 'irqs_disabled(void)', as otherwise
I was getting this assert triggered constantly when it should not have been.
> +
> + /* Record current ns and until_ticks for timer */
> + now_ns = ukplat_monotonic_clock();
> + until_ticks = generic_timer_get_ticks()
> + + ns_to_ticks(until_ns - now_ns);
> +
> + if (now_ns < until_ns) {
> + generic_timer_update_compare(until_ticks);
> + generic_timer_enable();
> + generic_timer_unmask_irq();
> + __asm__ __volatile__("wfi");
> + generic_timer_mask_irq();
> +
> + /* Give the IRQ handler a chance to handle whatever woke
> + * us up
> + */
> + ukplat_lcpu_enable_irq();
> + ukplat_lcpu_disable_irq();
> + }
> +}
> +
> +int generic_timer_init(int fdt_timer)
> +{
> + /* Get counter frequency from DTB or register */
> + counter_freq = generic_timer_get_frequency(fdt_timer);
> +
> + /*
> + * Calculate the shift factor and scaling multiplier for
> + * converting ticks to ns.
> + */
> + calculate_mult_shift(&ns_per_tick, &counter_shift_to_ns,
> + counter_freq, NSEC_PER_SEC);
> +
> + /* We disallow zero ns_per_tick */
> + UK_BUGON(!ns_per_tick);
> +
> + /*
> + * Calculate the shift factor and scaling multiplier for
> + * converting ns to ticks.
> + */
> + calculate_mult_shift(&tick_per_ns, &counter_shift_to_tick,
> + NSEC_PER_SEC, counter_freq);
> +
> + /* We disallow zero ns_per_tick */
> + UK_BUGON(!tick_per_ns);
> +
> + max_convert_ticks = __MAX_CONVERT_SECS*counter_freq;
> +
> + return 0;
> +}
> +
> +int generic_timer_irq_handler(void *arg __unused)
> +{
> + /*
> + * We just mask the IRQ here, the scheduler will call
> + * generic_timer_cpu_block_until, and then unmask the IRQ.
> + */
> + generic_timer_mask_irq();
> + generic_timer_clear_irq();
Please also elaborate it more why you add a clear_irq here?
The IRQ needs to be cleared at some point, either here or when unmasking the
IRQ, as otherwise at the moment of unmasking the IRQ, if the bit remained set
from the last interrupt, the IRQ is immediately re-triggered. This is for sure
the case in the Raspberry Pi 3.
> +
> + /* Yes, we handled the irq. */
> + return 1;
> +}
> +
> +/* return ns since time_init() */
> +__nsec ukplat_monotonic_clock(void)
> +{
> + return generic_timer_monotonic();
> +}
> +
> +/* return wall time in nsecs */
> +__nsec ukplat_wall_clock(void)
> +{
> + return generic_timer_monotonic() + generic_timer_epochoffset();
> +}
> diff --git a/plat/common/arm/time.c b/plat/common/arm/time.c
> index 56d9d6e1..25f2a80c 100644
> --- a/plat/common/arm/time.c
> +++ b/plat/common/arm/time.c
> @@ -56,111 +56,9 @@ static const char * const arch_timer_list[] = {
> NULL
> };
>
> -static uint64_t boot_ticks;
> -static uint32_t counter_freq;
> +extern uint64_t boot_ticks;
Would it be better if moving it to time.h?
Otherwise there is a checkpatch warning:
WARNING: externs should be avoided in .c files
Changed back to static, and added a new function get_boot_ticks() used inside
generic_timer_monotonic()
>
> -
> -/* Shift factor for converting ticks to ns */
> -static uint8_t counter_shift_to_ns;
> -
> -/* Shift factor for converting ns to ticks */
> -static uint8_t counter_shift_to_tick;
> -
> -/* Multiplier for converting counter ticks to nsecs */
> -static uint32_t ns_per_tick;
> -
> -/* Multiplier for converting nsecs to counter ticks */
> -static uint32_t tick_per_ns;
> -
> -/*
> - * The maximum time range in seconds which can be converted by
> multiplier
> - * and shift factors. This will guarantee the converted value not to
exceed
> - * 64-bit unsigned integer. Increase the time range will reduce the
accuracy
> - * of conversion, because we will get smaller multiplier and shift
factors.
> - * In this case, we selected 3600s as the time range.
> - */
> -#define __MAX_CONVERT_SECS (3600UL)
> -#define __MAX_CONVERT_NS (3600UL*NSEC_PER_SEC)
> -static uint64_t max_convert_ticks = ~0UL;
> -
> -/* How many nanoseconds per second */
> -#define NSEC_PER_SEC ukarch_time_sec_to_nsec(1)
> -
> -static inline uint64_t ticks_to_ns(uint64_t ticks)
> -{
> - UK_ASSERT(ticks <= max_convert_ticks);
> -
> - return (ns_per_tick * ticks) >> counter_shift_to_ns;
> -}
> -
> -static inline uint64_t ns_to_ticks(uint64_t ns)
> -{
> - UK_ASSERT(ns <= __MAX_CONVERT_NS);
> -
> - return (tick_per_ns * ns) >> counter_shift_to_tick;
> -}
> -
> -/*
> - * Calculate multiplier/shift factors for scaled math.
> - */
> -static void calculate_mult_shift(uint32_t *mult, uint8_t *shift,
> - uint64_t from, uint64_t to)
> -{
> - uint64_t tmp;
> - uint32_t sft, sftacc = 32;
> -
> - /*
> - * Calculate the shift factor which is limiting the conversion
> - * range:
> - */
> - tmp = ((uint64_t)__MAX_CONVERT_SECS * from) >> 32;
> - while (tmp) {
> - tmp >>= 1;
> - sftacc--;
> - }
> -
> -
> - /*
> - * Calculate shift factor (S) and scaling multiplier (M).
> - *
> - * (S) needs to be the largest shift factor (<= max_shift) where
> - * the result of the M calculation below fits into uint32_t
> - * without truncation.
> - *
> - * multiplier = (target << shift) / source
> - */
> - for (sft = 32; sft > 0; sft--) {
> - tmp = (uint64_t) to << sft;
> -
> - /* Ensuring we round to nearest when calculating the
> - * multiplier
> - */
> - tmp += from / 2;
> - tmp /= from;
> - if ((tmp >> sftacc) == 0)
> - break;
> - }
> - *mult = tmp;
> - *shift = sft;
> -}
> -
> -static inline void generic_timer_enable(void)
> -{
> - set_el0(cntv_ctl, get_el0(cntv_ctl) | GT_TIMER_ENABLE);
> -
> - /* Ensure the write of sys register is visible */
> - isb();
> -}
> -
> -static inline void generic_timer_disable(void)
> -{
> - set_el0(cntv_ctl, get_el0(cntv_ctl) & ~GT_TIMER_ENABLE);
> -
> - /* Ensure the write of sys register is visible */
> - isb();
> -}
> -
> -static inline void generic_timer_mask_irq(void)
> +void generic_timer_mask_irq(void)
> {
> set_el0(cntv_ctl, get_el0(cntv_ctl) | GT_TIMER_MASK_IRQ);
>
> @@ -168,7 +66,7 @@ static inline void generic_timer_mask_irq(void)
> isb();
> }
>
> -static inline void generic_timer_unmask_irq(void)
> +void generic_timer_unmask_irq(void)
> {
> set_el0(cntv_ctl, get_el0(cntv_ctl) & ~GT_TIMER_MASK_IRQ);
>
> @@ -176,49 +74,16 @@ static inline void generic_timer_unmask_irq(void)
> isb();
> }
>
> -static inline void generic_timer_update_compare(uint64_t new_val)
> -{
> - set_el0(cntv_cval, new_val);
> -
> - /* Ensure the write of sys register is visible */
> - isb();
> -}
> -
> -#ifdef CONFIG_ARM64_ERRATUM_858921
> -/*
> - * The errata #858921 describes that Cortex-A73 (r0p0 - r0p2) counter
> - * read can return a wrong value when the counter crosses a 32bit
boundary.
> - * But newer Cortex-A73 are not affected.
> - *
> - * The workaround involves performing the read twice, compare bit[32] of
> - * the two read values. If bit[32] is different, keep the first value,
> - * otherwise keep the second value.
> - */
> -static uint64_t generic_timer_get_ticks(void)
> -{
> - uint64_t val_1st, val_2nd;
> -
> - val_1st = get_el0(cntvct);
> - val_2nd = get_el0(cntvct);
> - return (((val_1st ^ val_2nd) >> 32) & 1) ? val_1st : val_2nd;
> -}
> -#else
> -static inline uint64_t generic_timer_get_ticks(void)
> -{
> - return get_el0(cntvct);
> -}
> -#endif
> -
> -static uint32_t generic_timer_get_frequency(int fdt_timer)
> +uint32_t generic_timer_get_frequency(int fdt_timer)
> {
> int len;
> const uint64_t *fdt_freq;
>
> /*
> - * On a few platforms the frequency is not configured correctly
> - * by the firmware. A property in the DT (clock-frequency) has
> - * been introduced to workaround those firmware.
> - */
> + * On a few platforms the frequency is not configured correctly
> + * by the firmware. A property in the DT (clock-frequency) has
> + * been introduced to workaround those firmware.
> + */
> fdt_freq = fdt_getprop(_libkvmplat_cfg.dtb,
> fdt_timer, "clock-frequency", &len);
> if (!fdt_freq || (len <= 0)) {
> @@ -231,102 +96,6 @@ static uint32_t generic_timer_get_frequency(int
> fdt_timer)
> return fdt32_to_cpu(fdt_freq[0]);
> }
>
> -/*
> - * monotonic_clock(): returns # of nanoseconds passed since
> - * generic_timer_time_init()
> - */
> -static __nsec generic_timer_monotonic(void)
> -{
> - return (__nsec)ticks_to_ns(generic_timer_get_ticks() - boot_ticks);
> -}
> -
> -/*
> - * Return epoch offset (wall time offset to monotonic clock start).
> - */
> -static uint64_t generic_timer_epochoffset(void)
> -{
> - return 0;
> -}
> -
> -/*
> - * Returns early if any interrupts are serviced, or if the requested
delay is
> - * too short. Must be called with interrupts disabled, will enable
interrupts
> - * "atomically" during idle loop.
> - *
> - * This function must be called only from the scheduler. It will screw
> - * your system if you do otherwise. And, there is no reason you
> - * actually want to use it anywhere else. THIS IS NOT A YIELD or any
> - * kind of mutex_lock. It will simply halt the cpu, not allowing any
> - * other thread to execute.
> - */
> -static void generic_timer_cpu_block_until(uint64_t until_ns)
> -{
> - uint64_t now_ns, until_ticks;
> -
> - UK_ASSERT(ukplat_lcpu_irqs_disabled());
> -
> - /* Record current ns and until_ticks for timer */
> - now_ns = ukplat_monotonic_clock();
> - until_ticks = generic_timer_get_ticks()
> - + ns_to_ticks(until_ns - now_ns);
> -
> - if (now_ns < until_ns) {
> - generic_timer_update_compare(until_ticks);
> - generic_timer_enable();
> - generic_timer_unmask_irq();
> - __asm__ __volatile__("wfi");
> - generic_timer_mask_irq();
> -
> - /* Give the IRQ handler a chance to handle whatever woke
> - * us up
> - */
> - ukplat_lcpu_enable_irq();
> - ukplat_lcpu_disable_irq();
> - }
> -}
> -
> -static int generic_timer_init(int fdt_timer)
> -{
> - /* Get counter frequency from DTB or register */
> - counter_freq = generic_timer_get_frequency(fdt_timer);
> -
> - /*
> - * Calculate the shift factor and scaling multiplier for
> - * converting ticks to ns.
> - */
> - calculate_mult_shift(&ns_per_tick, &counter_shift_to_ns,
> - counter_freq, NSEC_PER_SEC);
> -
> - /* We disallow zero ns_per_tick */
> - UK_BUGON(!ns_per_tick);
> -
> - /*
> - * Calculate the shift factor and scaling multiplier for
> - * converting ns to ticks.
> - */
> - calculate_mult_shift(&tick_per_ns, &counter_shift_to_tick,
> - NSEC_PER_SEC, counter_freq);
> -
> - /* We disallow zero ns_per_tick */
> - UK_BUGON(!tick_per_ns);
> -
> - max_convert_ticks = __MAX_CONVERT_SECS*counter_freq;
> -
> - return 0;
> -}
> -
> -static int generic_timer_irq_handler(void *arg __unused)
> -{
> - /*
> - * We just mask the IRQ here, the scheduler will call
> - * generic_timer_cpu_block_until, and then unmask the IRQ.
> - */
> - generic_timer_mask_irq();
> -
> - /* Yes, we handled the irq. */
> - return 1;
> -}
> -
> unsigned long sched_have_pending_events;
>
> void time_block_until(__snsec until)
> @@ -338,18 +107,6 @@ void time_block_until(__snsec until)
> }
> }
>
> -/* return ns since time_init() */
> -__nsec ukplat_monotonic_clock(void)
> -{
> - return generic_timer_monotonic();
> -}
> -
> -/* return wall time in nsecs */
> -__nsec ukplat_wall_clock(void)
> -{
> - return generic_timer_monotonic() + generic_timer_epochoffset();
> -}
> -
> /* must be called before interrupts are enabled */
> void ukplat_time_init(void)
> {
> diff --git a/plat/common/include/arm/time.h
> b/plat/common/include/arm/time.h
> index 3eed7b92..bcc4e3e7 100644
> --- a/plat/common/include/arm/time.h
> +++ b/plat/common/include/arm/time.h
> @@ -12,4 +12,13 @@
> #include <arm/arm/time.h>
> #endif /* CONFIG_ARCH_ARM_64 */
>
> +void generic_timer_enable(void);
> +void generic_timer_mask_irq(void);
> +void generic_timer_unmask_irq(void);
> +uint64_t generic_timer_get_ticks(void);
> +uint32_t generic_timer_get_frequency(int fdt_timer);
> +int generic_timer_init(int fdt_timer);
> +int generic_timer_irq_handler(void *arg __unused);
> +void generic_timer_cpu_block_until(uint64_t until_ns);
> +
> #endif /* __ARM_ARM_TIME_H */
> diff --git a/plat/kvm/Makefile.uk b/plat/kvm/Makefile.uk
> index 68bcfd95..64909e2a 100644
> --- a/plat/kvm/Makefile.uk
> +++ b/plat/kvm/Makefile.uk
> @@ -78,6 +78,7 @@ LIBKVMPLAT_SRCS-$(CONFIG_ARCH_ARM_64) +=
> $(UK_PLAT_COMMON_BASE)/arm/cpu_native.c
> LIBKVMPLAT_SRCS-$(CONFIG_ARCH_ARM_64) +=
> $(UK_PLAT_COMMON_BASE)/arm/cache64.S|common
> LIBKVMPLAT_SRCS-$(CONFIG_ARCH_ARM_64) +=
> $(UK_PLAT_COMMON_BASE)/arm/psci_arm64.S|common
> LIBKVMPLAT_SRCS-$(CONFIG_ARCH_ARM_64) +=
> $(UK_PLAT_COMMON_BASE)/arm/time.c|common
> +LIBKVMPLAT_SRCS-$(CONFIG_ARCH_ARM_64) +=
> $(UK_PLAT_COMMON_BASE)/arm/generic_timer.c|common
> LIBKVMPLAT_SRCS-$(CONFIG_ARCH_ARM_64) +=
> $(UK_PLAT_COMMON_BASE)/arm/traps.c|common
> LIBKVMPLAT_SRCS-$(CONFIG_ARCH_ARM_64) +=
> $(LIBKVMPLAT_BASE)/arm/entry64.S
> LIBKVMPLAT_SRCS-$(CONFIG_ARCH_ARM_64) +=
> $(LIBKVMPLAT_BASE)/arm/exceptions.S
> --
> 2.17.1
>
>
> _______________________________________________
> Minios-devel mailing list
> Minios-devel@xxxxxxxxxxxxxxxxxxxx
> https://lists.xenproject.org/mailman/listinfo/minios-devel
IMPORTANT NOTICE: The contents of this email and any attachments are
confidential and may also be privileged. If you are not the intended recipient,
please notify the sender immediately and do not disclose the contents to any
other person, use it for any purpose, or store or copy the information in any
medium. Thank you.
_______________________________________________
Minios-devel mailing list
Minios-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/minios-devel
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |