325c117000
Move the static inline function setup_jiffies_interrupt() from
<asm/timex.h> to arch/mn10300/kernel/cevt-mn10300.c, which is its only
callsite.
This allows to remove the inclusion of <asm/hardirq.h> and <linux/irq.h>
from <asm/timex.h> and <unit/timex.h>, fixing include hell like:
include/linux/jiffies.h:260:31: warning: "CLOCK_TICK_RATE" is not defined [-Wundef]
include/linux/jiffies.h:260:31: warning: "CLOCK_TICK_RATE" is not defined [-Wundef]
include/linux/jiffies.h:46:42: error: division by zero in #if
...
make[4]: *** [arch/mn10300/kernel/asm-offsets.s] Error 1
and (after a quick hack for the above by defining CLOCK_TICK_RATE in
<linux/jiffies.h>):
In file included from include/linux/notifier.h:15:0,
from include/linux/memory_hotplug.h:6,
from include/linux/mmzone.h:718,
from include/linux/gfp.h:4,
from include/linux/irq.h:20,
from arch/mn10300/unit-asb2303/include/unit/timex.h:15,
from arch/mn10300/include/asm/timex.h:15,
from include/linux/timex.h:174,
from include/linux/jiffies.h:8,
from include/linux/ktime.h:25,
from include/linux/timer.h:5,
from include/linux/workqueue.h:8,
include/linux/srcu.h:55:22: error: field 'work' has incomplete type
As a consequence, we do need a few more inclusions of <asm/irq.h>, namely
in arch/mn10300/unit-asb2303/smc91111.c and
arch/mn10300/unit-asb2305/unit-init.c.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: David Howells <dhowells@redhat.com>
Cc: Koichi Yasutake <yasutake.koichi@jp.panasonic.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
155 lines
3.2 KiB
C
155 lines
3.2 KiB
C
/* timex.h: MN2WS0038 architecture timer specifications
|
|
*
|
|
* Copyright (C) 2002, 2010 Red Hat, Inc. All Rights Reserved.
|
|
* Written by David Howells (dhowells@redhat.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.
|
|
*/
|
|
#ifndef _ASM_UNIT_TIMEX_H
|
|
#define _ASM_UNIT_TIMEX_H
|
|
|
|
#include <asm/timer-regs.h>
|
|
#include <unit/clock.h>
|
|
#include <asm/param.h>
|
|
|
|
/*
|
|
* jiffies counter specifications
|
|
*/
|
|
|
|
#define TMJCBR_MAX 0xffffff /* 24bit */
|
|
#define TMJCIRQ TMTIRQ
|
|
|
|
#ifndef __ASSEMBLY__
|
|
|
|
#define MN10300_SRC_IOBCLK MN10300_IOBCLK
|
|
|
|
#ifndef HZ
|
|
# error HZ undeclared.
|
|
#endif /* !HZ */
|
|
|
|
#define MN10300_JCCLK (MN10300_SRC_IOBCLK)
|
|
#define MN10300_TSCCLK (MN10300_SRC_IOBCLK)
|
|
|
|
#define MN10300_JC_PER_HZ ((MN10300_JCCLK + HZ / 2) / HZ)
|
|
#define MN10300_TSC_PER_HZ ((MN10300_TSCCLK + HZ / 2) / HZ)
|
|
|
|
/* Check bit width of MTM interval value that sets base register */
|
|
#if (MN10300_JC_PER_HZ - 1) > TMJCBR_MAX
|
|
# error MTM tick timer interval value is overflow.
|
|
#endif
|
|
|
|
static inline void stop_jiffies_counter(void)
|
|
{
|
|
u16 tmp;
|
|
TMTMD = 0;
|
|
tmp = TMTMD;
|
|
}
|
|
|
|
static inline void reload_jiffies_counter(u32 cnt)
|
|
{
|
|
u32 tmp;
|
|
|
|
TMTBR = cnt;
|
|
tmp = TMTBR;
|
|
|
|
TMTMD = TMTMD_TMTLDE;
|
|
TMTMD = TMTMD_TMTCNE;
|
|
tmp = TMTMD;
|
|
}
|
|
|
|
#if defined(CONFIG_SMP) && defined(CONFIG_GENERIC_CLOCKEVENTS) && \
|
|
!defined(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST)
|
|
/*
|
|
* If we aren't using broadcasting, each core needs its own event timer.
|
|
* Since CPU0 uses the tick timer which is 24-bits, we use timer 4 & 5
|
|
* cascaded to 32-bits for CPU1 (but only really use 24-bits to match
|
|
* CPU0).
|
|
*/
|
|
|
|
#define TMJC1IRQ TM5IRQ
|
|
|
|
static inline void stop_jiffies_counter1(void)
|
|
{
|
|
u8 tmp;
|
|
TM4MD = 0;
|
|
TM5MD = 0;
|
|
tmp = TM4MD;
|
|
tmp = TM5MD;
|
|
}
|
|
|
|
static inline void reload_jiffies_counter1(u32 cnt)
|
|
{
|
|
u32 tmp;
|
|
|
|
TM45BR = cnt;
|
|
tmp = TM45BR;
|
|
|
|
TM4MD = TM4MD_INIT_COUNTER;
|
|
tmp = TM4MD;
|
|
|
|
TM5MD = TM5MD_SRC_TM4CASCADE | TM5MD_INIT_COUNTER;
|
|
TM5MD = TM5MD_SRC_TM4CASCADE | TM5MD_COUNT_ENABLE;
|
|
tmp = TM5MD;
|
|
|
|
TM4MD = TM4MD_COUNT_ENABLE;
|
|
tmp = TM4MD;
|
|
}
|
|
#endif /* CONFIG_SMP&GENERIC_CLOCKEVENTS&!GENERIC_CLOCKEVENTS_BROADCAST */
|
|
|
|
#endif /* !__ASSEMBLY__ */
|
|
|
|
|
|
/*
|
|
* timestamp counter specifications
|
|
*/
|
|
#define TMTSCBR_MAX 0xffffffff
|
|
|
|
#ifndef __ASSEMBLY__
|
|
|
|
/* Use 32-bit timestamp counter */
|
|
#define TMTSCMD TMSMD
|
|
#define TMTSCBR TMSBR
|
|
#define TMTSCBC TMSBC
|
|
#define TMTSCICR TMSICR
|
|
|
|
static inline void startup_timestamp_counter(void)
|
|
{
|
|
u32 sync;
|
|
|
|
/* set up TMS(Timestamp) 32bit timer register to count real time
|
|
* - count down from 4Gig-1 to 0 and wrap at IOBCLK rate
|
|
*/
|
|
|
|
TMTSCBR = TMTSCBR_MAX;
|
|
sync = TMTSCBR;
|
|
|
|
TMTSCICR = 0;
|
|
sync = TMTSCICR;
|
|
|
|
TMTSCMD = TMTMD_TMTLDE;
|
|
TMTSCMD = TMTMD_TMTCNE;
|
|
sync = TMTSCMD;
|
|
}
|
|
|
|
static inline void shutdown_timestamp_counter(void)
|
|
{
|
|
TMTSCMD = 0;
|
|
}
|
|
|
|
/*
|
|
* we use a cascaded pair of 16-bit down-counting timers to count I/O
|
|
* clock cycles for the purposes of time keeping
|
|
*/
|
|
typedef unsigned long cycles_t;
|
|
|
|
static inline cycles_t read_timestamp_counter(void)
|
|
{
|
|
return (cycles_t)~TMTSCBC;
|
|
}
|
|
|
|
#endif /* !__ASSEMBLY__ */
|
|
|
|
#endif /* _ASM_UNIT_TIMEX_H */
|