svn commit: r276867 - head/sys/x86/iommu

[Konstantin Belousov]

Author: kib
Date: Fri Jan  9 02:10:44 2015
New Revision: 276867
URL: https://svnweb.freebsd.org/changeset/base/276867

Log:
  Fix DMAR context allocations for the devices behind PCIe->PCI bridges
  after dmar driver was converted to use rids.  The bus component to
  calculate context page must be taken from the requestor rid, which is
  a bridge, and not from the device bus number.
  
  Sponsored by:	The FreeBSD Foundation
  MFC after:	1 week

Modified:
  head/sys/x86/iommu/intel_ctx.c

Modified: head/sys/x86/iommu/intel_ctx.c
==============================================================================
--- head/sys/x86/iommu/intel_ctx.c	Fri Jan  9 01:57:11 2015	(r276866)
+++ head/sys/x86/iommu/intel_ctx.c	Fri Jan  9 02:10:44 2015	(r276867)
@@ -288,7 +288,7 @@ dmar_get_ctx(struct dmar_unit *dmar, dev
 		 * higher chance to succeed if the sleep is allowed.
 		 */
 		DMAR_UNLOCK(dmar);
-		dmar_ensure_ctx_page(dmar, bus);
+		dmar_ensure_ctx_page(dmar, PCI_RID2BUS(rid));
 		ctx1 = dmar_get_ctx_alloc(dmar, rid);
 
 		if (id_mapped) {