On Wed, Mar 09, 2016 at 05:29:01PM +1100, Alexey Kardashevskiy wrote: > This uses the page size from iommu_table instead of hard-coded 4K. > This should cause no change in behavior. > > While we are here, move bits around to prepare for further rework > which will define and use iommu_table_group_ops. > > Signed-off-by: Alexey Kardashevskiy <a...@ozlabs.ru>
Reviewed-by: David Gibson <da...@gibson.dropbear.id.au>
> ---
> arch/powerpc/platforms/powernv/npu-dma.c | 11 +++++------
> 1 file changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/arch/powerpc/platforms/powernv/npu-dma.c
> b/arch/powerpc/platforms/powernv/npu-dma.c
> index 778570c..5bd5fee 100644
> --- a/arch/powerpc/platforms/powernv/npu-dma.c
> +++ b/arch/powerpc/platforms/powernv/npu-dma.c
> @@ -204,8 +204,7 @@ static void pnv_npu_disable_bypass(struct pnv_ioda_pe
> *npe)
> struct pnv_phb *phb = npe->phb;
> struct pci_dev *gpdev;
> struct pnv_ioda_pe *gpe;
> - void *addr;
> - unsigned int size;
> + struct iommu_table *tbl;
> int64_t rc;
>
> /*
> @@ -219,11 +218,11 @@ static void pnv_npu_disable_bypass(struct pnv_ioda_pe
> *npe)
> if (!gpe)
> return;
>
> - addr = (void *)gpe->table_group.tables[0]->it_base;
> - size = gpe->table_group.tables[0]->it_size << 3;
> + tbl = gpe->table_group.tables[0];
> rc = opal_pci_map_pe_dma_window(phb->opal_id, npe->pe_number,
> - npe->pe_number, 1, __pa(addr),
> - size, 0x1000);
> + npe->pe_number, 1, __pa(tbl->it_base),
> + tbl->it_size << 3,
> + IOMMU_PAGE_SIZE(tbl));
> if (rc != OPAL_SUCCESS)
> pr_warn("%s: Error %lld setting DMA window on PHB#%d-PE#%d\n",
> __func__, rc, phb->hose->global_number, npe->pe_number);
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature
_______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
