From: Andi Kleen <ak@suse.de>
To: tglx@linutronix.de, patches@x86-64.org, linux-kernel@vger.kernel.org
Subject: [PATCH] [30/58] x86: share hpet.h with i386
Date: Thu, 19 Jul 2007 11:55:15 +0200 (CEST) [thread overview]
Message-ID: <20070719095515.D6E1514E06@wotan.suse.de> (raw)
In-Reply-To: <200707191154.642492000@suse.de>
From: Thomas Gleixner <tglx@linutronix.de>
hpet.h in asm-i386 and asm-x86_64 contain tons of duplicated stuff.
Consolidate into one shared header file.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andi Kleen <ak@suse.de>
---
include/asm-i386/hpet.h | 124 +++++++++++++++++-----------------------------
include/asm-x86_64/hpet.h | 61 ----------------------
2 files changed, 48 insertions(+), 137 deletions(-)
Index: linux/include/asm-i386/hpet.h
===================================================================
--- linux.orig/include/asm-i386/hpet.h
+++ linux/include/asm-i386/hpet.h
@@ -4,112 +4,82 @@
#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
* ftp://download.intel.com/ial/home/sp/mmts098.pdf
*/
-#define HPET_MMAP_SIZE 1024
+#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_T0_CFG 0x100
-#define HPET_T0_CMP 0x108
-#define HPET_T0_ROUTE 0x110
-#define HPET_T1_CFG 0x120
-#define HPET_T1_CMP 0x128
-#define HPET_T1_ROUTE 0x130
-#define HPET_T2_CFG 0x140
-#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 0x000
+#define HPET_PERIOD 0x004
+#define HPET_CFG 0x010
+#define HPET_STATUS 0x020
+#define HPET_COUNTER 0x0f0
+#define HPET_T0_CFG 0x100
+#define HPET_T0_CMP 0x108
+#define HPET_T0_ROUTE 0x110
+#define HPET_T1_CFG 0x120
+#define HPET_T1_CMP 0x128
+#define HPET_T1_ROUTE 0x130
+#define HPET_T2_CFG 0x140
+#define HPET_T2_CMP 0x148
+#define HPET_T2_ROUTE 0x150
+
+#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_CFG_ENABLE 0x001
-#define HPET_CFG_LEGACY 0x002
+#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
Index: linux/include/asm-x86_64/hpet.h
===================================================================
--- linux.orig/include/asm-x86_64/hpet.h
+++ linux/include/asm-x86_64/hpet.h
@@ -1,59 +1,10 @@
#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
next prev parent reply other threads:[~2007-07-19 10:12 UTC|newest]
Thread overview: 119+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-07-19 9:54 [PATCH] [0/58] First batch of x86 patches for .23 Andi Kleen
2007-07-19 9:54 ` [PATCH] [1/58] x86: Always flush pages in change_page_attr Andi Kleen
2007-08-06 10:15 ` [patches] " Jan Beulich
2007-08-06 10:36 ` Andi Kleen
2007-08-06 10:49 ` Jan Beulich
2007-07-19 9:54 ` [PATCH] [2/58] x86_64: Tell gcc to only align stack to 8 bytes Andi Kleen
2007-07-19 11:50 ` Serge Belyshev
2007-07-19 12:06 ` Andi Kleen
2007-07-19 14:42 ` Chuck Ebbert
2007-07-19 9:54 ` [PATCH] [3/58] x86_64: asm/ptrace.h needs linux/compiler.h Andi Kleen
2007-07-19 9:54 ` [PATCH] [4/58] x86_64: Don't rely on a unique IO-APIC ID Andi Kleen
2007-07-19 9:54 ` [PATCH] [5/58] x86_64: Report the pending irq if available in smp_affinity Andi Kleen
2007-07-19 10:23 ` Ingo Molnar
2007-07-19 9:54 ` [PATCH] [6/58] x86_64: Use LOCAL_DISTANCE and REMOTE_DISTANCE in x86_64 ACPI code Andi Kleen
2007-07-19 9:54 ` [PATCH] [7/58] x86_64: various cleanups in NUMA scan node Andi Kleen
2007-07-19 17:15 ` Yinghai Lu
2007-07-19 17:21 ` Andi Kleen
2007-07-19 17:38 ` Yinghai Lu
2007-07-19 20:00 ` Andi Kleen
2007-07-19 21:01 ` David Rientjes
2007-07-19 9:54 ` [PATCH] [8/58] x86_64: Use string instruction memcpy/memset on AMD Fam10 Andi Kleen
2007-07-19 16:43 ` Jan Engelhardt
2007-07-19 17:00 ` Yinghai Lu
2007-07-19 9:54 ` [PATCH] [9/58] x86_64: Always use builtin memcpy on gcc 4.3 Andi Kleen
2007-07-21 23:16 ` Oleg Verych
2007-07-21 23:27 ` Andi Kleen
2007-07-22 0:29 ` Denis Vlasenko
2007-07-19 9:54 ` [PATCH] [10/58] i386: Move all simple string operations out of line Andi Kleen
2007-07-19 9:54 ` [PATCH] [11/58] x86: Support __attribute__((__cold__)) in gcc 4.3 Andi Kleen
2007-07-19 9:54 ` [PATCH] [12/58] x86_64: Add vDSO for x86-64 with gettimeofday/clock_gettime/getcpu Andi Kleen
2007-08-21 16:25 ` Daniel Walker
2007-08-21 18:45 ` Andi Kleen
2007-08-21 18:40 ` Andrew Morton
2007-07-19 9:54 ` [PATCH] [13/58] x86: Separate checking of unsynchronized and unstable TSC Andi Kleen
2007-07-19 9:54 ` [PATCH] [14/58] x86_64: Add on_cpu_single Andi Kleen
2007-07-19 11:09 ` Satyam Sharma
2007-07-19 12:07 ` Andi Kleen
2007-07-19 9:54 ` [PATCH] [15/58] i386: Rewrite sched_clock Andi Kleen
2007-07-19 16:51 ` Daniel Walker
2007-07-19 17:13 ` Andi Kleen
2007-07-19 17:15 ` Daniel Walker
2007-07-19 17:22 ` Andi Kleen
2007-07-19 17:31 ` Daniel Walker
2007-07-19 17:38 ` Andi Kleen
2007-07-19 17:43 ` Daniel Walker
2007-07-19 18:00 ` Andi Kleen
2007-07-19 18:00 ` Daniel Walker
2007-07-20 3:11 ` Mathieu Desnoyers
2007-07-20 3:47 ` Mathieu Desnoyers
2007-07-20 4:18 ` [PATCH] [15/58] i386: Rewrite sched_clock (cmpxchg8b) Mathieu Desnoyers
2007-07-20 5:07 ` Nick Piggin
2007-07-20 5:47 ` Mathieu Desnoyers
2007-07-20 8:27 ` [PATCH] [15/58] i386: Rewrite sched_clock Andi Kleen
2007-07-20 14:12 ` Mathieu Desnoyers
2007-07-20 14:39 ` Mathieu Desnoyers
2007-07-20 15:14 ` Andi Kleen
2007-07-20 15:22 ` Mathieu Desnoyers
2007-07-20 16:49 ` [PATCH] 80386 and 80486 cmpxchg64 and cmpxchg64_local fallback Mathieu Desnoyers
2007-07-19 9:55 ` [PATCH] [16/58] x86_64: Use new shared sched_clock in x86-64 too Andi Kleen
2007-07-19 9:55 ` [PATCH] [17/58] i386: Add L3 cache support to AMD CPUID4 emulation Andi Kleen
2007-07-20 17:00 ` [patches] " Andreas Herrmann
2007-07-20 17:15 ` Andreas Herrmann
2007-07-19 9:55 ` [PATCH] [18/58] x86_64: remove extra extern declaring about dmi_ioremap Andi Kleen
2007-07-19 9:55 ` [PATCH] [19/58] x86_64: Don't use softirq save locks in smp_call_function Andi Kleen
2007-07-19 12:16 ` Satyam Sharma
2007-07-19 12:19 ` Andi Kleen
2007-07-19 9:55 ` [PATCH] [20/58] x86: Always probe the NMI watchdog Andi Kleen
2007-07-19 10:24 ` Björn Steinbrink
2007-07-19 10:42 ` Andi Kleen
2007-07-19 9:55 ` [PATCH] [21/58] i386: Reserve the right performance counter for the Intel PerfMon " Andi Kleen
2007-07-19 10:21 ` Björn Steinbrink
2007-07-19 10:45 ` Andi Kleen
2007-07-19 9:55 ` [PATCH] [22/58] x86_64: hpet tsc calibration fix broken smi detection logic Andi Kleen
2007-07-19 9:55 ` [PATCH] [23/58] i386: remove pit_interrupt_hook Andi Kleen
2007-07-19 9:55 ` [PATCH] [24/58] x86_64: Untangle asm/hpet.h from asm/timex.h Andi Kleen
2007-07-19 9:55 ` [PATCH] [25/58] x86_64: use generic cmos update Andi Kleen
2007-07-19 9:55 ` [PATCH] [26/58] x86_64: Use generic xtime init Andi Kleen
2007-07-19 9:55 ` [PATCH] [27/58] x86_64: Remove dead code and other janitor work in tsc.c Andi Kleen
2007-07-19 9:55 ` [PATCH] [28/58] x86_64: Fix APIC typo Andi Kleen
2007-07-19 9:55 ` [PATCH] [29/58] x86_64: fiuxp pt_reqs leftovers Andi Kleen
2007-07-19 9:55 ` Andi Kleen [this message]
2007-07-19 9:55 ` [PATCH] [31/58] x86_64: apic.c coding style janitor work Andi Kleen
2007-07-19 9:55 ` [PATCH] [32/58] x86_64: time.c white space wreckage cleanup Andi Kleen
2007-07-19 9:55 ` [PATCH] [33/58] x86_64: Avoid too many remote cpu references due to /proc/stat Andi Kleen
2007-07-19 10:21 ` Christoph Hellwig
2007-07-19 10:41 ` Andi Kleen
2007-07-19 10:55 ` Adrian Bunk
2007-07-19 9:55 ` [PATCH] [34/58] x86_64: ia32entry adjustments Andi Kleen
2007-07-19 14:46 ` Jeff Garzik
2007-08-06 10:43 ` Jan Beulich
2007-07-19 9:55 ` [PATCH] [35/58] i386: allow debuggers to access the vsyscall page with compat vDSO Andi Kleen
2007-07-19 9:55 ` [PATCH] [36/58] x86_64: minor exception trace variables cleanup Andi Kleen
2007-07-19 9:55 ` [PATCH] [37/58] x86_64: remove unused variable maxcpus Andi Kleen
2007-07-19 9:55 ` [PATCH] [38/58] i386: smp-alt-once option is only useful with HOTPLUG_CPU Andi Kleen
2007-07-19 9:55 ` [PATCH] [39/58] i386: minor nx handling adjustment Andi Kleen
2007-07-19 9:55 ` [PATCH] [40/58] i386: remapped_pgdat_init() static Andi Kleen
2007-07-19 9:55 ` [PATCH] [41/58] i386: arch/i386/kernel/i8253.c should #include <asm/timer.h> Andi Kleen
2007-07-19 9:55 ` [PATCH] [42/58] i386: timer_irq_works() static again Andi Kleen
2007-07-19 9:55 ` [PATCH] [43/58] x86_64: Quicklist support for x86_64 Andi Kleen
2007-07-19 9:55 ` [PATCH] [44/58] x86_64: extract helper function from e820_register_active_regions Andi Kleen
2007-07-19 9:55 ` [PATCH] [45/58] x86_64: fake pxm-to-node mapping for fake numa Andi Kleen
2007-07-19 9:55 ` [PATCH] [46/58] x86_64: fake apicid_to_node " Andi Kleen
2007-07-19 9:55 ` [PATCH] [47/58] i386: insert unclaimed MMCONFIG resources Andi Kleen
2007-07-19 9:55 ` [PATCH] [48/58] x86_64: O_EXCL on /dev/mcelog Andi Kleen
2007-07-19 9:55 ` [PATCH] [49/58] x86_64: support poll() " Andi Kleen
2007-07-19 9:55 ` [PATCH] [50/58] x86_64: mcelog tolerant level cleanup Andi Kleen
2007-07-19 9:55 ` [PATCH] [51/58] i386: fix machine rebooting Andi Kleen
2007-07-19 9:55 ` [PATCH] [52/58] i386: fix section mismatch warnings in mtrr Andi Kleen
2007-07-19 9:55 ` [PATCH] [53/58] x86: PM_TRACE support Andi Kleen
2007-07-19 9:55 ` [PATCH] [54/58] x86: Make Alt-SysRq-p display the debug register contents Andi Kleen
2007-07-19 9:55 ` [PATCH] [55/58] i386: add reference to the arguments Andi Kleen
2007-07-19 9:55 ` [PATCH] [56/58] x86: round_jiffies() for i386 and x86-64 non-critical/corrected MCE polling Andi Kleen
2007-07-19 9:55 ` [PATCH] [57/58] x86_64: check remote IRR bit before migrating level triggered irq Andi Kleen
2007-07-19 9:55 ` [PATCH] [58/58] x86: remove support for the Rise CPU Andi Kleen
2007-07-19 10:45 ` Alan Cox
2007-07-19 10:48 ` Adrian Bunk
2007-07-19 11:13 ` Alan Cox
2007-07-19 12:03 ` Andi Kleen
2007-07-19 14:56 ` Jeff Garzik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070719095515.D6E1514E06@wotan.suse.de \
--to=ak@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=patches@x86-64.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®