Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f0798a3 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Thomas Gleixner
Browse files

x86: unify timex.h variants 



Combine the timex.h variants and move the TSC related code into tsc.h.
Move the set_cyc2ns_scale() call into the tsc calibraction code, where
it belongs.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarArjan van de Ven <arjan@linux.intel.com>
parent 5d5a2989

arch/x86/kernel/time_64.c

+0 −1
Original line number Diff line number Diff line
@@ -328,7 +328,6 @@ void __init time_init(void) 
	else

		vgetcpu_mode = VGETCPU_LSL;



	set_cyc2ns_scale(tsc_khz);

	printk(KERN_INFO "time.c: Detected %d.%03d MHz processor.\n",

		cpu_khz / 1000, cpu_khz % 1000);

	init_tsc_clocksource();

arch/x86/kernel/tsc_64.c

+2 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ EXPORT_SYMBOL(tsc_khz); 


static unsigned int cyc2ns_scale __read_mostly;



void set_cyc2ns_scale(unsigned long khz)

static inline void set_cyc2ns_scale(unsigned long khz)

{

	cyc2ns_scale = (NSEC_PER_MSEC << NS_SCALE) / khz;

}
@@ -206,6 +206,7 @@ void __init tsc_calibrate(void) 
	}



	tsc_khz = tsc2 / tsc1;

	set_cyc2ns_scale(tsc_khz);

}



/*

include/asm-x86/timex.h

+16 −3
Original line number Diff line number Diff line 
#ifdef CONFIG_X86_32

# include "timex_32.h"

/* x86 architecture timex specifications */

#ifndef _ASM_X86_TIMEX_H

#define _ASM_X86_TIMEX_H



#include <asm/processor.h>

#include <asm/tsc.h>



#ifdef CONFIG_X86_ELAN

#  define PIT_TICK_RATE 1189200 /* AMD Elan has different frequency! */

#else

# include "timex_64.h"

#  define PIT_TICK_RATE 1193182 /* Underlying HZ */

#endif

#define CLOCK_TICK_RATE	PIT_TICK_RATE



extern int read_current_timer(unsigned long *timer_value);

#define ARCH_HAS_READ_CURRENT_TIMER	1



#endif

include/asm-x86/timex_32.h

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
/*

 * linux/include/asm-i386/timex.h

 *

 * i386 architecture timex specifications

 */

#ifndef _ASMi386_TIMEX_H

#define _ASMi386_TIMEX_H



#include <asm/processor.h>

#include <asm/tsc.h>



#ifdef CONFIG_X86_ELAN

#  define PIT_TICK_RATE 1189200 /* AMD Elan has different frequency! */

#else

#  define PIT_TICK_RATE 1193182 /* Underlying HZ */

#endif

#define CLOCK_TICK_RATE	PIT_TICK_RATE



extern int read_current_timer(unsigned long *timer_value);

#define ARCH_HAS_READ_CURRENT_TIMER	1



#endif

include/asm-x86/timex_64.h

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 
/*

 * linux/include/asm-x86_64/timex.h

 *

 * x86-64 architecture timex specifications

 */

#ifndef _ASMx8664_TIMEX_H

#define _ASMx8664_TIMEX_H



#include <asm/msr.h>

#include <asm/vsyscall.h>

#include <asm/system.h>

#include <asm/processor.h>

#include <asm/tsc.h>

#include <linux/compiler.h>



#define PIT_TICK_RATE	1193182UL

#define CLOCK_TICK_RATE	PIT_TICK_RATE	/* Underlying HZ */



extern int read_current_timer(unsigned long *timer_value);

#define ARCH_HAS_READ_CURRENT_TIMER	1



#define USEC_PER_TICK (USEC_PER_SEC / HZ)

#define NSEC_PER_TICK (NSEC_PER_SEC / HZ)

#define FSEC_PER_TICK (FSEC_PER_SEC / HZ)



#define NS_SCALE        10 /* 2^10, carefully chosen */

#define US_SCALE        32 /* 2^32, arbitralrily chosen */



extern void mark_tsc_unstable(char *msg);

extern void set_cyc2ns_scale(unsigned long khz);

#endif