adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 19:56:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

x86: UV RTC: Rename generic_interrupt to x86_platform_ipi

Browse source 
Signed-off-by: Dimitri Sivanich <sivanich@sgi.com>
LKML-Reference: <20091014142257.GE11048@sgi.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Dimitri Sivanich 2009-10-14 09:22:57 -05:00 committed by Ingo Molnar
parent d5991ff297
commit 4a4de9c7d7
9 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/x86/include/asm/entry_arch.h
View file

@ -34,7 +34,7 @@ BUILD_INTERRUPT3(invalidate_interrupt7,INVALIDATE_TLB_VECTOR_START+7,
smp_invalidate_interrupt) smp_invalidate_interrupt)
#endif #endif
BUILD_INTERRUPT(generic_interrupt, GENERIC_INTERRUPT_VECTOR) BUILD_INTERRUPT(x86_platform_ipi, X86_PLATFORM_IPI_VECTOR)
/* /*
* every pentium local APIC has two 'local interrupts', with a * every pentium local APIC has two 'local interrupts', with a

2
arch/x86/include/asm/hardirq.h
View file

@ -12,7 +12,7 @@ typedef struct {
unsigned int apic_timer_irqs; /* arch dependent */ unsigned int apic_timer_irqs; /* arch dependent */
unsigned int irq_spurious_count; unsigned int irq_spurious_count;
#endif #endif
unsigned int generic_irqs; /* arch dependent */ unsigned int x86_platform_ipis; /* arch dependent */
unsigned int apic_perf_irqs; unsigned int apic_perf_irqs;
unsigned int apic_pending_irqs; unsigned int apic_pending_irqs;
#ifdef CONFIG_SMP #ifdef CONFIG_SMP

4
arch/x86/include/asm/hw_irq.h
View file

@ -27,7 +27,7 @@
/* Interrupt handlers registered during init_IRQ */ /* Interrupt handlers registered during init_IRQ */
extern void apic_timer_interrupt(void); extern void apic_timer_interrupt(void);
extern void generic_interrupt(void); extern void x86_platform_ipi(void);
extern void error_interrupt(void); extern void error_interrupt(void);
extern void perf_pending_interrupt(void); extern void perf_pending_interrupt(void);
@ -101,7 +101,7 @@ extern void eisa_set_level_irq(unsigned int irq);
/* SMP */ /* SMP */
extern void smp_apic_timer_interrupt(struct pt_regs *); extern void smp_apic_timer_interrupt(struct pt_regs *);
extern void smp_spurious_interrupt(struct pt_regs *); extern void smp_spurious_interrupt(struct pt_regs *);
extern void smp_generic_interrupt(struct pt_regs *); extern void smp_x86_platform_ipi(struct pt_regs *);
extern void smp_error_interrupt(struct pt_regs *); extern void smp_error_interrupt(struct pt_regs *);
#ifdef CONFIG_X86_IO_APIC #ifdef CONFIG_X86_IO_APIC
extern asmlinkage void smp_irq_move_cleanup_interrupt(void); extern asmlinkage void smp_irq_move_cleanup_interrupt(void);

2
arch/x86/include/asm/irq.h
View file

@ -36,7 +36,7 @@ static inline int irq_canonicalize(int irq)
extern void fixup_irqs(void); extern void fixup_irqs(void);
#endif #endif
extern void (*generic_interrupt_extension)(void); extern void (*x86_platform_ipi_callback)(void);
extern void native_init_IRQ(void); extern void native_init_IRQ(void);
extern bool handle_irq(unsigned irq, struct pt_regs *regs); extern bool handle_irq(unsigned irq, struct pt_regs *regs);

2
arch/x86/include/asm/irq_vectors.h
View file

