Skip to contentSkip to conversation

mn10300: Cleanup time and timer related code

PATCH In review Thomas Gleixner 2 participants 8 messages Jan 31, 2011 – Feb 1, 2011

lore
Share & tools
lore
#0 lore raw

cover mn10300: Cleanup time and timer related code

This series removes stale code and switches the clocksource/events code to generic functions.

Thanks,

tglx

#1 lore raw

PATCH 1/3 mn10300: Remove stale code

mn10300 implements clocksource and clockevents and selects them unconditionally in Kconfig. Remove the stale code which seems to be a leftover of the conversion. Cleanup the configuration switches as well.

Cc Koichi Yasutake <[email protected]>
Cc Mark Salter <[email protected]>
---
 arch/mn10300/Kconfig         |   15 ------------
 arch/mn10300/kernel/Makefile |    5 +---
 arch/mn10300/kernel/time.c   |   53 -------------------------------------------
 3 files changed, 2 insertions(+), 71 deletions(-)
arch/mn10300/Kconfig +0 -15
Index: linux-2.6/arch/mn10300/Kconfig
===================================================================
@@ -53,21 +53,6 @@ config GENERIC_TIME
 config GENERIC_CLOCKEVENTS
 	def_bool y
 
-config GENERIC_CLOCKEVENTS_BUILD
-	def_bool y
-	depends on GENERIC_CLOCKEVENTS
-
-config GENERIC_CLOCKEVENTS_BROADCAST
-	bool
-
-config CEVT_MN10300
-       def_bool y
-       depends on GENERIC_CLOCKEVENTS
-
-config CSRC_MN10300
-       def_bool y
-       depends on GENERIC_TIME
-
 config GENERIC_BUG
 	def_bool y
 
arch/mn10300/kernel/Makefile +2 -3
Index: linux-2.6/arch/mn10300/kernel/Makefile
===================================================================
@@ -8,7 +8,8 @@ fpu-obj-$(CONFIG_FPU) := fpu.o fpu-low.o
 
 obj-y   := process.o signal.o entry.o traps.o irq.o \
 	   ptrace.o setup.o time.o sys_mn10300.o io.o kthread.o \
-	   switch_to.o mn10300_ksyms.o kernel_execve.o $(fpu-obj-y)
+	   switch_to.o mn10300_ksyms.o kernel_execve.o $(fpu-obj-y) \
+	   csrc-mn10300.o cevt-mn10300.o
 
 obj-$(CONFIG_SMP) += smp.o smp-low.o
 
@@ -28,5 +29,3 @@ obj-$(CONFIG_MN10300_RTC) += rtc.o
 obj-$(CONFIG_PROFILE) += profile.o profile-low.o
 obj-$(CONFIG_MODULES) += module.o
 obj-$(CONFIG_KPROBES) += kprobes.o
-obj-$(CONFIG_CSRC_MN10300) += csrc-mn10300.o
-obj-$(CONFIG_CEVT_MN10300) += cevt-mn10300.o
arch/mn10300/kernel/time.c +0 -53

86 lines not on this page · raw message

#2 lore raw

Re: [patch 1/3] mn10300: Remove stale code

Quoted 26 lines · Thomas Gleixner

mn10300 implements clocksource and clockevents and selects them unconditionally in Kconfig. Remove the stale code which seems to be a leftover of the conversion. Cleanup the configuration switches as well.

Cc Koichi Yasutake <[email protected]>
Cc Mark Salter <[email protected]>
---
 arch/mn10300/Kconfig         |   15 ------------
 arch/mn10300/kernel/Makefile |    5 +---
 arch/mn10300/kernel/time.c   |   53 -------------------------------------------
 3 files changed, 2 insertions(+), 71 deletions(-)

Index: linux-2.6/arch/mn10300/Kconfig
===================================================================

arch/mn10300/Kconfig +0 -5
@@ -53,21 +53,6 @@ config GENERIC_TIME
 config GENERIC_CLOCKEVENTS
 	def_bool y
 
-config GENERIC_CLOCKEVENTS_BUILD
-	def_bool y
-	depends on GENERIC_CLOCKEVENTS
-
-config GENERIC_CLOCKEVENTS_BROADCAST

