This patch allocates a system interrupt vector for architecture specific
use in implementing RTC timer interrupts.

Signed-off-by: Dimitri Sivanich

---

arch/x86/kernel/entry_64.S | 4 +++
arch/x86/kernel/genx2apic_uv_x.c | 41 +++++++++++++++++++++++++++++++++++
arch/x86/kernel/irqinit_64.c | 3 ++
include/asm-x86/genapic_64.h | 2 +
include/asm-x86/hw_irq.h | 1
include/asm-x86/irq_vectors.h | 1
6 files changed, 52 insertions(+)

Index: linux/arch/x86/kernel/entry_64.S
================================================== =================
--- linux.orig/arch/x86/kernel/entry_64.S 2008-10-22 16:09:56.000000000 -0500
+++ linux/arch/x86/kernel/entry_64.S 2008-10-22 16:13:30.000000000 -0500
@@ -858,6 +858,10 @@ ENTRY(apic_timer_interrupt)
apicinterrupt LOCAL_TIMER_VECTOR,smp_apic_timer_interrupt
END(apic_timer_interrupt)

+ENTRY(uv_rtc_timer_intr)
+ apicinterrupt RTC_TIMER_VECTOR,uv_rtc_timer_interrupt
+END(uv_rtc_timer_intr)
+
ENTRY(uv_bau_message_intr1)
apicinterrupt 220,uv_bau_message_interrupt
END(uv_bau_message_intr1)
Index: linux/arch/x86/kernel/irqinit_64.c
================================================== =================
--- linux.orig/arch/x86/kernel/irqinit_64.c 2008-10-22 16:09:56.000000000 -0500
+++ linux/arch/x86/kernel/irqinit_64.c 2008-10-22 16:13:30.000000000 -0500
@@ -201,6 +201,9 @@ static void __init apic_intr_init(void)
/* self generated IPI for local APIC timer */
alloc_intr_gate(LOCAL_TIMER_VECTOR, apic_timer_interrupt);

+ /* IPI for RTC timers */
+ alloc_intr_gate(RTC_TIMER_VECTOR, uv_rtc_timer_intr);
+
/* IPI vectors for APIC spurious and error interrupts */
alloc_intr_gate(SPURIOUS_APIC_VECTOR, spurious_interrupt);
alloc_intr_gate(ERROR_APIC_VECTOR, error_interrupt);
Index: linux/include/asm-x86/irq_vectors.h
================================================== =================
--- linux.orig/include/asm-x86/irq_vectors.h 2008-10-22 16:10:03.000000000 -0500
+++ linux/include/asm-x86/irq_vectors.h 2008-10-22 16:13:30.000000000 -0500
@@ -85,6 +85,7 @@
* sources per level' errata.
*/
#define LOCAL_TIMER_VECTOR 0xef
+#define RTC_TIMER_VECTOR 0xee

/*
* First APIC vector available to drivers: (vectors 0x30-0xee) we
Index: linux/arch/x86/kernel/genx2apic_uv_x.c
================================================== =================
--- linux.orig/arch/x86/kernel/genx2apic_uv_x.c 2008-10-22 16:09:56.000000000 -0500
+++ linux/arch/x86/kernel/genx2apic_uv_x.c 2008-10-22 16:13:30.000000000 -0500
@@ -22,6 +22,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -356,6 +357,46 @@ static __init void uv_rtc_init(void)
sn_rtc_cycles_per_second = ticks_per_sec;
}

+/* Function pointer for RTC interrupt handling */
+static void (*uv_rtc_interrupt_extension)(void);
+
+int
+uv_rtc_reg_extension(void (*fn)(void))
+{
+ if (uv_rtc_interrupt_extension)
+ return 1;
+
+ uv_rtc_interrupt_extension = fn;
+ return 0;
+}
+EXPORT_SYMBOL_GPL(uv_rtc_reg_extension);
+
+void
+uv_rtc_unreg_extension(void)
+{
+ if (uv_rtc_interrupt_extension)
+ uv_rtc_interrupt_extension = NULL;
+}
+EXPORT_SYMBOL_GPL(uv_rtc_unreg_extension);
+
+void uv_rtc_timer_interrupt(struct pt_regs *regs)
+{
+ struct pt_regs *old_regs = set_irq_regs(regs);
+
+ ack_APIC_irq();
+
+ exit_idle();
+
+ irq_enter();
+
+ if (uv_rtc_interrupt_extension)
+ uv_rtc_interrupt_extension();
+
+ irq_exit();
+
+ set_irq_regs(old_regs);
+}
+
/*
* Called on each cpu to initialize the per_cpu UV data area.
* ZZZ hotplug not supported yet
Index: linux/include/asm-x86/genapic_64.h
================================================== =================
--- linux.orig/include/asm-x86/genapic_64.h 2008-10-22 16:10:03.000000000 -0500
+++ linux/include/asm-x86/genapic_64.h 2008-10-22 16:13:30.000000000 -0500
@@ -49,6 +49,8 @@ extern int is_uv_system(void);

extern struct genapic apic_x2apic_uv_x;
DECLARE_PER_CPU(int, x2apic_extra_bits);
+extern int uv_rtc_reg_extension(void (*fn)(void));
+extern void uv_rtc_unreg_extension(void);
extern void uv_cpu_init(void);
extern void uv_system_init(void);
extern int uv_wakeup_secondary(int phys_apicid, unsigned int start_rip);
Index: linux/include/asm-x86/hw_irq.h
================================================== =================
--- linux.orig/include/asm-x86/hw_irq.h 2008-10-22 16:10:03.000000000 -0500
+++ linux/include/asm-x86/hw_irq.h 2008-10-22 16:13:30.000000000 -0500
@@ -29,6 +29,7 @@

/* Interrupt handlers registered during init_IRQ */
extern void apic_timer_interrupt(void);
+extern void uv_rtc_timer_intr(void);
extern void error_interrupt(void);
extern void spurious_interrupt(void);
extern void thermal_interrupt(void);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/