svn commit: r279485 - stable/10/sys/x86/iommu

[Konstantin Belousov]

Author: kib
Date: Sun Mar  1 10:35:54 2015
New Revision: 279485
URL: https://svnweb.freebsd.org/changeset/base/279485

Log:
  MFC r276948:
  Print rid when announcing DMAR context creation.  Print sid when fault
  occurs.

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

Modified: stable/10/sys/x86/iommu/intel_ctx.c
==============================================================================
--- stable/10/sys/x86/iommu/intel_ctx.c	Sun Mar  1 10:29:48 2015	(r279484)
+++ stable/10/sys/x86/iommu/intel_ctx.c	Sun Mar  1 10:35:54 2015	(r279485)
@@ -383,10 +383,10 @@ dmar_get_ctx(struct dmar_unit *dmar, dev
 			LIST_INSERT_HEAD(&dmar->contexts, ctx, link);
 			ctx_id_entry_init(ctx, ctxp);
 			device_printf(dev,
-			    "dmar%d pci%d:%d:%d:%d domain %d mgaw %d "
+			    "dmar%d pci%d:%d:%d:%d rid %x domain %d mgaw %d "
 			    "agaw %d %s-mapped\n",
 			    dmar->unit, dmar->segment, bus, slot,
-			    func, ctx->domain, ctx->mgaw, ctx->agaw,
+			    func, rid, ctx->domain, ctx->mgaw, ctx->agaw,
 			    id_mapped ? "id" : "re");
 		} else {
 			dmar_ctx_dtr(ctx1, true, true);

Modified: stable/10/sys/x86/iommu/intel_fault.c
==============================================================================
--- stable/10/sys/x86/iommu/intel_fault.c	Sun Mar  1 10:29:48 2015	(r279484)
+++ stable/10/sys/x86/iommu/intel_fault.c	Sun Mar  1 10:35:54 2015	(r279485)
@@ -230,8 +230,9 @@ dmar_fault_task(void *arg, int pending _
 		}
 		DMAR_UNLOCK(unit);
 		printf(
-		    "pci%d:%d:%d fault acc %x adt 0x%x reason 0x%x addr %jx\n",
-		    bus, slot, func, DMAR_FRCD2_T(fault_rec[1]),
+		    "pci%d:%d:%d sid %x fault acc %x adt 0x%x reason 0x%x "
+		    "addr %jx\n",
+		    bus, slot, func, sid, DMAR_FRCD2_T(fault_rec[1]),
 		    DMAR_FRCD2_AT(fault_rec[1]), DMAR_FRCD2_FR(fault_rec[1]),
 		    (uintmax_t)fault_rec[0]);
 		DMAR_FAULT_LOCK(unit);