Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3144c332 authored by Fernando Luis VazquezCao's avatar Fernando Luis VazquezCao Committed by Andi Kleen
Browse files

[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: default avatarFernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
parent 4312fa81

arch/x86_64/kernel/smpboot.c

+5 −2
Original line number Diff line number Diff line
@@ -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]);