diff options
| author | Joerg Roedel <jroedel@suse.de> | 2015-07-22 12:44:02 +0200 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2015-08-12 16:23:36 +0200 |
| commit | dc534b25d11f42e6b4caa5b1918f549d9c0e9d4d (patch) | |
| tree | ec7d8febc8016a3b25672ac263e461dfee3cdd27 /drivers/iommu/intel-iommu.c | |
| parent | 2452d9db1218fdb1c29afb921838c323987f5799 (diff) | |
| download | blackbird-obmc-linux-dc534b25d11f42e6b4caa5b1918f549d9c0e9d4d.tar.gz blackbird-obmc-linux-dc534b25d11f42e6b4caa5b1918f549d9c0e9d4d.zip | |
iommu/vt-d: Pass an iommu pointer to domain_init()
This allows to do domain->iommu attachment after domain_init
has run.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers/iommu/intel-iommu.c')
| -rw-r--r-- | drivers/iommu/intel-iommu.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index 62c27eff549d..de5384e7e052 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -1832,9 +1832,9 @@ static inline int guestwidth_to_adjustwidth(int gaw) return agaw; } -static int domain_init(struct dmar_domain *domain, int guest_width) +static int domain_init(struct dmar_domain *domain, struct intel_iommu *iommu, + int guest_width) { - struct intel_iommu *iommu; int adjust_width, agaw; unsigned long sagaw; @@ -1843,7 +1843,6 @@ static int domain_init(struct dmar_domain *domain, int guest_width) domain_reserve_special_ranges(domain); /* calculate AGAW */ - iommu = domain_get_iommu(domain); if (guest_width > cap_mgaw(iommu->cap)) guest_width = cap_mgaw(iommu->cap); domain->gaw = guest_width; @@ -2389,7 +2388,7 @@ static struct dmar_domain *get_domain_for_dev(struct device *dev, int gaw) return NULL; } domain_attach_iommu(domain, iommu); - if (domain_init(domain, gaw)) { + if (domain_init(domain, iommu, gaw)) { domain_exit(domain); return NULL; } |
