forked from Minki/linux
67701ae976
A bug against an xSeries system showed up recently noting that the check_nmi_watchdog() test was failing. I have been investigating it and discovered in both i386 and x86_64 the recent change to the routine to use the cpu_callin_map has uncovered a problem. Prior to that change, on an SMP box, the test was trivally passing because all cpu's were found to not yet be online, but now with the callin_map they are discovered, it goes on to test the counter and they have not yet begun to increment, so it announces a CPU is stuck and bails out. On all the systems I have access to test, the announcement of failure is also bougs... by the time you can login and check /proc/interrupts, the NMI count is happily incrementing on all CPUs. Its just that the test is being done too early. I have tried moving the call to the test around a bit, and it was always too early. I finally hit on this proposed solution, it delays the routine via a late_initcall(), seems like the right solution to me. Signed-off-by: Adrian Bunk <bunk@stusta.de> Cc: Andi Kleen <ak@muc.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
126 lines
3.1 KiB
C
126 lines
3.1 KiB
C
#ifndef __ASM_APIC_H
|
|
#define __ASM_APIC_H
|
|
|
|
#include <linux/config.h>
|
|
#include <linux/pm.h>
|
|
#include <asm/fixmap.h>
|
|
#include <asm/apicdef.h>
|
|
#include <asm/system.h>
|
|
|
|
#define Dprintk(x...)
|
|
|
|
/*
|
|
* Debugging macros
|
|
*/
|
|
#define APIC_QUIET 0
|
|
#define APIC_VERBOSE 1
|
|
#define APIC_DEBUG 2
|
|
|
|
extern int apic_verbosity;
|
|
|
|
/*
|
|
* Define the default level of output to be very little
|
|
* This can be turned up by using apic=verbose for more
|
|
* information and apic=debug for _lots_ of information.
|
|
* apic_verbosity is defined in apic.c
|
|
*/
|
|
#define apic_printk(v, s, a...) do { \
|
|
if ((v) <= apic_verbosity) \
|
|
printk(s, ##a); \
|
|
} while (0)
|
|
|
|
|
|
#ifdef CONFIG_X86_LOCAL_APIC
|
|
|
|
/*
|
|
* Basic functions accessing APICs.
|
|
*/
|
|
|
|
static __inline void apic_write(unsigned long reg, unsigned long v)
|
|
{
|
|
*((volatile unsigned long *)(APIC_BASE+reg)) = v;
|
|
}
|
|
|
|
static __inline void apic_write_atomic(unsigned long reg, unsigned long v)
|
|
{
|
|
xchg((volatile unsigned long *)(APIC_BASE+reg), v);
|
|
}
|
|
|
|
static __inline unsigned long apic_read(unsigned long reg)
|
|
{
|
|
return *((volatile unsigned long *)(APIC_BASE+reg));
|
|
}
|
|
|
|
static __inline__ void apic_wait_icr_idle(void)
|
|
{
|
|
while ( apic_read( APIC_ICR ) & APIC_ICR_BUSY )
|
|
cpu_relax();
|
|
}
|
|
|
|
int get_physical_broadcast(void);
|
|
|
|
#ifdef CONFIG_X86_GOOD_APIC
|
|
# define FORCE_READ_AROUND_WRITE 0
|
|
# define apic_read_around(x)
|
|
# define apic_write_around(x,y) apic_write((x),(y))
|
|
#else
|
|
# define FORCE_READ_AROUND_WRITE 1
|
|
# define apic_read_around(x) apic_read(x)
|
|
# define apic_write_around(x,y) apic_write_atomic((x),(y))
|
|
#endif
|
|
|
|
static inline void ack_APIC_irq(void)
|
|
{
|
|
/*
|
|
* ack_APIC_irq() actually gets compiled as a single instruction:
|
|
* - a single rmw on Pentium/82489DX
|
|
* - a single write on P6+ cores (CONFIG_X86_GOOD_APIC)
|
|
* ... yummie.
|
|
*/
|
|
|
|
/* Docs say use 0 for future compatibility */
|
|
apic_write_around(APIC_EOI, 0);
|
|
}
|
|
|
|
extern void (*wait_timer_tick)(void);
|
|
|
|
extern int get_maxlvt(void);
|
|
extern void clear_local_APIC(void);
|
|
extern void connect_bsp_APIC (void);
|
|
extern void disconnect_bsp_APIC (void);
|
|
extern void disable_local_APIC (void);
|
|
extern void lapic_shutdown (void);
|
|
extern int verify_local_APIC (void);
|
|
extern void cache_APIC_registers (void);
|
|
extern void sync_Arb_IDs (void);
|
|
extern void init_bsp_APIC (void);
|
|
extern void setup_local_APIC (void);
|
|
extern void init_apic_mappings (void);
|
|
extern void smp_local_timer_interrupt (struct pt_regs * regs);
|
|
extern void setup_boot_APIC_clock (void);
|
|
extern void setup_secondary_APIC_clock (void);
|
|
extern void setup_apic_nmi_watchdog (void);
|
|
extern int reserve_lapic_nmi(void);
|
|
extern void release_lapic_nmi(void);
|
|
extern void disable_timer_nmi_watchdog(void);
|
|
extern void enable_timer_nmi_watchdog(void);
|
|
extern void nmi_watchdog_tick (struct pt_regs * regs);
|
|
extern int APIC_init_uniprocessor (void);
|
|
extern void disable_APIC_timer(void);
|
|
extern void enable_APIC_timer(void);
|
|
|
|
extern void enable_NMI_through_LVT0 (void * dummy);
|
|
|
|
extern unsigned int nmi_watchdog;
|
|
#define NMI_NONE 0
|
|
#define NMI_IO_APIC 1
|
|
#define NMI_LOCAL_APIC 2
|
|
#define NMI_INVALID 3
|
|
|
|
#else /* !CONFIG_X86_LOCAL_APIC */
|
|
static inline void lapic_shutdown(void) { }
|
|
|
|
#endif /* !CONFIG_X86_LOCAL_APIC */
|
|
|
|
#endif /* __ASM_APIC_H */
|