arch/mn10300/Kconfig config GENERIC_TIME · line 70

Quoted 10 lines
arch/mn10300/Kconfig +0 -10
-	bool
-
-config CEVT_MN10300
-       def_bool y
-       depends on GENERIC_CLOCKEVENTS
-
-config CSRC_MN10300
-       def_bool y
-       depends on GENERIC_TIME
-

Actually that should zap GENERIC_TIME as well. It's gone since commit 592913ec.

Thanks,

tglx

Acked-by on v1 1/3
#3 lore raw

Re: [patch 1/3] mn10300: Remove stale code

In reply to Thomas Gleixner
Quoted 8 lines · Thomas Gleixner

plain text document attachment (mn10300-remove-stale-code.patch) mn10300 implements clocksource and clockevents and selects them unconditionally in Kconfig. Remove the stale code which seems to be a leftover of the conversion. Cleanup the configuration switches as well.

Cc Koichi Yasutake <[email protected]>
Cc Mark Salter <[email protected]>
Quoted 149 lines
---
 arch/mn10300/Kconfig         |   15 ------------
 arch/mn10300/kernel/Makefile |    5 +---
 arch/mn10300/kernel/time.c   |   53 -------------------------------------------
 3 files changed, 2 insertions(+), 71 deletions(-)

Index: linux-2.6/arch/mn10300/Kconfig
===================================================================

arch/mn10300/Kconfig +0 -15
@@ -53,21 +53,6 @@ config GENERIC_TIME
 config GENERIC_CLOCKEVENTS
 	def_bool y
 
-config GENERIC_CLOCKEVENTS_BUILD
-	def_bool y
-	depends on GENERIC_CLOCKEVENTS
-
-config GENERIC_CLOCKEVENTS_BROADCAST
-	bool
-
-config CEVT_MN10300
-       def_bool y
-       depends on GENERIC_CLOCKEVENTS
-
-config CSRC_MN10300
-       def_bool y
-       depends on GENERIC_TIME
-
 config GENERIC_BUG
 	def_bool y
 

Index: linux-2.6/arch/mn10300/kernel/Makefile
===================================================================

arch/mn10300/kernel/Makefile +2 -3
@@ -8,7 +8,8 @@ fpu-obj-$(CONFIG_FPU) := fpu.o fpu-low.o
 
 obj-y   := process.o signal.o entry.o traps.o irq.o \
 	   ptrace.o setup.o time.o sys_mn10300.o io.o kthread.o \
-	   switch_to.o mn10300_ksyms.o kernel_execve.o $(fpu-obj-y)
+	   switch_to.o mn10300_ksyms.o kernel_execve.o $(fpu-obj-y) \
+	   csrc-mn10300.o cevt-mn10300.o
 
 obj-$(CONFIG_SMP) += smp.o smp-low.o
 
@@ -28,5 +29,3 @@ obj-$(CONFIG_MN10300_RTC) += rtc.o
 obj-$(CONFIG_PROFILE) += profile.o profile-low.o
 obj-$(CONFIG_MODULES) += module.o
 obj-$(CONFIG_KPROBES) += kprobes.o
-obj-$(CONFIG_CSRC_MN10300) += csrc-mn10300.o
-obj-$(CONFIG_CEVT_MN10300) += cevt-mn10300.o

Index: linux-2.6/arch/mn10300/kernel/time.c
===================================================================

arch/mn10300/kernel/time.c +0 -53
@@ -93,47 +93,6 @@ irqreturn_t local_timer_interrupt(void)
 	return IRQ_HANDLED;
 }
 
