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

Commit da1ad9d7 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86: ioapic: Use setup function in setup_IO_APIC_irq_extra() 



Another version of the same thing. Only set the pin programmed, when
the setup function succeeds.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 2d57e37d

arch/x86/kernel/apic/io_apic.c

+6 −10
Original line number Diff line number Diff line
@@ -1447,7 +1447,7 @@ static void __init setup_IO_APIC_irqs(void) 
void setup_IO_APIC_irq_extra(u32 gsi)

{

	int apic_id = 0, pin, idx, irq, node = cpu_to_node(0);

	struct irq_cfg *cfg;

	struct io_apic_irq_attr attr;



	/*

	 * Convert 'gsi' to 'ioapic.pin'.
@@ -1467,21 +1467,17 @@ void setup_IO_APIC_irq_extra(u32 gsi) 
	if (apic_id == 0 || irq < NR_IRQS_LEGACY)

		return;



	cfg = alloc_irq_and_cfg_at(irq, node);

	if (!cfg)

		return;



	add_pin_to_irq_node(cfg, node, apic_id, pin);



	if (test_bit(pin, mp_ioapic_routing[apic_id].pin_programmed)) {

		pr_debug("Pin %d-%d already programmed\n",

			 mp_ioapics[apic_id].apicid, pin);

		return;

	}

	set_bit(pin, mp_ioapic_routing[apic_id].pin_programmed);



	setup_ioapic_irq(apic_id, pin, irq, cfg,

			irq_trigger(idx), irq_polarity(idx));

	set_io_apic_irq_attr(&attr, apic_id, pin, irq_trigger(idx),

			     irq_polarity(idx));



	if (!io_apic_setup_irq_pin(irq, node, &attr))

		set_bit(pin, mp_ioapic_routing[apic_id].pin_programmed);

}



/*