lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[POWERPC] iSeries: Make pcibios_final_fixup not depend on pci_dn

Browse Source 
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Stephen Rothwell
2007-12-07 01:58:01 +11:00
committed by Paul Mackerras
parent 3b32c162bb
commit 53761746ec
1 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
arch/powerpc/platforms/iseries/pci.c
View File

@@ -188,39 +188,36 @@ void __init iSeries_pci_final_fixup(void)
printk("pcibios_final_fixup\n"); printk("pcibios_final_fixup\n");
for_each_pci_dev(pdev) { for_each_pci_dev(pdev) {
struct pci_dn *pdn;
const u32 *agent; const u32 *agent;
const u32 *sub_bus; const u32 *sub_bus;
unsigned char bus = pdev->bus->number;
node = find_device_node(pdev->bus->number, pdev->devfn); node = find_device_node(bus, pdev->devfn);
printk("pci dev %p (%x.%x), node %p\n", pdev, printk("pci dev %p (%x.%x), node %p\n", pdev, bus,
pdev->bus->number, pdev->devfn, node); pdev->devfn, node);
if (!node) { if (!node) {
printk("PCI: Device Tree not found for 0x%016lX\n", printk("PCI: Device Tree not found for 0x%016lX\n",
(unsigned long)pdev); (unsigned long)pdev);
continue; continue;
} }
pdn = PCI_DN(node);
agent = of_get_property(node, "linux,agent-id", NULL); agent = of_get_property(node, "linux,agent-id", NULL);
sub_bus = of_get_property(node, "linux,subbus", NULL); sub_bus = of_get_property(node, "linux,subbus", NULL);
if (pdn && agent && sub_bus) { if (agent && sub_bus) {
u8 irq = iSeries_allocate_IRQ(pdn->busno, 0, *sub_bus); u8 irq = iSeries_allocate_IRQ(bus, 0, *sub_bus);
int err; int err;
err = HvCallXm_connectBusUnit(pdn->busno, *sub_bus, err = HvCallXm_connectBusUnit(bus, *sub_bus,
*agent, irq); *agent, irq);
if (err) if (err)
pci_log_error("Connect Bus Unit", pci_log_error("Connect Bus Unit",
pdn->busno, *sub_bus, *agent, err); bus, *sub_bus, *agent, err);
else { else {
err = HvCallPci_configStore8(pdn->busno, err = HvCallPci_configStore8(bus, *sub_bus,
*sub_bus, *agent, *agent, PCI_INTERRUPT_LINE, irq);
PCI_INTERRUPT_LINE, irq);
if (err) if (err)
pci_log_error("PciCfgStore Irq Failed!", pci_log_error("PciCfgStore Irq Failed!",
pdn->busno, *sub_bus, bus, *sub_bus, *agent, err);
*agent, err);
else else
pdev->irq = irq; pdev->irq = irq;
} }
@@ -230,7 +227,7 @@ void __init iSeries_pci_final_fixup(void)
pdev->sysdata = node; pdev->sysdata = node;
PCI_DN(node)->pcidev = pdev; PCI_DN(node)->pcidev = pdev;
allocate_device_bars(pdev); allocate_device_bars(pdev);
iSeries_Device_Information(pdev, num_dev, pdn->busno, *sub_bus); iSeries_Device_Information(pdev, num_dev, bus, *sub_bus);
iommu_devnode_init_iSeries(pdev, node); iommu_devnode_init_iSeries(pdev, node);
} }
iSeries_activate_IRQs(); iSeries_activate_IRQs();