2008-01-30 07:30:15 -05:00
|
|
|
#ifndef _ASM_X86_APIC_H
|
|
|
|
#define _ASM_X86_APIC_H
|
|
|
|
|
|
|
|
#include <linux/pm.h>
|
|
|
|
#include <linux/delay.h>
|
x86: APIC: remove apic_write_around(); use alternatives
Use alternatives to select the workaround for the 11AP Pentium erratum
for the affected steppings on the fly rather than build time. Remove the
X86_GOOD_APIC configuration option and replace all the calls to
apic_write_around() with plain apic_write(), protecting accesses to the
ESR as appropriate due to the 3AP Pentium erratum. Remove
apic_read_around() and all its invocations altogether as not needed.
Remove apic_write_atomic() and all its implementing backends. The use of
ASM_OUTPUT2() is not strictly needed for input constraints, but I have
used it for readability's sake.
I had the feeling no one else was brave enough to do it, so I went ahead
and here it is. Verified by checking the generated assembly and tested
with both a 32-bit and a 64-bit configuration, also with the 11AP
"feature" forced on and verified with gdb on /proc/kcore to work as
expected (as an 11AP machines are quite hard to get hands on these days).
Some script complained about the use of "volatile", but apic_write() needs
it for the same reason and is effectively a replacement for writel(), so I
have disregarded it.
I am not sure what the policy wrt defconfig files is, they are generated
and there is risk of a conflict resulting from an unrelated change, so I
have left changes to them out. The option will get removed from them at
the next run.
Some testing with machines other than mine will be needed to avoid some
stupid mistake, but despite its volume, the change is not really that
intrusive, so I am fairly confident that because it works for me, it will
everywhere.
Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2008-07-16 14:15:30 -04:00
|
|
|
|
|
|
|
#include <asm/alternative.h>
|
2008-01-30 07:30:15 -05:00
|
|
|
#include <asm/fixmap.h>
|
|
|
|
#include <asm/apicdef.h>
|
|
|
|
#include <asm/processor.h>
|
|
|
|
#include <asm/system.h>
|
|
|
|
|
|
|
|
#define ARCH_APICTIMER_STOPS_ON_C3 1
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Debugging macros
|
|
|
|
*/
|
|
|
|
#define APIC_QUIET 0
|
|
|
|
#define APIC_VERBOSE 1
|
|
|
|
#define APIC_DEBUG 2
|
|
|
|
|
|
|
|
/*
|
|
|
|
* 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)
|
|
|
|
|
|
|
|
|
|
|
|
extern void generic_apic_probe(void);
|
|
|
|
|
|
|
|
#ifdef CONFIG_X86_LOCAL_APIC
|
|
|
|
|
2008-07-14 13:44:51 -04:00
|
|
|
extern unsigned int apic_verbosity;
|
2008-01-30 07:30:15 -05:00
|
|
|
extern int local_apic_timer_c2_ok;
|
|
|
|
|
|
|
|
extern int ioapic_force;
|
|
|
|
|
2008-06-20 19:11:20 -04:00
|
|
|
extern int disable_apic;
|
2008-01-30 07:30:15 -05:00
|
|
|
/*
|
|
|
|
* Basic functions accessing APICs.
|
|
|
|
*/
|
|
|
|
#ifdef CONFIG_PARAVIRT
|
|
|
|
#include <asm/paravirt.h>
|
2007-10-11 05:20:03 -04:00
|
|
|
#else
|
2008-01-30 07:30:15 -05:00
|
|
|
#define apic_write native_apic_write
|
|
|
|
#define apic_read native_apic_read
|
|
|
|
#define setup_boot_clock setup_boot_APIC_clock
|
|
|
|
#define setup_secondary_clock setup_secondary_APIC_clock
|
2007-10-11 05:20:03 -04:00
|
|
|
#endif
|
2008-01-30 07:30:15 -05:00
|
|
|
|
2008-03-20 03:41:16 -04:00
|
|
|
extern int is_vsmp_box(void);
|
|
|
|
|
2008-01-30 07:31:17 -05:00
|
|
|
static inline void native_apic_write(unsigned long reg, u32 v)
|
2008-01-30 07:30:15 -05:00
|
|
|
{
|
x86: APIC: remove apic_write_around(); use alternatives
Use alternatives to select the workaround for the 11AP Pentium erratum
for the affected steppings on the fly rather than build time. Remove the
X86_GOOD_APIC configuration option and replace all the calls to
apic_write_around() with plain apic_write(), protecting accesses to the
ESR as appropriate due to the 3AP Pentium erratum. Remove
apic_read_around() and all its invocations altogether as not needed.
Remove apic_write_atomic() and all its implementing backends. The use of
ASM_OUTPUT2() is not strictly needed for input constraints, but I have
used it for readability's sake.
I had the feeling no one else was brave enough to do it, so I went ahead
and here it is. Verified by checking the generated assembly and tested
with both a 32-bit and a 64-bit configuration, also with the 11AP
"feature" forced on and verified with gdb on /proc/kcore to work as
expected (as an 11AP machines are quite hard to get hands on these days).
Some script complained about the use of "volatile", but apic_write() needs
it for the same reason and is effectively a replacement for writel(), so I
have disregarded it.
I am not sure what the policy wrt defconfig files is, they are generated
and there is risk of a conflict resulting from an unrelated change, so I
have left changes to them out. The option will get removed from them at
the next run.
Some testing with machines other than mine will be needed to avoid some
stupid mistake, but despite its volume, the change is not really that
intrusive, so I am fairly confident that because it works for me, it will
everywhere.
Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2008-07-16 14:15:30 -04:00
|
|
|
volatile u32 *addr = (volatile u32 *)(APIC_BASE + reg);
|
2008-01-30 07:30:15 -05:00
|
|
|
|
x86: APIC: remove apic_write_around(); use alternatives
Use alternatives to select the workaround for the 11AP Pentium erratum
for the affected steppings on the fly rather than build time. Remove the
X86_GOOD_APIC configuration option and replace all the calls to
apic_write_around() with plain apic_write(), protecting accesses to the
ESR as appropriate due to the 3AP Pentium erratum. Remove
apic_read_around() and all its invocations altogether as not needed.
Remove apic_write_atomic() and all its implementing backends. The use of
ASM_OUTPUT2() is not strictly needed for input constraints, but I have
used it for readability's sake.
I had the feeling no one else was brave enough to do it, so I went ahead
and here it is. Verified by checking the generated assembly and tested
with both a 32-bit and a 64-bit configuration, also with the 11AP
"feature" forced on and verified with gdb on /proc/kcore to work as
expected (as an 11AP machines are quite hard to get hands on these days).
Some script complained about the use of "volatile", but apic_write() needs
it for the same reason and is effectively a replacement for writel(), so I
have disregarded it.
I am not sure what the policy wrt defconfig files is, they are generated
and there is risk of a conflict resulting from an unrelated change, so I
have left changes to them out. The option will get removed from them at
the next run.
Some testing with machines other than mine will be needed to avoid some
stupid mistake, but despite its volume, the change is not really that
intrusive, so I am fairly confident that because it works for me, it will
everywhere.
Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2008-07-16 14:15:30 -04:00
|
|
|
alternative_io("movl %0, %1", "xchgl %0, %1", X86_FEATURE_11AP,
|
|
|
|
ASM_OUTPUT2("=r" (v), "=m" (*addr)),
|
|
|
|
ASM_OUTPUT2("0" (v), "m" (*addr)));
|
2008-01-30 07:30:15 -05:00
|
|
|
}
|
|
|
|
|
2008-01-30 07:31:17 -05:00
|
|
|
static inline u32 native_apic_read(unsigned long reg)
|
2008-01-30 07:30:15 -05:00
|
|
|
{
|
|
|
|
return *((volatile u32 *)(APIC_BASE + reg));
|
|
|
|
}
|
|
|
|
|
|
|
|
extern void apic_wait_icr_idle(void);
|
|
|
|
extern u32 safe_apic_wait_icr_idle(void);
|
|
|
|
extern int get_physical_broadcast(void);
|
|
|
|
|
|
|
|
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 */
|
x86: APIC: remove apic_write_around(); use alternatives
Use alternatives to select the workaround for the 11AP Pentium erratum
for the affected steppings on the fly rather than build time. Remove the
X86_GOOD_APIC configuration option and replace all the calls to
apic_write_around() with plain apic_write(), protecting accesses to the
ESR as appropriate due to the 3AP Pentium erratum. Remove
apic_read_around() and all its invocations altogether as not needed.
Remove apic_write_atomic() and all its implementing backends. The use of
ASM_OUTPUT2() is not strictly needed for input constraints, but I have
used it for readability's sake.
I had the feeling no one else was brave enough to do it, so I went ahead
and here it is. Verified by checking the generated assembly and tested
with both a 32-bit and a 64-bit configuration, also with the 11AP
"feature" forced on and verified with gdb on /proc/kcore to work as
expected (as an 11AP machines are quite hard to get hands on these days).
Some script complained about the use of "volatile", but apic_write() needs
it for the same reason and is effectively a replacement for writel(), so I
have disregarded it.
I am not sure what the policy wrt defconfig files is, they are generated
and there is risk of a conflict resulting from an unrelated change, so I
have left changes to them out. The option will get removed from them at
the next run.
Some testing with machines other than mine will be needed to avoid some
stupid mistake, but despite its volume, the change is not really that
intrusive, so I am fairly confident that because it works for me, it will
everywhere.
Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2008-07-16 14:15:30 -04:00
|
|
|
apic_write(APIC_EOI, 0);
|
2008-01-30 07:30:15 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
extern int lapic_get_maxlvt(void);
|
|
|
|
extern void clear_local_APIC(void);
|
|
|
|
extern void connect_bsp_APIC(void);
|
|
|
|
extern void disconnect_bsp_APIC(int virt_wire_setup);
|
|
|
|
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);
|
2008-01-30 07:30:40 -05:00
|
|
|
extern void end_local_APIC_setup(void);
|
2008-01-30 07:30:15 -05:00
|
|
|
extern void init_apic_mappings(void);
|
|
|
|
extern void setup_boot_APIC_clock(void);
|
|
|
|
extern void setup_secondary_APIC_clock(void);
|
|
|
|
extern int APIC_init_uniprocessor(void);
|
2008-01-30 07:31:24 -05:00
|
|
|
extern void enable_NMI_through_LVT0(void);
|
2008-01-30 07:30:15 -05:00
|
|
|
|
|
|
|
/*
|
|
|
|
* On 32bit this is mach-xxx local
|
|
|
|
*/
|
|
|
|
#ifdef CONFIG_X86_64
|
2008-02-19 06:21:06 -05:00
|
|
|
extern void early_init_lapic_mapping(void);
|
2008-07-01 14:43:34 -04:00
|
|
|
extern int apic_is_clustered_box(void);
|
|
|
|
#else
|
|
|
|
static inline int apic_is_clustered_box(void)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
2008-01-30 07:30:15 -05:00
|
|
|
#endif
|
|
|
|
|
2008-01-30 07:30:40 -05:00
|
|
|
extern u8 setup_APIC_eilvt_mce(u8 vector, u8 msg_type, u8 mask);
|
|
|
|
extern u8 setup_APIC_eilvt_ibs(u8 vector, u8 msg_type, u8 mask);
|
2008-01-30 07:30:15 -05:00
|
|
|
|
|
|
|
|
|
|
|
#else /* !CONFIG_X86_LOCAL_APIC */
|
|
|
|
static inline void lapic_shutdown(void) { }
|
|
|
|
#define local_apic_timer_c2_ok 1
|
2008-06-27 04:41:56 -04:00
|
|
|
static inline void init_apic_mappings(void) { }
|
2008-01-30 07:30:15 -05:00
|
|
|
|
|
|
|
#endif /* !CONFIG_X86_LOCAL_APIC */
|
|
|
|
|
|
|
|
#endif /* __ASM_APIC_H */
|