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

Commit a93db2f2 authored by Shunqian Zheng's avatar Shunqian Zheng Committed by Joerg Roedel
Browse files

iommu/rockchip: Prepare to support generic DMA mapping 



Set geometry for allocated domains and fix .domain_alloc() callback to
work with IOMMU_DOMAIN_DMA domain type, which is used for implicit
domains on ARM64.

Signed-off-by: default avatarShunqian Zheng <zhengsq@rock-chips.com>
Signed-off-by: default avatarTomasz Figa <tfiga@chromium.org>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 4f0aba67

drivers/iommu/rockchip-iommu.c

+11 −5
Original line number Diff line number Diff line
@@ -889,7 +889,7 @@ static struct iommu_domain *rk_iommu_domain_alloc(unsigned type) 
	struct platform_device *pdev;

	struct device *iommu_dev;



	if (type != IOMMU_DOMAIN_UNMANAGED)

	if (type != IOMMU_DOMAIN_UNMANAGED && type != IOMMU_DOMAIN_DMA)

		return NULL;



	/* Register a pdev per domain, so DMA API can base on this *dev
@@ -906,8 +906,8 @@ static struct iommu_domain *rk_iommu_domain_alloc(unsigned type) 


	rk_domain->pdev = pdev;



	/* To init the iovad which is required by iommu_dma_init_domain() */

	if (iommu_get_dma_cookie(&rk_domain->domain))

	if (type == IOMMU_DOMAIN_DMA &&

	    iommu_get_dma_cookie(&rk_domain->domain))

		goto err_unreg_pdev;



	/*
@@ -933,11 +933,16 @@ static struct iommu_domain *rk_iommu_domain_alloc(unsigned type) 
	spin_lock_init(&rk_domain->dt_lock);

	INIT_LIST_HEAD(&rk_domain->iommus);



	rk_domain->domain.geometry.aperture_start = 0;

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

	rk_domain->domain.geometry.force_aperture = true;



	return &rk_domain->domain;



err_free_dt:

	free_page((unsigned long)rk_domain->dt);

err_put_cookie:

	if (type == IOMMU_DOMAIN_DMA)

		iommu_put_dma_cookie(&rk_domain->domain);

err_unreg_pdev:

	platform_device_unregister(pdev);
@@ -967,6 +972,7 @@ static void rk_iommu_domain_free(struct iommu_domain *domain) 
			 SPAGE_SIZE, DMA_TO_DEVICE);

	free_page((unsigned long)rk_domain->dt);



	if (domain->type == IOMMU_DOMAIN_DMA)

		iommu_put_dma_cookie(&rk_domain->domain);



	platform_device_unregister(rk_domain->pdev);