Commit 06a24dec authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Thomas Gleixner
Browse files

i386: prepare sharing the hpet code with x86_64 



The hpet implementations of i386 and x8664 has been mostly the same
before the clock events conversion of i386. The clock events
conversion of i386 hpet is already done. So it makes sense to share
the code for the x86_64 clock events conversion.

Abstract out the mapping functions.

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 avatarArjan van de Ven <arjan@linux.intel.com>
parent d371698e

arch/x86/kernel/hpet_32.c

+16 −8
Original line number Diff line number Diff line
@@ -8,10 +8,9 @@ 
#include <linux/delay.h>



#include <asm/hpet.h>

#include <asm/i8253.h>

#include <asm/io.h>



extern struct clock_event_device *global_clock_event;



#define HPET_MASK	CLOCKSOURCE_MASK(32)

#define HPET_SHIFT	22
@@ -34,6 +33,17 @@ static inline void hpet_writel(unsigned long d, unsigned long a) 
	writel(d, hpet_virt_address + a);

}



static inline void hpet_set_mapping(void)

{

	hpet_virt_address = ioremap_nocache(hpet_address, HPET_MMAP_SIZE);

}



static inline void hpet_clear_mapping(void)

{

	iounmap(hpet_virt_address);

	hpet_virt_address = NULL;

}



/*

 * HPET command line enable / disable

 */
@@ -83,7 +93,7 @@ static void hpet_reserve_platform_timers(unsigned long id) 


	memset(&hd, 0, sizeof (hd));

	hd.hd_phys_address = hpet_address;

	hd.hd_address = hpet_virt_address;

	hd.hd_address = hpet;

	hd.hd_nirqs = nrtimers;

	hd.hd_flags = HPET_DATA_PLATFORM;

	hpet_reserve_timer(&hd, 0);
@@ -238,7 +248,7 @@ int __init hpet_enable(void) 
	if (!is_hpet_capable())

		return 0;



	hpet_virt_address = ioremap_nocache(hpet_address, HPET_MMAP_SIZE);

	hpet_set_mapping();



	/*

	 * Read the period and check for a sane value:
@@ -334,13 +344,11 @@ int __init hpet_enable(void) 
	return 0;



out_nohpet:

	iounmap(hpet_virt_address);

	hpet_virt_address = NULL;

	hpet_clear_mapping();

	boot_hpet_disable = 1;

	return 0;

}





#ifdef CONFIG_HPET_EMULATE_RTC



/* HPET in LegacyReplacement Mode eats up RTC interrupt line. When, HPET

CRA Git | Maintained and supported by SUSTech CRA and CCSE