Skip to content

Commit

Permalink
powerpc/cell: Fix iommu breakage caused by controller_ops change
Browse files Browse the repository at this point in the history
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: 9c1368f ("powerpc/cell: Move controller ops from ppc_md to controller_ops")
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
  • Loading branch information
Michael Ellerman committed Apr 14, 2015
1 parent 89a51df commit 4acd09b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions arch/powerpc/platforms/cell/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -127,13 +127,13 @@ static int cell_setup_phb(struct pci_controller *phb)
if (rc)
return rc;

phb->controller_ops = cell_pci_controller_ops;

np = phb->dn;
model = of_get_property(np, "model", NULL);
if (model == NULL || strcmp(np->name, "pci"))
return 0;

phb->controller_ops = cell_pci_controller_ops;

/* Setup workarounds for spider */
if (strcmp(model, "Spider"))
return 0;
Expand Down

0 comments on commit 4acd09b

Please sign in to comment.