[PATCH] i386: use safe_apic_wait_icr_idle in smpboot.c
__inquire_remote_apic is used for APIC debugging, so use safe_apic_wait_icr_idle instead of apic_wait_icr_idle to avoid possible lockups when APIC delivery fails. Signed-off-by: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp> Signed-off-by: Andi Kleen <ak@suse.de>
This commit is contained in:
committed by
Andi Kleen
parent
ea8c733b98
commit
4312fa8157
@ -521,7 +521,8 @@ static inline void __inquire_remote_apic(int apicid)
|
|||||||
{
|
{
|
||||||
int i, regs[] = { APIC_ID >> 4, APIC_LVR >> 4, APIC_SPIV >> 4 };
|
int i, regs[] = { APIC_ID >> 4, APIC_LVR >> 4, APIC_SPIV >> 4 };
|
||||||
char *names[] = { "ID", "VERSION", "SPIV" };
|
char *names[] = { "ID", "VERSION", "SPIV" };
|
||||||
int timeout, status;
|
int timeout;
|
||||||
|
unsigned long status;
|
||||||
|
|
||||||
printk("Inquiring remote APIC #%d...\n", apicid);
|
printk("Inquiring remote APIC #%d...\n", apicid);
|
||||||
|
|
||||||
@ -531,7 +532,9 @@ static inline void __inquire_remote_apic(int apicid)
|
|||||||
/*
|
/*
|
||||||
* Wait for idle.
|
* Wait for idle.
|
||||||
*/
|
*/
|
||||||
apic_wait_icr_idle();
|
status = safe_apic_wait_icr_idle();
|
||||||
|
if (status)
|
||||||
|
printk("a previous APIC delivery may have failed\n");
|
||||||
|
|
||||||
apic_write_around(APIC_ICR2, SET_APIC_DEST_FIELD(apicid));
|
apic_write_around(APIC_ICR2, SET_APIC_DEST_FIELD(apicid));
|
||||||
apic_write_around(APIC_ICR, APIC_DM_REMRD | regs[i]);
|
apic_write_around(APIC_ICR, APIC_DM_REMRD | regs[i]);
|
||||||
|
Reference in New Issue
Block a user