Commit 6ed77051 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 apic changes from Ingo Molnar:
 "An xAPIC CPU hotplug race fix, plus cleanups and minor fixes"

* 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/apic: Plug racy xAPIC access of CPU hotplug code
  x86/apic: Always define nox2apic and define it as initdata
  x86/apic: Remove unused function prototypes
  x86/apic: Switch wait_for_init_deassert() to a bool flag
  x86/apic: Only use default_wait_for_init_deassert()
parents 3a88fe3b ea7bdc65

arch/x86/include/asm/apic.h

+1 −13
Original line number Diff line number Diff line
@@ -93,9 +93,6 @@ static inline int is_vsmp_box(void) 
	return 0;

}

#endif

extern void xapic_wait_icr_idle(void);

extern u32 safe_xapic_wait_icr_idle(void);

extern void xapic_icr_write(u32, u32);

extern int setup_profiling_timer(unsigned int);



static inline void native_apic_mem_write(u32 reg, u32 v)
@@ -184,7 +181,6 @@ extern int x2apic_phys; 
extern int x2apic_preenabled;

extern void check_x2apic(void);

extern void enable_x2apic(void);

extern void x2apic_icr_write(u32 low, u32 id);

static inline int x2apic_enabled(void)

{

	u64 msr;
@@ -221,7 +217,6 @@ static inline void x2apic_force_phys(void) 
{

}



#define	nox2apic	0

#define	x2apic_preenabled 0

#define	x2apic_supported()	0

#endif
@@ -351,7 +346,7 @@ struct apic { 
	int trampoline_phys_low;

	int trampoline_phys_high;



	void (*wait_for_init_deassert)(atomic_t *deassert);

	bool wait_for_init_deassert;

	void (*smp_callin_clear_local_apic)(void);

	void (*inquire_remote_apic)(int apicid);
@@ -517,13 +512,6 @@ extern int default_cpu_present_to_apicid(int mps_cpu); 
extern int default_check_phys_apicid_present(int phys_apicid);

#endif



static inline void default_wait_for_init_deassert(atomic_t *deassert)

{

	while (!atomic_read(deassert))

		cpu_relax();

	return;

}



extern void generic_bigsmp_probe(void);

arch/x86/kernel/apic/apic.c

+10 −3
Original line number Diff line number Diff line
@@ -133,6 +133,10 @@ static inline void imcr_apic_to_pic(void) 
 * +1=force-enable

 */

static int force_enable_local_apic __initdata;



/* Control whether x2APIC mode is enabled or not */

static bool nox2apic __initdata;



/*

 * APIC command line parameters

 */
@@ -162,8 +166,7 @@ int x2apic_mode; 
/* x2apic enabled before OS handover */

int x2apic_preenabled;

static int x2apic_disabled;

static int nox2apic;

static __init int setup_nox2apic(char *str)

static int __init setup_nox2apic(char *str)

{

	if (x2apic_enabled()) {

		int apicid = native_apic_msr_read(APIC_ID);
@@ -178,7 +181,7 @@ static __init int setup_nox2apic(char *str) 
	} else

		setup_clear_cpu_cap(X86_FEATURE_X2APIC);



	nox2apic = 1;

	nox2apic = true;



	return 0;

}
@@ -283,8 +286,12 @@ u32 native_safe_apic_wait_icr_idle(void) 


void native_apic_icr_write(u32 low, u32 id)

{

	unsigned long flags;



	local_irq_save(flags);

	apic_write(APIC_ICR2, SET_APIC_DEST_FIELD(id));

	apic_write(APIC_ICR, low);

	local_irq_restore(flags);

}



u64 native_apic_icr_read(void)

arch/x86/kernel/apic/apic_flat_64.c

+2 −2
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ static struct apic apic_flat = { 


	.trampoline_phys_low		= DEFAULT_TRAMPOLINE_PHYS_LOW,

	.trampoline_phys_high		= DEFAULT_TRAMPOLINE_PHYS_HIGH,

	.wait_for_init_deassert		= NULL,

	.wait_for_init_deassert		= false,

	.smp_callin_clear_local_apic	= NULL,

	.inquire_remote_apic		= default_inquire_remote_apic,
@@ -314,7 +314,7 @@ static struct apic apic_physflat = { 


	.trampoline_phys_low		= DEFAULT_TRAMPOLINE_PHYS_LOW,

	.trampoline_phys_high		= DEFAULT_TRAMPOLINE_PHYS_HIGH,

	.wait_for_init_deassert		= NULL,

	.wait_for_init_deassert		= false,

	.smp_callin_clear_local_apic	= NULL,

	.inquire_remote_apic		= default_inquire_remote_apic,

arch/x86/kernel/apic/apic_noop.c

+1 −2
Original line number Diff line number Diff line
@@ -172,8 +172,7 @@ struct apic apic_noop = { 
	.trampoline_phys_low		= DEFAULT_TRAMPOLINE_PHYS_LOW,

	.trampoline_phys_high		= DEFAULT_TRAMPOLINE_PHYS_HIGH,



	.wait_for_init_deassert		= NULL,



	.wait_for_init_deassert		= false,

	.smp_callin_clear_local_apic	= NULL,

	.inquire_remote_apic		= NULL,

arch/x86/kernel/apic/apic_numachip.c

+1 −1
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ static const struct apic apic_numachip __refconst = { 
	.wakeup_secondary_cpu		= numachip_wakeup_secondary,

	.trampoline_phys_low		= DEFAULT_TRAMPOLINE_PHYS_LOW,

	.trampoline_phys_high		= DEFAULT_TRAMPOLINE_PHYS_HIGH,

	.wait_for_init_deassert		= NULL,

	.wait_for_init_deassert		= false,

	.smp_callin_clear_local_apic	= NULL,

	.inquire_remote_apic		= NULL, /* REMRD not supported */

CRA Git | Maintained and supported by SUSTech CRA and CCSE