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

Commit 0655d7c3 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Linus Torvalds
Browse files

x86: share hpet.h with i386 



hpet.h in asm-i386 and asm-x86_64 contain tons of duplicated stuff.
Consolidate into one shared header file.

AK: Fix i386 compilation with !X86_IO_APIC

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarChris Wright <chrisw@sous-sol.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent aec8148f

arch/i386/kernel/hpet.c

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
#include <linux/init.h>

#include <linux/sysdev.h>

#include <linux/pm.h>

#include <linux/delay.h>



#include <asm/hpet.h>

#include <asm/io.h>

include/asm-i386/hpet.h

+48 −78
Original line number Diff line number Diff line
@@ -4,30 +4,6 @@ 


#ifdef CONFIG_HPET_TIMER



#include <linux/errno.h>

#include <linux/module.h>

#include <linux/sched.h>

#include <linux/kernel.h>

#include <linux/param.h>

#include <linux/string.h>

#include <linux/mm.h>

#include <linux/interrupt.h>

#include <linux/time.h>

#include <linux/delay.h>

#include <linux/init.h>

#include <linux/smp.h>



#include <asm/io.h>

#include <asm/smp.h>

#include <asm/irq.h>

#include <asm/msr.h>

#include <asm/delay.h>

#include <asm/mpspec.h>

#include <asm/uaccess.h>

#include <asm/processor.h>



#include <linux/timex.h>



/*

 * Documentation on HPET can be found at:

 *      http://www.intel.com/ial/home/sp/pcmmspec.htm
@@ -51,65 +27,59 @@ 
#define HPET_T2_CMP		0x148

#define HPET_T2_ROUTE		0x150



#define HPET_ID_LEGSUP	0x00008000

#define HPET_ID_NUMBER	0x00001f00

#define HPET_ID_REV		0x000000ff

#define HPET_ID_NUMBER		0x00001f00

#define HPET_ID_64BIT		0x00002000

#define HPET_ID_LEGSUP		0x00008000

#define HPET_ID_VENDOR		0xffff0000

#define	HPET_ID_NUMBER_SHIFT	8

#define HPET_ID_VENDOR_SHIFT	16



#define HPET_ID_VENDOR_8086	0x8086



#define HPET_CFG_ENABLE		0x001

#define HPET_CFG_LEGACY		0x002

#define	HPET_LEGACY_8254	2

#define	HPET_LEGACY_RTC		8



#define HPET_TN_ENABLE		0x004

#define HPET_TN_PERIODIC	0x008

#define HPET_TN_PERIODIC_CAP	0x010

#define HPET_TN_SETVAL		0x040

#define HPET_TN_32BIT		0x100



/* Use our own asm for 64 bit multiply/divide */

#define ASM_MUL64_REG(eax_out,edx_out,reg_in,eax_in) 			\

		__asm__ __volatile__("mull %2" 				\

				:"=a" (eax_out), "=d" (edx_out) 	\

				:"r" (reg_in), "0" (eax_in))



#define ASM_DIV64_REG(eax_out,edx_out,reg_in,eax_in,edx_in) 		\

		__asm__ __volatile__("divl %2" 				\

				:"=a" (eax_out), "=d" (edx_out) 	\

				:"r" (reg_in), "0" (eax_in), "1" (edx_in))

#define HPET_TN_LEVEL		0x0002

#define HPET_TN_ENABLE		0x0004

#define HPET_TN_PERIODIC	0x0008

#define HPET_TN_PERIODIC_CAP	0x0010

#define HPET_TN_64BIT_CAP	0x0020

#define HPET_TN_SETVAL		0x0040

#define HPET_TN_32BIT		0x0100

#define HPET_TN_ROUTE		0x3e00

#define HPET_TN_FSB		0x4000

#define HPET_TN_FSB_CAP		0x8000

#define HPET_TN_ROUTE_SHIFT	9



#define KERNEL_TICK_USEC 	(1000000UL/HZ)	/* tick value in microsec */

/* Max HPET Period is 10^8 femto sec as in HPET spec */

#define HPET_MAX_PERIOD (100000000UL)

#define HPET_MAX_PERIOD		100000000UL

/*

 * Min HPET period is 10^5 femto sec just for safety. If it is less than this,

 * then 32 bit HPET counter wrapsaround in less than 0.5 sec.

 */

#define HPET_MIN_PERIOD (100000UL)

#define HPET_TICK_RATE  (HZ * 100000UL)

#define HPET_MIN_PERIOD		100000UL



extern unsigned long hpet_address;	/* hpet memory map physical address */

/* hpet memory map physical address */

extern unsigned long hpet_address;

extern int is_hpet_enabled(void);



#ifdef CONFIG_X86_64

