x86/pci: add 4 more return parameters to IO_APIC_get_PCI_irq_vector()
To prepare those params for pcibios_irq_enable() to call setup_io_apic_routing(). [ Impact: extend function call API to prepare for new functionality ] Signed-off-by: Yinghai Lu <yinghai@kernel.org> Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org> Cc: Len Brown <lenb@kernel.org> Cc: Andrew Morton <akpm@linux-foundation.org> LKML-Reference: <4A01C406.2040303@kernel.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
@@ -153,45 +153,49 @@ int ibmphp_init_devno(struct slot **cur_slot)
|
||||
return -1;
|
||||
}
|
||||
for (loop = 0; loop < len; loop++) {
|
||||
if ((*cur_slot)->number == rtable->slots[loop].slot) {
|
||||
if ((*cur_slot)->bus == rtable->slots[loop].bus) {
|
||||
if ((*cur_slot)->number == rtable->slots[loop].slot &&
|
||||
(*cur_slot)->bus == rtable->slots[loop].bus) {
|
||||
int ioapic = -1, ioapic_pin = -1;
|
||||
int triggering, polarity;
|
||||
|
||||
(*cur_slot)->device = PCI_SLOT(rtable->slots[loop].devfn);
|
||||
for (i = 0; i < 4; i++)
|
||||
(*cur_slot)->irq[i] = IO_APIC_get_PCI_irq_vector((int) (*cur_slot)->bus,
|
||||
(int) (*cur_slot)->device, i);
|
||||
(int) (*cur_slot)->device, i.
|
||||
&ioapic, &ioapic_pin,
|
||||
&triggering, &polarity);
|
||||
|
||||
debug("(*cur_slot)->irq[0] = %x\n",
|
||||
(*cur_slot)->irq[0]);
|
||||
debug("(*cur_slot)->irq[1] = %x\n",
|
||||
(*cur_slot)->irq[1]);
|
||||
debug("(*cur_slot)->irq[2] = %x\n",
|
||||
(*cur_slot)->irq[2]);
|
||||
debug("(*cur_slot)->irq[3] = %x\n",
|
||||
(*cur_slot)->irq[3]);
|
||||
debug("(*cur_slot)->irq[0] = %x\n",
|
||||
(*cur_slot)->irq[0]);
|
||||
debug("(*cur_slot)->irq[1] = %x\n",
|
||||
(*cur_slot)->irq[1]);
|
||||
debug("(*cur_slot)->irq[2] = %x\n",
|
||||
(*cur_slot)->irq[2]);
|
||||
debug("(*cur_slot)->irq[3] = %x\n",
|
||||
(*cur_slot)->irq[3]);
|
||||
|
||||
debug("rtable->exlusive_irqs = %x\n",
|
||||
debug("rtable->exlusive_irqs = %x\n",
|
||||
rtable->exclusive_irqs);
|
||||
debug("rtable->slots[loop].irq[0].bitmap = %x\n",
|
||||
debug("rtable->slots[loop].irq[0].bitmap = %x\n",
|
||||
rtable->slots[loop].irq[0].bitmap);
|
||||
debug("rtable->slots[loop].irq[1].bitmap = %x\n",
|
||||
debug("rtable->slots[loop].irq[1].bitmap = %x\n",
|
||||
rtable->slots[loop].irq[1].bitmap);
|
||||
debug("rtable->slots[loop].irq[2].bitmap = %x\n",
|
||||
debug("rtable->slots[loop].irq[2].bitmap = %x\n",
|
||||
rtable->slots[loop].irq[2].bitmap);
|
||||
debug("rtable->slots[loop].irq[3].bitmap = %x\n",
|
||||
debug("rtable->slots[loop].irq[3].bitmap = %x\n",
|
||||
rtable->slots[loop].irq[3].bitmap);
|
||||
|
||||
debug("rtable->slots[loop].irq[0].link = %x\n",
|
||||
debug("rtable->slots[loop].irq[0].link = %x\n",
|
||||
rtable->slots[loop].irq[0].link);
|
||||
debug("rtable->slots[loop].irq[1].link = %x\n",
|
||||
debug("rtable->slots[loop].irq[1].link = %x\n",
|
||||
rtable->slots[loop].irq[1].link);
|
||||
debug("rtable->slots[loop].irq[2].link = %x\n",
|
||||
debug("rtable->slots[loop].irq[2].link = %x\n",
|
||||
rtable->slots[loop].irq[2].link);
|
||||
debug("rtable->slots[loop].irq[3].link = %x\n",
|
||||
debug("rtable->slots[loop].irq[3].link = %x\n",
|
||||
rtable->slots[loop].irq[3].link);
|
||||
debug("end of init_devno\n");
|
||||
kfree(rtable);
|
||||
return 0;
|
||||
}
|
||||
debug("end of init_devno\n");
|
||||
kfree(rtable);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user