8643f9d02a
When acpi=off or there is no SRAT defined, apicid_to_node is got from K8 Northbridge PCI configuration space in k8_scan_nodes() in arch/x86_64/mm/k8toplogy.c. The problem is that it assumes bsp apic id is 0 at that point. For four socket system with Quad core cpus installed, all cpus apic id is offset by 4, and bsp apic id is 4. For eight socket system with dual core cpus installed, all cpus apic id is offset by 2, and bsp apic id is 2. We need get boot_cpu_id --- bsp apic id, before k8_scan_nodes by called. So create early_acpi_boot_init and early_get_smp_config for get boot_cpu_id. Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
146 lines
3.6 KiB
C
146 lines
3.6 KiB
C
#ifndef _ASM_X86_APIC_H
|
|
#define _ASM_X86_APIC_H
|
|
|
|
#include <linux/pm.h>
|
|
#include <linux/delay.h>
|
|
#include <asm/fixmap.h>
|
|
#include <asm/apicdef.h>
|
|
#include <asm/processor.h>
|
|
#include <asm/system.h>
|
|
|
|
#define ARCH_APICTIMER_STOPS_ON_C3 1
|
|
|
|
#define Dprintk(x...)
|
|
|
|
/*
|
|
* 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
|
|
|
|
extern int apic_verbosity;
|
|
extern int timer_over_8254;
|
|
extern int local_apic_timer_c2_ok;
|
|
extern int local_apic_timer_disabled;
|
|
|
|
extern int apic_runs_main_timer;
|
|
extern int ioapic_force;
|
|
extern int disable_apic;
|
|
extern int disable_apic_timer;
|
|
extern unsigned boot_cpu_id;
|
|
|
|
/*
|
|
* Basic functions accessing APICs.
|
|
*/
|
|
#ifdef CONFIG_PARAVIRT
|
|
#include <asm/paravirt.h>
|
|
extern int is_vsmp_box(void);
|
|
#else
|
|
#define apic_write native_apic_write
|
|
#define apic_write_atomic native_apic_write_atomic
|
|
#define apic_read native_apic_read
|
|
#define setup_boot_clock setup_boot_APIC_clock
|
|
#define setup_secondary_clock setup_secondary_APIC_clock
|
|
static int inline is_vsmp_box(void)
|
|
{
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
static inline void native_apic_write(unsigned long reg, u32 v)
|
|
{
|
|
*((volatile u32 *)(APIC_BASE + reg)) = v;
|
|
}
|
|
|
|
static inline void native_apic_write_atomic(unsigned long reg, u32 v)
|
|
{
|
|
(void) xchg((u32*)(APIC_BASE + reg), v);
|
|
}
|
|
|
|
static inline u32 native_apic_read(unsigned long reg)
|
|
{
|
|
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);
|
|
|
|
#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 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);
|
|
extern void end_local_APIC_setup(void);
|
|
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);
|
|
extern void enable_NMI_through_LVT0(void);
|
|
|
|
/*
|
|
* On 32bit this is mach-xxx local
|
|
*/
|
|
#ifdef CONFIG_X86_64
|
|
extern void setup_apic_routing(void);
|
|
extern void early_init_lapic_mapping(void);
|
|
#endif
|
|
|
|
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);
|
|
|
|
extern int apic_is_clustered_box(void);
|
|
|
|
#else /* !CONFIG_X86_LOCAL_APIC */
|
|
static inline void lapic_shutdown(void) { }
|
|
#define local_apic_timer_c2_ok 1
|
|
|
|
#endif /* !CONFIG_X86_LOCAL_APIC */
|
|
|
|
#endif /* __ASM_APIC_H */
|