Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 26 Oct 2015 03:30:50 +0000 (UTC)
From:      "Conrad E. Meyer" <cem@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r289983 - head/sys/dev/ioat
Message-ID:  <201510260330.t9Q3Uo6h003067@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: cem
Date: Mon Oct 26 03:30:50 2015
New Revision: 289983
URL: https://svnweb.freebsd.org/changeset/base/289983

Log:
  ioat: Add %b format string for CHANERR codes
  
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/sys/dev/ioat/ioat.c
  head/sys/dev/ioat/ioat_hw.h

Modified: head/sys/dev/ioat/ioat.c
==============================================================================
--- head/sys/dev/ioat/ioat.c	Mon Oct 26 03:30:38 2015	(r289982)
+++ head/sys/dev/ioat/ioat.c	Mon Oct 26 03:30:50 2015	(r289983)
@@ -349,7 +349,8 @@ ioat_start_channel(struct ioat_softc *io
 
 	chanerr = ioat_read_4(ioat, IOAT_CHANERR_OFFSET);
 	ioat_log_message(0, "could not start channel: "
-	    "status = %#jx error = %x\n", (uintmax_t)status, chanerr);
+	    "status = %#jx error = %b\n", (uintmax_t)status, (int)chanerr,
+	    IOAT_CHANERR_STR);
 	return (ENXIO);
 }
 
@@ -1105,7 +1106,8 @@ ioat_halted_debug(struct ioat_softc *ioa
 {
 	struct ioat_descriptor *desc;
 
-	ioat_log_message(0, "Channel halted (%x)\n", chanerr);
+	ioat_log_message(0, "Channel halted (%b)\n", (int)chanerr,
+	    IOAT_CHANERR_STR);
 	if (chanerr == 0)
 		return;
 

Modified: head/sys/dev/ioat/ioat_hw.h
==============================================================================
--- head/sys/dev/ioat/ioat_hw.h	Mon Oct 26 03:30:38 2015	(r289982)
+++ head/sys/dev/ioat/ioat_hw.h	Mon Oct 26 03:30:50 2015	(r289983)
@@ -126,6 +126,13 @@ __FBSDID("$FreeBSD$");
 #define	IOAT_CHANERR_RATVERR		(1 << 26)
 #define	IOAT_CHANERR_RRTVERR		(1 << 27)
 
+#define	IOAT_CHANERR_STR \
+    "\20\34RRTVERR\33RATVERR\32RGTVERR\31RDIFFERR\30BBERR\27RTVERR\26ATVERR" \
+    "\25GTVERR\24DIFFERR\23DCNTERR\21CXPERR\20UNAFFERR\17SEDERR\16INTCFGERR" \
+    "\15CMPADDERR\14DXSERR\13DCERR\12WDERR\11RDERR\10DUNCORERR\07CUNCORERR" \
+    "\06CCMDERR\05CHADDERR\04DERR\03NDADDERR\02XDADDERR\01XSADDERR"
+
+
 #define	IOAT_CFG_CHANERR_INT_OFFSET		0x180
 #define	IOAT_CFG_CHANERRMASK_INT_OFFSET		0x184
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510260330.t9Q3Uo6h003067>