seems fine to me, if it works, then push it
On Fri, Mar 19, 2021 at 5:30 AM Jan Sommer <[email protected]> wrote: > > - Fixes failure of test smpclock01 > --- > bsps/riscv/riscv/clock/clockdrv.c | 61 +++++++++++++++++++++++++------ > 1 file changed, 50 insertions(+), 11 deletions(-) > > diff --git a/bsps/riscv/riscv/clock/clockdrv.c > b/bsps/riscv/riscv/clock/clockdrv.c > index d085b6bd95..04abe24545 100644 > --- a/bsps/riscv/riscv/clock/clockdrv.c > +++ b/bsps/riscv/riscv/clock/clockdrv.c > @@ -41,6 +41,7 @@ > #include <rtems/timecounter.h> > #include <rtems/score/cpuimpl.h> > #include <rtems/score/riscv-utility.h> > +#include <rtems/score/smpimpl.h> > > #include <libfdt.h> > > @@ -92,13 +93,18 @@ static void riscv_clock_at_tick(riscv_timecounter *tc) > { > volatile RISCV_CLINT_regs *clint; > uint64_t value; > + uint32_t cpu = 0; > + > +#if defined(RTEMS_SMP) > + cpu = _CPU_SMP_Get_current_processor(); > +#endif > > clint = tc->clint; > > - value = clint->mtimecmp[0].val_64; > + value = clint->mtimecmp[cpu].val_64; > value += tc->interval; > > - riscv_clock_write_mtimecmp(&clint->mtimecmp[0], value); > + riscv_clock_write_mtimecmp(&clint->mtimecmp[cpu], value); > } > > static void riscv_clock_handler_install(void) > @@ -148,6 +154,42 @@ static uint32_t riscv_clock_get_timebase_frequency(const > void *fdt) > return fdt32_to_cpu(*val); > } > > +static void riscv_clock_clint_init( > + volatile RISCV_CLINT_regs *clint, > + uint64_t cmpval, > + uint32_t cpu > +) > +{ > + riscv_clock_write_mtimecmp( > + &clint->mtimecmp[cpu], > + cmpval > + ); > + > + /* Enable mtimer interrupts */ > + set_csr(mie, MIP_MTIP); > +} > + > +#if defined(RTEMS_SMP) && !defined(CLOCK_DRIVER_USE_ONLY_BOOT_PROCESSOR) > +static void riscv_clock_secondary_action(void *arg) > +{ > + volatile RISCV_CLINT_regs *clint = riscv_clint; > + uint64_t *cmpval = arg; > + uint32_t cpu = _CPU_SMP_Get_current_processor(); > + > + riscv_clock_clint_init(clint, *cmpval, cpu); > +} > +#endif > + > +static void riscv_clock_secondary_initialization( > + volatile RISCV_CLINT_regs *clint, > + uint64_t cmpval > +) > +{ > +#if defined(RTEMS_SMP) && !defined(CLOCK_DRIVER_USE_ONLY_BOOT_PROCESSOR) > + _SMP_Othercast_action(riscv_clock_secondary_action, &cmpval); > +#endif > +} > + > static void riscv_clock_initialize(void) > { > const char *fdt; > @@ -156,6 +198,7 @@ static void riscv_clock_initialize(void) > uint32_t tb_freq; > uint64_t us_per_tick; > uint32_t interval; > + uint64_t cmpval; > > fdt = bsp_fdt_get(); > tb_freq = riscv_clock_get_timebase_frequency(fdt); > @@ -167,13 +210,11 @@ static void riscv_clock_initialize(void) > tc->clint = clint; > tc->interval = interval; > > - riscv_clock_write_mtimecmp( > - &clint->mtimecmp[0], > - riscv_clock_read_mtime(&clint->mtime) + interval > - ); > - > - /* Enable mtimer interrupts */ > - set_csr(mie, MIP_MTIP); > + cmpval = riscv_clock_read_mtime(&clint->mtime); > + cmpval += interval; > + > + riscv_clock_clint_init(clint, cmpval, 0); > + riscv_clock_secondary_initialization(clint, cmpval); > > /* Initialize timecounter */ > tc->base.tc_get_timecount = riscv_clock_get_timecount; > @@ -213,6 +254,4 @@ RTEMS_SYSINIT_ITEM( > #define Clock_driver_support_install_isr(isr) \ > riscv_clock_handler_install() > > -#define CLOCK_DRIVER_USE_ONLY_BOOT_PROCESSOR > - > #include "../../../shared/dev/clock/clockimpl.h" > -- > 2.17.1 > > _______________________________________________ > devel mailing list > [email protected] > http://lists.rtems.org/mailman/listinfo/devel _______________________________________________ devel mailing list [email protected] http://lists.rtems.org/mailman/listinfo/devel
