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

Commit ea8c733b 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 



The functionality provided by the new safe_apic_wait_icr_idle is being
open-coded all over "kernel/smpboot.c". Use safe_apic_wait_icr_idle
instead to consolidate code and ease maintenance.

Signed-off-by: default avatarFernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
parent ae08e43e

arch/x86_64/kernel/smpboot.c

+5 −20
Original line number Diff line number Diff line
@@ -429,8 +429,8 @@ static void inquire_remote_apic(int apicid) 
 */

static int __cpuinit wakeup_secondary_via_INIT(int phys_apicid, unsigned int start_rip)

{

	unsigned long send_status = 0, accept_status = 0;

	int maxlvt, timeout, num_starts, j;

	unsigned long send_status, accept_status = 0;

	int maxlvt, num_starts, j;



	Dprintk("Asserting INIT.\n");
@@ -446,12 +446,7 @@ static int __cpuinit wakeup_secondary_via_INIT(int phys_apicid, unsigned int sta 
				| APIC_DM_INIT);



	Dprintk("Waiting for send to finish...\n");

	timeout = 0;

	do {

		Dprintk("+");

		udelay(100);

		send_status = apic_read(APIC_ICR) & APIC_ICR_BUSY;

	} while (send_status && (timeout++ < 1000));

	send_status = safe_apic_wait_icr_idle();



	mdelay(10);
@@ -464,12 +459,7 @@ static int __cpuinit wakeup_secondary_via_INIT(int phys_apicid, unsigned int sta 
	apic_write(APIC_ICR, APIC_INT_LEVELTRIG | APIC_DM_INIT);



	Dprintk("Waiting for send to finish...\n");

	timeout = 0;

	do {

		Dprintk("+");

		udelay(100);

		send_status = apic_read(APIC_ICR) & APIC_ICR_BUSY;

	} while (send_status && (timeout++ < 1000));

	send_status = safe_apic_wait_icr_idle();



	mb();

	atomic_set(&init_deasserted, 1);
@@ -508,12 +498,7 @@ static int __cpuinit wakeup_secondary_via_INIT(int phys_apicid, unsigned int sta 
		Dprintk("Startup point 1.\n");



		Dprintk("Waiting for send to finish...\n");

		timeout = 0;

		do {

			Dprintk("+");

			udelay(100);

			send_status = apic_read(APIC_ICR) & APIC_ICR_BUSY;

		} while (send_status && (timeout++ < 1000));

		send_status = safe_apic_wait_icr_idle();



		/*

		 * Give the other CPU some time to accept the IPI.