powerpc/cell: Fix iommu breakage caused by controller_ops change

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

The recent patch to convert cell to use pci_controller_ops had a small
bug which broke machines using an iommu.

The set of phb->controller_ops was added after the check for name !=
"pci", meaning pcix/pcie PHBs weren't getting their ops set correctly.

Fixes: 9c1368fc50e7 ("powerpc/cell: Move controller ops from ppc_md to controller_ops")
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

Michael Ellerman 11 years ago 4acd09b4 89a51df5

+2 -2

1 changed file

expand all

arch

powerpc

platforms

cell

setup.c

+2 -2

arch/powerpc/platforms/cell/setup.c

··· 127 127 if (rc) 128 128 return rc; 129 129 130 + phb->controller_ops = cell_pci_controller_ops; 131 + 130 132 np = phb->dn; 131 133 model = of_get_property(np, "model", NULL); 132 134 if (model == NULL || strcmp(np->name, "pci")) 133 135 return 0; 134 - 135 - phb->controller_ops = cell_pci_controller_ops; 136 136 137 137 /* Setup workarounds for spider */ 138 138 if (strcmp(model, "Spider"))