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: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
parent
2d57e37dbf
commit
da1ad9d7b2
|
@ -1447,7 +1447,7 @@ static void __init setup_IO_APIC_irqs(void)
|
||||||
void setup_IO_APIC_irq_extra(u32 gsi)
|
void setup_IO_APIC_irq_extra(u32 gsi)
|
||||||
{
|
{
|
||||||
int apic_id = 0, pin, idx, irq, node = cpu_to_node(0);
|
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'.
|
* 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)
|
if (apic_id == 0 || irq < NR_IRQS_LEGACY)
|
||||||
return;
|
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)) {
|
if (test_bit(pin, mp_ioapic_routing[apic_id].pin_programmed)) {
|
||||||
pr_debug("Pin %d-%d already programmed\n",
|
pr_debug("Pin %d-%d already programmed\n",
|
||||||
mp_ioapics[apic_id].apicid, pin);
|
mp_ioapics[apic_id].apicid, pin);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
set_bit(pin, mp_ioapic_routing[apic_id].pin_programmed);
|
|
||||||
|
|
||||||
setup_ioapic_irq(apic_id, pin, irq, cfg,
|
set_io_apic_irq_attr(&attr, apic_id, pin, irq_trigger(idx),
|
||||||
irq_trigger(idx), irq_polarity(idx));
|
irq_polarity(idx));
|
||||||
|
|
||||||
|
if (!io_apic_setup_irq_pin(irq, node, &attr))
|
||||||
|
set_bit(pin, mp_ioapic_routing[apic_id].pin_programmed);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in New Issue