svn commit: r316345 - stable/11/sys/x86/iommu

[Konstantin Belousov]

Author: kib
Date: Sat Apr  1 08:37:19 2017
New Revision: 316345
URL: https://svnweb.freebsd.org/changeset/base/316345

Log:
  MFC r315933:
  Do not create RMRR entries for identity-mapped domains.

Modified:
  stable/11/sys/x86/iommu/intel_ctx.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/x86/iommu/intel_ctx.c
==============================================================================
--- stable/11/sys/x86/iommu/intel_ctx.c	Sat Apr  1 08:34:53 2017	(r316344)
+++ stable/11/sys/x86/iommu/intel_ctx.c	Sat Apr  1 08:37:19 2017	(r316345)
@@ -433,11 +433,13 @@ dmar_get_ctx_for_dev(struct dmar_unit *d
 			TD_PINNED_ASSERT;
 			return (NULL);
 		}
-		error = domain_init_rmrr(domain1, dev);
-		if (error != 0) {
-			dmar_domain_destroy(domain1);
-			TD_PINNED_ASSERT;
-			return (NULL);
+		if (!id_mapped) {
+			error = domain_init_rmrr(domain1, dev);
+			if (error != 0) {
+				dmar_domain_destroy(domain1);
+				TD_PINNED_ASSERT;
+				return (NULL);
+			}
 		}
 		ctx1 = dmar_ctx_alloc(domain1, rid);
 		ctxp = dmar_map_ctx_entry(ctx1, &sf);