diff options
author | Michael Ellerman <mpe@ellerman.id.au> | 2015-04-02 23:11:54 -0400 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2015-04-10 06:02:49 -0400 |
commit | 7261b956b276aa97fbf60d00f1d7717d2ea6ee78 (patch) | |
tree | 8ca3698597818083b5e31ed05b7387e4ef9f8242 /arch/powerpc/platforms | |
parent | b0dd00addc5035f87ec9c5820dacc1ebc7fcb3e6 (diff) |
powerpc/cell: Fix cell iommu after it_page_shift changes
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>
Diffstat (limited to 'arch/powerpc/platforms')
-rw-r--r-- | arch/powerpc/platforms/cell/iommu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c index 31b1a67daccf..ee53344277e0 100644 --- a/arch/powerpc/platforms/cell/iommu.c +++ b/arch/powerpc/platforms/cell/iommu.c | |||
@@ -197,7 +197,7 @@ static int tce_build_cell(struct iommu_table *tbl, long index, long npages, | |||
197 | 197 | ||
198 | io_pte = (unsigned long *)tbl->it_base + (index - tbl->it_offset); | 198 | io_pte = (unsigned long *)tbl->it_base + (index - tbl->it_offset); |
199 | 199 | ||
200 | for (i = 0; i < npages; i++, uaddr += tbl->it_page_shift) | 200 | for (i = 0; i < npages; i++, uaddr += (1 << tbl->it_page_shift)) |
201 | io_pte[i] = base_pte | (__pa(uaddr) & CBE_IOPTE_RPN_Mask); | 201 | io_pte[i] = base_pte | (__pa(uaddr) & CBE_IOPTE_RPN_Mask); |
202 | 202 | ||
203 | mb(); | 203 | mb(); |