Skip to content

Commit

Permalink
iommu/amd: Implement DOMAIN_ATTR_GEOMETRY attribute
Browse files Browse the repository at this point in the history
Implement the attribute itself and add the code for the
AMD IOMMU driver.

Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
  • Loading branch information
Joerg Roedel committed Jul 11, 2012
1 parent 0cd76dd commit 0ff64f8
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 3 deletions.
4 changes: 4 additions & 0 deletions drivers/iommu/amd_iommu.c
Original file line number Diff line number Diff line change
Expand Up @@ -3069,6 +3069,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:
Expand Down
19 changes: 16 additions & 3 deletions drivers/iommu/iommu.c
Original file line number Diff line number Diff line change
Expand Up @@ -348,10 +348,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);

Expand Down
8 changes: 8 additions & 0 deletions include/linux/iommu.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,18 +37,26 @@ struct iommu_domain;
typedef int (*iommu_fault_handler_t)(struct iommu_domain *,
struct device *, unsigned long, int, void *);

struct iommu_domain_geometry {
dma_addr_t aperture_start; /* First address that can be mapped */
dma_addr_t aperture_end; /* Last address that can be mapped */
bool force_aperture; /* DMA only allowed in mappable range? */
};

struct iommu_domain {
struct iommu_ops *ops;
void *priv;
iommu_fault_handler_t handler;
void *handler_token;
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_MAX,
DOMAIN_ATTR_GEOMETRY,
};

#ifdef CONFIG_IOMMU_API
Expand Down

0 comments on commit 0ff64f8

Please sign in to comment.