Commit 229496a0 authored by Robin Murphy's avatar Robin Murphy Committed by Joerg Roedel
Browse files

iommu/arm-smmu: Drop IOVA cookie management 



The core code bakes its own cookies now.

Signed-off-by: default avatarRobin Murphy <robin.murphy@arm.com>
Link: https://lore.kernel.org/r/7ae3680dad9735cc69c3618866666896bd11e031.1628682048.git.robin.murphy@arm.com


Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 3f166dae

drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c

+0 −7
Original line number Diff line number Diff line
@@ -1984,12 +1984,6 @@ static struct iommu_domain *arm_smmu_domain_alloc(unsigned type) 
	if (!smmu_domain)

		return NULL;



	if (type == IOMMU_DOMAIN_DMA &&

	    iommu_get_dma_cookie(&smmu_domain->domain)) {

		kfree(smmu_domain);

		return NULL;

	}



	mutex_init(&smmu_domain->init_mutex);

	INIT_LIST_HEAD(&smmu_domain->devices);

	spin_lock_init(&smmu_domain->devices_lock);
@@ -2021,7 +2015,6 @@ static void arm_smmu_domain_free(struct iommu_domain *domain) 
	struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);

	struct arm_smmu_device *smmu = smmu_domain->smmu;



	iommu_put_dma_cookie(domain);

	free_io_pgtable_ops(smmu_domain->pgtbl_ops);



	/* Free the CD and ASID, if we allocated them */

drivers/iommu/arm/arm-smmu/arm-smmu.c

+4 −11
Original line number Diff line number Diff line
@@ -868,10 +868,10 @@ static struct iommu_domain *arm_smmu_domain_alloc(unsigned type) 
{

	struct arm_smmu_domain *smmu_domain;



	if (type != IOMMU_DOMAIN_UNMANAGED &&

	    type != IOMMU_DOMAIN_DMA &&

	    type != IOMMU_DOMAIN_IDENTITY)

	if (type != IOMMU_DOMAIN_UNMANAGED && type != IOMMU_DOMAIN_IDENTITY) {

		if (using_legacy_binding || type != IOMMU_DOMAIN_DMA)

			return NULL;

	}

	/*

	 * Allocate the domain and initialise some of its data structures.

	 * We can't really do anything meaningful until we've added a
@@ -881,12 +881,6 @@ static struct iommu_domain *arm_smmu_domain_alloc(unsigned type) 
	if (!smmu_domain)

		return NULL;



	if (type == IOMMU_DOMAIN_DMA && (using_legacy_binding ||

	    iommu_get_dma_cookie(&smmu_domain->domain))) {

		kfree(smmu_domain);

		return NULL;

	}



	mutex_init(&smmu_domain->init_mutex);

	spin_lock_init(&smmu_domain->cb_lock);
@@ -901,7 +895,6 @@ static void arm_smmu_domain_free(struct iommu_domain *domain) 
	 * Free the domain resources. We assume that all devices have

	 * already been detached.

	 */

	iommu_put_dma_cookie(domain);

	arm_smmu_destroy_domain_context(domain);

	kfree(smmu_domain);

}

drivers/iommu/arm/arm-smmu/qcom_iommu.c

+0 −9
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
#include <linux/bitfield.h>

#include <linux/clk.h>

#include <linux/delay.h>

#include <linux/dma-iommu.h>

#include <linux/dma-mapping.h>

#include <linux/err.h>

#include <linux/interrupt.h>
@@ -335,12 +334,6 @@ static struct iommu_domain *qcom_iommu_domain_alloc(unsigned type) 
	if (!qcom_domain)

		return NULL;



	if (type == IOMMU_DOMAIN_DMA &&

	    iommu_get_dma_cookie(&qcom_domain->domain)) {

		kfree(qcom_domain);

		return NULL;

	}



	mutex_init(&qcom_domain->init_mutex);

	spin_lock_init(&qcom_domain->pgtbl_lock);
@@ -351,8 +344,6 @@ static void qcom_iommu_domain_free(struct iommu_domain *domain) 
{

	struct qcom_iommu_domain *qcom_domain = to_qcom_iommu_domain(domain);



	iommu_put_dma_cookie(domain);



	if (qcom_domain->iommu) {

		/*

		 * NOTE: unmap can be called after client device is powered