Skip to contentSkip to conversation

m68k: restore lost coldfire CLOCK_TICK_RATE

PATCH In review Philippe De Muyter 3 participants 7 messages Jun 20, 2009 – Aug 13, 2009 m68k architecture

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 m68k: restore lost coldfire CLOCK_TICK_RATE

Hello list,

The good definition of CLOCK_TICK_RATE for coldfires has been lost in the merge of m68k and m68knommu include files. Restore it. Culprit :
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=ebafc17468d58bd903c886175ca84a4edc69ae1d;hp=34055b806a6334624e7e8af6eefc3aee42372a85

arch/m68k/include/asm/timex.h +15 -2
diff -r 8dcc271a81a8 arch/m68k/include/asm/timex.h
@@ -3,10 +3,23 @@
  *
  * m68k architecture timex specifications
  */
-#ifndef _ASMm68k_TIMEX_H
-#define _ASMm68k_TIMEX_H
+#ifndef _ASMm68K_TIMEX_H
+#define _ASMm68K_TIMEX_H
 
+#ifdef CONFIG_COLDFIRE
+/*
+ * CLOCK_TICK_RATE should give the underlying frequency of the tick timer
+ * to make ntp work best.  For Coldfires, that's the main clock.
+ */
+#include <asm/coldfire.h>
+#define CLOCK_TICK_RATE	MCF_CLK
+#else
+/*
+ * This default CLOCK_TICK_RATE is probably wrong for many 68k boards
+ * Users of those boards will need to check and modify accordingly
+ */
 #define CLOCK_TICK_RATE	1193180 /* Underlying HZ */
+#endif
 
 typedef unsigned long cycles_t;
 
#1 lore raw

HI Philippe,

Quoted 7 lines · Philippe De Muyter

Hello list,

The good definition of CLOCK_TICK_RATE for coldfires has been lost in the merge of m68k and m68knommu include files. Restore it. Culprit :
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=ebafc17468d58bd903c886175ca84a4edc69ae1d;hp=34055b806a6334624e7e8af6eefc3aee42372a85

Is it needed?
What is broken with the existing value?

Regards
Greg

Quoted 37 lines

diff -r 8dcc271a81a8 arch/m68k/include/asm/timex.h

arch/m68k/include/asm/timex.h +15 -2
@@ -3,10 +3,23 @@
  *
  * m68k architecture timex specifications
  */
-#ifndef _ASMm68k_TIMEX_H
-#define _ASMm68k_TIMEX_H
+#ifndef _ASMm68K_TIMEX_H
+#define _ASMm68K_TIMEX_H
 
+#ifdef CONFIG_COLDFIRE
+/*
+ * CLOCK_TICK_RATE should give the underlying frequency of the tick timer
+ * to make ntp work best.  For Coldfires, that's the main clock.
+ */
+#include <asm/coldfire.h>
+#define CLOCK_TICK_RATE	MCF_CLK
+#else
+/*
+ * This default CLOCK_TICK_RATE is probably wrong for many 68k boards
+ * Users of those boards will need to check and modify accordingly
+ */
 #define CLOCK_TICK_RATE	1193180 /* Underlying HZ */
+#endif
 
 typedef unsigned long cycles_t;
 

_______________________________________________
uClinux-dev mailing list [email protected]
http://mailman.uclinux.org/mailman/listinfo/uclinux-dev
This message was resent by [email protected] To unsubscribe see:
http://mailman.uclinux.org/mailman/options/uclinux-dev

Signature · 5 lines
------------------------------------------------------------------------
Greg Ungerer  --  Principal Engineer        EMAIL:     [email protected]
SnapGear Group, McAfee                      PHONE:       +61 7 3435 2888
825 Stanley St,                             FAX:         +61 7 3891 3630
Woolloongabba, QLD, 4102, Australia         WEB: http://www.SnapGear.com
#2 lore raw

Hi Greg,

Quoted 11 lines · Greg Ungerer

HI Philippe,

Quoted 5 lines · Philippe De Muyter

Hello list,
The good definition of CLOCK_TICK_RATE for coldfires has been lost in the merge of m68k and m68knommu include files. Restore it. Culprit :
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=ebafc17468d58bd903c886175ca84a4edc69ae1d;hp=34055b806a6334624e7e8af6eefc3aee42372a85

Is it needed?
What is broken with the existing value?

I am no ntp expert, but IIRC kernel/time/ntp.c needs to know the remainder of CLOCK_TICK_RATE / HZ to obtain a good stability of the time. That's probably only needed when you have ntpd running.

Philippe

#3 lore raw

Hi Philippe,

