mirror of
https://github.com/torvalds/linux.git
synced 2024-11-07 12:41:55 +00:00
0195c00244
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIVAwUAT3NKzROxKuMESys7AQKElw/+JyDxJSlj+g+nymkx8IVVuU8CsEwNLgRk 8KEnRfLhGtkXFLSJYWO6jzGo16F8Uqli1PdMFte/wagSv0285/HZaKlkkBVHdJ/m u40oSjgT013bBh6MQ0Oaf8pFezFUiQB5zPOA9QGaLVGDLXCmgqUgd7exaD5wRIwB ZmyItjZeAVnDfk1R+ZiNYytHAi8A5wSB+eFDCIQYgyulA1Igd1UnRtx+dRKbvc/m rWQ6KWbZHIdvP1ksd8wHHkrlUD2pEeJ8glJLsZUhMm/5oMf/8RmOCvmo8rvE/qwl eDQ1h4cGYlfjobxXZMHqAN9m7Jg2bI946HZjdb7/7oCeO6VW3FwPZ/Ic75p+wp45 HXJTItufERYk6QxShiOKvA+QexnYwY0IT5oRP4DrhdVB/X9cl2MoaZHC+RbYLQy+ /5VNZKi38iK4F9AbFamS7kd0i5QszA/ZzEzKZ6VMuOp3W/fagpn4ZJT1LIA3m4A9 Q0cj24mqeyCfjysu0TMbPtaN+Yjeu1o1OFRvM8XffbZsp5bNzuTDEvviJ2NXw4vK 4qUHulhYSEWcu9YgAZXvEWDEM78FXCkg2v/CrZXH5tyc95kUkMPcgG+QZBB5wElR FaOKpiC/BuNIGEf02IZQ4nfDxE90QwnDeoYeV+FvNj9UEOopJ5z5bMPoTHxm4cCD NypQthI85pc= =G9mT -----END PGP SIGNATURE----- Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system Pull "Disintegrate and delete asm/system.h" from David Howells: "Here are a bunch of patches to disintegrate asm/system.h into a set of separate bits to relieve the problem of circular inclusion dependencies. I've built all the working defconfigs from all the arches that I can and made sure that they don't break. The reason for these patches is that I recently encountered a circular dependency problem that came about when I produced some patches to optimise get_order() by rewriting it to use ilog2(). This uses bitops - and on the SH arch asm/bitops.h drags in asm-generic/get_order.h by a circuituous route involving asm/system.h. The main difficulty seems to be asm/system.h. It holds a number of low level bits with no/few dependencies that are commonly used (eg. memory barriers) and a number of bits with more dependencies that aren't used in many places (eg. switch_to()). These patches break asm/system.h up into the following core pieces: (1) asm/barrier.h Move memory barriers here. This already done for MIPS and Alpha. (2) asm/switch_to.h Move switch_to() and related stuff here. (3) asm/exec.h Move arch_align_stack() here. Other process execution related bits could perhaps go here from asm/processor.h. (4) asm/cmpxchg.h Move xchg() and cmpxchg() here as they're full word atomic ops and frequently used by atomic_xchg() and atomic_cmpxchg(). (5) asm/bug.h Move die() and related bits. (6) asm/auxvec.h Move AT_VECTOR_SIZE_ARCH here. Other arch headers are created as needed on a per-arch basis." Fixed up some conflicts from other header file cleanups and moving code around that has happened in the meantime, so David's testing is somewhat weakened by that. We'll find out anything that got broken and fix it.. * tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system: (38 commits) Delete all instances of asm/system.h Remove all #inclusions of asm/system.h Add #includes needed to permit the removal of asm/system.h Move all declarations of free_initmem() to linux/mm.h Disintegrate asm/system.h for OpenRISC Split arch_align_stack() out from asm-generic/system.h Split the switch_to() wrapper out of asm-generic/system.h Move the asm-generic/system.h xchg() implementation to asm-generic/cmpxchg.h Create asm-generic/barrier.h Make asm-generic/cmpxchg.h #include asm-generic/cmpxchg-local.h Disintegrate asm/system.h for Xtensa Disintegrate asm/system.h for Unicore32 [based on ver #3, changed by gxt] Disintegrate asm/system.h for Tile Disintegrate asm/system.h for Sparc Disintegrate asm/system.h for SH Disintegrate asm/system.h for Score Disintegrate asm/system.h for S390 Disintegrate asm/system.h for PowerPC Disintegrate asm/system.h for PA-RISC Disintegrate asm/system.h for MN10300 ...
263 lines
7.1 KiB
C
263 lines
7.1 KiB
C
/*
|
|
* linux/arch/arm/mach-omap1/time.c
|
|
*
|
|
* OMAP Timers
|
|
*
|
|
* Copyright (C) 2004 Nokia Corporation
|
|
* Partial timer rewrite and additional dynamic tick timer support by
|
|
* Tony Lindgen <tony@atomide.com> and
|
|
* Tuukka Tikkanen <tuukka.tikkanen@elektrobit.com>
|
|
*
|
|
* MPU timer code based on the older MPU timer code for OMAP
|
|
* Copyright (C) 2000 RidgeRun, Inc.
|
|
* Author: Greg Lonnon <glonnon@ridgerun.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms of the GNU General Public License as published by the
|
|
* Free Software Foundation; either version 2 of the License, or (at your
|
|
* option) any later version.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
|
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
|
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
|
|
* NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
|
|
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
|
|
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
* 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/init.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/spinlock.h>
|
|
#include <linux/clk.h>
|
|
#include <linux/err.h>
|
|
#include <linux/clocksource.h>
|
|
#include <linux/clockchips.h>
|
|
#include <linux/io.h>
|
|
|
|
#include <asm/leds.h>
|
|
#include <asm/irq.h>
|
|
#include <asm/sched_clock.h>
|
|
|
|
#include <mach/hardware.h>
|
|
#include <asm/mach/irq.h>
|
|
#include <asm/mach/time.h>
|
|
|
|
#include "iomap.h"
|
|
#include "common.h"
|
|
|
|
#ifdef CONFIG_OMAP_MPU_TIMER
|
|
|
|
#define OMAP_MPU_TIMER_BASE OMAP_MPU_TIMER1_BASE
|
|
#define OMAP_MPU_TIMER_OFFSET 0x100
|
|
|
|
typedef struct {
|
|
u32 cntl; /* CNTL_TIMER, R/W */
|
|
u32 load_tim; /* LOAD_TIM, W */
|
|
u32 read_tim; /* READ_TIM, R */
|
|
} omap_mpu_timer_regs_t;
|
|
|
|
#define omap_mpu_timer_base(n) \
|
|
((omap_mpu_timer_regs_t __iomem *)OMAP1_IO_ADDRESS(OMAP_MPU_TIMER_BASE + \
|
|
(n)*OMAP_MPU_TIMER_OFFSET))
|
|
|
|
static inline unsigned long notrace omap_mpu_timer_read(int nr)
|
|
{
|
|
omap_mpu_timer_regs_t __iomem *timer = omap_mpu_timer_base(nr);
|
|
return readl(&timer->read_tim);
|
|
}
|
|
|
|
static inline void omap_mpu_set_autoreset(int nr)
|
|
{
|
|
omap_mpu_timer_regs_t __iomem *timer = omap_mpu_timer_base(nr);
|
|
|
|
writel(readl(&timer->cntl) | MPU_TIMER_AR, &timer->cntl);
|
|
}
|
|
|
|
static inline void omap_mpu_remove_autoreset(int nr)
|
|
{
|
|
omap_mpu_timer_regs_t __iomem *timer = omap_mpu_timer_base(nr);
|
|
|
|
writel(readl(&timer->cntl) & ~MPU_TIMER_AR, &timer->cntl);
|
|
}
|
|
|
|
static inline void omap_mpu_timer_start(int nr, unsigned long load_val,
|
|
int autoreset)
|
|
{
|
|
omap_mpu_timer_regs_t __iomem *timer = omap_mpu_timer_base(nr);
|
|
unsigned int timerflags = MPU_TIMER_CLOCK_ENABLE | MPU_TIMER_ST;
|
|
|
|
if (autoreset)
|
|
timerflags |= MPU_TIMER_AR;
|
|
|
|
writel(MPU_TIMER_CLOCK_ENABLE, &timer->cntl);
|
|
udelay(1);
|
|
writel(load_val, &timer->load_tim);
|
|
udelay(1);
|
|
writel(timerflags, &timer->cntl);
|
|
}
|
|
|
|
static inline void omap_mpu_timer_stop(int nr)
|
|
{
|
|
omap_mpu_timer_regs_t __iomem *timer = omap_mpu_timer_base(nr);
|
|
|
|
writel(readl(&timer->cntl) & ~MPU_TIMER_ST, &timer->cntl);
|
|
}
|
|
|
|
/*
|
|
* ---------------------------------------------------------------------------
|
|
* MPU timer 1 ... count down to zero, interrupt, reload
|
|
* ---------------------------------------------------------------------------
|
|
*/
|
|
static int omap_mpu_set_next_event(unsigned long cycles,
|
|
struct clock_event_device *evt)
|
|
{
|
|
omap_mpu_timer_start(0, cycles, 0);
|
|
return 0;
|
|
}
|
|
|
|
static void omap_mpu_set_mode(enum clock_event_mode mode,
|
|
struct clock_event_device *evt)
|
|
{
|
|
switch (mode) {
|
|
case CLOCK_EVT_MODE_PERIODIC:
|
|
omap_mpu_set_autoreset(0);
|
|
break;
|
|
case CLOCK_EVT_MODE_ONESHOT:
|
|
omap_mpu_timer_stop(0);
|
|
omap_mpu_remove_autoreset(0);
|
|
break;
|
|
case CLOCK_EVT_MODE_UNUSED:
|
|
case CLOCK_EVT_MODE_SHUTDOWN:
|
|
case CLOCK_EVT_MODE_RESUME:
|
|
break;
|
|
}
|
|
}
|
|
|
|
static struct clock_event_device clockevent_mpu_timer1 = {
|
|
.name = "mpu_timer1",
|
|
.features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
|
|
.shift = 32,
|
|
.set_next_event = omap_mpu_set_next_event,
|
|
.set_mode = omap_mpu_set_mode,
|
|
};
|
|
|
|
static irqreturn_t omap_mpu_timer1_interrupt(int irq, void *dev_id)
|
|
{
|
|
struct clock_event_device *evt = &clockevent_mpu_timer1;
|
|
|
|
evt->event_handler(evt);
|
|
|
|
return IRQ_HANDLED;
|
|
}
|
|
|
|
static struct irqaction omap_mpu_timer1_irq = {
|
|
.name = "mpu_timer1",
|
|
.flags = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL,
|
|
.handler = omap_mpu_timer1_interrupt,
|
|
};
|
|
|
|
static __init void omap_init_mpu_timer(unsigned long rate)
|
|
{
|
|
setup_irq(INT_TIMER1, &omap_mpu_timer1_irq);
|
|
omap_mpu_timer_start(0, (rate / HZ) - 1, 1);
|
|
|
|
clockevent_mpu_timer1.mult = div_sc(rate, NSEC_PER_SEC,
|
|
clockevent_mpu_timer1.shift);
|
|
clockevent_mpu_timer1.max_delta_ns =
|
|
clockevent_delta2ns(-1, &clockevent_mpu_timer1);
|
|
clockevent_mpu_timer1.min_delta_ns =
|
|
clockevent_delta2ns(1, &clockevent_mpu_timer1);
|
|
|
|
clockevent_mpu_timer1.cpumask = cpumask_of(0);
|
|
clockevents_register_device(&clockevent_mpu_timer1);
|
|
}
|
|
|
|
|
|
/*
|
|
* ---------------------------------------------------------------------------
|
|
* MPU timer 2 ... free running 32-bit clock source and scheduler clock
|
|
* ---------------------------------------------------------------------------
|
|
*/
|
|
|
|
static u32 notrace omap_mpu_read_sched_clock(void)
|
|
{
|
|
return ~omap_mpu_timer_read(1);
|
|
}
|
|
|
|
static void __init omap_init_clocksource(unsigned long rate)
|
|
{
|
|
omap_mpu_timer_regs_t __iomem *timer = omap_mpu_timer_base(1);
|
|
static char err[] __initdata = KERN_ERR
|
|
"%s: can't register clocksource!\n";
|
|
|
|
omap_mpu_timer_start(1, ~0, 1);
|
|
setup_sched_clock(omap_mpu_read_sched_clock, 32, rate);
|
|
|
|
if (clocksource_mmio_init(&timer->read_tim, "mpu_timer2", rate,
|
|
300, 32, clocksource_mmio_readl_down))
|
|
printk(err, "mpu_timer2");
|
|
}
|
|
|
|
static void __init omap_mpu_timer_init(void)
|
|
{
|
|
struct clk *ck_ref = clk_get(NULL, "ck_ref");
|
|
unsigned long rate;
|
|
|
|
BUG_ON(IS_ERR(ck_ref));
|
|
|
|
rate = clk_get_rate(ck_ref);
|
|
clk_put(ck_ref);
|
|
|
|
/* PTV = 0 */
|
|
rate /= 2;
|
|
|
|
omap_init_mpu_timer(rate);
|
|
omap_init_clocksource(rate);
|
|
}
|
|
|
|
#else
|
|
static inline void omap_mpu_timer_init(void)
|
|
{
|
|
pr_err("Bogus timer, should not happen\n");
|
|
}
|
|
#endif /* CONFIG_OMAP_MPU_TIMER */
|
|
|
|
static inline int omap_32k_timer_usable(void)
|
|
{
|
|
int res = false;
|
|
|
|
if (cpu_is_omap730() || cpu_is_omap15xx())
|
|
return res;
|
|
|
|
#ifdef CONFIG_OMAP_32K_TIMER
|
|
res = omap_32k_timer_init();
|
|
#endif
|
|
|
|
return res;
|
|
}
|
|
|
|
/*
|
|
* ---------------------------------------------------------------------------
|
|
* Timer initialization
|
|
* ---------------------------------------------------------------------------
|
|
*/
|
|
static void __init omap1_timer_init(void)
|
|
{
|
|
if (!omap_32k_timer_usable())
|
|
omap_mpu_timer_init();
|
|
}
|
|
|
|
struct sys_timer omap1_timer = {
|
|
.init = omap1_timer_init,
|
|
};
|