From owner-svn-src-all@FreeBSD.ORG  Thu Jan 24 15:23:02 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 925F58DA;
 Thu, 24 Jan 2013 15:23:02 +0000 (UTC)
 (envelope-from jchandra@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 6CE5EEF4;
 Thu, 24 Jan 2013 15:23:02 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0OFN2Y5083241;
 Thu, 24 Jan 2013 15:23:02 GMT
 (envelope-from jchandra@svn.freebsd.org)
Received: (from jchandra@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0OFN2OZ083239;
 Thu, 24 Jan 2013 15:23:02 GMT
 (envelope-from jchandra@svn.freebsd.org)
Message-Id: <201301241523.r0OFN2OZ083239@svn.freebsd.org>
From: "Jayachandran C." <jchandra@FreeBSD.org>
Date: Thu, 24 Jan 2013 15:23:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r245883 - head/sys/mips/nlm/hal
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.14
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: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 24 Jan 2013 15:23:02 -0000

Author: jchandra
Date: Thu Jan 24 15:23:01 2013
New Revision: 245883
URL: http://svnweb.freebsd.org/changeset/base/245883

Log:
  Fix credit configuration on Broadcom XLP CMS
  
  The CMS output queue credit configuration register is 64 bit, so use
  a 64 bit variable while updating it.
  Obtained from:	Venkatesh J V <venkatesh.vivekanandan@broadcom.com>

Modified:
  head/sys/mips/nlm/hal/fmn.c

Modified: head/sys/mips/nlm/hal/fmn.c
==============================================================================
--- head/sys/mips/nlm/hal/fmn.c	Thu Jan 24 15:18:41 2013	(r245882)
+++ head/sys/mips/nlm/hal/fmn.c	Thu Jan 24 15:23:01 2013	(r245883)
@@ -138,9 +138,9 @@ uint32_t nlm_cms_total_stations = 18 * 4
 
 void nlm_cms_setup_credits(uint64_t base, int destid, int srcid, int credit)
 {
-	uint32_t val;
+	uint64_t val;
 
-	val = ((credit << 24) | (destid << 12) | (srcid << 0));
+	val = (((uint64_t)credit << 24) | (destid << 12) | (srcid << 0));
 	nlm_write_cms_reg(base, CMS_OUTPUTQ_CREDIT_CFG, val);
 
 }