Quoted 11 lines · Philippe De Muyter

Hi Greg,

Quoted 8 lines · Greg Ungerer

HI Philippe,

Quoted 5 lines · Philippe De Muyter

Hello list,
The good definition of CLOCK_TICK_RATE for coldfires has been lost in the merge of m68k and m68knommu include files. Restore it. Culprit :
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=ebafc17468d58bd903c886175ca84a4edc69ae1d;hp=34055b806a6334624e7e8af6eefc3aee42372a85

Quoted 6 lines
Quoted 2 lines

Is it needed?
What is broken with the existing value?

I am no ntp expert, but IIRC kernel/time/ntp.c needs to know the remainder of CLOCK_TICK_RATE / HZ to obtain a good stability of the time. That's probably only needed when you have ntpd running.

I thought it did that based on gettimeofday()? And that ends up going through the underlying timer code, which for both of the ColdFire timer types doesn't use CLOCK_TICK_RATE. They directly use the MCF_CLK definition.

Regards
Greg

------------------------------------------------------------------------

Greg Ungerer  --  Principal Engineer        EMAIL:     [email protected]
SnapGear Group, McAfee                      PHONE:       +61 7 3435 2888
825 Stanley St,                             FAX:         +61 7 3891 3630
Woolloongabba, QLD, 4102, Australia         WEB: http://www.SnapGear.com
#4 lore raw
Quoted 4 lines · Greg Ungerer

I thought it did that based on gettimeofday()? And that ends up going through the underlying timer code, which for both of the ColdFire timer types doesn't use CLOCK_TICK_RATE. They directly use the MCF_CLK definition.

The problem is the definition of TICK_NSEC, which is calculated from CLOCK_TICK_RATE. If you use the i8253 PIT tick rate, this will be slightly different from the regular TICK_NSEC value of (1000000000 / HZ).

	Arnd <><
#5 lore raw
In reply to Philippe De Muyter

Hi Philippe,

Quoted 5 lines · Philippe De Muyter

The good definition of CLOCK_TICK_RATE for coldfires has been lost in the merge of m68k and m68knommu include files. Restore it. Culprit :
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=ebafc17468d58bd903c886175ca84a4edc69ae1d;hp=34055b806a6334624e7e8af6eefc3aee42372a85

I have added this to the for-linus branch at git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git.

Thanks
Greg

Quoted 37 lines

diff -r 8dcc271a81a8 arch/m68k/include/asm/timex.h

arch/m68k/include/asm/timex.h +15 -2
@@ -3,10 +3,23 @@
  *
  * m68k architecture timex specifications
  */
-#ifndef _ASMm68k_TIMEX_H
-#define _ASMm68k_TIMEX_H
+#ifndef _ASMm68K_TIMEX_H
+#define _ASMm68K_TIMEX_H
 
+#ifdef CONFIG_COLDFIRE
+/*
+ * CLOCK_TICK_RATE should give the underlying frequency of the tick timer
+ * to make ntp work best.  For Coldfires, that's the main clock.
+ */
+#include <asm/coldfire.h>
+#define CLOCK_TICK_RATE	MCF_CLK
+#else
+/*
+ * This default CLOCK_TICK_RATE is probably wrong for many 68k boards
+ * Users of those boards will need to check and modify accordingly
+ */
 #define CLOCK_TICK_RATE	1193180 /* Underlying HZ */
+#endif
 
 typedef unsigned long cycles_t;
 

_______________________________________________
uClinux-dev mailing list [email protected]
http://mailman.uclinux.org/mailman/listinfo/uclinux-dev
This message was resent by [email protected] To unsubscribe see:
http://mailman.uclinux.org/mailman/options/uclinux-dev

Signature · 5 lines
------------------------------------------------------------------------
Greg Ungerer  --  Principal Engineer        EMAIL:     [email protected]
SnapGear Group, McAfee                      PHONE:       +61 7 3435 2888
825 Stanley St,                             FAX:         +61 7 3891 3630
Woolloongabba, QLD, 4102, Australia         WEB: http://www.SnapGear.com
#6 lore raw
Quoted 8 lines · Greg Ungerer

Hi Philippe,

Quoted 4 lines · Philippe De Muyter

The good definition of CLOCK_TICK_RATE for coldfires has been lost in the merge of m68k and m68knommu include files. Restore it. Culprit :
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=ebafc17468d58bd903c886175ca84a4edc69ae1d;hp=34055b806a6334624e7e8af6eefc3aee42372a85

Quoted 5 lines

I have added this to the for-linus branch at
git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git.

Thanks
Greg

Thanks, Greg

Philippe