2008-06-18 17:08:48 +02:00
|
|
|
#ifndef ASM_X86__APIC_H
|
|
|
|
|
#define ASM_X86__APIC_H
|
2008-01-30 13:30:15 +01:00
|
|
|
|
|
|
|
|
#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 20:15:30 +02:00
|
|
|
|
|
|
|
|
#include <asm/alternative.h>
|
2008-01-30 13:30:15 +01:00
|
|
|
#include <asm/fixmap.h>
|
|
|
|
|
#include <asm/apicdef.h>
|
|
|
|
|
#include <asm/processor.h>
|
|
|
|
|
#include <asm/system.h>
|
2008-07-10 20:16:52 +02:00
|
|
|
#include <asm/cpufeature.h>
|
|
|
|
|
#include <asm/msr.h>
|
2008-01-30 13:30:15 +01:00
|
|
|
|
|
|
|
|
#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 19:44:51 +02:00
|
|
|
extern unsigned int apic_verbosity;
|
2008-01-30 13:30:15 +01:00
|
|
|
extern int local_apic_timer_c2_ok;
|
|
|
|
|
|
|
|
|
|
extern int ioapic_force;
|
|
|
|
|
|
2008-06-21 01:11:20 +02:00
|
|
|
extern int disable_apic;
|
2008-01-30 13:30:15 +01:00
|
|
|
/*
|
|
|
|
|
* Basic functions accessing APICs.
|
|
|
|
|
*/
|
|
|
|
|
#ifdef CONFIG_PARAVIRT
|
|
|
|
|
#include <asm/paravirt.h>
|
2007-10-11 11:20:03 +02:00
|
|
|
#else
|
2008-01-30 13:30:15 +01:00
|
|
|
#define setup_boot_clock setup_boot_APIC_clock
|
|
|
|
|
#define setup_secondary_clock setup_secondary_APIC_clock
|
2007-10-11 11:20:03 +02:00
|
|
|
#endif
|
2008-01-30 13:30:15 +01:00
|
|
|
|
2008-03-20 08:41:16 +01:00
|
|
|
extern int is_vsmp_box(void);
|
2008-07-23 13:43:14 +02:00
|
|
|
extern void xapic_wait_icr_idle(void);
|
|
|
|
|
extern u32 safe_xapic_wait_icr_idle(void);
|
|
|
|
|
extern u64 xapic_icr_read(void);
|
|
|
|
|
extern void xapic_icr_write(u32, u32);
|
|
|
|
|
extern int setup_profiling_timer(unsigned int);
|
2008-03-20 08:41:16 +01:00
|
|
|
|
2008-07-10 20:16:49 +02:00
|
|
|
static inline void native_apic_mem_write(u32 reg, u32 v)
|
2008-01-30 13:30:15 +01: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 20:15:30 +02:00
|
|
|
volatile u32 *addr = (volatile u32 *)(APIC_BASE + reg);
|
2008-01-30 13:30:15 +01: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 20:15:30 +02: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 13:30:15 +01:00
|
|
|
}
|
|
|
|
|
|
2008-07-10 20:16:49 +02:00
|
|
|
static inline u32 native_apic_mem_read(u32 reg)
|
2008-01-30 13:30:15 +01:00
|
|
|
{
|
|
|
|
|
return *((volatile u32 *)(APIC_BASE + reg));
|
|
|
|
|
}
|
|
|
|
|
|
2008-07-10 20:16:52 +02:00
|
|
|
static inline void native_apic_msr_write(u32 reg, u32 v)
|
|
|
|
|
{
|
|
|
|
|
if (reg == APIC_DFR || reg == APIC_ID || reg == APIC_LDR ||
|
|
|
|
|
reg == APIC_LVR)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
wrmsr(APIC_BASE_MSR + (reg >> 4), v, 0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline u32 native_apic_msr_read(u32 reg)
|
|
|
|
|
{
|
|
|
|
|
u32 low, high;
|
|
|
|
|
|
|
|
|
|
if (reg == APIC_DFR)
|
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
|
|
rdmsr(APIC_BASE_MSR + (reg >> 4), low, high);
|
|
|
|
|
return low;
|
|
|
|
|
}
|
|
|
|
|
|
2008-07-12 03:41:54 +02:00
|
|
|
#ifndef CONFIG_X86_32
|
2008-07-10 20:16:58 +02:00
|
|
|
extern int x2apic, x2apic_preenabled;
|
|
|
|
|
extern void check_x2apic(void);
|
|
|
|
|
extern void enable_x2apic(void);
|
|
|
|
|
extern void enable_IR_x2apic(void);
|
|
|
|
|
extern void x2apic_icr_write(u32 low, u32 id);
|
2008-07-12 03:41:54 +02:00
|
|
|
#endif
|
2008-07-10 20:16:49 +02:00
|
|
|
|
|
|
|
|
struct apic_ops {
|
|
|
|
|
u32 (*read)(u32 reg);
|
|
|
|
|
void (*write)(u32 reg, u32 v);
|
|
|
|
|
u64 (*icr_read)(void);
|
|
|
|
|
void (*icr_write)(u32 low, u32 high);
|
|
|
|
|
void (*wait_icr_idle)(void);
|
|
|
|
|
u32 (*safe_wait_icr_idle)(void);
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
extern struct apic_ops *apic_ops;
|
|
|
|
|
|
|
|
|
|
#define apic_read (apic_ops->read)
|
|
|
|
|
#define apic_write (apic_ops->write)
|
|
|
|
|
#define apic_icr_read (apic_ops->icr_read)
|
|
|
|
|
#define apic_icr_write (apic_ops->icr_write)
|
|
|
|
|
#define apic_wait_icr_idle (apic_ops->wait_icr_idle)
|
|
|
|
|
#define safe_apic_wait_icr_idle (apic_ops->safe_wait_icr_idle)
|
|
|
|
|
|
2008-01-30 13:30:15 +01:00
|
|
|
extern int get_physical_broadcast(void);
|
|
|
|
|
|
x64, x2apic/intr-remap: IO-APIC support for interrupt-remapping
IO-APIC support in the presence of interrupt-remapping infrastructure.
IO-APIC RTE will be programmed with interrupt-remapping table entry(IRTE)
index and the IRTE will contain information about the vector, cpu destination,
trigger mode etc, which traditionally was present in the IO-APIC RTE.
Introduce a new irq_chip for cleaner irq migration (in the process
context as opposed to the current irq migration in the context of an interrupt.
interrupt-remapping infrastructure will help us achieve this cleanly).
For edge triggered, irq migration is a simple atomic update(of vector
and cpu destination) of IRTE and flush the hardware cache.
For level triggered, we need to modify the io-apic RTE aswell with the update
vector information, along with modifying IRTE with vector and cpu destination.
So irq migration for level triggered is little bit more complex compared to
edge triggered migration. But the good news is, we use the same algorithm
for level triggered migration as we have today, only difference being,
we now initiate the irq migration from process context instead of the
interrupt context.
In future, when we do a directed EOI (combined with cpu EOI broadcast
suppression) to the IO-APIC, level triggered irq migration will also be
as simple as edge triggered migration and we can do the irq migration
with a simple atomic update to IO-APIC RTE.
TBD: some tests/changes needed in the presence of fixup_irqs() for
level triggered irq migration.
Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
Cc: akpm@linux-foundation.org
Cc: arjan@linux.intel.com
Cc: andi@firstfloor.org
Cc: ebiederm@xmission.com
Cc: jbarnes@virtuousgeek.org
Cc: steiner@sgi.com
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2008-07-10 20:16:56 +02:00
|
|
|
#ifdef CONFIG_X86_64
|
|
|
|
|
static inline void ack_x2APIC_irq(void)
|
|
|
|
|
{
|
|
|
|
|
/* Docs say use 0 for future compatibility */
|
|
|
|
|
native_apic_msr_write(APIC_EOI, 0);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
2008-01-30 13:30:15 +01:00
|
|
|
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 20:15:30 +02:00
|
|
|
apic_write(APIC_EOI, 0);
|
2008-01-30 13:30:15 +01: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 13:30:40 +01:00
|
|
|
extern void end_local_APIC_setup(void);
|
2008-01-30 13:30:15 +01: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 13:31:24 +01:00
|
|
|
extern void enable_NMI_through_LVT0(void);
|
2008-01-30 13:30:15 +01:00
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* On 32bit this is mach-xxx local
|
|
|
|
|
*/
|
|
|
|
|
#ifdef CONFIG_X86_64
|
2008-02-19 12:21:06 +01:00
|
|
|
extern void early_init_lapic_mapping(void);
|
2008-07-01 20:43:34 +02:00
|
|
|
extern int apic_is_clustered_box(void);
|
|
|
|
|
#else
|
|
|
|
|
static inline int apic_is_clustered_box(void)
|
|
|
|
|
{
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
2008-01-30 13:30:15 +01:00
|
|
|
#endif
|
|
|
|
|
|
2008-01-30 13:30:40 +01: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 13:30:15 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
#else /* !CONFIG_X86_LOCAL_APIC */
|
|
|
|
|
static inline void lapic_shutdown(void) { }
|
|
|
|
|
#define local_apic_timer_c2_ok 1
|
2008-06-27 10:41:56 +02:00
|
|
|
static inline void init_apic_mappings(void) { }
|
2008-01-30 13:30:15 +01:00
|
|
|
|
|
|
|
|
#endif /* !CONFIG_X86_LOCAL_APIC */
|
|
|
|
|
|
2008-06-18 17:08:48 +02:00
|
|
|
#endif /* ASM_X86__APIC_H */
|