extern unsigned long hpet_tick;	/* hpet clks count per tick */

extern int hpet_use_timer;

extern int hpet_rtc_timer_init(void);

extern int hpet_enable(void);

extern int is_hpet_capable(void);

extern int hpet_readl(unsigned long a);

#else

extern int hpet_enable(void);

#endif



#ifdef CONFIG_HPET_EMULATE_RTC



#include <linux/interrupt.h>



extern int hpet_mask_rtc_irq_bit(unsigned long bit_mask);

extern int hpet_set_rtc_irq_bit(unsigned long bit_mask);

extern int hpet_set_alarm_time(unsigned char hrs, unsigned char min, unsigned char sec);

extern int hpet_set_alarm_time(unsigned char hrs, unsigned char min,

			       unsigned char sec);

extern int hpet_set_periodic_freq(unsigned long freq);

extern int hpet_rtc_dropped_irq(void);

extern int hpet_rtc_timer_init(void);

extern irqreturn_t hpet_rtc_interrupt(int irq, void *dev_id);



#endif /* CONFIG_HPET_EMULATE_RTC */



#else

include/asm-x86_64/hpet.h

+1 −60
Original line number Diff line number Diff line 
#ifndef _ASM_X8664_HPET_H

#define _ASM_X8664_HPET_H 1



/*

 * Documentation on HPET can be found at:

 *      http://www.intel.com/ial/home/sp/pcmmspec.htm

 *      ftp://download.intel.com/ial/home/sp/mmts098.pdf

 */



#define HPET_MMAP_SIZE	1024



#define HPET_ID		0x000

#define HPET_PERIOD	0x004

#define HPET_CFG	0x010

#define HPET_STATUS	0x020

#define HPET_COUNTER	0x0f0

#define HPET_Tn_OFFSET	0x20

#define HPET_Tn_CFG(n)	 (0x100 + (n) * HPET_Tn_OFFSET)

#define HPET_Tn_ROUTE(n) (0x104 + (n) * HPET_Tn_OFFSET)

#define HPET_Tn_CMP(n)	 (0x108 + (n) * HPET_Tn_OFFSET)

#define HPET_T0_CFG	HPET_Tn_CFG(0)

#define HPET_T0_CMP	HPET_Tn_CMP(0)

#define HPET_T1_CFG	HPET_Tn_CFG(1)

#define HPET_T1_CMP	HPET_Tn_CMP(1)



#define HPET_ID_VENDOR	0xffff0000

#define HPET_ID_LEGSUP	0x00008000

#define HPET_ID_64BIT	0x00002000

#define HPET_ID_NUMBER	0x00001f00

#define HPET_ID_REV	0x000000ff

#define	HPET_ID_NUMBER_SHIFT	8



#define HPET_ID_VENDOR_SHIFT	16

#define HPET_ID_VENDOR_8086	0x8086



#define HPET_CFG_ENABLE	0x001

#define HPET_CFG_LEGACY	0x002

#define	HPET_LEGACY_8254	2

#define	HPET_LEGACY_RTC		8



#define HPET_TN_LEVEL		0x0002

#define HPET_TN_ENABLE		0x0004

#define HPET_TN_PERIODIC	0x0008

#define HPET_TN_PERIODIC_CAP	0x0010

#define HPET_TN_64BIT_CAP	0x0020

#define HPET_TN_SETVAL		0x0040

#define HPET_TN_32BIT		0x0100

#define HPET_TN_ROUTE		0x3e00

#define HPET_TN_FSB		0x4000

#define HPET_TN_FSB_CAP		0x8000



#define HPET_TN_ROUTE_SHIFT	9

#include <asm-i386/hpet.h>



#define HPET_TICK_RATE (HZ * 100000UL)



extern int is_hpet_enabled(void);

extern int hpet_rtc_timer_init(void);

extern int hpet_arch_init(void);

extern int hpet_timer_stop_set_go(unsigned long tick);
@@ -61,17 +12,7 @@ extern int hpet_reenable(void); 
extern unsigned int hpet_calibrate_tsc(void);



extern int hpet_use_timer;

extern unsigned long hpet_address;

extern unsigned long hpet_period;

extern unsigned long hpet_tick;



#ifdef CONFIG_HPET_EMULATE_RTC

extern int hpet_mask_rtc_irq_bit(unsigned long bit_mask);

extern int hpet_set_rtc_irq_bit(unsigned long bit_mask);

extern int hpet_set_alarm_time(unsigned char hrs, unsigned char min, unsigned char sec);

extern int hpet_set_periodic_freq(unsigned long freq);

extern int hpet_rtc_dropped_irq(void);

extern int hpet_rtc_timer_init(void);

#endif /* CONFIG_HPET_EMULATE_RTC */



#endif