Commit 4fc52b81 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Joerg Roedel
Browse files

iommu: remove DOMAIN_ATTR_IO_PGTABLE_CFG 



Use an explicit set_pgtable_quirks method instead that just passes
the actual quirk bitmask instead.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarWill Deacon <will@kernel.org>
Acked-by: default avatarLi Yang <leoyang.li@nxp.com>
Link: https://lore.kernel.org/r/20210401155256.298656-20-hch@lst.de


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

drivers/gpu/drm/msm/adreno/adreno_gpu.c

+1 −4
Original line number Diff line number Diff line
@@ -188,10 +188,7 @@ int adreno_zap_shader_load(struct msm_gpu *gpu, u32 pasid) 


void adreno_set_llc_attributes(struct iommu_domain *iommu)

{

	struct io_pgtable_domain_attr pgtbl_cfg;



	pgtbl_cfg.quirks = IO_PGTABLE_QUIRK_ARM_OUTER_WBWA;

	iommu_domain_set_attr(iommu, DOMAIN_ATTR_IO_PGTABLE_CFG, &pgtbl_cfg);

	iommu_set_pgtable_quirks(iommu, IO_PGTABLE_QUIRK_ARM_OUTER_WBWA);

}



struct msm_gem_address_space *

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

+11 −53
Original line number Diff line number Diff line
@@ -770,8 +770,8 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain, 
			goto out_clear_smmu;

	}



	if (smmu_domain->pgtbl_cfg.quirks)

		pgtbl_cfg.quirks |= smmu_domain->pgtbl_cfg.quirks;

	if (smmu_domain->pgtbl_quirks)

		pgtbl_cfg.quirks |= smmu_domain->pgtbl_quirks;



	pgtbl_ops = alloc_io_pgtable_ops(fmt, &pgtbl_cfg, smmu_domain);

	if (!pgtbl_ops) {
@@ -1484,29 +1484,6 @@ static struct iommu_group *arm_smmu_device_group(struct device *dev) 
	return group;

}



static int arm_smmu_domain_get_attr(struct iommu_domain *domain,

				    enum iommu_attr attr, void *data)

{

	struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);



	switch(domain->type) {

	case IOMMU_DOMAIN_UNMANAGED:

		switch (attr) {

		case DOMAIN_ATTR_IO_PGTABLE_CFG: {

			struct io_pgtable_domain_attr *pgtbl_cfg = data;

			*pgtbl_cfg = smmu_domain->pgtbl_cfg;



			return 0;

		}

		default:

			return -ENODEV;

		}

		break;

	default:

		return -EINVAL;

	}

}



static int arm_smmu_enable_nesting(struct iommu_domain *domain)

{

	struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);
@@ -1522,37 +1499,19 @@ static int arm_smmu_enable_nesting(struct iommu_domain *domain) 
	return ret;

}



static int arm_smmu_domain_set_attr(struct iommu_domain *domain,

				    enum iommu_attr attr, void *data)

static int arm_smmu_set_pgtable_quirks(struct iommu_domain *domain,

		unsigned long quirks)

{

	int ret = 0;

	struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);

	int ret = 0;



	mutex_lock(&smmu_domain->init_mutex);



	switch(domain->type) {

	case IOMMU_DOMAIN_UNMANAGED:

		switch (attr) {

		case DOMAIN_ATTR_IO_PGTABLE_CFG: {

			struct io_pgtable_domain_attr *pgtbl_cfg = data;



			if (smmu_domain->smmu) {

	if (smmu_domain->smmu)

		ret = -EPERM;

				goto out_unlock;

			}



			smmu_domain->pgtbl_cfg = *pgtbl_cfg;

			break;

		}

		default:

			ret = -ENODEV;

		}

		break;

	default:

		ret = -EINVAL;

	}

out_unlock:

	else

		smmu_domain->pgtbl_quirks = quirks;

	mutex_unlock(&smmu_domain->init_mutex);



	return ret;

}
@@ -1611,9 +1570,8 @@ static struct iommu_ops arm_smmu_ops = { 
	.probe_device		= arm_smmu_probe_device,

	.release_device		= arm_smmu_release_device,

	.device_group		= arm_smmu_device_group,

	.domain_get_attr	= arm_smmu_domain_get_attr,

	.domain_set_attr	= arm_smmu_domain_set_attr,

	.enable_nesting		= arm_smmu_enable_nesting,

	.set_pgtable_quirks	= arm_smmu_set_pgtable_quirks,

	.of_xlate		= arm_smmu_of_xlate,

	.get_resv_regions	= arm_smmu_get_resv_regions,

	.put_resv_regions	= generic_iommu_put_resv_regions,

drivers/iommu/arm/arm-smmu/arm-smmu.h

+1 −1
Original line number Diff line number Diff line
@@ -364,7 +364,7 @@ enum arm_smmu_domain_stage { 
struct arm_smmu_domain {

	struct arm_smmu_device		*smmu;

	struct io_pgtable_ops		*pgtbl_ops;

	struct io_pgtable_domain_attr	pgtbl_cfg;

	unsigned long			pgtbl_quirks;

	const struct iommu_flush_ops	*flush_ops;

	struct arm_smmu_cfg		cfg;

	enum arm_smmu_domain_stage	stage;

drivers/iommu/iommu.c

+11 −0
Original line number Diff line number Diff line
@@ -2701,6 +2701,17 @@ int iommu_enable_nesting(struct iommu_domain *domain) 
}

EXPORT_SYMBOL_GPL(iommu_enable_nesting);



int iommu_set_pgtable_quirks(struct iommu_domain *domain,

		unsigned long quirk)

{

	if (domain->type != IOMMU_DOMAIN_UNMANAGED)

		return -EINVAL;

	if (!domain->ops->set_pgtable_quirks)

		return -EINVAL;

	return domain->ops->set_pgtable_quirks(domain, quirk);

}

EXPORT_SYMBOL_GPL(iommu_set_pgtable_quirks);



void iommu_get_resv_regions(struct device *dev, struct list_head *list)

{

	const struct iommu_ops *ops = dev->bus->iommu_ops;

include/linux/io-pgtable.h

+0 −4
Original line number Diff line number Diff line
@@ -204,10 +204,6 @@ struct io_pgtable { 


#define io_pgtable_ops_to_pgtable(x) container_of((x), struct io_pgtable, ops)



struct io_pgtable_domain_attr {

	unsigned long quirks;

};



static inline void io_pgtable_tlb_flush_all(struct io_pgtable *iop)

{

	if (iop->cfg.tlb && iop->cfg.tlb->tlb_flush_all)