Skip to content

Commit

Permalink
powerpc/cell: Fix cell iommu after it_page_shift changes
Browse files Browse the repository at this point in the history
The patch to add it_page_shift incorrectly changed the increment of
uaddr to use it_page_shift, rather then (1 << it_page_shift).

This broke booting on at least some Cell blades, as the iommu was
basically non-functional.

Fixes: 3a55317 ("powerpc/iommu: Add it_page_shift field to determine iommu page size")
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
  • Loading branch information
Michael Ellerman committed Apr 10, 2015
1 parent b0dd00a commit 7261b95
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/powerpc/platforms/cell/iommu.c
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ static int tce_build_cell(struct iommu_table *tbl, long index, long npages,

io_pte = (unsigned long *)tbl->it_base + (index - tbl->it_offset);

for (i = 0; i < npages; i++, uaddr += tbl->it_page_shift)
for (i = 0; i < npages; i++, uaddr += (1 << tbl->it_page_shift))
io_pte[i] = base_pte | (__pa(uaddr) & CBE_IOPTE_RPN_Mask);

mb();
Expand Down

0 comments on commit 7261b95

Please sign in to comment.