From owner-svn-src-head@FreeBSD.ORG  Sun Apr  8 19:58:39 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 42FC5106564A;
	Sun,  8 Apr 2012 19:58:39 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2CC938FC0C;
	Sun,  8 Apr 2012 19:58:39 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q38Jwd7Y026019;
	Sun, 8 Apr 2012 19:58:39 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q38JwcZc026017;
	Sun, 8 Apr 2012 19:58:38 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201204081958.q38JwcZc026017@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Sun, 8 Apr 2012 19:58:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234040 - head/sys/pci
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Apr 2012 19:58:39 -0000

Author: avg
Date: Sun Apr  8 19:58:38 2012
New Revision: 234040
URL: http://svn.freebsd.org/changeset/base/234040

Log:
  intpm: reflect the fact that SB800 and later AMD chipsets are not supported
  
  They do not have compatible configuration registers in PCI configuration
  space.  Instead their configuration resides in AMD "PM I/O" space
  (accessed via a pair of I/O space registers).
  
  MFC after:	5 days

Modified:
  head/sys/pci/intpm.c

Modified: head/sys/pci/intpm.c
==============================================================================
--- head/sys/pci/intpm.c	Sun Apr  8 18:25:12 2012	(r234039)
+++ head/sys/pci/intpm.c	Sun Apr  8 19:58:38 2012	(r234040)
@@ -99,6 +99,9 @@ intsmb_probe(device_t dev)
 		device_set_desc(dev, "Intel PIIX4 SMBUS Interface");
 		break;
 	case 0x43851002:
+		/* SB800 and newer can not be configured in a compatible way. */
+		if (pci_get_revid(dev) >= 0x40)
+			return (ENXIO);
 		device_set_desc(dev, "AMD SB600/700/710/750 SMBus Controller");
 		/* XXX Maybe force polling right here? */
 		break;