Commit 21e722c4 authored by Ashok Raj's avatar Ashok Raj Committed by Joerg Roedel

iommu/vt-d: Tylersburg isoch identity map check is done too late.

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: stable@vger.kernel.org
Cc: Ashok Raj <ashok.raj@intel.com>

Fixes: 86080ccc ("iommu/vt-d: Allocate si_domain in init_dmars()")
Signed-off-by: default avatarAshok Raj <ashok.raj@intel.com>
Reported-by: default avatarYunhong Jiang <yunhong.jiang@intel.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent aaa59306
...@@ -3325,13 +3325,14 @@ static int __init init_dmars(void) ...@@ -3325,13 +3325,14 @@ static int __init init_dmars(void)
iommu_identity_mapping |= IDENTMAP_GFX; iommu_identity_mapping |= IDENTMAP_GFX;
#endif #endif
check_tylersburg_isoch();
if (iommu_identity_mapping) { if (iommu_identity_mapping) {
ret = si_domain_init(hw_pass_through); ret = si_domain_init(hw_pass_through);
if (ret) if (ret)
goto free_iommu; goto free_iommu;
} }
check_tylersburg_isoch();
/* /*
* If we copied translations from a previous kernel in the kdump * If we copied translations from a previous kernel in the kdump
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment