openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

powerpc/cell: Fix iommu breakage caused by controller_ops change 

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: 9c1368fc50 ("powerpc/cell: Move controller ops from ppc_md to controller_ops")
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Michael Ellerman 2015-04-14 16:49:06 +10:00
parent 89a51df5ab
commit 4acd09b4bf
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/powerpc/platforms/cell/setup.c
View File

@ -127,13 +127,13 @@ static int cell_setup_phb(struct pci_controller *phb)
if (rc) if (rc)
return rc; return rc;
phb->controller_ops = cell_pci_controller_ops;
np = phb->dn; np = phb->dn;
model = of_get_property(np, "model", NULL); model = of_get_property(np, "model", NULL);
if (model == NULL || strcmp(np->name, "pci")) if (model == NULL || strcmp(np->name, "pci"))
return 0; return 0;
phb->controller_ops = cell_pci_controller_ops;
/* Setup workarounds for spider */ /* Setup workarounds for spider */
if (strcmp(model, "Spider")) if (strcmp(model, "Spider"))
return 0; return 0;