Commit 4f956c97 authored by Yong Wu's avatar Yong Wu Committed by Will Deacon
Browse files

iommu/mediatek: Move domain_finalise into attach_device 



Currently domain_alloc only has a parameter(type), We have no chance to
input some special data. This patch moves the domain_finalise into
attach_device which has the device information, then could update
the domain's geometry.aperture ranges for each a device.

Strictly, I should use the data from mtk_iommu_get_m4u_data as the
parameter of mtk_iommu_domain_finalise in this patch. but dom->data
only is used in tlb ops in which the data is get from the m4u_list, thus
it is ok here.

Signed-off-by: default avatarYong Wu <yong.wu@mediatek.com>
Reviewed-by: default avatarTomasz Figa <tfiga@chromium.org>
Link: https://lore.kernel.org/r/20210111111914.22211-25-yong.wu@mediatek.com


Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent 08500c43

drivers/iommu/mtk_iommu.c

+12 −19
Original line number Diff line number Diff line
@@ -328,10 +328,9 @@ static void mtk_iommu_config(struct mtk_iommu_data *data, 
	}

}



static int mtk_iommu_domain_finalise(struct mtk_iommu_domain *dom)

static int mtk_iommu_domain_finalise(struct mtk_iommu_domain *dom,

				     struct mtk_iommu_data *data)

{

	struct mtk_iommu_data *data = mtk_iommu_get_m4u_data();



	dom->cfg = (struct io_pgtable_cfg) {

		.quirks = IO_PGTABLE_QUIRK_ARM_NS |

			IO_PGTABLE_QUIRK_NO_PERMS |
@@ -352,7 +351,6 @@ static int mtk_iommu_domain_finalise(struct mtk_iommu_domain *dom) 
		return -EINVAL;

	}



	dom->data = data;

	/* Update our support page sizes bitmap */

	dom->domain.pgsize_bitmap = dom->cfg.pgsize_bitmap;

	return 0;
@@ -369,30 +367,19 @@ static struct iommu_domain *mtk_iommu_domain_alloc(unsigned type) 
	if (!dom)

		return NULL;



	if (iommu_get_dma_cookie(&dom->domain))

		goto  free_dom;



	if (mtk_iommu_domain_finalise(dom))

		goto  put_dma_cookie;

	if (iommu_get_dma_cookie(&dom->domain)) {

		kfree(dom);

		return NULL;

	}



	dom->domain.geometry.aperture_start = 0;

	dom->domain.geometry.aperture_end = DMA_BIT_MASK(32);

	dom->domain.geometry.force_aperture = true;



	return &dom->domain;



put_dma_cookie:

	iommu_put_dma_cookie(&dom->domain);

free_dom:

	kfree(dom);

	return NULL;

}



static void mtk_iommu_domain_free(struct iommu_domain *domain)

{

	struct mtk_iommu_domain *dom = to_mtk_domain(domain);



	free_io_pgtable_ops(dom->iop);

	iommu_put_dma_cookie(domain);

	kfree(to_mtk_domain(domain));

}
@@ -408,6 +395,12 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain, 
	if (!data)

		return -ENODEV;



	if (!dom->data) {

		if (mtk_iommu_domain_finalise(dom, data))

			return -ENODEV;

		dom->data = data;

	}



	if (!data->m4u_dom) { /* Initialize the M4U HW */

		ret = pm_runtime_resume_and_get(m4udev);

		if (ret < 0)