From owner-svn-src-stable@FreeBSD.ORG  Mon Nov 29 01:33:25 2010
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 81D461065670;
	Mon, 29 Nov 2010 01:33:25 +0000 (UTC)
	(envelope-from yongari@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6EE338FC08;
	Mon, 29 Nov 2010 01:33:25 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oAT1XPqb075883;
	Mon, 29 Nov 2010 01:33:25 GMT (envelope-from yongari@svn.freebsd.org)
Received: (from yongari@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAT1XPuO075881;
	Mon, 29 Nov 2010 01:33:25 GMT (envelope-from yongari@svn.freebsd.org)
Message-Id: <201011290133.oAT1XPuO075881@svn.freebsd.org>
From: Pyun YongHyeon <yongari@FreeBSD.org>
Date: Mon, 29 Nov 2010 01:33:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r216025 - stable/8/sys/dev/jme
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 29 Nov 2010 01:33:25 -0000

Author: yongari
Date: Mon Nov 29 01:33:25 2010
New Revision: 216025
URL: http://svn.freebsd.org/changeset/base/216025

Log:
  MFC r215847:
    Disable retrying RX descriptor loading. The counter is used to set
    number of retry to be performed whenever controller found RX
    descriptor was empty. RX empty interrupt is generated only when the
    retry counter is over. Experimentation shows retrying RX descriptor
    loading increased number of dropped frames under flow-control
    enabled environments so disable it and have controller generate RX
    empty interrupt as fast as it can.
    While I'm here fix RXCSR_DESC_RT_CNT macro.

Modified:
  stable/8/sys/dev/jme/if_jmereg.h
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/dev/jme/if_jmereg.h
==============================================================================
--- stable/8/sys/dev/jme/if_jmereg.h	Mon Nov 29 01:30:49 2010	(r216024)
+++ stable/8/sys/dev/jme/if_jmereg.h	Mon Nov 29 01:33:25 2010	(r216025)
@@ -275,8 +275,8 @@
 #define	RXCSR_RXQ2		2
 #define	RXCSR_RXQ3		3
 #define	RXCSR_DESC_RT_CNT(x)	\
-	((((x) / 4) << RXCSR_DESC_RT_CNT_SHIFT) & RXCSR_DESC_RT_CNT_MASK)
-#define	RXCSR_DESC_RT_CNT_DEFAULT	32
+	(((x) << RXCSR_DESC_RT_CNT_SHIFT) & RXCSR_DESC_RT_CNT_MASK)
+#define	RXCSR_DESC_RT_CNT_DEFAULT	0
 
 /* Rx queue descriptor base address. 16bytes alignment needed. */
 #define	JME_RXDBA_LO		0x0024