07 Jan, 2012
1 commit
-
* 'for-linus' of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (207 commits)
ARM: 7267/1: Remove BUILD_BUG_ON from asm/bug.h
ARM: 7269/1: mach-sa1100: fix sched_clock breakage
ARM: 7198/1: arm/imx6: add restart support for imx6q
ARM: restart: remove the now empty arch_reset()
ARM: restart: remove comments about adding code to arch_reset()
ARM: restart: lpc32xx & u300: remove unnecessary printk
ARM: restart: plat-samsung: remove plat/reset.h and s5p_reset_hook
ARM: restart: w90x900: use new restart hook
ARM: restart: Versatile Express: use new restart hook
ARM: restart: versatile: use new restart hook
ARM: restart: u300: use new restart hook
ARM: restart: tegra: use new restart hook
ARM: restart: spear: use new restart hook
ARM: restart: shark: use new restart hook
ARM: restart: sa1100: use new restart hook
ARM: 7252/1: restart: S5PV210: use new restart hook
ARM: 7251/1: restart: S5PC100: use new restart hook
ARM: 7250/1: restart: S5P64X0: use new restart hook
ARM: 7266/1: restart: S3C64XX: use new restart hook
ARM: 7265/1: restart: S3C24XX: use new restart hook
...Fix up trivial conflict in arch/arm/mm/init.c due to removal of
memblock_init() clashing with the movement of the sorting of the meminfo
array.
03 Jan, 2012
1 commit
-
commit 2f0778afac79bd8d226225556858a636931eeabc adding
runtime-selectable sched_clock() forgot to patch this
driver down in drivers/clocksource, this patch fixes
the problem.Reported-by: Daniel Lezcano
Acked-by: Marc Zyngier
Signed-off-by: Linus Walleij
Signed-off-by: Russell King
06 Dec, 2011
1 commit
-
…z/linux into timers/core
22 Nov, 2011
3 commits
-
Convert tcb_clksrc to use clocksource_register_hz.
CC: Nikolaus Voss
CC: Thomas Gleixner
Acked-by: Nikolaus Voss
Signed-off-by: John Stultz -
The i8253 clockevent & clocksource driver uses PIT_LATCH
except for two cases where it uses LATCH:1)
/* VIA686a test code... reset the latch if count > max + 1 */
if (count > LATCH) {LATCH is based on CLOCK_TICK_RATE which is defined as
PIT_TICK_RATE on x86 so this should just be the later.2)
...
switch (mode) {
case CLOCK_EVT_MODE_PERIODIC:
/* binary, mode 2, LSB/MSB, ch 0 */
outb_p(0x34, PIT_MODE);
outb_p(LATCH & 0xff , PIT_CH0); /* LSB */
outb_p(LATCH >> 8 , PIT_CH0); /* MSB */
...MIPS and ARM are the only other arches that use this driver. In
the MIPS case CLOCK_TICK_RATE is defined as the same value as
PIT_TICK_RATE. For ARM, the only machine that uses it is
Footbridge which has a totally bogus CLOCK_TICK_RATE according
to the comments. Furthermore, the clockevent_i8253_init()
initializes the clockevent with PIT_TIC_RATE, so there's
no reason to use the generic LATCH.This is part of work to remove and depecrate the global
CLOCK_TICK_RATE symbol.Signed-off-by: Deepak Saxena
Signed-off-by: John Stultz -
The acpi_pm clocksource driver uses CLOCK_TICK_RATE which is
defined as PIT_TICK_RATE on x86. This patch cleans it up to
just use the later so that CLOCK_TICK_RATE can be depecrated.Signed-off-by: Deepak Saxena
Signed-off-by: John Stultz
07 Nov, 2011
1 commit
-
* 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)
Revert "tracing: Include module.h in define_trace.h"
irq: don't put module.h into irq.h for tracking irqgen modules.
bluetooth: macroize two small inlines to avoid module.h
ip_vs.h: fix implicit use of module_get/module_put from module.h
nf_conntrack.h: fix up fallout from implicit moduleparam.h presence
include: replace linux/module.h with "struct module" wherever possible
include: convert various register fcns to macros to avoid include chaining
crypto.h: remove unused crypto_tfm_alg_modname() inline
uwb.h: fix implicit use of asm/page.h for PAGE_SIZE
pm_runtime.h: explicitly requires notifier.h
linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h
miscdevice.h: fix up implicit use of lists and types
stop_machine.h: fix implicit use of smp.h for smp_processor_id
of: fix implicit use of errno.h in include/linux/of.h
of_platform.h: delete needless include
acpi: remove module.h include from platform/aclinux.h
miscdevice.h: delete unnecessary inclusion of module.h
device_cgroup.h: delete needless include
net: sch_generic remove redundant use of
net: inet_timewait_sock doesnt need
...Fix up trivial conflicts (other header files, and removal of the ab3550 mfd driver) in
- drivers/media/dvb/frontends/dibx000_common.c
- drivers/media/video/{mt9m111.c,ov6650.c}
- drivers/mfd/ab3550-core.c
- include/linux/dmaengine.h
02 Nov, 2011
1 commit
-
* 'next/timer' of git://git.linaro.org/people/arnd/arm-soc:
clocksource: fixup ux500 build problems
ARM: omap: use __devexit_p in dmtimer driver
ARM: ux500: Reprogram timers upon resume
ARM: plat-nomadik: timer: Export reset functions
ARM: plat-nomadik: timer: Add support for periodic timers
ARM: ux500: Move timer code to separate file
ARM: ux500: add support for clocksource DBX500 PRCMU
clocksource: add DBX500 PRCMU Timer support
ARM: plat-nomadik: MTU sched_clock as an option
ARM: OMAP: dmtimer: add error handling to export APIs
ARM: OMAP: dmtimer: low-power mode support
ARM: OMAP: dmtimer: skip reserved timers
ARM: OMAP: dmtimer: pm_runtime support
ARM: OMAP: dmtimer: switch-over to platform device driver
ARM: OMAP: dmtimer: platform driver
ARM: OMAP2+: dmtimer: convert to platform devices
ARM: OMAP1: dmtimer: conversion to platform devices
ARM: OMAP2+: dmtimer: add device names to flck nodes
ARM: OMAP: Add support for dmtimer v2 ip
01 Nov, 2011
1 commit
-
A pending cleanup will mean that module.h won't be implicitly
everywhere anymore. Make sure the modular drivers in clocksource
are actually calling out for explicitly in advance.Signed-off-by: Paul Gortmaker
26 Oct, 2011
1 commit
-
* 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (23 commits)
time, s390: Get rid of compile warning
dw_apb_timer: constify clocksource name
time: Cleanup old CONFIG_GENERIC_TIME references that snuck in
time: Change jiffies_to_clock_t() argument type to unsigned long
alarmtimers: Fix error handling
clocksource: Make watchdog reset lockless
posix-cpu-timers: Cure SMP accounting oddities
s390: Use direct ktime path for s390 clockevent device
clockevents: Add direct ktime programming function
clockevents: Make minimum delay adjustments configurable
nohz: Remove "Switched to NOHz mode" debugging messages
proc: Consider NO_HZ when printing idle and iowait times
nohz: Make idle/iowait counter update conditional
nohz: Fix update_ts_time_stat idle accounting
cputime: Clean up cputime_to_usecs and usecs_to_cputime macros
alarmtimers: Rework RTC device selection using class interface
alarmtimers: Add try_to_cancel functionality
alarmtimers: Add more refined alarm state tracking
alarmtimers: Remove period from alarm structure
alarmtimers: Remove interval cap limit hack
...
05 Oct, 2011
1 commit
-
The clocksource name should be const for correctness.
Cc: John Stultz
Signed-off-by: Jamie Iles
Signed-off-by: John Stultz
03 Oct, 2011
1 commit
-
Based on a patch from Arnd Bergmann this fixes up the build
problem of assigning a non-existing global when the ux500 PRCMU
timer is not linked in by passing its base address to the init
function. We also add a missing inclusion and
staticize the dummy function.Cc: Arnd Bergmann
Signed-off-by: Linus Walleij
22 Sep, 2011
1 commit
-
This patch adds the DBX500 PRCMU Timer driver as a clocksource
and as sched_clock.Cc: Thomas Gleixner
Signed-off-by: Mattias Wallin
Signed-off-by: Jonas Aaberg
Signed-off-by: Linus Walleij
08 Aug, 2011
1 commit
24 Jul, 2011
1 commit
-
…x/kernel/git/tip/linux-2.6-tip
* 'timers-clocksource-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
clocksource: apb: Share APB timer code with other platforms
21 Jul, 2011
1 commit
-
Add code to the CMT driver to wait for CMCNT V2. This to let
the register value settle before starting the timer channel.
Makes the driver more robust.Needed for CMT2 on sh7372 and certain CMT channels on sh73a0.
Signed-off-by: Magnus Damm
Signed-off-by: Paul Mundt
01 Jul, 2011
1 commit
-
arm, mips and x86 implement i8253 based clockevents. All the same code
copied. Create a common implementation in drivers/clocksource/i8253.c.About time to rename drivers/clocksource/ to something else.
Signed-off-by: Thomas Gleixner
Cc: Russell King
Cc: Ralf Baechle
Cc: John Stultz
Link: http://lkml.kernel.org/r/20110609130621.921710458@linutronix.de
28 Jun, 2011
1 commit
-
The APB timers are an IP block from Synopsys (DesignWare APB timers)
and are also found in other systems including ARM SoC's. This patch
adds functions for creating clock_event_devices and clocksources from
APB timers but does not do the resource allocation. This is handled
in a higher layer to allow the timers to be created from multiple
methods such as platform_devices.Cc: Thomas Gleixner
Cc: Ingo Molnar
Cc: "H. Peter Anvin"
Cc: Jacob Pan
Signed-off-by: Jamie Iles
Signed-off-by: John Stultz
10 Jun, 2011
1 commit
-
We don't want to add endless selects and module ifdefs.
Reported-by: Ingo Molnar
Signed-off-by: Thomas Gleixner
09 Jun, 2011
3 commits
-
Now that all extra ifdeffed implementations are gone, depend the lock
export on PCSPKR_PLATFORMSigned-off-by: Thomas Gleixner
Cc: Ralf Baechle
Cc: Russell King -
Move them to drivers/clocksource/i8253.c and remove the
implementations in arch/[ tglx: Avoid the extra file in lib - folded arch patches in. The
export will become conditional in a later step ]Signed-off-by: Ralf Baechle
Link: http://lkml.kernel.org/r/20110601180610.221426078@duck.linux-mips.net
Cc: Russell King
Signed-off-by: Thomas Gleixner -
Signed-off-by: Ralf Baechle
Cc: linux-mips@linux-mips.org
Link: http://lkml.kernel.org/r/20110601180610.054254048@duck.linux-mips.net
Signed-off-by: Thomas Gleixnerarch/arm/mach-footbridge/isa-timer.c | 2 +-
arch/mips/cobalt/time.c | 2 +-
arch/mips/jazz/irq.c | 2 +-
arch/mips/kernel/i8253.c | 2 +-
arch/mips/mti-malta/malta-time.c | 2 +-
arch/mips/sgi-ip22/ip22-time.c | 2 +-
arch/mips/sni/time.c | 2 +-
arch/x86/kernel/apic/apic.c | 2 +-
arch/x86/kernel/apm_32.c | 2 +-
arch/x86/kernel/hpet.c | 2 +-
arch/x86/kernel/i8253.c | 2 +-
arch/x86/kernel/time.c | 2 +-
drivers/block/hd.c | 2 +-
drivers/clocksource/i8253.c | 2 +-
drivers/input/gameport/gameport.c | 2 +-
drivers/input/joystick/analog.c | 2 +-
drivers/input/misc/pcspkr.c | 2 +-
include/linux/i8253.h | 11 +++++++++++
sound/drivers/pcsp/pcsp.h | 2 +-
19 files changed, 29 insertions(+), 18 deletions(-)
31 May, 2011
2 commits
-
This reverts commit 01fa68b58492a5d6708a91c1f474b6a099a9509e.
The same note as per the sh_tmu change applies here, too.
Signed-off-by: Paul Mundt
-
This reverts commit 1b842e91fea9447eff5eb687e28ad61c02f5033e.
There is a fundamental ordering race between the early and late probe
paths and the runtime PM tie-in that results in __pm_runtime_resume()
attempting to take a lock that hasn't been initialized yet (which by
proxy also suggests that pm_runtime_init() hasn't yet been run on the
device either, making the entire thing unsafe) -- resulting in instant
death on SMP or on UP with spinlock debugging enabled:sh_tmu.0: used for clock events
sh_tmu.0: used for periodic clock events
BUG: spinlock trylock failure on UP on CPU#0, swapper/0
lock: 804db198, .magic: 00000000, .owner: /-1, .owner_cpu: 0
...Revert it for now until the ordering issues can be resolved, or we can get
some more help from the runtime PM framework to make this possible.Signed-off-by: Paul Mundt
24 May, 2011
2 commits
-
* 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (23 commits)
sh: Ignore R_SH_NONE module relocations.
SH: SE7751: Fix pcibios_map_platform_irq prototype.
sh: remove warning and warning_symbol from struct stacktrace_ops
sh: wire up sys_sendmmsg.
clocksource: sh_tmu: Runtime PM support
clocksource: sh_tmu: __clocksource_updatefreq_hz() update
clocksource: sh_cmt: Runtime PM support
clocksource: sh_cmt: __clocksource_updatefreq_hz() update
dmaengine: shdma: synchronize RCU before freeing, simplify spinlock
dmaengine: shdma: add runtime- and system-level power management
dmaengine: shdma: fix locking
sh: sh-sci: sh7377 and sh73a0 build fixes
sh: cosmetic improvement: use an existing pointer
serial: sh-sci: suspend/resume wakeup support V2
serial: sh-sci: Runtime PM support
sh: select IRQ_FORCED_THREADING.
sh: intc: Set virtual IRQs as nothread.
sh: fixup fpu.o compile order
i2c: add a module alias to the sh-mobile driver
ALSA: add a module alias to the FSI driver
... -
Add a generic mmio clocksource, covering both 32-bit and 16-bit register
access sizes, for up or down counters. This can be used to easily
create clocksources for simple counter-based implementations.Cc: Alessandro Rubini
Cc: Colin Cross
Cc: Eric Miao
Cc: Erik Gilling
Acked-by: "Hans J. Koch"
Cc: Imre Kaloz
Cc: Krzysztof Halasa
Cc: Kukjin Kim
Cc: Lennert Buytenhek
Cc: Linus Walleij
Cc: linux-omap@vger.kernel.org
Acked-by: Nicolas Pitre
Cc: Olof Johansson
Tested-by: Sascha Hauer
Reviewed-by: Thomas Gleixner
Tested-by: Tony Lindgren
Reviewed-by: Viresh Kumar
Cc: Wan ZongShun
Signed-off-by: Russell King
23 May, 2011
4 commits
-
Add Runtime PM support to the TMU driver.
The hardware device is enabled as long as the clocksource
or the clockevent portion of the driver is used.Signed-off-by: Magnus Damm
Acked-by: John Stultz
Signed-off-by: Paul Mundt -
This patch updates the clocksource part of the TMU driver
to make use of the __clocksource_updatefreq_hz() function.Without this patch the old code uses clocksource_register()
together with a hack that assumes a never changing clock rate
(see clk_enable(), clk_get_rate() and clk_disable()).The patch uses clocksource_register_hz() with 1 Hz as initial
value, then lets the ->enable() callback update the value
with __clocksource_updatefreq_hz() once the struct clk has
been enabled and the frequency is stable.Signed-off-by: Magnus Damm
Acked-by: John Stultz
Signed-off-by: Paul Mundt -
Add Runtime PM support to the CMT driver.
The hardware device is enabled as long as the clocksource
or the clockevent portion of the driver is used.Signed-off-by: Magnus Damm
Acked-by: John Stultz
Signed-off-by: Paul Mundt -
This patch updates the clocksource part of the CMT driver
to make use of the __clocksource_updatefreq_hz() function.Without this patch the old code uses clocksource_register()
together with a hack that assumes a never changing clock rate
(see clk_enable(), clk_get_rate() and clk_disable()).The patch uses clocksource_register_hz() with 1 Hz as initial
value, then lets the ->enable() callback update the value
with __clocksource_updatefreq_hz() once the struct clk has
been enabled and the frequency is stable.Signed-off-by: Magnus Damm
Acked-by: John Stultz
Signed-off-by: Paul Mundt
14 May, 2011
2 commits
-
…into timers/clocksource
Conflicts:
arch/ia64/kernel/cyclone.c
arch/mips/kernel/i8253.c
arch/x86/kernel/i8253.cReason: Resolve conflicts so further cleanups do not conflict further
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-
This is based upon both arch/arm/mach-footbridge/isa-timer.c and
arch/x86/kernel/i8253.c.Acked-by: John Stultz
Acked-by: Thomas Gleixner
Cc: "H. Peter Anvin"
Cc: Ingo Molnar
Cc: Ralf Baechle
Signed-off-by: Russell King
22 Feb, 2011
1 commit
-
This converts the remaining x86 clocksources to use
clocksource_register_hz/khz.CC: jacob.jun.pan@intel.com
CC: Glauber Costa
CC: Dimitri Sivanich
CC: Rusty Russell
CC: Jeremy Fitzhardinge
CC: Chris McDermott
CC: Thomas Gleixner
Tested-by: Konrad Rzeszutek Wilk [xen]
Signed-off-by: John Stultz
26 Jan, 2011
1 commit
-
setup_irq() was called before clockevents_register_device() which is
needed by the irq handler. Bug was reproducible by restarting the
kernel using kexec (reliable crash).Signed-off-by: Nikolaus Voss
Cc: David Brownell
Cc: Haavard Skinnemoen
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds
22 Jan, 2011
1 commit
-
If the acpi pm timer throws invalid data, clear pmtmr_ioport
so the pm timer won't accidentally be used.This was found when using Xen where there is a acpi pm reported,
but gives bogus values, and other code was continuing to try
to use the pm timer after the initialization failed.[jstultz: Catch additional failure and reword changelog message. ]
Signed-off-by: Konrad Rzeszutek Wilk
Signed-off-by: John Stultz
LKML-Reference:
Signed-off-by: Thomas Gleixner
17 Dec, 2010
1 commit
-
There are control flow that sh_cmt_set_next() does double
spin-lock. The callers sh_cmt_{start,stop}() already have
lock. But another callers sh_cmt_clock_event_{start,next}()
does not.Now sh_cmt_set_next() does not lock by itself. All the
callers should hold spin-lock before calling it.[damm@opensource.se: use __sh_cmt_set_next() to simplify code]
[damm@opensource.se: added stable, suitable for v2.6.35 + v2.6.36]
Cc: stable@kernel.org
Signed-off-by: Takashi YOSHII
Signed-off-by: Magnus Damm
Signed-off-by: Paul Mundt
31 Oct, 2010
1 commit
-
Now when the SH-Mobile ARM platforms have been converted
to use device name it is possible to remove "clk" from
struct sh_timer_config.Signed-off-by: Magnus Damm
Signed-off-by: Paul Mundt
16 Aug, 2010
1 commit
-
Conflicts:
arch/sh/include/asm/Kbuild
drivers/MakefileSigned-off-by: Paul Mundt
04 Aug, 2010
2 commits
-
Fix the rate calculation in the CMT driver.
Without this fix the clocksource runs way
too fast and we get a divide-by-zero error.Signed-off-by: Magnus Damm
Signed-off-by: Paul Mundt -
Fix a one-off error in the CMT driver V2. The match register
should be programmed with the period minus one.Many thanks to Eiraku-san for tracking down this issue.
Signed-off-by: Magnus Damm
Signed-off-by: Paul Mundt