Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6969af73 authored by Alexey Kardashevskiy's avatar Alexey Kardashevskiy Committed by Michael Ellerman
Browse files

powerpc/powernv/npu: Use the correct IOMMU page size 



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: default avatarAlexey Kardashevskiy <aik@ozlabs.ru>
Reviewed-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Reviewed-by: default avatarAlistair Popple <alistair@popple.id.au>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 0bbcdb43

arch/powerpc/platforms/powernv/npu-dma.c

+5 −6
Original line number Diff line number Diff line
@@ -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);