Convert the remaining !GENERIC_TIME architectures to use the generic timekeeping core.
Subsystems (17)
cover Convert the remaining !GENERIC_TIME architectures to use the generic timekeeping core.
Hello,
Its been two and a half years since the GENERIC_TIME infrastructure
landed. It allowed architectures that have free running counters to only have to provide a clocksource driver and leave the rest of the timekeeping management to generic code.
So far out of the 23 architectures we've fully converted 15 of them over to GENERIC_TIME. The remaining 8 have in some cases been able to convert, but not fully. The issue that keeps most architectures from converting is that they do not have free running counters. They instead use the counter on their tick timer to determine their inter-tick time. This counter usually wraps every interrupt, so its not really efficient to use as a clocksource.
This has created some difficulty as the generic timekeeping core has had to deal with both GENERIC_TIME arches as well as !GENERIC_TIME arches, and since it didn't manage 100% of the calculation in the !GENERIC_TIME case, we've been limited in some of the changes we could make.
So since these last remaining architectures are unlikely to be able to fully convert to GENERIC_TIME as it stands, the generic core should try to adopt to their needs so we can bring them into the fold and reduce code duplication.
The solution is to provide a arch callout from the generic timekeeping
core: arch_gettimeoffset(). On architectures that do not provide a clocksource, the jiffies clocksource is used, and arch_gettimeoffset is added in to create finer grained inter-tick time.
The patchset is split up into three parts.
1) Introducing the arch_gettimeoffset infrastructure to the timekeeping core.
2) 8 patches to convert the remaining arches over to use arch_gettimeoffset()
3) Finally, Removing all conditionals and references to GENERIC_TIME.
The full patchset reduces the kernel by about 550 lines.
42 files changed, 139 insertions(+), 684 deletions(-)
Any thoughts or feedback would be appreciated. I've been unable to test the arch conversions, so any help in getting those right would be appreciated. I expect this will probably take a few tries.
And credits to Roman for initially suggesting the idea quite awhile back.
thanks
-john
RFC PATCH 1/10 Create arch_gettimeoffset infrastructure for use in the generic timekeeping core.
Some arches don't supply their own clocksource. This is mainly the case in architectures that get their inter-tick times by reading the counter on their interval timer. Since these timers wrap every tick, they're not really useful as clocksources. Wrapping them to act like one is possible but not very efficient. So we provide a callout these arches can implement for use with the jiffies clocksource to provide finer then tick granular time.
include/linux/time.h +15 -0
@@ -113,6 +113,21 @@ struct timespec current_kernel_time(void);#define CURRENT_TIME (current_kernel_time())#define CURRENT_TIME_SEC ((struct timespec) { get_seconds(), 0 }) +/* Some architectures do not supply their own clocksource. +* This is mainly the case in architectures that get their +* inter-tick times by reading the counter on their interval +* timer. Since these timers wrap every tick, they're not really +* useful as clocksources. Wrapping them to act like one is possible +* but not very efficient. So we provide a callout these arches +* can implement for use with the jiffies clocksource to provide +* finer then tick granular time. +*/ +#ifdef CONFIG_ARCH_USES_GETTIMEOFFSET +extern u32 arch_gettimeoffset (void ); +#else +#define arch_gettimeoffset () (0) +#endif +extern void do_gettimeofday (struct timeval *tv);extern int do_settimeofday (struct timespec *tv);extern int do_sys_settimeofday (struct timespec *tv,struct timezone *tz);
kernel/time/timekeeping.c +7 -0
@@ -77,6 +77,10 @@ static void clocksource_forward_now(void) clock->cycle_last = cycle_now; nsec =cyc2ns (clock, cycle_delta); + +/* If arch requires, add in gettimeoffset() */ + nsec +=arch_gettimeoffset (); +timespec_add_ns (&xtime, nsec); nsec = ((s64 )cycle_delta * clock->mult_orig) >> clock->shift;
@@ -111,6 +115,9 @@ void getnstimeofday(struct timespec *ts)/* convert to nanoseconds: */ nsecs =cyc2ns (clock, cycle_delta); +/* If arch requires, add in gettimeoffset() */ + nsecs +=arch_gettimeoffset (); + }while (read_seqretry (&xtime_lock, seq));timespec_add_ns (ts, nsecs);
RFC PATCH 2/10 Convert arm to use arch_getoffset() infrastructure.
This patch converts arm to use GENERIC_TIME via the arch_getoffset() infrastructure
I do not have cross compilers for these architectures, and in some cases the architectures can be compiles both with and without clocksources. So I've taken my best swing at converting this, but I'm not confident I got it right. Any assistance from arch maintainers or testers would be great.
arch/arm/Kconfig +25 -17
@@ -38,7 +38,7 @@ config GENERIC_GPIO config GENERIC_TIME bool - default n + default y config GENERIC_CLOCKEVENTS bool
@@ -203,6 +203,7 @@ config ARCH_AAEC2000 select CPU_ARM920T select ARM_AMBA select HAVE_CLK + select ARCH_USES_GETTIMEOFFSET help This enables support for systems based on the Agilent AAEC-2000
@@ -212,6 +213,7 @@ config ARCH_INTEGRATOR select HAVE_CLK select COMMON_CLKDEV select ICST525 + select ARCH_USES_GETTIMEOFFSET help Support for ARM's Integrator platform.
@@ -221,7 +223,6 @@ config ARCH_REALVIEW select HAVE_CLK select COMMON_CLKDEV select ICST307 - select GENERIC_TIME select GENERIC_CLOCKEVENTS help This enables support for ARM Ltd RealView boards.
@@ -233,7 +234,6 @@ config ARCH_VERSATILE select HAVE_CLK select COMMON_CLKDEV select ICST307 - select GENERIC_TIME select GENERIC_CLOCKEVENTS help This enables support for ARM Ltd Versatile board.
@@ -242,6 +242,7 @@ config ARCH_AT91 bool "Atmel AT91" select GENERIC_GPIO select HAVE_CLK + select ARCH_USES_GETTIMEOFFSET help This enables support for systems based on the Atmel AT91RM9200, AT91SAM9 and AT91CAP9 processors.
@@ -257,6 +258,7 @@ config ARCH_EBSA110 select CPU_SA110 select ISA select NO_IOPORT + select ARCH_USES_GETTIMEOFFSET help This is an evaluation board for the StrongARM processor available from Digital. It has limited hardware on-board, including an
@@ -272,6 +274,7 @@ config ARCH_EP93XX select HAVE_CLK select COMMON_CLKDEV select ARCH_REQUIRE_GPIOLIB + select ARCH_USES_GETTIMEOFFSET help This enables support for the Cirrus EP93xx series of CPUs.
@@ -279,6 +282,7 @@ config ARCH_FOOTBRIDGE bool "FootBridge" select CPU_SA110 select FOOTBRIDGE + select ARCH_USES_GETTIMEOFFSET help Support for systems based on the DC21285 companion chip ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder.
@@ -288,7 +292,6 @@ config ARCH_NETX select CPU_ARM926T select ARM_VIC select GENERIC_CLOCKEVENTS - select GENERIC_TIME help This enables support for systems based on the Hilscher NetX Soc
@@ -296,6 +299,7 @@ config ARCH_H720X bool "Hynix HMS720x-based" select CPU_ARM720T select ISA_DMA_API + select ARCH_USES_GETTIMEOFFSET help This enables support for systems based on the Hynix HMS720x
@@ -303,7 +307,6 @@ config ARCH_IMX bool "IMX" select CPU_ARM920T select GENERIC_GPIO - select GENERIC_TIME select GENERIC_CLOCKEVENTS help Support for Motorola's i.MX family of processors (MX1, MXL).
@@ -316,6 +319,7 @@ config ARCH_IOP13XX select PCI select ARCH_SUPPORTS_MSI select VMSPLIT_1G + select ARCH_USES_GETTIMEOFFSET help Support for Intel's IOP13XX (XScale) family of processors.
@@ -327,6 +331,7 @@ config ARCH_IOP32X select PCI select GENERIC_GPIO select ARCH_REQUIRE_GPIOLIB + select ARCH_USES_GETTIMEOFFSET help Support for Intel's 80219 and IOP32X (XScale) family of processors.
@@ -339,6 +344,7 @@ config ARCH_IOP33X select PCI select GENERIC_GPIO select ARCH_REQUIRE_GPIOLIB + select ARCH_USES_GETTIMEOFFSET help Support for Intel's IOP33X (XScale) family of processors.
@@ -347,6 +353,7 @@ config ARCH_IXP23XX depends on MMU select CPU_XSC3 select PCI + select ARCH_USES_GETTIMEOFFSET help Support for Intel's IXP23xx (XScale) family of processors.
@@ -355,6 +362,7 @@ config ARCH_IXP2000 depends on MMU select CPU_XSCALE select PCI + select ARCH_USES_GETTIMEOFFSET help Support for Intel's IXP2400/2800 (XScale) family of processors.
@@ -363,7 +371,6 @@ config ARCH_IXP4XX depends on MMU select CPU_XSCALE select GENERIC_GPIO - select GENERIC_TIME select GENERIC_CLOCKEVENTS select DMABOUNCE if PCI help
@@ -373,6 +380,7 @@ config ARCH_L7200 bool "LinkUp-L7200" select CPU_ARM720T select FIQ + select ARCH_USES_GETTIMEOFFSET help Say Y here if you intend to run this kernel on a LinkUp Systems L7200 Software Development Board which uses an ARM720T processor.
@@ -388,7 +396,6 @@ config ARCH_KIRKWOOD select CPU_FEROCEON select PCI select GENERIC_GPIO - select GENERIC_TIME select GENERIC_CLOCKEVENTS select PLAT_ORION help
@@ -400,6 +407,7 @@ config ARCH_KS8695 select CPU_ARM922T select GENERIC_GPIO select ARCH_REQUIRE_GPIOLIB + select ARCH_USES_GETTIMEOFFSET help Support for Micrel/Kendin KS8695 "Centaur" (ARM922T) based System-on-Chip devices.
@@ -408,7 +416,6 @@ config ARCH_NS9XXX bool "NetSilicon NS9xxx" select CPU_ARM926T select GENERIC_GPIO - select GENERIC_TIME select GENERIC_CLOCKEVENTS select HAVE_CLK help
@@ -420,7 +427,6 @@ config ARCH_NS9XXX config ARCH_LOKI bool "Marvell Loki (88RC8480)" select CPU_FEROCEON - select GENERIC_TIME select GENERIC_CLOCKEVENTS select PLAT_ORION help
@@ -431,7 +437,6 @@ config ARCH_MV78XX0 select CPU_FEROCEON select PCI select GENERIC_GPIO - select GENERIC_TIME select GENERIC_CLOCKEVENTS select PLAT_ORION help
@@ -440,7 +445,6 @@ config ARCH_MV78XX0 config ARCH_MXC bool "Freescale MXC/iMX-based" - select GENERIC_TIME select GENERIC_CLOCKEVENTS select ARCH_MTD_XIP select GENERIC_GPIO
@@ -454,7 +458,6 @@ config ARCH_ORION5X select CPU_FEROCEON select PCI select GENERIC_GPIO - select GENERIC_TIME select GENERIC_CLOCKEVENTS select PLAT_ORION help
@@ -466,6 +469,7 @@ config ARCH_PNX4008 bool "Philips Nexperia PNX4008 Mobile" select CPU_ARM926T select HAVE_CLK + select ARCH_USES_GETTIMEOFFSET help This enables support for Philips PNX4008 mobile platform.
@@ -477,7 +481,6 @@ config ARCH_PXA select HAVE_CLK select COMMON_CLKDEV select ARCH_REQUIRE_GPIOLIB - select GENERIC_TIME select GENERIC_CLOCKEVENTS select TICK_ONESHOT help
@@ -493,6 +496,7 @@ config ARCH_RPC select ISA_DMA_API select NO_IOPORT select ARCH_SPARSEMEM_ENABLE + select ARCH_USES_GETTIMEOFFSET help On the Acorn Risc-PC, Linux can support the internal IDE disk and CD-ROM interface, serial and parallel port, and the floppy drive.
@@ -504,7 +508,6 @@ config ARCH_SA1100 select ARCH_SPARSEMEM_ENABLE select ARCH_MTD_XIP select GENERIC_GPIO - select GENERIC_TIME select GENERIC_CLOCKEVENTS select HAVE_CLK select TICK_ONESHOT
@@ -516,6 +519,7 @@ config ARCH_S3C2410 bool "Samsung S3C2410, S3C2412, S3C2413, S3C2440, S3C2442, S3C2443" select GENERIC_GPIO select HAVE_CLK + select ARCH_USES_GETTIMEOFFSET help Samsung S3C2410X CPU based systems, such as the Simtec Electronics BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or
@@ -525,6 +529,7 @@ config ARCH_S3C64XX bool "Samsung S3C64XX" select GENERIC_GPIO select HAVE_CLK + select ARCH_USES_GETTIMEOFFSET help Samsung S3C64XX series based systems
@@ -535,6 +540,7 @@ config ARCH_SHARK select ISA_DMA select ZONE_DMA select PCI + select ARCH_USES_GETTIMEOFFSET help Support for the StrongARM based Digital DNARD machine, also known as "Shark" (<http://www.shark-linux.de/shark.html>).
@@ -544,6 +550,7 @@ config ARCH_LH7A40X select CPU_ARM922T select ARCH_DISCONTIGMEM_ENABLE if !LH7A40X_CONTIGMEM select ARCH_SPARSEMEM_ENABLE if !LH7A40X_CONTIGMEM + select ARCH_USES_GETTIMEOFFSET help Say Y here for systems based on one of the Sharp LH7A40X System on a Chip processors. These CPUs include an ARM922T
@@ -553,7 +560,6 @@ config ARCH_LH7A40X config ARCH_DAVINCI bool "TI DaVinci" select CPU_ARM926T - select GENERIC_TIME select GENERIC_CLOCKEVENTS select GENERIC_GPIO select ARCH_REQUIRE_GPIOLIB
@@ -567,7 +573,6 @@ config ARCH_OMAP select GENERIC_GPIO select HAVE_CLK select ARCH_REQUIRE_GPIOLIB - select GENERIC_TIME select GENERIC_CLOCKEVENTS help Support for TI's OMAP platform (OMAP1 and OMAP2).
@@ -575,7 +580,6 @@ config ARCH_OMAP config ARCH_MSM bool "Qualcomm MSM" select CPU_V6 - select GENERIC_TIME select GENERIC_CLOCKEVENTS help Support for Qualcomm MSM7K based systems. This runs on the ARM11
@@ -586,6 +590,7 @@ config ARCH_MSM config ARCH_W90X900 bool "Nuvoton W90X900 CPU" select CPU_ARM926T + select ARCH_USES_GETTIMEOFFSET help Support for Nuvoton (Winbond logic dept.) ARM9 processor,You can login www.mcuos.com or www.nuvoton.com to know more.
@@ -1338,3 +1343,6 @@ source "security/Kconfig" source "crypto/Kconfig" source "lib/Kconfig" + + +
arch/arm/include/asm/mach/time.h +1 -1
@@ -38,7 +38,7 @@ struct sys_timer {void (*init)(void );void (*suspend)(void );void (*resume)(void ); -#ifndef CONFIG_GENERIC_TIME +#ifdef CONFIG_ARCH_USES_GETTIMEOFFSET unsigned long (*offset)(void );#endif };
arch/arm/kernel/time.c +6 -57
83 lines not on this page · raw message
arch/arm/mach-at91/Kconfig +1 -7
@@ -8,47 +8,41 @@ choice config ARCH_AT91RM9200 bool "AT91RM9200" select CPU_ARM920T - select GENERIC_TIME select GENERIC_CLOCKEVENTS config ARCH_AT91SAM9260 bool "AT91SAM9260 or AT91SAM9XE" select CPU_ARM926T - select GENERIC_TIME select GENERIC_CLOCKEVENTS config ARCH_AT91SAM9261 bool "AT91SAM9261" select CPU_ARM926T - select GENERIC_TIME select GENERIC_CLOCKEVENTS config ARCH_AT91SAM9263 bool "AT91SAM9263" select CPU_ARM926T - select GENERIC_TIME select GENERIC_CLOCKEVENTS config ARCH_AT91SAM9RL bool "AT91SAM9RL" select CPU_ARM926T - select GENERIC_TIME select GENERIC_CLOCKEVENTS config ARCH_AT91SAM9G20 bool "AT91SAM9G20" select CPU_ARM926T - select GENERIC_TIME select GENERIC_CLOCKEVENTS config ARCH_AT91CAP9 bool "AT91CAP9" select CPU_ARM926T - select GENERIC_TIME select GENERIC_CLOCKEVENTS config ARCH_AT91X40 bool "AT91x40" + select ARCH_USES_GETTIMEOFFSET endchoice
RFC PATCH 3/10 Convert blackfin to use arch_getoffset() infrastructure.
This patch converts blackfin to use GENERIC_TIME via the arch_getoffset() infrastructure
I do not have cross compilers for these architectures, and in some cases the architectures can be compiles both with and without clocksources. So I've taken my best swing at converting this, but I'm not confident I got it right. Any assistance from arch maintainers or testers would be great.
arch/blackfin/Kconfig +5 -3
@@ -576,9 +576,7 @@ comment "Kernel Timer/Scheduler" source kernel/Kconfig.hz config GENERIC_TIME - bool "Generic time" - depends on !SMP - default y + def_bool y config GENERIC_CLOCKEVENTS bool "Generic clock events"
@@ -598,6 +596,10 @@ config CYCLES_CLOCKSOURCE still be able to read it (such as for performance monitoring), but writing the registers will most likely crash the kernel. +config ARCH_USES_GETTIMEOFFSET + depends on !CYCLES_CLOCKSOURCE + def_bool y + source kernel/time/Kconfig comment "Misc"
arch/blackfin/kernel/time.c +20 -55
95 lines not on this page · raw message
RFC PATCH 4/10 Convert cris to use arch_getoffset() infrastructure.
This patch converts cris to use GENERIC_TIME via the arch_getoffset() infrastructure
I do not have cross compilers for these architectures, and in some cases the architectures can be compiles both with and without clocksources. So I've taken my best swing at converting this, but I'm not confident I got it right. Any assistance from arch maintainers or testers would be great.
arch/cris/Kconfig +6 -0
@@ -20,6 +20,12 @@ config RWSEM_GENERIC_SPINLOCK config RWSEM_XCHGADD_ALGORITHM bool +config GENERIC_TIME + def_bool y + +config ARCH_USES_GETTIMEOFFSET + def_bool y + config GENERIC_IOMAP bool default y
arch/cris/kernel/time.c +2 -66
77 lines not on this page · raw message
RFC PATCH 5/10 Convert m32r to use arch_getoffset() infrastructure.
This patch converts m32r to use GENERIC_TIME via the arch_getoffset() infrastructure
I do not have cross compilers for these architectures, and in some cases the architectures can be compiles both with and without clocksources. So I've taken my best swing at converting this, but I'm not confident I got it right. Any assistance from arch maintainers or testers would be great.
arch/m32r/Kconfig +6 -0
@@ -41,6 +41,12 @@ config HZ int default 100 +config GENERIC_TIME + def_bool y + +config ARCH_USES_GETTIMEOFFSET + def_bool y + source "init/Kconfig" source "kernel/Kconfig.freezer"
arch/m32r/kernel/time.c +3 -71
95 lines not on this page · raw message
RFC PATCH 6/10 Convert m68k to use arch_getoffset() infrastructure.
This patch converts m68k to use GENERIC_TIME via the arch_getoffset() infrastructure
I do not have cross compilers for these architectures, and in some cases the architectures can be compiles both with and without clocksources. So I've taken my best swing at converting this, but I'm not confident I got it right. Any assistance from arch maintainers or testers would be great.
arch/m68k/Kconfig +6 -0
@@ -58,6 +58,12 @@ config HZ int default 100 +config GENERIC_TIME + def_bool y + +config ARCH_USES_GETTIMEOFFSET + def_bool y + mainmenu "Linux/68k Kernel Configuration" source "init/Kconfig"
arch/m68k/kernel/time.c +2 -67
74 lines not on this page · raw message
RFC PATCH 7/10 Convert sh to use arch_getoffset() infrastructure.
This patch converts sh to use GENERIC_TIME via the arch_getoffset() infrastructure
I do not have cross compilers for these architectures, and in some cases the architectures can be compiles both with and without clocksources. So I've taken my best swing at converting this, but I'm not confident I got it right. Any assistance from arch maintainers or testers would be great.
arch/sh/Kconfig +5 -1
@@ -72,7 +72,7 @@ config GENERIC_IOMAP bool config GENERIC_TIME - def_bool n + def_bool y config GENERIC_CLOCKEVENTS def_bool n
@@ -406,6 +406,10 @@ config SH_TMU help This enables the use of the TMU as the system timer. +config ARCH_USES_GETTIMEOFFSET + def_bool y + depends on !SH_TMU + config SH_CMT def_bool y prompt "CMT timer support"
arch/sh/include/asm/timer.h +2 -2
@@ -10,7 +10,7 @@ struct sys_timer_ops {int (*start)(void );int (*stop)(void );cycle_t (*read)(void); -#ifndef CONFIG_GENERIC_TIME +#ifdef CONFIG_ARCH_USES_GETTIMEOFFSET unsigned long (*get_offset)(void );#endif };
@@ -27,7 +27,7 @@ struct sys_timer {extern struct sys_timer tmu_timer, cmt_timer, mtu2_timer;extern struct sys_timer *sys_timer; -#ifndef CONFIG_GENERIC_TIME +#ifdef CONFIG_ARCH_USES_GETTIMEOFFSET static inline unsigned long get_timer_offset (void ) {return sys_timer->ops->get_offset ();
arch/sh/kernel/time_32.c +5 -58
77 lines not on this page · raw message
arch/sh/kernel/time_64.c +2 -51
61 lines not on this page · raw message
arch/sh/kernel/timers/timer-cmt.c +1 -1
@@ -178,7 +178,7 @@ static struct sys_timer_ops cmt_timer_ops = { .init = cmt_timer_init, .start = cmt_timer_start, .stop = cmt_timer_stop, -#ifndef CONFIG_GENERIC_TIME +#ifdef CONFIG_ARCH_USES_GETTIMEOFFSET .get_offset = cmt_timer_get_offset,#endif };
arch/sh/kernel/timers/timer-mtu2.c +1 -1
@@ -191,7 +191,7 @@ struct sys_timer_ops mtu2_timer_ops = { .init = mtu2_timer_init, .start = mtu2_timer_start, .stop = mtu2_timer_stop, -#ifndef CONFIG_GENERIC_TIME +#ifdef CONFIG_ARCH_USES_GETTIMEOFFSET .get_offset = mtu2_timer_get_offset,#endif };
RFC PATCH 8/10 Convert sparc to use arch_getoffset() infrastructure.
This patch converts sparc to use GENERIC_TIME via the arch_getoffset() infrastructure
I do not have cross compilers for these architectures, and in some cases the architectures can be compiles both with and without clocksources. So I've taken my best swing at converting this, but I'm not confident I got it right. Any assistance from arch maintainers or testers would be great.
arch/sparc/Kconfig +4 -1
@@ -55,8 +55,11 @@ config BITS default 64 if SPARC64 config GENERIC_TIME + def_bool y + +config ARCH_USES_GETTIMEOFFSET bool - default y if SPARC64 + default y if SPARC32 config GENERIC_CMOS_UPDATE bool
arch/sparc/kernel/time_32.c +2 -79
93 lines not on this page · raw message
RFC PATCH 9/10 Convert xtensa to use arch_getoffset() infrastructure.
This patch converts xtensa to use GENERIC_TIME via the arch_getoffset() infrastructure
I do not have cross compilers for these architectures, and in some cases the architectures can be compiles both with and without clocksources. So I've taken my best swing at converting this, but I'm not confident I got it right. Any assistance from arch maintainers or testers would be great.
arch/xtensa/Kconfig +6 -0
@@ -54,6 +54,12 @@ config HZ int default 100 +config GENERIC_TIME + def_bool y + +config ARCH_USES_GETTIMEOFFSET + def_bool y + source "init/Kconfig" source "kernel/Kconfig.freezer"
arch/xtensa/kernel/time.c +4 -59
72 lines not on this page · raw message
RFC PATCH 10/10 Remove CONFIG_GENERIC_TIME
This removes all references to CONFIG_GENERIC_TIME in the timekeeping core as well as the arch Kconfig files.
Arch defconfig files were left alone.
arch/arm/Kconfig +0 -4
@@ -36,10 +36,6 @@ config GENERIC_GPIO bool default n -config GENERIC_TIME - bool - default y - config GENERIC_CLOCKEVENTS bool default n
arch/avr32/Kconfig +0 -3
@@ -45,9 +45,6 @@ config GENERIC_IRQ_PROBE config RWSEM_GENERIC_SPINLOCK def_bool y -config GENERIC_TIME - def_bool y - config GENERIC_CLOCKEVENTS def_bool y
arch/blackfin/Kconfig +0 -4
@@ -575,12 +575,8 @@ comment "Kernel Timer/Scheduler" source kernel/Kconfig.hz -config GENERIC_TIME - def_bool y - config GENERIC_CLOCKEVENTS bool "Generic clock events" - depends on GENERIC_TIME default y config CYCLES_CLOCKSOURCE
arch/cris/Kconfig +0 -3
@@ -20,9 +20,6 @@ config RWSEM_GENERIC_SPINLOCK config RWSEM_XCHGADD_ALGORITHM bool -config GENERIC_TIME - def_bool y - config ARCH_USES_GETTIMEOFFSET def_bool y
arch/frv/Kconfig +0 -4
@@ -38,10 +38,6 @@ config GENERIC_HARDIRQS_NO__DO_IRQ bool default y -config GENERIC_TIME - bool - default y - config TIME_LOW_RES bool default y
arch/h8300/Kconfig +0 -4
@@ -58,10 +58,6 @@ config GENERIC_CALIBRATE_DELAY bool default y -config GENERIC_TIME - bool - default y - config GENERIC_BUG bool depends on BUG
arch/ia64/Kconfig +0 -4
@@ -77,10 +77,6 @@ config GENERIC_CALIBRATE_DELAY bool default y -config GENERIC_TIME - bool - default y - config GENERIC_TIME_VSYSCALL bool default y
arch/m32r/Kconfig +0 -3
@@ -41,9 +41,6 @@ config HZ int default 100 -config GENERIC_TIME - def_bool y - config ARCH_USES_GETTIMEOFFSET def_bool y
arch/m68k/Kconfig +0 -3
@@ -58,9 +58,6 @@ config HZ int default 100 -config GENERIC_TIME - def_bool y - config ARCH_USES_GETTIMEOFFSET def_bool y
arch/m68knommu/Kconfig +0 -4
@@ -58,10 +58,6 @@ config GENERIC_CALIBRATE_DELAY bool default y -config GENERIC_TIME - bool - default y - config GENERIC_CMOS_UPDATE bool default y
arch/mips/Kconfig +0 -4
@@ -684,10 +684,6 @@ config GENERIC_CLOCKEVENTS bool default y -config GENERIC_TIME - bool - default y - config GENERIC_CMOS_UPDATE bool default y
arch/mn10300/Kconfig +0 -3
@@ -41,9 +41,6 @@ config GENERIC_FIND_NEXT_BIT config GENERIC_HWEIGHT def_bool y -config GENERIC_TIME - def_bool y - config GENERIC_BUG def_bool y
arch/parisc/Kconfig +0 -4
@@ -60,10 +60,6 @@ config GENERIC_CALIBRATE_DELAY bool default y -config GENERIC_TIME - bool - default y - config TIME_LOW_RES bool depends on SMP
arch/powerpc/Kconfig +0 -3
@@ -29,9 +29,6 @@ config MMU config GENERIC_CMOS_UPDATE def_bool y -config GENERIC_TIME - def_bool y - config GENERIC_TIME_VSYSCALL def_bool y
arch/s390/Kconfig +0 -3
@@ -40,9 +40,6 @@ config ARCH_HAS_ILOG2_U64 config GENERIC_HWEIGHT def_bool y -config GENERIC_TIME - def_bool y - config GENERIC_TIME_VSYSCALL def_bool y
arch/sh/Kconfig +0 -4
@@ -71,9 +71,6 @@ config GENERIC_CALIBRATE_DELAY config GENERIC_IOMAP bool -config GENERIC_TIME - def_bool y - config GENERIC_CLOCKEVENTS def_bool n
@@ -401,7 +398,6 @@ config SH_TMU def_bool y prompt "TMU timer support" depends on CPU_SH3 || CPU_SH4 - select GENERIC_TIME select GENERIC_CLOCKEVENTS help This enables the use of the TMU as the system timer.
arch/sparc/Kconfig +0 -3
@@ -54,9 +54,6 @@ config BITS default 32 if SPARC32 default 64 if SPARC64 -config GENERIC_TIME - def_bool y - config ARCH_USES_GETTIMEOFFSET bool default y if SPARC32
arch/um/Kconfig.common +0 -4
@@ -55,10 +55,6 @@ config GENERIC_BUG default y depends on BUG -config GENERIC_TIME - bool - default y - config GENERIC_CLOCKEVENTS bool default y
arch/x86/Kconfig +2 -5
@@ -46,9 +46,6 @@ config ARCH_DEFCONFIG default "arch/x86/configs/i386_defconfig" if X86_32 default "arch/x86/configs/x86_64_defconfig" if X86_64 -config GENERIC_TIME - def_bool y - config GENERIC_CMOS_UPDATE def_bool y
@@ -1892,7 +1889,7 @@ config SCx200 config SCx200HR_TIMER tristate "NatSemi SCx200 27MHz High-Resolution Timer Support" - depends on SCx200 && GENERIC_TIME + depends on SCx200 default y help This driver provides a clocksource built upon the on-chip
@@ -1904,7 +1901,7 @@ config SCx200HR_TIMER config GEODE_MFGPT_TIMER def_bool y prompt "Geode Multi-Function General Purpose Timer (MFGPT) events" - depends on MGEODE_LX && GENERIC_TIME && GENERIC_CLOCKEVENTS + depends on MGEODE_LX && GENERIC_CLOCKEVENTS help This driver provides a clock event source based on the MFGPT timer(s) in the CS5535 and CS5536 companion chip for the geode.
arch/xtensa/Kconfig +0 -3
@@ -54,9 +54,6 @@ config HZ int default 100 -config GENERIC_TIME - def_bool y - config ARCH_USES_GETTIMEOFFSET def_bool y
drivers/Makefile +3 -1
@@ -96,7 +96,9 @@ obj-$(CONFIG_SGI_SN) += sn/ obj-y += firmware/ obj-$(CONFIG_CRYPTO) += crypto/ obj-$(CONFIG_SUPERH) += sh/ -obj-$(CONFIG_GENERIC_TIME) += clocksource/ +ifndef CONFIG_ARCH_USES_GETTIMEOFFSET +obj-y += clocksource/ +endif obj-$(CONFIG_DMA_ENGINE) += dma/ obj-$(CONFIG_DCA) += dca/ obj-$(CONFIG_HID) += hid/
drivers/acpi/processor_idle.c +5 -5
@@ -370,7 +370,7 @@ int acpi_processor_resume(struct acpi_device * device)return 0 ; } -#if defined (CONFIG_GENERIC_TIME ) && defined (CONFIG_X86 ) +#if defined(CONFIG_X86 )static int tsc_halts_in_c (int state) {switch (boot_cpu_data.x86_vendor) {
@@ -553,7 +553,7 @@ static void acpi_processor_idle(void)/* Get end time (ticks) */ t2 =inl (acpi_gbl_FADT.xpm_timer_block.address); -#if defined (CONFIG_GENERIC_TIME ) && defined (CONFIG_X86 ) +#if defined(CONFIG_X86 )/* TSC halts in C2, so notify users */ if (tsc_halts_in_c (ACPI_STATE_C2 ))mark_tsc_unstable ("possible TSC halt in C2" );
@@ -618,7 +618,7 @@ static void acpi_processor_idle(void)acpi_set_register (ACPI_BITREG_ARB_DISABLE ,0 ); } -#if defined (CONFIG_GENERIC_TIME ) && defined (CONFIG_X86 ) +#if defined(CONFIG_X86 )/* TSC halts in C3, so notify users */ if (tsc_halts_in_c (ACPI_STATE_C3 ))mark_tsc_unstable ("TSC halts in C3" );
@@ -1539,7 +1539,7 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev,acpi_idle_do_entry (cx); t2 =inl (acpi_gbl_FADT.xpm_timer_block.address); -#if defined (CONFIG_GENERIC_TIME ) && defined (CONFIG_X86 ) +#if defined(CONFIG_X86 )/* TSC could halt in idle, so notify users */ if (tsc_halts_in_c (cx->type))mark_tsc_unstable ("TSC halts in idle" );;
@@ -1656,7 +1656,7 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,spin_unlock (&c3_lock); } -#if defined (CONFIG_GENERIC_TIME ) && defined (CONFIG_X86 ) +#if defined(CONFIG_X86 )/* TSC could halt in idle, so notify users */ if (tsc_halts_in_c (ACPI_STATE_C3 ))mark_tsc_unstable ("TSC halts in idle" );
drivers/misc/Kconfig +1 -1
@@ -32,7 +32,7 @@ config ATMEL_TCLIB config ATMEL_TCB_CLKSRC bool "TC Block Clocksource" - depends on ATMEL_TCLIB && GENERIC_TIME + depends on ATMEL_TCLIB default y help Select this to get a high precision clocksource based on a
kernel/time.c +0 -16
@@ -302,22 +302,6 @@ struct timespec timespec_trunc(struct timespec t, unsigned gran) }EXPORT_SYMBOL (timespec_trunc); -#ifndef CONFIG_GENERIC_TIME -/* -* Simulate gettimeofday using do_gettimeofday which only allows a timeval -* and therefore only yields usec accuracy -*/ -void getnstimeofday (struct timespec *tv) -{ -struct timeval x; - -do_gettimeofday (&x); - tv->tv_sec = x.tv_sec; - tv->tv_nsec = x.tv_usec *NSEC_PER_USEC ; -} -EXPORT_SYMBOL_GPL (getnstimeofday); -#endif -/* Converts Gregorian date to seconds since 1970-01-01 00:00:00. * Assumes input in normal date format, i.e. 1980-12-31 23:59:59 * => year=1980, mon=12, day=31, hour=23, min=59, sec=59.
kernel/time/Kconfig +2 -2
@@ -6,7 +6,7 @@ config TICK_ONESHOT config NO_HZ bool "Tickless System (Dynamic Ticks)" - depends on GENERIC_TIME && GENERIC_CLOCKEVENTS + depends on !ARCH_USES_GETTIMEOFFSET && GENERIC_CLOCKEVENTS select TICK_ONESHOT help This option enables a tickless system: timer interrupts will
@@ -15,7 +15,7 @@ config NO_HZ config HIGH_RES_TIMERS bool "High Resolution Timer Support" - depends on GENERIC_TIME && GENERIC_CLOCKEVENTS + depends on !ARCH_USES_GETTIMEOFFSET && GENERIC_CLOCKEVENTS select TICK_ONESHOT help This option enables high resolution timer support. If your
kernel/time/timekeeping.c +4 -5
@@ -59,7 +59,6 @@ void update_xtime_cache(u64 nsec)struct clocksource *clock; -#ifdef CONFIG_GENERIC_TIME /** * clocksource_forward_now - update clock to the current time *
@@ -182,6 +181,7 @@ int do_settimeofday(struct timespec *tv)EXPORT_SYMBOL (do_settimeofday); +#ifndef CONFIG_ARCH_USES_GETTIMEOFFSET /** * change_clocksource - Swaps clocksources if a new one is available *
@@ -217,7 +217,6 @@ static void change_clocksource(void) */ }#else -static inline void clocksource_forward_now (void ) { }static inline void change_clocksource (void ) { }#endif
@@ -492,10 +491,10 @@ void update_wall_time(void)if (unlikely (timekeeping_suspended))return ; -#ifdef CONFIG_GENERIC_TIME - offset = (clocksource_read (clock) - clock->cycle_last) & clock->mask; -#else +#ifdef CONFIG_ARCH_USES_GETTIMEOFFSET offset = clock->cycle_interval; +#else + offset = (clocksource_read (clock) - clock->cycle_last) & clock->mask;#endif clock->xtime_nsec = (s64 )xtime.tv_nsec << clock->shift;
kernel/trace/Kconfig +2 -2
@@ -81,7 +81,7 @@ config IRQSOFF_TRACER bool "Interrupts-off Latency Tracer" default n depends on TRACE_IRQFLAGS_SUPPORT - depends on GENERIC_TIME + depends on !ARCH_USES_GETTIMEOFFSET depends on DEBUG_KERNEL select TRACE_IRQFLAGS select TRACING
@@ -103,7 +103,7 @@ config IRQSOFF_TRACER config PREEMPT_TRACER bool "Preemption-off Latency Tracer" default n - depends on GENERIC_TIME + depends on !ARCH_USES_GETTIMEOFFSET depends on PREEMPT depends on DEBUG_KERNEL select TRACING
Re: [RFC][PATCH 8/10] Convert sparc to use arch_getoffset() infrastructure.
In reply to john stultzFrom: john stultz <[email protected]>
Date: Wed, 28 Jan 2009 20:10:41 -0800
Quoted 10 lines
This patch converts sparc to use
GENERIC_TIMEvia thearch_getoffset()infrastructureI do not have cross compilers for these architectures, and in some cases the architectures can be compiles both with and without clocksources. So I've taken my best swing at converting this, but I'm not confident I got it right. Any assistance from arch maintainers or testers would be great.
Signed-off-by John Stultz <[email protected]>
Re: [RFC][PATCH 7/10] Convert sh to use arch_getoffset() infrastructure.
In reply to john stultzQuoted 11 lines · john stultz
This patch converts sh to use
GENERIC_TIMEvia thearch_getoffset()infrastructureI do not have cross compilers for these architectures, and in some cases the architectures can be compiles both with and without clocksources. So I've taken my best swing at converting this, but I'm not confident I got it right. Any assistance from arch maintainers or testers would be great.
Signed-off-by John Stultz <[email protected]>