Commit ad892f5e authored by Yinghai Lu's avatar Yinghai Lu Committed by Andi Kleen
Browse files

[PATCH] x86-64: check vector in setup_ioapic_dest to verify if need setup_IO_APIC_irq 



setup_IO_APIC_irqs could fail to get vector for some device when you have too
many devices, because at that time only boot cpu is online.  So check vector
for irq in setup_ioapic_dest and call setup_IO_APIC_irq to make sure IO-APIC
irq-routing table is initialized.

Also seperate setup_IO_APIC_irq from setup_IO_APIC_irqs.

Signed-off-by: default avatarYinghai Lu <yinghai.lu@amd.com>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Cc: Andi Kleen <ak@suse.de>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
parent f6ca8083

arch/x86_64/kernel/io_apic.c

+61 −43
Original line number Diff line number Diff line
@@ -789,17 +789,12 @@ static void ioapic_register_intr(int irq, int vector, unsigned long trigger) 
					      handle_edge_irq, "edge");

	}

}



static void __init setup_IO_APIC_irqs(void)

static void __init setup_IO_APIC_irq(int apic, int pin, int idx, int irq)

{

	struct IO_APIC_route_entry entry;

	int apic, pin, idx, irq, first_notcon = 1, vector;

	int vector;

	unsigned long flags;



	apic_printk(APIC_VERBOSE, KERN_DEBUG "init IO_APIC IRQs\n");



	for (apic = 0; apic < nr_ioapics; apic++) {

	for (pin = 0; pin < nr_ioapic_registers[apic]; pin++) {



	/*

	 * add it to the IO-APIC irq-routing table:
@@ -811,16 +806,6 @@ static void __init setup_IO_APIC_irqs(void) 
	entry.mask = 0;				/* enable IRQ */

	entry.dest.logical.logical_dest = cpu_mask_to_apicid(TARGET_CPUS);



		idx = find_irq_entry(apic,pin,mp_INT);

		if (idx == -1) {

			if (first_notcon) {

				apic_printk(APIC_VERBOSE, KERN_DEBUG " IO-APIC (apicid-pin) %d-%d", mp_ioapics[apic].mpc_apicid, pin);

				first_notcon = 0;

			} else

				apic_printk(APIC_VERBOSE, ", %d-%d", mp_ioapics[apic].mpc_apicid, pin);

			continue;

		}



	entry.trigger = irq_trigger(idx);

	entry.polarity = irq_polarity(idx);
@@ -830,17 +815,14 @@ static void __init setup_IO_APIC_irqs(void) 
		entry.dest.logical.logical_dest = cpu_mask_to_apicid(TARGET_CPUS);

	}



		irq = pin_2_irq(idx, apic, pin);

		add_pin_to_irq(irq, apic, pin);



	if (!apic && !IO_APIC_IRQ(irq))

			continue;

		return;



	if (IO_APIC_IRQ(irq)) {

		cpumask_t mask;

		vector = assign_irq_vector(irq, TARGET_CPUS, &mask);

		if (vector < 0)

				continue;

			return;



		entry.dest.logical.logical_dest = cpu_mask_to_apicid(mask);

		entry.vector = vector;
@@ -849,11 +831,39 @@ static void __init setup_IO_APIC_irqs(void) 
		if (!apic && (irq < 16))

			disable_8259A_irq(irq);

	}



	ioapic_write_entry(apic, pin, entry);



	spin_lock_irqsave(&ioapic_lock, flags);

	set_native_irq_info(irq, TARGET_CPUS);

	spin_unlock_irqrestore(&ioapic_lock, flags);



}



static void __init setup_IO_APIC_irqs(void)

{

	int apic, pin, idx, irq, first_notcon = 1;



	apic_printk(APIC_VERBOSE, KERN_DEBUG "init IO_APIC IRQs\n");



	for (apic = 0; apic < nr_ioapics; apic++) {

	for (pin = 0; pin < nr_ioapic_registers[apic]; pin++) {



		idx = find_irq_entry(apic,pin,mp_INT);

		if (idx == -1) {

			if (first_notcon) {

				apic_printk(APIC_VERBOSE, KERN_DEBUG " IO-APIC (apicid-pin) %d-%d", mp_ioapics[apic].mpc_apicid, pin);

				first_notcon = 0;

			} else

				apic_printk(APIC_VERBOSE, ", %d-%d", mp_ioapics[apic].mpc_apicid, pin);

			continue;

		}



		irq = pin_2_irq(idx, apic, pin);

		add_pin_to_irq(irq, apic, pin);



		setup_IO_APIC_irq(apic, pin, idx, irq);



	}

	}
@@ -2139,6 +2149,14 @@ void __init setup_ioapic_dest(void) 
			if (irq_entry == -1)

				continue;

			irq = pin_2_irq(irq_entry, ioapic, pin);



			/* setup_IO_APIC_irqs could fail to get vector for some device

			 * when you have too many devices, because at that time only boot

			 * cpu is online.

			 */

			if(!irq_vector[irq])

				setup_IO_APIC_irq(ioapic, pin, irq_entry, irq);

			else

				set_ioapic_affinity_irq(irq, TARGET_CPUS);

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE