Messages in this thread | | | From | Laurent Pinchart <> | Subject | Re: [PATCH 2/5] iommu/amd: Implement DOMAIN_ATTR_GEOMETRY attribute | Date | Thu, 19 Jan 2012 16:46:13 +0100 |
| |
Hi Joerg,
On Thursday 19 January 2012 15:30:02 Joerg Roedel wrote: > Implement the attribute itself and add the code for the > AMD IOMMU driver. > > Signed-off-by: Joerg Roedel <joerg.roedel@amd.com> > --- > drivers/iommu/amd_iommu.c | 4 ++++ > drivers/iommu/iommu.c | 19 ++++++++++++++++--- > include/linux/iommu.h | 11 ++++++++++- > 3 files changed, 30 insertions(+), 4 deletions(-) > > diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c > index cce1f03..421c3e6 100644 > --- a/drivers/iommu/amd_iommu.c > +++ b/drivers/iommu/amd_iommu.c > @@ -3030,6 +3030,10 @@ static int amd_iommu_domain_init(struct iommu_domain > *dom) > > dom->priv = domain; > > + dom->geometry.aperture_start = 0; > + dom->geometry.aperture_end = ~0ULL; > + dom->geometry.force_aperture = true; > + > return 0; > > out_free: > diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c > index ef54718..3d0b0bf 100644 > --- a/drivers/iommu/iommu.c > +++ b/drivers/iommu/iommu.c > @@ -345,10 +345,23 @@ EXPORT_SYMBOL_GPL(iommu_device_group); > int iommu_domain_get_attr(struct iommu_domain *domain, > enum iommu_attr attr, void *data) > { > - if (!domain->ops->domain_get_attr) > - return -EINVAL; > + 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; > > - return domain->ops->domain_get_attr(domain, attr, data); > + ret = domain->ops->domain_get_attr(domain, attr, data); > + } > + > + return ret; > } > EXPORT_SYMBOL_GPL(iommu_domain_get_attr); > > diff --git a/include/linux/iommu.h b/include/linux/iommu.h > index 32d0de1..3f971b3 100644 > --- a/include/linux/iommu.h > +++ b/include/linux/iommu.h > @@ -37,16 +37,24 @@ struct iommu_domain; > typedef int (*iommu_fault_handler_t)(struct iommu_domain *, > struct device *, unsigned long, int); > > +struct iommu_domain_geometry { > + u64 aperture_start; /* First address that can be mapped */ > + u64 aperture_end; /* Last address that can be mapped */
Would it make sense to use a platform-dependent type that represents physical addresses instead of u64 ?
> + bool force_aperture; /* DMA only allowed in mappable range? */ > +}; > + > struct iommu_domain { > struct iommu_ops *ops; > void *priv; > iommu_fault_handler_t handler; > + struct iommu_domain_geometry geometry; > }; > > #define IOMMU_CAP_CACHE_COHERENCY 0x1 > #define IOMMU_CAP_INTR_REMAP 0x2 /* isolates device intrs */ > > enum iommu_attr { > + DOMAIN_ATTR_GEOMETRY, /* struct iommu_domain_geometry */ > DOMAIN_ATTR_MAX, > }; > > @@ -62,7 +70,8 @@ enum iommu_attr { > * @unmap: unmap a physically contiguous memory region from an iommu > domain * @iova_to_phys: translate iova to physical address > * @domain_has_cap: domain capabilities query > - * @commit: commit iommu domain > + * @domain_get_attr: Query domain attributes > + * @domain_set_attr: Change domain attributes
This belongs to the previous patch.
> * @pgsize_bitmap: bitmap of supported page sizes > */ > struct iommu_ops {
-- Regards,
Laurent Pinchart
| |