From owner-svn-src-all@freebsd.org  Mon May 16 19:39:07 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 07103B3E4F7;
 Mon, 16 May 2016 19:39:07 +0000 (UTC)
 (envelope-from adrian@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 C86DD1053;
 Mon, 16 May 2016 19:39:06 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4GJd5Cl010140;
 Mon, 16 May 2016 19:39:05 GMT (envelope-from adrian@FreeBSD.org)
Received: (from adrian@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4GJd5gL010138;
 Mon, 16 May 2016 19:39:05 GMT (envelope-from adrian@FreeBSD.org)
Message-Id: <201605161939.u4GJd5gL010138@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: adrian set sender to
 adrian@FreeBSD.org using -f
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Mon, 16 May 2016 19:39:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r299969 - head/sys/dev/siba
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: Mon, 16 May 2016 19:39:07 -0000

Author: adrian
Date: Mon May 16 19:39:05 2016
New Revision: 299969
URL: https://svnweb.freebsd.org/changeset/base/299969

Log:
  [siba] make the debug code somewhat useful again.
  
  It's still not configurable by a kernel option; that'll come next.
  
  Sponsored by:	Palm Springs

Modified:
  head/sys/dev/siba/siba_core.c
  head/sys/dev/siba/sibavar.h

Modified: head/sys/dev/siba/siba_core.c
==============================================================================
--- head/sys/dev/siba/siba_core.c	Mon May 16 19:33:23 2016	(r299968)
+++ head/sys/dev/siba/siba_core.c	Mon May 16 19:39:05 2016	(r299969)
@@ -184,6 +184,8 @@ siba_core_attach(struct siba_softc *siba
 
 	siba->siba_ops = &siba_pci_ops;
 
+	siba->siba_debug = SIBA_DEBUG_SCAN;
+
 	siba_pci_gpio(siba, SIBA_GPIO_CRYSTAL | SIBA_GPIO_PLL, 1);
 	siba_scan(siba);
 
@@ -332,7 +334,8 @@ siba_scan(struct siba_softc *siba)
 		DPRINTF(siba, SIBA_DEBUG_SCAN,
 		    "core %d (%s) found (cc %#xrev %#x vendor %#x)\n",
 		    i, siba_core_name(sd->sd_id.sd_device),
-		    sd->sd_id.sd_device, sd->sd_id.sd_rev, sd->sd_id.vendor);
+		    sd->sd_id.sd_device, sd->sd_id.sd_rev,
+		    sd->sd_id.sd_vendor);
 
 		switch (sd->sd_id.sd_device) {
 		case SIBA_DEVID_CHIPCOMMON:

Modified: head/sys/dev/siba/sibavar.h
==============================================================================
--- head/sys/dev/siba/sibavar.h	Mon May 16 19:33:23 2016	(r299968)
+++ head/sys/dev/siba/sibavar.h	Mon May 16 19:39:05 2016	(r299969)
@@ -604,6 +604,7 @@ struct siba_softc {
 	bus_addr_t			siba_maddr;
 	bus_size_t			siba_msize;
 	uint8_t				siba_ncores;
+	uint32_t			siba_debug;
 
 	/*
 	 * the following variables are only used for siba_bwn bridge.