From owner-svn-src-all@FreeBSD.ORG  Fri Jan 16 01:32:41 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 4D2A7492;
 Fri, 16 Jan 2015 01:32:41 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 38FE0EA9;
 Fri, 16 Jan 2015 01:32:41 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0G1WfeM028139;
 Fri, 16 Jan 2015 01:32:41 GMT (envelope-from np@FreeBSD.org)
Received: (from np@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0G1WeUV028137;
 Fri, 16 Jan 2015 01:32:40 GMT (envelope-from np@FreeBSD.org)
Message-Id: <201501160132.t0G1WeUV028137@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: np set sender to np@FreeBSD.org
 using -f
From: Navdeep Parhar <np@FreeBSD.org>
Date: Fri, 16 Jan 2015 01:32:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r277226 - 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-all@freebsd.org
X-Mailman-Version: 2.1.18-1
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: Fri, 16 Jan 2015 01:32:41 -0000

Author: np
Date: Fri Jan 16 01:32:40 2015
New Revision: 277226
URL: https://svnweb.freebsd.org/changeset/base/277226

Log:
  Allow cxgbe(4) to be built on i386.  Driver attach will succeed only on a subset
  of i386 systems.

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

Modified: head/sys/dev/cxgbe/t4_main.c
==============================================================================
--- head/sys/dev/cxgbe/t4_main.c	Fri Jan 16 01:28:28 2015	(r277225)
+++ head/sys/dev/cxgbe/t4_main.c	Fri Jan 16 01:32:40 2015	(r277226)
@@ -668,6 +668,14 @@ t4_attach(device_t dev)
 		goto done;
 	}
 
+#if defined(__i386__)
+	if ((cpu_feature & CPUID_CX8) == 0) {
+		device_printf(dev, "64 bit atomics not available.\n");
+		rc = ENOTSUP;
+		goto done;
+	}
+#endif
+
 	/* Prepare the firmware for operation */
 	rc = prep_firmware(sc);
 	if (rc != 0)

Modified: head/sys/dev/cxgbe/t4_mp_ring.c
==============================================================================
--- head/sys/dev/cxgbe/t4_mp_ring.c	Fri Jan 16 01:28:28 2015	(r277225)
+++ head/sys/dev/cxgbe/t4_mp_ring.c	Fri Jan 16 01:32:40 2015	(r277226)
@@ -38,6 +38,11 @@ __FBSDID("$FreeBSD$");
 
 #include "t4_mp_ring.h"
 
+#if defined(__i386__)
+#define atomic_cmpset_acq_64 atomic_cmpset_64
+#define atomic_cmpset_rel_64 atomic_cmpset_64
+#endif
+
 union ring_state {
 	struct {
 		uint16_t pidx_head;