Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

iommu/vt-d: Pass an iommu pointer to domain_init()

Browse source 
This allows to do domain->iommu attachment after domain_init
has run.

Signed-off-by: Joerg Roedel <jroedel@suse.de>
This commit is contained in:
Joerg Roedel 2015-07-22 12:44:02 +02:00
parent 2452d9db12
commit dc534b25d1
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/iommu/intel-iommu.c
View file

@ -1832,9 +1832,9 @@ static inline int guestwidth_to_adjustwidth(int gaw)
return agaw; 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; int adjust_width, agaw;
unsigned long sagaw; unsigned long sagaw;
@ -1843,7 +1843,6 @@ static int domain_init(struct dmar_domain *domain, int guest_width)
domain_reserve_special_ranges(domain); domain_reserve_special_ranges(domain);
/* calculate AGAW */ /* calculate AGAW */
iommu = domain_get_iommu(domain);
if (guest_width > cap_mgaw(iommu->cap)) if (guest_width > cap_mgaw(iommu->cap))
guest_width = cap_mgaw(iommu->cap); guest_width = cap_mgaw(iommu->cap);
domain->gaw = guest_width; domain->gaw = guest_width;
@ -2389,7 +2388,7 @@ static struct dmar_domain *get_domain_for_dev(struct device *dev, int gaw)
return NULL; return NULL;
} }
domain_attach_iommu(domain, iommu); domain_attach_iommu(domain, iommu);
if (domain_init(domain, gaw)) { if (domain_init(domain, iommu, gaw)) {
domain_exit(domain); domain_exit(domain);
return NULL; return NULL;
} }