]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
powerpc/cell: Fix cell iommu after it_page_shift changes
authorMichael Ellerman <mpe@ellerman.id.au>
Fri, 3 Apr 2015 03:11:54 +0000 (14:11 +1100)
committerMichael Ellerman <mpe@ellerman.id.au>
Fri, 10 Apr 2015 10:02:49 +0000 (20:02 +1000)
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: 3a553170d35d ("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>
arch/powerpc/platforms/cell/iommu.c

index 31b1a67daccfeefe809f11d6ffd76dac22512d50..ee53344277e03b0a65d8556b1102111ea71cb249 100644 (file)
@@ -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();