diff options
| author | Ashok Raj <ashok.raj@intel.com> | 2017-01-30 09:39:53 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-12 06:44:09 +0100 |
| commit | 9d654322f85e279ad09584beaf42dfbb3f84487e (patch) | |
| tree | 6abc13c1a53f86bf4595f2867d8031c48e128834 | |
| parent | 1f8d55b2050c9a2a87107801ce442f35aea4063b (diff) | |
| download | linux-stable-9d654322f85e279ad09584beaf42dfbb3f84487e.tar.gz linux-stable-9d654322f85e279ad09584beaf42dfbb3f84487e.tar.bz2 linux-stable-9d654322f85e279ad09584beaf42dfbb3f84487e.zip | |
iommu/vt-d: Tylersburg isoch identity map check is done too late.
commit 21e722c4c8377b5bc82ad058fed12165af739c1b upstream.
The check to set identity map for tylersburg is done too late. It needs
to be done before the check for identity_map domain is done.
To: Joerg Roedel <joro@8bytes.org>
To: David Woodhouse <dwmw2@infradead.org>
Cc: iommu@lists.linux-foundation.org
Cc: linux-kernel@vger.kernel.org
Cc: Ashok Raj <ashok.raj@intel.com>
Fixes: 86080ccc22 ("iommu/vt-d: Allocate si_domain in init_dmars()")
Signed-off-by: Ashok Raj <ashok.raj@intel.com>
Reported-by: Yunhong Jiang <yunhong.jiang@intel.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/iommu/intel-iommu.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index 8a185250ae5a..23eead3cf77c 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -3325,13 +3325,14 @@ static int __init init_dmars(void) iommu_identity_mapping |= IDENTMAP_GFX; #endif + check_tylersburg_isoch(); + if (iommu_identity_mapping) { ret = si_domain_init(hw_pass_through); if (ret) goto free_iommu; } - check_tylersburg_isoch(); /* * If we copied translations from a previous kernel in the kdump |