[PATCH] powerpc/pseries: Fix TCE building with 64k pagesize
Must adjust tcenum and npages by TCE_PAGE_FACTOR to convert between 64KB pages and TCE (4K) pages. (This is done in other places, except for this one location.) Signed-off-by: Michal Ostrowski <mostrows at watson ibm com> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
parent
deda498710
commit
cc8b5c96a7
|
@ -109,6 +109,9 @@ static void tce_build_pSeriesLP(struct iommu_table *tbl, long tcenum,
|
||||||
u64 rc;
|
u64 rc;
|
||||||
union tce_entry tce;
|
union tce_entry tce;
|
||||||
|
|
||||||
|
tcenum <<= TCE_PAGE_FACTOR;
|
||||||
|
npages <<= TCE_PAGE_FACTOR;
|
||||||
|
|
||||||
tce.te_word = 0;
|
tce.te_word = 0;
|
||||||
tce.te_rpn = (virt_to_abs(uaddr)) >> TCE_SHIFT;
|
tce.te_rpn = (virt_to_abs(uaddr)) >> TCE_SHIFT;
|
||||||
tce.te_rdwr = 1;
|
tce.te_rdwr = 1;
|
||||||
|
@ -143,9 +146,6 @@ static void tce_buildmulti_pSeriesLP(struct iommu_table *tbl, long tcenum,
|
||||||
union tce_entry tce, *tcep;
|
union tce_entry tce, *tcep;
|
||||||
long l, limit;
|
long l, limit;
|
||||||
|
|
||||||
tcenum <<= TCE_PAGE_FACTOR;
|
|
||||||
npages <<= TCE_PAGE_FACTOR;
|
|
||||||
|
|
||||||
if (npages == 1)
|
if (npages == 1)
|
||||||
return tce_build_pSeriesLP(tbl, tcenum, npages, uaddr,
|
return tce_build_pSeriesLP(tbl, tcenum, npages, uaddr,
|
||||||
direction);
|
direction);
|
||||||
|
@ -164,6 +164,9 @@ static void tce_buildmulti_pSeriesLP(struct iommu_table *tbl, long tcenum,
|
||||||
__get_cpu_var(tce_page) = tcep;
|
__get_cpu_var(tce_page) = tcep;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
tcenum <<= TCE_PAGE_FACTOR;
|
||||||
|
npages <<= TCE_PAGE_FACTOR;
|
||||||
|
|
||||||
tce.te_word = 0;
|
tce.te_word = 0;
|
||||||
tce.te_rpn = (virt_to_abs(uaddr)) >> TCE_SHIFT;
|
tce.te_rpn = (virt_to_abs(uaddr)) >> TCE_SHIFT;
|
||||||
tce.te_rdwr = 1;
|
tce.te_rdwr = 1;
|
||||||
|
|
Loading…
Reference in New Issue