@ -106,7 +106,7 @@
/* /*
* Generic system vector for platform specific use * Generic system vector for platform specific use
*/ */
#define GENERIC_INTERRUPT_VECTOR 0xed #define X86_PLATFORM_IPI_VECTOR 0xed
/* /*
* Performance monitoring pending work vector: * Performance monitoring pending work vector:

4
arch/x86/kernel/entry_64.S
View file

@ -969,8 +969,8 @@ apicinterrupt UV_BAU_MESSAGE \
#endif #endif
apicinterrupt LOCAL_TIMER_VECTOR \ apicinterrupt LOCAL_TIMER_VECTOR \
apic_timer_interrupt smp_apic_timer_interrupt apic_timer_interrupt smp_apic_timer_interrupt
apicinterrupt GENERIC_INTERRUPT_VECTOR \ apicinterrupt X86_PLATFORM_IPI_VECTOR \
generic_interrupt smp_generic_interrupt x86_platform_ipi smp_x86_platform_ipi
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
apicinterrupt INVALIDATE_TLB_VECTOR_START+0 \ apicinterrupt INVALIDATE_TLB_VECTOR_START+0 \

20
arch/x86/kernel/irq.c
View file

@ -18,7 +18,7 @@
atomic_t irq_err_count; atomic_t irq_err_count;
/* Function pointer for generic interrupt vector handling */ /* Function pointer for generic interrupt vector handling */
void (*generic_interrupt_extension)(void) = NULL; void (*x86_platform_ipi_callback)(void) = NULL;
/* /*
* 'what should we do if we get a hw irq event on an illegal vector'. * 'what should we do if we get a hw irq event on an illegal vector'.
@ -72,10 +72,10 @@ static int show_other_interrupts(struct seq_file *p, int prec)
seq_printf(p, "%10u ", irq_stats(j)->apic_pending_irqs); seq_printf(p, "%10u ", irq_stats(j)->apic_pending_irqs);
seq_printf(p, " Performance pending work\n"); seq_printf(p, " Performance pending work\n");
#endif #endif
if (generic_interrupt_extension) { if (x86_platform_ipi_callback) {
seq_printf(p, "%*s: ", prec, "PLT"); seq_printf(p, "%*s: ", prec, "PLT");
for_each_online_cpu(j) for_each_online_cpu(j)
seq_printf(p, "%10u ", irq_stats(j)->generic_irqs); seq_printf(p, "%10u ", irq_stats(j)->x86_platform_ipis);
seq_printf(p, " Platform interrupts\n"); seq_printf(p, " Platform interrupts\n");
} }
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
@ -187,8 +187,8 @@ u64 arch_irq_stat_cpu(unsigned int cpu)
sum += irq_stats(cpu)->apic_perf_irqs; sum += irq_stats(cpu)->apic_perf_irqs;
sum += irq_stats(cpu)->apic_pending_irqs; sum += irq_stats(cpu)->apic_pending_irqs;
#endif #endif
if (generic_interrupt_extension) if (x86_platform_ipi_callback)
sum += irq_stats(cpu)->generic_irqs; sum += irq_stats(cpu)->x86_platform_ipis;
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
sum += irq_stats(cpu)->irq_resched_count; sum += irq_stats(cpu)->irq_resched_count;
sum += irq_stats(cpu)->irq_call_count; sum += irq_stats(cpu)->irq_call_count;
@ -252,9 +252,9 @@ unsigned int __irq_entry do_IRQ(struct pt_regs *regs)
} }
/* /*
* Handler for GENERIC_INTERRUPT_VECTOR. * Handler for X86_PLATFORM_IPI_VECTOR.
*/ */
void smp_generic_interrupt(struct pt_regs *regs) void smp_x86_platform_ipi(struct pt_regs *regs)
{ {
struct pt_regs *old_regs = set_irq_regs(regs); struct pt_regs *old_regs = set_irq_regs(regs);
@ -264,10 +264,10 @@ void smp_generic_interrupt(struct pt_regs *regs)
irq_enter(); irq_enter();
inc_irq_stat(generic_irqs); inc_irq_stat(x86_platform_ipis);
if (generic_interrupt_extension) if (x86_platform_ipi_callback)
generic_interrupt_extension(); x86_platform_ipi_callback();
run_local_timers(); run_local_timers();
irq_exit(); irq_exit();

4
arch/x86/kernel/irqinit.c
View file

@ -200,8 +200,8 @@ static void __init apic_intr_init(void)
/* self generated IPI for local APIC timer */ /* self generated IPI for local APIC timer */
alloc_intr_gate(LOCAL_TIMER_VECTOR, apic_timer_interrupt); alloc_intr_gate(LOCAL_TIMER_VECTOR, apic_timer_interrupt);
/* generic IPI for platform specific use */ /* IPI for X86 platform specific use */
alloc_intr_gate(GENERIC_INTERRUPT_VECTOR, generic_interrupt); alloc_intr_gate(X86_PLATFORM_IPI_VECTOR, x86_platform_ipi);
/* IPI vectors for APIC spurious and error interrupts */ /* IPI vectors for APIC spurious and error interrupts */
alloc_intr_gate(SPURIOUS_APIC_VECTOR, spurious_interrupt); alloc_intr_gate(SPURIOUS_APIC_VECTOR, spurious_interrupt);

10
arch/x86/kernel/uv_time.c
View file

@ -91,7 +91,7 @@ static void uv_rtc_send_IPI(int cpu)
pnode = uv_apicid_to_pnode(apicid); pnode = uv_apicid_to_pnode(apicid);
val = (1UL << UVH_IPI_INT_SEND_SHFT) | val = (1UL << UVH_IPI_INT_SEND_SHFT) |
(apicid << UVH_IPI_INT_APIC_ID_SHFT) | (apicid << UVH_IPI_INT_APIC_ID_SHFT) |
(GENERIC_INTERRUPT_VECTOR << UVH_IPI_INT_VECTOR_SHFT); (X86_PLATFORM_IPI_VECTOR << UVH_IPI_INT_VECTOR_SHFT);
uv_write_global_mmr64(pnode, UVH_IPI_INT, val); uv_write_global_mmr64(pnode, UVH_IPI_INT, val);
} }
@ -116,7 +116,7 @@ static int uv_setup_intr(int cpu, u64 expires)
uv_write_global_mmr64(pnode, UVH_EVENT_OCCURRED0_ALIAS, uv_write_global_mmr64(pnode, UVH_EVENT_OCCURRED0_ALIAS,
UVH_EVENT_OCCURRED0_RTC1_MASK); UVH_EVENT_OCCURRED0_RTC1_MASK);
val = (GENERIC_INTERRUPT_VECTOR << UVH_RTC1_INT_CONFIG_VECTOR_SHFT) | val = (X86_PLATFORM_IPI_VECTOR << UVH_RTC1_INT_CONFIG_VECTOR_SHFT) |
((u64)cpu_physical_id(cpu) << UVH_RTC1_INT_CONFIG_APIC_ID_SHFT); ((u64)cpu_physical_id(cpu) << UVH_RTC1_INT_CONFIG_APIC_ID_SHFT);
/* Set configuration */ /* Set configuration */
@ -364,7 +364,7 @@ static __init int uv_rtc_setup_clock(void)
{ {
int rc; int rc;
if (!uv_rtc_enable || !is_uv_system() || generic_interrupt_extension) if (!uv_rtc_enable || !is_uv_system() || x86_platform_ipi_callback)
return -ENODEV; return -ENODEV;
clocksource_uv.mult = clocksource_hz2mult(sn_rtc_cycles_per_second, clocksource_uv.mult = clocksource_hz2mult(sn_rtc_cycles_per_second,
@ -385,7 +385,7 @@ static __init int uv_rtc_setup_clock(void)
if (rc) if (rc)
goto error; goto error;
generic_interrupt_extension = uv_rtc_interrupt; x86_platform_ipi_callback = uv_rtc_interrupt;
clock_event_device_uv.mult = div_sc(sn_rtc_cycles_per_second, clock_event_device_uv.mult = div_sc(sn_rtc_cycles_per_second,
NSEC_PER_SEC, clock_event_device_uv.shift); NSEC_PER_SEC, clock_event_device_uv.shift);
@ -398,7 +398,7 @@ static __init int uv_rtc_setup_clock(void)
rc = schedule_on_each_cpu(uv_rtc_register_clockevents); rc = schedule_on_each_cpu(uv_rtc_register_clockevents);
if (rc) { if (rc) {
generic_interrupt_extension = NULL; x86_platform_ipi_callback = NULL;
uv_rtc_deallocate_timers(); uv_rtc_deallocate_timers();
goto error; goto error;
} }