mirror of
https://github.com/adulau/aha.git
synced 2024-12-30 20:56:23 +00:00
[PATCH] x86-64: use safe_apic_wait_icr_idle in smpboot.c - x86_64
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:
parent
4312fa8157
commit
3144c332fa
1 changed files with 5 additions and 2 deletions
|
@ -391,7 +391,8 @@ static void inquire_remote_apic(int apicid)
|
|||
{
|
||||
unsigned i, regs[] = { APIC_ID >> 4, APIC_LVR >> 4, APIC_SPIV >> 4 };
|
||||
char *names[] = { "ID", "VERSION", "SPIV" };
|
||||
int timeout, status;
|
||||
int timeout;
|
||||
unsigned int status;
|
||||
|
||||
printk(KERN_INFO "Inquiring remote APIC #%d...\n", apicid);
|
||||
|
||||
|
@ -401,7 +402,9 @@ static void inquire_remote_apic(int apicid)
|
|||
/*
|
||||
* 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(APIC_ICR2, SET_APIC_DEST_FIELD(apicid));
|
||||
apic_write(APIC_ICR, APIC_DM_REMRD | regs[i]);
|
||||
|
|
Loading…
Reference in a new issue