From owner-svn-src-all@freebsd.org  Fri Jul 29 17:54:22 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 A6F62BA8DB7;
 Fri, 29 Jul 2016 17:54:22 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 6A5AE13E5;
 Fri, 29 Jul 2016 17:54:22 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6THsLXF098041;
 Fri, 29 Jul 2016 17:54:21 GMT (envelope-from jhb@FreeBSD.org)
Received: (from jhb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6THsLl5098040;
 Fri, 29 Jul 2016 17:54:21 GMT (envelope-from jhb@FreeBSD.org)
Message-Id: <201607291754.u6THsLl5098040@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org
 using -f
From: John Baldwin <jhb@FreeBSD.org>
Date: Fri, 29 Jul 2016 17:54:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r303497 - head/sys/dev/pci
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.22
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: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 29 Jul 2016 17:54:22 -0000

Author: jhb
Date: Fri Jul 29 17:54:21 2016
New Revision: 303497
URL: https://svnweb.freebsd.org/changeset/base/303497

Log:
  Add a loader tunable (hw.pci.enable_pcie_hp) to disable PCI-e HotPlug.
  
  Some systems and/or devices (such as riser cards) do not include a
  non-compliant implementation of PCI-e HotPlug that can result in devices
  not being attached (e.g. the HotPlug code might assume that a card is
  being unplugged and will power the slot off and detach it).  This
  tunable can be set to 0 to disable support for PCI-e HotPlug ignoring
  the incorrect HotPlug state on these slots.
  
  PR:		211081
  Reported by:	Sergey Renkas <serg_ic@mail.ru> (SuperMicro X7 riser card)
  Reported by:	Jeffrey E Pieper <jeffrey.e.pieper@intel.com>
  	 	(Intel X520 adapter)
  MFC after:	1 week
  Relnotes:	yes

Modified:
  head/sys/dev/pci/pci_pci.c

Modified: head/sys/dev/pci/pci_pci.c
==============================================================================
--- head/sys/dev/pci/pci_pci.c	Fri Jul 29 17:28:14 2016	(r303496)
+++ head/sys/dev/pci/pci_pci.c	Fri Jul 29 17:54:21 2016	(r303497)
@@ -907,11 +907,19 @@ pcib_set_mem_decode(struct pcib_softc *s
 /*
  * PCI-express HotPlug support.
  */
+static int pci_enable_pcie_hp = 1;
+SYSCTL_INT(_hw_pci, OID_AUTO, enable_pcie_hp, CTLFLAG_RDTUN,
+    &pci_enable_pcie_hp, 0,
+    "Enable support for native PCI-express HotPlug.");
+
 static void
 pcib_probe_hotplug(struct pcib_softc *sc)
 {
 	device_t dev;
 
+	if (!pci_enable_pcie_hp)
+		return;
+
 	dev = sc->dev;
 	if (pci_find_cap(dev, PCIY_EXPRESS, NULL) != 0)
 		return;