From owner-svn-src-all@freebsd.org  Wed Nov  2 23:18:18 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2ECE3C2CD87;
 Wed,  2 Nov 2016 23:18:18 +0000 (UTC) (envelope-from cem@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9BE341207;
 Wed,  2 Nov 2016 23:18:17 +0000 (UTC) (envelope-from cem@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uA2NIGWI049357;
 Wed, 2 Nov 2016 23:18:16 GMT (envelope-from cem@FreeBSD.org)
Received: (from cem@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uA2NIGla049356;
 Wed, 2 Nov 2016 23:18:16 GMT (envelope-from cem@FreeBSD.org)
Message-Id: <201611022318.uA2NIGla049356@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org
 using -f
From: "Conrad E. Meyer" <cem@FreeBSD.org>
Date: Wed, 2 Nov 2016 23:18:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r308230 - head/sys/dev/ioat
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 02 Nov 2016 23:18:18 -0000

Author: cem
Date: Wed Nov  2 23:18:16 2016
New Revision: 308230
URL: https://svnweb.freebsd.org/changeset/base/308230

Log:
  ioat(4): Read CHANSTS register for suspended/halted checks
  
  The device doesn't accurately update the CHANCMP address with the device state
  when the device is suspended or halted.  So, read the CHANSTS register to check
  for those states.
  
  We still need to read the CHANCMP address for the last completed descriptor.
  
  Sponsored by:	Dell EMC Isilon

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

Modified: head/sys/dev/ioat/ioat.c
==============================================================================
--- head/sys/dev/ioat/ioat.c	Wed Nov  2 22:33:37 2016	(r308229)
+++ head/sys/dev/ioat/ioat.c	Wed Nov  2 23:18:16 2016	(r308230)
@@ -747,6 +747,12 @@ out:
 		wakeup(&ioat->tail);
 	}
 
+	/*
+	 * The device doesn't seem to reliably push suspend/halt statuses to
+	 * the channel completion memory address, so poll the device register
+	 * here.
+	 */
+	comp_update = ioat_get_chansts(ioat) & IOAT_CHANSTS_STATUS;
 	if (!is_ioat_halted(comp_update) && !is_ioat_suspended(comp_update))
 		return;