mirror of
https://github.com/torvalds/linux.git
synced 2024-11-22 12:11:40 +00:00
1bdbdaacf7
enabled, then interrupts don't work for the rtc-cmos driver which results in
RTC_AIE*, RTC_PIE* and RTC_ALM being unusable. This affects hwclock from
util-linux-ng at least on i386 since that uses RTC_PIE_ON. (For x86-64, a
polling method is used for unknown reasons.)
This patch series now
1. export the functions from arch/x86/kernel/hpet.c that the old char/rtc
driver uses to work around that problem,
2. makes it possible to compile the old rtc driver as module, while still
having CONFIG_HPET_EMULATE_RTC enabled and
3. makes use of the exported functions in (1) in the new rtc-cmos driver.
This patch:
This patch makes the RTC emulation functions in arch/x86/kernel/hpet.c usable
for kernel modules. It
- exports the functions (EXPORT_SYMBOL_GPL()),
- adds an interface to register the interrupt callback function
instead of using only a fixed callback function and
- replaces the rtc_get_rtc_time() function which depends on
CONFIG_RTC with a call to get_rtc_time() which is defined in
include/asm-generic/rtc.h.
The only dependency to CONFIG_RTC is the call to rtc_interrupt() which is
removed by the next patch. After this, there's no (code) dependency of
this functions to CONFIG_RTC=y any more.
Signed-off-by: Bernhard Walle <bwalle@suse.de>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: David Brownell <david-b@pacbell.net>
Cc: Andi Kleen <ak@suse.de>
Cc: john stultz <johnstul@us.ibm.com>
Cc: Robert Picco <Robert.Picco@hp.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
94 lines
2.7 KiB
C
94 lines
2.7 KiB
C
#ifndef ASM_X86_HPET_H
|
|
#define ASM_X86_HPET_H
|
|
|
|
#ifdef CONFIG_HPET_TIMER
|
|
|
|
#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_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_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
|
|
|
|
/* Max HPET Period is 10^8 femto sec as in HPET spec */
|
|
#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
|
|
|
|
/* hpet memory map physical address */
|
|
extern unsigned long hpet_address;
|
|
extern unsigned long force_hpet_address;
|
|
extern int hpet_force_user;
|
|
extern int is_hpet_enabled(void);
|
|
extern int hpet_enable(void);
|
|
extern void hpet_disable(void);
|
|
extern unsigned long hpet_readl(unsigned long a);
|
|
extern void force_hpet_resume(void);
|
|
|
|
#ifdef CONFIG_HPET_EMULATE_RTC
|
|
|
|
#include <linux/interrupt.h>
|
|
|
|
typedef irqreturn_t (*rtc_irq_handler)(int interrupt, void *cookie);
|
|
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);
|
|
extern irqreturn_t hpet_rtc_interrupt(int irq, void *dev_id);
|
|
extern int hpet_register_irq_handler(rtc_irq_handler handler);
|
|
extern void hpet_unregister_irq_handler(rtc_irq_handler handler);
|
|
|
|
#endif /* CONFIG_HPET_EMULATE_RTC */
|
|
|
|
#else /* CONFIG_HPET_TIMER */
|
|
|
|
static inline int hpet_enable(void) { return 0; }
|
|
static inline unsigned long hpet_readl(unsigned long a) { return 0; }
|
|
static inline int is_hpet_enabled(void) { return 0; }
|
|
|
|
#endif
|
|
#endif /* ASM_X86_HPET_H */
|