-#ifndef CONFIG_GENERIC_TIME
-/*
- * advance the kernel's time keeping clocks (xtime and jiffies)
- * - we use Timer 0 & 1 cascaded as a clock to nudge us the next time
- *   there's a need to update
- */
-static irqreturn_t timer_interrupt(int irq, void *dev_id)
-{
-	unsigned tsc, elapse;
-	irqreturn_t ret;
-
-	write_seqlock(&xtime_lock);
-
-	while (tsc = get_cycles(),
-	       elapse = tsc - mn10300_last_tsc, /* time elapsed since last
-						 * tick */
-	       elapse > MN10300_TSC_PER_HZ
-	       ) {
-		mn10300_last_tsc += MN10300_TSC_PER_HZ;
-
-		/* advance the kernel's time tracking system */
-		do_timer(1);
-	}
-
-	write_sequnlock(&xtime_lock);
-
-	ret = local_timer_interrupt();
-#ifdef CONFIG_SMP
-	send_IPI_allbutself(LOCAL_TIMER_IPI);
-#endif
-	return ret;
-}
-
-static struct irqaction timer_irq = {
-	.handler	= timer_interrupt,
-	.flags		= IRQF_DISABLED | IRQF_SHARED | IRQF_TIMER,
-	.name		= "timer",
-};
-#endif /* CONFIG_GENERIC_TIME */
-
-#ifdef CONFIG_CSRC_MN10300
 void __init clocksource_set_clock(struct clocksource *cs, unsigned int clock)
 {
 	u64 temp;
@@ -149,9 +108,7 @@ void __init clocksource_set_clock(struct
 	cs->shift = shift;
 	cs->mult = (u32) temp;
 }
-#endif
 
-#if CONFIG_CEVT_MN10300
 void __cpuinit clockevent_set_clock(struct clock_event_device *cd,
 				    unsigned int clock)
 {
@@ -168,7 +125,6 @@ void __cpuinit clockevent_set_clock(stru
 	cd->shift = shift;
 	cd->mult = (u32) temp;
 }
-#endif
 
 /*
  * initialise the various timers used by the main part of the kernel
@@ -181,11 +137,7 @@ void __init time_init(void)
 	 */
 	TMPSCNT |= TMPSCNT_ENABLE;
 
-#ifdef CONFIG_GENERIC_TIME
 	init_clocksource();
-#else
-	startup_timestamp_counter();
-#endif
 
 	printk(KERN_INFO
 	       "timestamp counter I/O clock running at %lu.%02lu"
@@ -194,12 +146,7 @@ void __init time_init(void)
 
 	mn10300_last_tsc = read_timestamp_counter();
 
-#ifdef CONFIG_GENERIC_CLOCKEVENTS
 	init_clockevents();
-#else
-	reload_jiffies_counter(MN10300_JC_PER_HZ - 1);
-	setup_jiffies_interrupt(TMJCIRQ, &timer_irq, CONFIG_TIMER_IRQ_LEVEL);
-#endif
 
 #ifdef CONFIG_MN10300_WD_TIMER
 	/* start the watchdog timer */
#4 lore raw

PATCH 2/3 mn10300: Use clocksource_register_hz()

In reply to Thomas Gleixner

clocksource_register_hz() calculates the shift/mult pair for the clocksource. Remove the mn10300 duplicate implementation.

Cc Koichi Yasutake <[email protected]>
Cc Mark Salter <[email protected]>
---
 arch/mn10300/kernel/csrc-mn10300.c |    3 +--
 arch/mn10300/kernel/internal.h     |    3 ---
 arch/mn10300/kernel/time.c         |   16 ----------------
 3 files changed, 1 insertion(+), 21 deletions(-)
arch/mn10300/kernel/csrc-mn10300.c +1 -2
Index: linux-2.6/arch/mn10300/kernel/csrc-mn10300.c
===================================================================
@@ -29,7 +29,6 @@ static struct clocksource clocksource_mn
 int __init init_clocksource(void)
 {
 	startup_timestamp_counter();
-	clocksource_set_clock(&clocksource_mn10300, MN10300_TSCCLK);
-	clocksource_register(&clocksource_mn10300);
+	clocksource_register_hz(&clocksource_mn10300, MN10300_TSCCLK);
 	return 0;
 }
arch/mn10300/kernel/internal.h +0 -3
Index: linux-2.6/arch/mn10300/kernel/internal.h
===================================================================
@@ -37,9 +37,6 @@ extern irqreturn_t local_timer_interrupt
 /*
  * time.c
  */
-#ifdef CONFIG_CEVT_MN10300
-extern void clockevent_set_clock(struct clock_event_device *, unsigned int);
-#endif
 #ifdef CONFIG_CSRC_MN10300
 extern void clocksource_set_clock(struct clocksource *, unsigned int);
 #endif
arch/mn10300/kernel/time.c +0 -16
Index: linux-2.6/arch/mn10300/kernel/time.c
===================================================================
@@ -93,22 +93,6 @@ irqreturn_t local_timer_interrupt(void)
 	return IRQ_HANDLED;
 }
 
-void __init clocksource_set_clock(struct clocksource *cs, unsigned int clock)
-{
-	u64 temp;
-	u32 shift;
-
-	/* Find a shift value */
-	for (shift = 32; shift > 0; shift--) {
-		temp = (u64) NSEC_PER_SEC << shift;
-		do_div(temp, clock);
-		if ((temp >> 32) == 0)
-			break;
-	}
-	cs->shift = shift;
-	cs->mult = (u32) temp;
-}
-
 void __cpuinit clockevent_set_clock(struct clock_event_device *cd,
 				    unsigned int clock)
 {
Acked-by on v1 2/3
#5 lore raw

Re: [patch 2/3] mn10300: Use clocksource_register_hz()

Quoted 8 lines · Thomas Gleixner

plain text document attachment (mn10300-use-clocksource-register-hz.patch) clocksource_register_hz() calculates the shift/mult pair for the clocksource. Remove the mn10300 duplicate implementation.

Cc Koichi Yasutake <[email protected]>
Cc Mark Salter <[email protected]>
#6 lore raw

PATCH 3/3 mn10300: Use clockevents_calc_mult_shift()

In reply to Thomas Gleixner

Use clockevents_calc_mult_shift() instead of the homebrewn function in mn10300/kernel/time.c.

Cc Koichi Yasutake <[email protected]>
Cc Mark Salter <[email protected]>
---
 arch/mn10300/kernel/cevt-mn10300.c |    5 +++--
 arch/mn10300/kernel/internal.h     |    7 -------
 arch/mn10300/kernel/time.c         |   17 -----------------
 3 files changed, 3 insertions(+), 26 deletions(-)
arch/mn10300/kernel/cevt-mn10300.c +3 -2
Index: linux-2.6/arch/mn10300/kernel/cevt-mn10300.c
===================================================================
@@ -89,9 +89,10 @@ int __init init_clockevents(void)
 	cd->name		= "Timestamp";
 	cd->features		= CLOCK_EVT_FEAT_ONESHOT;
 
-	/* Calculate the min / max delta */
-	clockevent_set_clock(cd, MN10300_JCCLK);
+	/* Calculate shift/mult. We want to spawn at least 1 second */
+	clockevents_calc_mult_shift(cd, MN10300_JCCLK, 1);
 
+	/* Calculate the min / max delta */
 	cd->max_delta_ns	= clockevent_delta2ns(TMJCBR_MAX, cd);
 	cd->min_delta_ns	= clockevent_delta2ns(100, cd);
 
arch/mn10300/kernel/internal.h +0 -7
Index: linux-2.6/arch/mn10300/kernel/internal.h
===================================================================
@@ -33,10 +33,3 @@ extern void mn10300_low_ipi_handler(void
  * time.c
  */
 extern irqreturn_t local_timer_interrupt(void);
-
-/*
- * time.c
- */
-#ifdef CONFIG_CSRC_MN10300
-extern void clocksource_set_clock(struct clocksource *, unsigned int);
-#endif
arch/mn10300/kernel/time.c +0 -17
Index: linux-2.6/arch/mn10300/kernel/time.c
===================================================================
@@ -93,23 +93,6 @@ irqreturn_t local_timer_interrupt(void)
 	return IRQ_HANDLED;
 }
 
-void __cpuinit clockevent_set_clock(struct clock_event_device *cd,
-				    unsigned int clock)
-{
-	u64 temp;
-	u32 shift;
-
-	/* Find a shift value */
-	for (shift = 32; shift > 0; shift--) {
-		temp = (u64) clock << shift;
-		do_div(temp, NSEC_PER_SEC);
-		if ((temp >> 32) == 0)
-			break;
-	}
-	cd->shift = shift;
-	cd->mult = (u32) temp;
-}
-
 /*
  * initialise the various timers used by the main part of the kernel
  */