Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 14:42:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

[PATCH] time: x86_64: hpet_address cleanup

Browse Source 
In preparation for supporting generic timekeeping, this patch cleans up
x86-64's use of vxtime.hpet_address, changing it to just hpet_address as is
also used in i386.  This is necessary since the vxtime structure will be going
away.

Signed-off-by: John Stultz <johnstul@us.ibm.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Andi Kleen <ak@muc.de>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
john stultz 2007-02-16 01:28:18 -08:00 committed by Linus Torvalds
parent acc9a9dcdd
commit 2d0c87c3bc
4 changed files with 26 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
arch/i386/kernel/acpi/boot.c
View File

@ -616,6 +616,7 @@ static int __init acpi_parse_sbf(struct acpi_table_header *table)
} }
#ifdef CONFIG_HPET_TIMER #ifdef CONFIG_HPET_TIMER
#include <asm/hpet.h>
static int __init acpi_parse_hpet(struct acpi_table_header *table) static int __init acpi_parse_hpet(struct acpi_table_header *table)
{ {
@ -646,24 +647,11 @@ static int __init acpi_parse_hpet(struct acpi_table_header *table)
hpet_res->end = (1 * 1024) - 1; hpet_res->end = (1 * 1024) - 1;
} }
#ifdef CONFIG_X86_64 hpet_address = hpet_tbl->address.address;
vxtime.hpet_address = hpet_tbl->address.address;
printk(KERN_INFO PREFIX "HPET id: %#x base: %#lx\n", printk(KERN_INFO PREFIX "HPET id: %#x base: %#lx\n",
hpet_tbl->id, vxtime.hpet_address); hpet_tbl->id, hpet_address);
res_start = vxtime.hpet_address; res_start = hpet_address;
#else /* X86 */
{
extern unsigned long hpet_address;
hpet_address = hpet_tbl->address.address;
printk(KERN_INFO PREFIX "HPET id: %#x base: %#lx\n",
hpet_tbl->id, hpet_address);
res_start = hpet_address;
}
#endif /* X86 */
if (hpet_res) { if (hpet_res) {
hpet_res->start = res_start; hpet_res->start = res_start;

3
arch/x86_64/kernel/apic.c
View File

@ -37,6 +37,7 @@
#include <asm/idle.h> #include <asm/idle.h>
#include <asm/proto.h> #include <asm/proto.h>
#include <asm/timex.h> #include <asm/timex.h>
#include <asm/hpet.h>
#include <asm/apic.h> #include <asm/apic.h>
int apic_mapped; int apic_mapped;
@ -763,7 +764,7 @@ static void setup_APIC_timer(unsigned int clocks)
local_irq_save(flags); local_irq_save(flags);
/* wait for irq slice */ /* wait for irq slice */
if (vxtime.hpet_address && hpet_use_timer) { if (hpet_address && hpet_use_timer) {
int trigger = hpet_readl(HPET_T0_CMP); int trigger = hpet_readl(HPET_T0_CMP);
while (hpet_readl(HPET_COUNTER) >= trigger) while (hpet_readl(HPET_COUNTER) >= trigger)
/* do nothing */ ; /* do nothing */ ;

36
arch/x86_64/kernel/time.c
View File

@ -67,6 +67,7 @@ static int notsc __initdata = 0;
unsigned int cpu_khz; /* TSC clocks / usec, not used here */ unsigned int cpu_khz; /* TSC clocks / usec, not used here */
EXPORT_SYMBOL(cpu_khz); EXPORT_SYMBOL(cpu_khz);
unsigned long hpet_address;
static unsigned long hpet_period; /* fsecs / HPET clock */ static unsigned long hpet_period; /* fsecs / HPET clock */
unsigned long hpet_tick; /* HPET clocks / interrupt */ unsigned long hpet_tick; /* HPET clocks / interrupt */
int hpet_use_timer; /* Use counter of hpet for time keeping, otherwise PIT */ int hpet_use_timer; /* Use counter of hpet for time keeping, otherwise PIT */
@ -316,7 +317,7 @@ static noinline void handle_lost_ticks(int lost)
KERN_WARNING "Your time source seems to be instable or " KERN_WARNING "Your time source seems to be instable or "
"some driver is hogging interupts\n"); "some driver is hogging interupts\n");
print_symbol("rip %s\n", get_irq_regs()->rip); print_symbol("rip %s\n", get_irq_regs()->rip);
if (vxtime.mode == VXTIME_TSC && vxtime.hpet_address) { if (vxtime.mode == VXTIME_TSC && hpet_address) {
printk(KERN_WARNING "Falling back to HPET\n"); printk(KERN_WARNING "Falling back to HPET\n");
if (hpet_use_timer) if (hpet_use_timer)
vxtime.last = hpet_readl(HPET_T0_CMP) - vxtime.last = hpet_readl(HPET_T0_CMP) -
@ -324,6 +325,7 @@ static noinline void handle_lost_ticks(int lost)
else else
vxtime.last = hpet_readl(HPET_COUNTER); vxtime.last = hpet_readl(HPET_COUNTER);
vxtime.mode = VXTIME_HPET; vxtime.mode = VXTIME_HPET;
vxtime.hpet_address = hpet_address;
do_gettimeoffset = do_gettimeoffset_hpet; do_gettimeoffset = do_gettimeoffset_hpet;
} }
/* else should fall back to PIT, but code missing. */ /* else should fall back to PIT, but code missing. */
@ -354,7 +356,7 @@ void main_timer_handler(void)
write_seqlock(&xtime_lock); write_seqlock(&xtime_lock);
if (vxtime.hpet_address) if (hpet_address)
offset = hpet_readl(HPET_COUNTER); offset = hpet_readl(HPET_COUNTER);
if (hpet_use_timer) { if (hpet_use_timer) {
@ -739,7 +741,7 @@ static __init int late_hpet_init(void)
struct hpet_data hd; struct hpet_data hd;
unsigned int ntimer; unsigned int ntimer;
if (!vxtime.hpet_address) if (!hpet_address)
return 0; return 0;
memset(&hd, 0, sizeof (hd)); memset(&hd, 0, sizeof (hd));
@ -752,7 +754,7 @@ static __init int late_hpet_init(void)
* Register with driver. * Register with driver.
* Timer0 and Timer1 is used by platform. * Timer0 and Timer1 is used by platform.
*/ */
hd.hd_phys_address = vxtime.hpet_address; hd.hd_phys_address = hpet_address;
hd.hd_address = (void __iomem *)fix_to_virt(FIX_HPET_BASE); hd.hd_address = (void __iomem *)fix_to_virt(FIX_HPET_BASE);
hd.hd_nirqs = ntimer; hd.hd_nirqs = ntimer;
hd.hd_flags = HPET_DATA_PLATFORM; hd.hd_flags = HPET_DATA_PLATFORM;
@ -821,10 +823,10 @@ static int hpet_init(void)
{ {
unsigned int id; unsigned int id;
if (!vxtime.hpet_address) if (!hpet_address)
return -1; return -1;
set_fixmap_nocache(FIX_HPET_BASE, vxtime.hpet_address); set_fixmap_nocache(FIX_HPET_BASE, hpet_address);
__set_fixmap(VSYSCALL_HPET, vxtime.hpet_address, PAGE_KERNEL_VSYSCALL_NOCACHE); __set_fixmap(VSYSCALL_HPET, hpet_address, PAGE_KERNEL_VSYSCALL_NOCACHE);
/* /*
* Read the period, compute tick and quotient. * Read the period, compute tick and quotient.
@ -878,7 +880,7 @@ void __init pit_stop_interrupt(void)
void __init stop_timer_interrupt(void) void __init stop_timer_interrupt(void)
{ {
char *name; char *name;
if (vxtime.hpet_address) { if (hpet_address) {
name = "HPET"; name = "HPET";
hpet_timer_stop_set_go(0); hpet_timer_stop_set_go(0);
} else { } else {
@ -901,8 +903,7 @@ static struct irqaction irq0 = {
void __init time_init(void) void __init time_init(void)
{ {
if (nohpet) if (nohpet)
vxtime.hpet_address = 0; hpet_address = 0;
xtime.tv_sec = get_cmos_time(); xtime.tv_sec = get_cmos_time();
xtime.tv_nsec = 0; xtime.tv_nsec = 0;
@ -912,7 +913,7 @@ void __init time_init(void)
if (!hpet_init()) if (!hpet_init())
vxtime_hz = (FSEC_PER_SEC + hpet_period / 2) / hpet_period; vxtime_hz = (FSEC_PER_SEC + hpet_period / 2) / hpet_period;
else else
vxtime.hpet_address = 0; hpet_address = 0;
if (hpet_use_timer) { if (hpet_use_timer) {
/* set tick_nsec to use the proper rate for HPET */ /* set tick_nsec to use the proper rate for HPET */
@ -920,7 +921,7 @@ void __init time_init(void)
cpu_khz = hpet_calibrate_tsc(); cpu_khz = hpet_calibrate_tsc();
timename = "HPET"; timename = "HPET";
#ifdef CONFIG_X86_PM_TIMER #ifdef CONFIG_X86_PM_TIMER
} else if (pmtmr_ioport && !vxtime.hpet_address) { } else if (pmtmr_ioport && !hpet_address) {
vxtime_hz = PM_TIMER_FREQUENCY; vxtime_hz = PM_TIMER_FREQUENCY;
timename = "PM"; timename = "PM";
pit_init(); pit_init();
@ -990,23 +991,24 @@ void time_init_gtod(void)
if (unsynchronized_tsc()) if (unsynchronized_tsc())
notsc = 1; notsc = 1;
if (cpu_has(&boot_cpu_data, X86_FEATURE_RDTSCP)) if (cpu_has(&boot_cpu_data, X86_FEATURE_RDTSCP))
vgetcpu_mode = VGETCPU_RDTSCP; vgetcpu_mode = VGETCPU_RDTSCP;
else else
vgetcpu_mode = VGETCPU_LSL; vgetcpu_mode = VGETCPU_LSL;
if (vxtime.hpet_address && notsc) { if (hpet_address && notsc) {
timetype = hpet_use_timer ? "HPET" : "PIT/HPET"; timetype = hpet_use_timer ? "HPET" : "PIT/HPET";
if (hpet_use_timer) if (hpet_use_timer)
vxtime.last = hpet_readl(HPET_T0_CMP) - hpet_tick; vxtime.last = hpet_readl(HPET_T0_CMP) - hpet_tick;
else else
vxtime.last = hpet_readl(HPET_COUNTER); vxtime.last = hpet_readl(HPET_COUNTER);
vxtime.mode = VXTIME_HPET; vxtime.mode = VXTIME_HPET;
vxtime.hpet_address = hpet_address;
do_gettimeoffset = do_gettimeoffset_hpet; do_gettimeoffset = do_gettimeoffset_hpet;
#ifdef CONFIG_X86_PM_TIMER #ifdef CONFIG_X86_PM_TIMER
/* Using PM for gettimeofday is quite slow, but we have no other /* Using PM for gettimeofday is quite slow, but we have no other
choice because the TSC is too unreliable on some systems. */ choice because the TSC is too unreliable on some systems. */
} else if (pmtmr_ioport && !vxtime.hpet_address && notsc) { } else if (pmtmr_ioport && !hpet_address && notsc) {
timetype = "PM"; timetype = "PM";
do_gettimeoffset = do_gettimeoffset_pm; do_gettimeoffset = do_gettimeoffset_pm;
vxtime.mode = VXTIME_PMTMR; vxtime.mode = VXTIME_PMTMR;
@ -1066,7 +1068,7 @@ static int timer_resume(struct sys_device *dev)
sleep_length = 0; sleep_length = 0;
ctime = sleep_start; ctime = sleep_start;
} }
if (vxtime.hpet_address) if (hpet_address)
hpet_reenable(); hpet_reenable();
else else
i8254_timer_resume(); i8254_timer_resume();
@ -1150,7 +1152,7 @@ static unsigned int hpet_t1_cmp; /* cached comparator register */
int is_hpet_enabled(void) int is_hpet_enabled(void)
{ {
return vxtime.hpet_address != 0; return hpet_address != 0;
} }
/* /*

1
include/asm-x86_64/hpet.h
View File

@ -58,6 +58,7 @@ extern int hpet_rtc_timer_init(void);
extern int apic_is_clustered_box(void); extern int apic_is_clustered_box(void);
extern int hpet_use_timer; extern int hpet_use_timer;
extern unsigned long hpet_address;
#ifdef CONFIG_HPET_EMULATE_RTC #ifdef CONFIG_HPET_EMULATE_RTC
extern int hpet_mask_rtc_irq_bit(unsigned long bit_mask); extern int hpet_mask_rtc_irq_bit(unsigned long bit_mask);