From owner-svn-src-head@freebsd.org  Tue Sep 22 12:56:35 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 431569CFF4B;
 Tue, 22 Sep 2015 12:56:35 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org (repo.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 33CFA1C78;
 Tue, 22 Sep 2015 12:56:35 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8MCuZ2f035282;
 Tue, 22 Sep 2015 12:56:35 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8MCuZV2035281;
 Tue, 22 Sep 2015 12:56:35 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201509221256.t8MCuZV2035281@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: emaste set sender to
 emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Tue, 22 Sep 2015 12:56:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r288108 - head/sys/arm64/cavium
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.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Sep 2015 12:56:35 -0000

Author: emaste
Date: Tue Sep 22 12:56:34 2015
New Revision: 288108
URL: https://svnweb.freebsd.org/changeset/base/288108

Log:
  arm64 ThunderX PCIe workaround: enumerate only one slot for now
  
  Otherwise an em(4) NIC is detected 32 times.
  
  Submitted by:	wma@semihalf.com
  Obtained from:	Semihalf
  Differential Revision:	https://reviews.freebsd.org/D3706

Modified:
  head/sys/arm64/cavium/thunder_pcie_pem.c

Modified: head/sys/arm64/cavium/thunder_pcie_pem.c
==============================================================================
--- head/sys/arm64/cavium/thunder_pcie_pem.c	Tue Sep 22 11:38:58 2015	(r288107)
+++ head/sys/arm64/cavium/thunder_pcie_pem.c	Tue Sep 22 12:56:34 2015	(r288108)
@@ -183,8 +183,16 @@ static int
 thunder_pem_maxslots(device_t dev)
 {
 
+#if 0
 	/* max slots per bus acc. to standard */
 	return (PCI_SLOTMAX);
+#else
+	/*
+	 * ARM64TODO Workaround - otherwise an em(4) interface appears to be
+	 * present on every PCI function on the bus to which it is connected
+	 */
+	return (0);
+#endif
 }
 
 static int