From owner-svn-src-head@FreeBSD.ORG  Thu Oct 18 15:44:27 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id DB852D59;
 Thu, 18 Oct 2012 15:44:27 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id BF60B8FC08;
 Thu, 18 Oct 2012 15:44:27 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9IFiR80069561;
 Thu, 18 Oct 2012 15:44:27 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9IFiRkZ069559;
 Thu, 18 Oct 2012 15:44:27 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201210181544.q9IFiRkZ069559@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Thu, 18 Oct 2012 15:44:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r241697 - head/sys/ofed/include/rdma
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: Thu, 18 Oct 2012 15:44:28 -0000

Author: jhb
Date: Thu Oct 18 15:44:27 2012
New Revision: 241697
URL: http://svn.freebsd.org/changeset/base/241697

Log:
  Take advantage of if_baudrate_pf and calculate an effective baud rate on
  all platforms (not just amd64) to compute an equivalent IB rate.

Modified:
  head/sys/ofed/include/rdma/ib_addr.h

Modified: head/sys/ofed/include/rdma/ib_addr.h
==============================================================================
--- head/sys/ofed/include/rdma/ib_addr.h	Thu Oct 18 15:43:19 2012	(r241696)
+++ head/sys/ofed/include/rdma/ib_addr.h	Thu Oct 18 15:44:27 2012	(r241697)
@@ -247,17 +247,21 @@ static inline int iboe_get_rate(struct n
 #else
 static inline int iboe_get_rate(struct net_device *dev)
 {
-#ifdef __amd64__
-	if (dev->if_baudrate >= IF_Gbps(40ULL))
+	uintmax_t baudrate;
+	int exp;
+
+	baudrate = dev->if_baudrate;
+	for (exp = dev->if_baudrate_pf; exp > 0; exp--)
+		baudrate *= 10;
+	if (baudrate >= IF_Gbps(40))
 		return IB_RATE_40_GBPS;
-	else if (dev->if_baudrate >= IF_Gbps(30ULL))
+	else if (baudrate >= IF_Gbps(30))
 		return IB_RATE_30_GBPS;
-	else if (dev->if_baudrate >= IF_Gbps(20ULL))
+	else if (baudrate >= IF_Gbps(20))
 		return IB_RATE_20_GBPS;
-	else if (dev->if_baudrate >= IF_Gbps(10ULL))
+	else if (baudrate >= IF_Gbps(10))
 		return IB_RATE_10_GBPS;
 	else
-#endif
 		return IB_RATE_PORT_CURRENT;
 }
 #endif