]> Git Repo - J-linux.git/commitdiff
Merge tag 'timers-core-2024-03-23' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <[email protected]>
Sat, 23 Mar 2024 21:42:45 +0000 (14:42 -0700)
committerLinus Torvalds <[email protected]>
Sat, 23 Mar 2024 21:42:45 +0000 (14:42 -0700)
Pull more clocksource updates from Thomas Gleixner:
 "A set of updates for clocksource and clockevent drivers:

   - A fix for the prescaler of the ARM global timer where the prescaler
     mask define only covered 4 bits while it is actully 8 bits wide.
     This obviously restricted the possible range of prescaler
     adjustments

   - A fix for the RISC-V timer which prevents a timer interrupt being
     raised while the timer is initialized

   - A set of device tree updates to support new system on chips in
     various drivers

   - Kernel-doc and other cleanups all over the place"

* tag 'timers-core-2024-03-23' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  clocksource/drivers/timer-riscv: Clear timer interrupt on timer initialization
  dt-bindings: timer: Add support for cadence TTC PWM
  clocksource/drivers/arm_global_timer: Simplify prescaler register access
  clocksource/drivers/arm_global_timer: Guard against division by zero
  clocksource/drivers/arm_global_timer: Make gt_target_rate unsigned long
  dt-bindings: timer: add Ralink SoCs system tick counter
  clocksource: arm_global_timer: fix non-kernel-doc comment
  clocksource/drivers/arm_global_timer: Remove stray tab
  clocksource/drivers/arm_global_timer: Fix maximum prescaler value
  clocksource/drivers/imx-sysctr: Add i.MX95 support
  clocksource/drivers/imx-sysctr: Drop use global variables
  dt-bindings: timer: nxp,sysctr-timer: support i.MX95
  dt-bindings: timer: renesas: ostm: Document RZ/Five SoC
  dt-bindings: timer: renesas,tmu: Document input capture interrupt
  clocksource/drivers/ti-32K: Fix misuse of "/**" comment
  clocksource/drivers/stm32: Fix all kernel-doc warnings
  dt-bindings: timer: exynos4210-mct: Add google,gs101-mct compatible
  clocksource/drivers/imx: Fix -Wunused-but-set-variable warning

1  2 
drivers/clocksource/timer-riscv.c

index 87a7ac0ce6cec46e4b00fa06a90402f4e2ced9de,79bb9a98baa7b47816d56752bf2b99738d90f3ea..48ce50c5f5e68eeec9de696476d424dd5b2c00d0
@@@ -108,13 -108,16 +108,16 @@@ static int riscv_timer_starting_cpu(uns
  {
        struct clock_event_device *ce = per_cpu_ptr(&riscv_clock_event, cpu);
  
+       /* Clear timer interrupt */
+       riscv_clock_event_stop();
        ce->cpumask = cpumask_of(cpu);
        ce->irq = riscv_clock_event_irq;
        if (riscv_timer_cannot_wake_cpu)
                ce->features |= CLOCK_EVT_FEAT_C3STOP;
        if (static_branch_likely(&riscv_sstc_available))
                ce->rating = 450;
 -      clockevents_config_and_register(ce, riscv_timebase, 100, 0x7fffffff);
 +      clockevents_config_and_register(ce, riscv_timebase, 100, ULONG_MAX);
  
        enable_percpu_irq(riscv_clock_event_irq,
                          irq_get_trigger_type(riscv_clock_event_irq));
This page took 0.060786 seconds and 4 git commands to generate.