From owner-svn-src-head@FreeBSD.ORG  Tue Jun  4 02:25:26 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 658CF801;
 Tue,  4 Jun 2013 02:25:26 +0000 (UTC) (envelope-from np@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 57A9A133A;
 Tue,  4 Jun 2013 02:25:26 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r542PQM0081739;
 Tue, 4 Jun 2013 02:25:26 GMT (envelope-from np@svn.freebsd.org)
Received: (from np@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r542PQe2081738;
 Tue, 4 Jun 2013 02:25:26 GMT (envelope-from np@svn.freebsd.org)
Message-Id: <201306040225.r542PQe2081738@svn.freebsd.org>
From: Navdeep Parhar <np@FreeBSD.org>
Date: Tue, 4 Jun 2013 02:25:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251358 - head/sys/dev/cxgbe
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 04 Jun 2013 02:25:26 -0000

Author: np
Date: Tue Jun  4 02:25:25 2013
New Revision: 251358
URL: http://svnweb.freebsd.org/changeset/base/251358

Log:
  cxgbe(4): Provide accurate hit count for filters on T5 cards.  The
  location within the TCB and the size have both changed.
  
  MFC after:	1 week

Modified:
  head/sys/dev/cxgbe/t4_main.c

Modified: head/sys/dev/cxgbe/t4_main.c
==============================================================================
--- head/sys/dev/cxgbe/t4_main.c	Tue Jun  4 00:42:31 2013	(r251357)
+++ head/sys/dev/cxgbe/t4_main.c	Tue Jun  4 02:25:25 2013	(r251358)
@@ -6573,9 +6573,15 @@ get_filter_hits(struct adapter *sc, uint
 	memwin_info(sc, 0, &mw_base, NULL);
 	off = position_memwin(sc, 0,
 	    tcb_base + (fid + sc->tids.ftid_base) * TCB_SIZE);
-	hits = t4_read_reg64(sc, mw_base + off + 16);
+	if (is_t4(sc)) {
+		hits = t4_read_reg64(sc, mw_base + off + 16);
+		hits = be64toh(hits);
+	} else {
+		hits = t4_read_reg(sc, mw_base + off + 24);
+		hits = be32toh(hits);
+	}
 
-	return (be64toh(hits));
+	return (hits);
 }
 
 static int