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

iommu: remove DOMAIN_ATTR_GEOMETRY 



The geometry information can be trivially queried from the iommu_domain
struture.

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-16-hch@lst.de


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

drivers/iommu/iommu.c

+3 −17
Original line number Diff line number Diff line
@@ -2667,23 +2667,9 @@ core_initcall(iommu_init); 
int iommu_domain_get_attr(struct iommu_domain *domain,

			  enum iommu_attr attr, void *data)

{

	struct iommu_domain_geometry *geometry;

	int ret = 0;



	switch (attr) {

	case DOMAIN_ATTR_GEOMETRY:

		geometry  = data;

		*geometry = domain->geometry;



		break;

	default:

	if (!domain->ops->domain_get_attr)

		return -EINVAL;



		ret = domain->ops->domain_get_attr(domain, attr, data);

	}



	return ret;

	return domain->ops->domain_get_attr(domain, attr, data);

}

EXPORT_SYMBOL_GPL(iommu_domain_get_attr);

drivers/vfio/vfio_iommu_type1.c

+12 −14
Original line number Diff line number Diff line
@@ -2252,7 +2252,7 @@ static int vfio_iommu_type1_attach_group(void *iommu_data, 
	int ret;

	bool resv_msi, msi_remap;

	phys_addr_t resv_msi_base = 0;

	struct iommu_domain_geometry geo;

	struct iommu_domain_geometry *geo;

	LIST_HEAD(iova_copy);

	LIST_HEAD(group_resv_regions);
@@ -2333,10 +2333,9 @@ static int vfio_iommu_type1_attach_group(void *iommu_data, 
		goto out_domain;



	/* Get aperture info */

	iommu_domain_get_attr(domain->domain, DOMAIN_ATTR_GEOMETRY, &geo);



	if (vfio_iommu_aper_conflict(iommu, geo.aperture_start,

				     geo.aperture_end)) {

	geo = &domain->domain->geometry;

	if (vfio_iommu_aper_conflict(iommu, geo->aperture_start,

				     geo->aperture_end)) {

		ret = -EINVAL;

		goto out_detach;

	}
@@ -2359,8 +2358,8 @@ static int vfio_iommu_type1_attach_group(void *iommu_data, 
	if (ret)

		goto out_detach;



	ret = vfio_iommu_aper_resize(&iova_copy, geo.aperture_start,

				     geo.aperture_end);

	ret = vfio_iommu_aper_resize(&iova_copy, geo->aperture_start,

				     geo->aperture_end);

	if (ret)

		goto out_detach;
@@ -2493,7 +2492,6 @@ static void vfio_iommu_aper_expand(struct vfio_iommu *iommu, 
				   struct list_head *iova_copy)

{

	struct vfio_domain *domain;

	struct iommu_domain_geometry geo;

	struct vfio_iova *node;

	dma_addr_t start = 0;

	dma_addr_t end = (dma_addr_t)~0;
@@ -2502,12 +2500,12 @@ static void vfio_iommu_aper_expand(struct vfio_iommu *iommu, 
		return;



	list_for_each_entry(domain, &iommu->domain_list, next) {

		iommu_domain_get_attr(domain->domain, DOMAIN_ATTR_GEOMETRY,

				      &geo);

		if (geo.aperture_start > start)

			start = geo.aperture_start;

		if (geo.aperture_end < end)

			end = geo.aperture_end;

		struct iommu_domain_geometry *geo = &domain->domain->geometry;



		if (geo->aperture_start > start)

			start = geo->aperture_start;

		if (geo->aperture_end < end)

			end = geo->aperture_end;

	}



	/* Modify aperture limits. The new aper is either same or bigger */

drivers/vhost/vdpa.c

+3 −7
Original line number Diff line number Diff line
@@ -826,18 +826,14 @@ static void vhost_vdpa_free_domain(struct vhost_vdpa *v) 
static void vhost_vdpa_set_iova_range(struct vhost_vdpa *v)

{

	struct vdpa_iova_range *range = &v->range;

	struct iommu_domain_geometry geo;

	struct vdpa_device *vdpa = v->vdpa;

	const struct vdpa_config_ops *ops = vdpa->config;



	if (ops->get_iova_range) {

		*range = ops->get_iova_range(vdpa);

	} else if (v->domain &&

		   !iommu_domain_get_attr(v->domain,

		   DOMAIN_ATTR_GEOMETRY, &geo) &&

		   geo.force_aperture) {

		range->first = geo.aperture_start;

		range->last = geo.aperture_end;

	} else if (v->domain && v->domain->geometry.force_aperture) {

		range->first = v->domain->geometry.aperture_start;

		range->last = v->domain->geometry.aperture_end;

	} else {

		range->first = 0;

		range->last = ULLONG_MAX;

include/linux/iommu.h

+0 −1
Original line number Diff line number Diff line
@@ -107,7 +107,6 @@ enum iommu_cap { 
 */



enum iommu_attr {

	DOMAIN_ATTR_GEOMETRY,

	DOMAIN_ATTR_NESTING,	/* two stages of translation */

	DOMAIN_ATTR_DMA_USE_FLUSH_QUEUE,

	DOMAIN_ATTR_IO_PGTABLE_CFG,