From owner-p4-projects@FreeBSD.ORG  Thu Feb  8 14:29:14 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BAB1016A408; Thu,  8 Feb 2007 14:29:09 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id A259E16A40B
	for <perforce@freebsd.org>; Thu,  8 Feb 2007 14:28:59 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 9306A13C4A5
	for <perforce@freebsd.org>; Thu,  8 Feb 2007 14:28:59 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l18ESxUW018797
	for <perforce@freebsd.org>; Thu, 8 Feb 2007 14:28:59 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l18ESxie018794
	for perforce@freebsd.org; Thu, 8 Feb 2007 14:28:59 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Thu, 8 Feb 2007 14:28:59 GMT
Message-Id: <200702081428.l18ESxie018794@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 114239 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Feb 2007 14:29:14 -0000

http://perforce.freebsd.org/chv.cgi?CH=114239

Change 114239 by rwatson@rwatson_noisy on 2007/02/08 14:28:50

	Workaround for VPD problems on my test hardware.  Disabled by
	default.

Affected files ...

.. //depot/projects/zcopybpf/src/sys/dev/pci/pci.c#2 edit

Differences ...

==== //depot/projects/zcopybpf/src/sys/dev/pci/pci.c#2 (text+ko) ====

@@ -244,6 +244,11 @@
     &pci_do_power_resume, 1,
   "Transition from D3 -> D0 on resume.");
 
+static int pci_do_vpd = 1;
+TUNABLE_INT("hw.pci.enable_vpd", &pci_do_vpd);
+SYSCTL_INT(_hw_pci, OID_AUTO, enable_vpd, CTLFLAG_RW, &pci_do_vpd, 1,
+    "Enable support for VPD.");
+
 static int pci_do_msi = 1;
 TUNABLE_INT("hw.pci.enable_msi", &pci_do_msi);
 SYSCTL_INT(_hw_pci, OID_AUTO, enable_msi, CTLFLAG_RW, &pci_do_msi, 1,
@@ -568,8 +573,10 @@
 			cfg->msix.msix_pba_offset = val & ~PCIM_MSIX_BIR_MASK;
 			break;
 		case PCIY_VPD:		/* PCI Vital Product Data */
-			cfg->vpd.vpd_reg = ptr;
-			pci_read_vpd(pcib, cfg);
+			if (pci_do_vpd) {
+				cfg->vpd.vpd_reg = ptr;
+				pci_read_vpd(pcib, cfg);
+			}
 			break;
 		case PCIY_SUBVENDOR:
 			/* Should always be true. */