Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a46d3f9b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull timer updates from Thomas Gleixner:
 "The timer departement presents:

   - A rather large rework of the hrtimer infrastructure which
     introduces softirq based hrtimers to replace the spread of
     hrtimer/tasklet combos which force the actual callback execution
     into softirq context. The approach is completely different from the
     initial implementation which you cursed at 10 years ago rightfully.

     The softirq based timers have their own queues and there is no
     nasty indirection and list reshuffling in the hard interrupt
     anymore. This comes with conversion of some of the hrtimer/tasklet
     users, the rest and the final removal of that horrible interface
     will come towards the end of the merge window or go through the
     relevant maintainer trees.

     Note: The top commit merged the last minute bugfix for the 10 years
     old CPU hotplug bug as I wanted to make sure that I fatfinger the
     merge conflict resolution myself.

   - The overhaul of the STM32 clocksource/clockevents driver

   - A new driver for the Spreadtrum SC9860 timer

   - A new driver dor the Actions Semi S700 timer

   - The usual set of fixes and updates all over the place"

* 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (53 commits)
  usb/gadget/NCM: Replace tasklet with softirq hrtimer
  ALSA/dummy: Replace tasklet with softirq hrtimer
  hrtimer: Implement SOFT/HARD clock base selection
  hrtimer: Implement support for softirq based hrtimers
  hrtimer: Prepare handling of hard and softirq based hrtimers
  hrtimer: Add clock bases and hrtimer mode for softirq context
  hrtimer: Use irqsave/irqrestore around __run_hrtimer()
  hrtimer: Factor out __hrtimer_next_event_base()
  hrtimer: Factor out __hrtimer_start_range_ns()
  hrtimer: Remove the 'base' parameter from hrtimer_reprogram()
  hrtimer: Make remote enqueue decision less restrictive
  hrtimer: Unify remote enqueue handling
  hrtimer: Unify hrtimer removal handling
  hrtimer: Make hrtimer_force_reprogramm() unconditionally available
  hrtimer: Make hrtimer_reprogramm() unconditional
  hrtimer: Make hrtimer_cpu_base.next_timer handling unconditional
  hrtimer: Make the remote enqueue check unconditional
  hrtimer: Use accesor functions instead of direct access
  hrtimer: Make the hrtimer_cpu_base::hres_active field unconditional, to simplify the code
  hrtimer: Make room in 'struct hrtimer_cpu_base'
  ...
parents 7bcd3425 303c146d

Documentation/devicetree/bindings/timer/actions,owl-timer.txt

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ Actions Semi Owl Timer 


Required properties:

- compatible      :  "actions,s500-timer" for S500

                     "actions,s700-timer" for S700

                     "actions,s900-timer" for S900

- reg             :  Offset and length of the register set for the device.

- interrupts      :  Should contain the interrupts.

Documentation/devicetree/bindings/timer/spreadtrum,sprd-timer.txt

0 → 100644
+20 −0
Original line number Diff line number Diff line 
Spreadtrum timers



The Spreadtrum SC9860 platform provides 3 general-purpose timers.

These timers can support 32bit or 64bit counter, as well as supporting

period mode or one-shot mode, and they are can be wakeup source

during deep sleep.



Required properties:

- compatible: should be "sprd,sc9860-timer" for SC9860 platform.

- reg: The register address of the timer device.

- interrupts: Should contain the interrupt for the timer device.

- clocks: The phandle to the source clock (usually a 32.768 KHz fixed clock).



Example:

	timer@40050000 {

		compatible = "sprd,sc9860-timer";

		reg = <0 0x40050000 0 0x20>;

		interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&ext_32k>;

	};

drivers/clocksource/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -269,6 +269,7 @@ config CLKSRC_STM32 
	bool "Clocksource for STM32 SoCs" if !ARCH_STM32

	depends on OF && ARM && (ARCH_STM32 || COMPILE_TEST)

	select CLKSRC_MMIO

	select TIMER_OF



config CLKSRC_MPS2

	bool "Clocksource for MPS2 SoCs" if COMPILE_TEST
@@ -441,6 +442,13 @@ config MTK_TIMER 
	help

	  Support for Mediatek timer driver.



config SPRD_TIMER

	bool "Spreadtrum timer driver" if COMPILE_TEST

	depends on HAS_IOMEM

	select TIMER_OF

	help

	  Enables support for the Spreadtrum timer driver.



config SYS_SUPPORTS_SH_MTU2

        bool

drivers/clocksource/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ obj-$(CONFIG_CLKSRC_TI_32K) += timer-ti-32k.o 
obj-$(CONFIG_CLKSRC_NPS)	+= timer-nps.o

obj-$(CONFIG_OXNAS_RPS_TIMER)	+= timer-oxnas-rps.o

obj-$(CONFIG_OWL_TIMER)		+= owl-timer.o

obj-$(CONFIG_SPRD_TIMER)	+= timer-sprd.o



obj-$(CONFIG_ARC_TIMERS)		+= arc_timer.o

obj-$(CONFIG_ARM_ARCH_TIMER)		+= arm_arch_timer.o

drivers/clocksource/owl-timer.c

+3 −2
Original line number Diff line number Diff line
@@ -168,5 +168,6 @@ static int __init owl_timer_init(struct device_node *node) 


	return 0;

}

CLOCKSOURCE_OF_DECLARE(owl_s500, "actions,s500-timer", owl_timer_init);

CLOCKSOURCE_OF_DECLARE(owl_s900, "actions,s900-timer", owl_timer_init);
 
TIMER_OF_DECLARE(owl_s500, "actions,s500-timer", owl_timer_init);

TIMER_OF_DECLARE(owl_s700, "actions,s700-timer", owl_timer_init);

TIMER_OF_DECLARE(owl_s900, "actions,s900-timer", owl_timer_init);