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

Commit ab86e974 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 core timer updates from Ingo Molnar:
 "The main changes in this cycle's merge are:

   - Implement shadow timekeeper to shorten in kernel reader side
     blocking, by Thomas Gleixner.

   - Posix timers enhancements by Pavel Emelyanov:

   - allocate timer ID per process, so that exact timer ID allocations
     can be re-created be checkpoint/restore code.

   - debuggability and tooling (/proc/PID/timers, etc.) improvements.

   - suspend/resume enhancements by Feng Tang: on certain new Intel Atom
     processors (Penwell and Cloverview), there is a feature that the
     TSC won't stop in S3 state, so the TSC value won't be reset to 0
     after resume.  This can be taken advantage of by the generic via
     the CLOCK_SOURCE_SUSPEND_NONSTOP flag: instead of using the RTC to
     recover/approximate sleep time, the main (and precise) clocksource
     can be used.

   - Fix /proc/timer_list for 4096 CPUs by Nathan Zimmer: on so many
     CPUs the file goes beyond 4MB of size and thus the current
     simplistic seqfile approach fails.  Convert /proc/timer_list to a
     proper seq_file with its own iterator.

   - Cleanups and refactorings of the core timekeeping code by John
     Stultz.

   - International Atomic Clock time is managed by the NTP code
     internally currently but not exposed externally.  Separate the TAI
     code out and add CLOCK_TAI support and TAI support to the hrtimer
     and posix-timer code, by John Stultz.

   - Add deep idle support enhacement to the broadcast clockevents core
     timer code, by Daniel Lezcano: add an opt-in CLOCK_EVT_FEAT_DYNIRQ
     clockevents feature (which will be utilized by future clockevents
     driver updates), which allows the use of IRQ affinities to avoid
     spurious wakeups of idle CPUs - the right CPU with an expiring
     timer will be woken.

   - Add new ARM bcm281xx clocksource driver, by Christian Daudt

   - ... various other fixes and cleanups"

* 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (52 commits)
  clockevents: Set dummy handler on CPU_DEAD shutdown
  timekeeping: Update tk->cycle_last in resume
  posix-timers: Remove unused variable
  clockevents: Switch into oneshot mode even if broadcast registered late
  timer_list: Convert timer list to be a proper seq_file
  timer_list: Split timer_list_show_tickdevices
  posix-timers: Show sigevent info in proc file
  posix-timers: Introduce /proc/PID/timers file
  posix timers: Allocate timer id per process (v2)
  timekeeping: Make sure to notify hrtimers when TAI offset changes
  hrtimer: Fix ktime_add_ns() overflow on 32bit architectures
  hrtimer: Add expiry time overflow check in hrtimer_interrupt
  timekeeping: Shorten seq_count region
  timekeeping: Implement a shadow timekeeper
  timekeeping: Delay update of clock->cycle_last
  timekeeping: Store cycle_last value in timekeeper struct as well
  ntp: Remove ntp_lock, using the timekeeping locks to protect ntp state
  timekeeping: Simplify tai updating from do_adjtimex
  timekeeping: Hold timekeepering locks in do_adjtimex and hardpps
  timekeeping: Move ADJ_SETOFFSET to top level do_adjtimex()
  ...
parents 8700c95a 6f7a05d7

arch/arm/mach-bcm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ config ARCH_BCM 
	select ARM_ERRATA_764369 if SMP

	select ARM_GIC

	select CPU_V7

	select CLKSRC_OF

	select GENERIC_CLOCKEVENTS

	select GENERIC_TIME

	select GPIO_BCM

arch/arm/mach-bcm/board_bcm.c

+2 −5
Original line number Diff line number Diff line
@@ -16,14 +16,11 @@ 
#include <linux/device.h>

#include <linux/platform_device.h>

#include <linux/irqchip.h>

#include <linux/clocksource.h>



#include <asm/mach/arch.h>

#include <asm/mach/time.h>



static void timer_init(void)

{

}





static void __init board_init(void)

{
@@ -35,7 +32,7 @@ static const char * const bcm11351_dt_compat[] = { "bcm,bcm11351", NULL, }; 


DT_MACHINE_START(BCM11351_DT, "Broadcom Application Processor")

	.init_irq = irqchip_init,

	.init_time = timer_init,

	.init_time = clocksource_of_init,

	.init_machine = board_init,

	.dt_compat = bcm11351_dt_compat,

MACHINE_END

arch/x86/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ config X86 
	select OLD_SIGSUSPEND3 if X86_32 || IA32_EMULATION

	select OLD_SIGACTION if X86_32

	select COMPAT_OLD_SIGACTION if IA32_EMULATION

	select RTC_LIB



config INSTRUCTION_DECODER

	def_bool y

arch/x86/include/asm/cpufeature.h

+1 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ 
#define X86_FEATURE_AMD_DCM     (3*32+27) /* multi-node processor */

#define X86_FEATURE_APERFMPERF	(3*32+28) /* APERFMPERF */

#define X86_FEATURE_EAGER_FPU	(3*32+29) /* "eagerfpu" Non lazy FPU restore */

#define X86_FEATURE_NONSTOP_TSC_S3 (3*32+30) /* TSC doesn't stop in S3 state */



/* Intel-defined CPU features, CPUID level 0x00000001 (ecx), word 4 */

#define X86_FEATURE_XMM3	(4*32+ 0) /* "pni" SSE-3 */

arch/x86/kernel/cpu/intel.c

+12 −0
Original line number Diff line number Diff line
@@ -96,6 +96,18 @@ static void __cpuinit early_init_intel(struct cpuinfo_x86 *c) 
			sched_clock_stable = 1;

	}



	/* Penwell and Cloverview have the TSC which doesn't sleep on S3 */

	if (c->x86 == 6) {

		switch (c->x86_model) {

		case 0x27:	/* Penwell */

		case 0x35:	/* Cloverview */

			set_cpu_cap(c, X86_FEATURE_NONSTOP_TSC_S3);

			break;

		default:

			break;

		}

	}



	/*

	 * There is a known erratum on Pentium III and Core Solo

	 * and Core Duo CPUs.