diff options
| author | Thierry Reding <treding@nvidia.com> | 2015-03-27 11:07:26 +0100 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2015-03-31 16:34:12 +0200 |
| commit | 836a8ac9fe60fb112e830464868791bf7470e7b6 (patch) | |
| tree | a6e480fd0547ae4380210bdb28a56914f527ce2a /drivers/iommu/tegra-gart.c | |
| parent | 471d9144b4ec2a2cbf497af7e186c1fe89b5150e (diff) | |
| download | op-kernel-dev-836a8ac9fe60fb112e830464868791bf7470e7b6.zip op-kernel-dev-836a8ac9fe60fb112e830464868791bf7470e7b6.tar.gz | |
iommu/tegra: gart: Set aperture at domain initialization time
The aperture of the domain should always be available, otherwise drivers
need to attach first before they can use the aperture geometry.
Cc: Hiroshi Doyu <hdoyu@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers/iommu/tegra-gart.c')
| -rw-r--r-- | drivers/iommu/tegra-gart.c | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/drivers/iommu/tegra-gart.c b/drivers/iommu/tegra-gart.c index c48da05..5f3b68c 100644 --- a/drivers/iommu/tegra-gart.c +++ b/drivers/iommu/tegra-gart.c @@ -156,20 +156,10 @@ static inline bool gart_iova_range_valid(struct gart_device *gart, static int gart_iommu_attach_dev(struct iommu_domain *domain, struct device *dev) { - struct gart_device *gart; + struct gart_device *gart = domain->priv; struct gart_client *client, *c; int err = 0; - gart = gart_handle; - if (!gart) - return -EINVAL; - domain->priv = gart; - - domain->geometry.aperture_start = gart->iovmm_base; - domain->geometry.aperture_end = gart->iovmm_base + - gart->page_count * GART_PAGE_SIZE - 1; - domain->geometry.force_aperture = true; - client = devm_kzalloc(gart->dev, sizeof(*c), GFP_KERNEL); if (!client) return -ENOMEM; @@ -218,6 +208,19 @@ out: static int gart_iommu_domain_init(struct iommu_domain *domain) { + struct gart_device *gart; + + gart = gart_handle; + if (!gart) + return -EINVAL; + + domain->priv = gart; + + domain->geometry.aperture_start = gart->iovmm_base; + domain->geometry.aperture_end = gart->iovmm_base + + gart->page_count * GART_PAGE_SIZE - 1; + domain->geometry.force_aperture = true; + return 0; } |
