From owner-svn-src-stable@freebsd.org  Wed Sep 21 16:19:28 2016
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@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 49567BE4B3C;
 Wed, 21 Sep 2016 16:19:28 +0000 (UTC) (envelope-from avg@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 1BDE0EF3;
 Wed, 21 Sep 2016 16:19:28 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8LGJR0B033912;
 Wed, 21 Sep 2016 16:19:27 GMT (envelope-from avg@FreeBSD.org)
Received: (from avg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8LGJRf8033911;
 Wed, 21 Sep 2016 16:19:27 GMT (envelope-from avg@FreeBSD.org)
Message-Id: <201609211619.u8LGJRf8033911@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org
 using -f
From: Andriy Gapon <avg@FreeBSD.org>
Date: Wed, 21 Sep 2016 16:19:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r306120 - stable/11/sys/dev/intpm
X-SVN-Group: stable-11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Sep 2016 16:19:28 -0000

Author: avg
Date: Wed Sep 21 16:19:27 2016
New Revision: 306120
URL: https://svnweb.freebsd.org/changeset/base/306120

Log:
  MFC r305603: intpm: do not try attaching to unsupported controller revisions

Modified:
  stable/11/sys/dev/intpm/intpm.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/dev/intpm/intpm.c
==============================================================================
--- stable/11/sys/dev/intpm/intpm.c	Wed Sep 21 16:17:22 2016	(r306119)
+++ stable/11/sys/dev/intpm/intpm.c	Wed Sep 21 16:19:27 2016	(r306120)
@@ -104,9 +104,12 @@ intsmb_probe(device_t dev)
 		device_set_desc(dev, "ATI IXP400 SMBus Controller");
 		break;
 	case 0x43851002:
-	case 0x780b1022:	/* AMD Hudson */
-		device_set_desc(dev, "AMD SB600/7xx/8xx SMBus Controller");
-		/* XXX Maybe force polling right here? */
+		device_set_desc(dev, "AMD SB600/7xx/8xx/9xx SMBus Controller");
+		break;
+	case 0x780b1022:	/* AMD FCH */
+		if (pci_get_revid(dev) < 0x40)
+			return (ENXIO);
+		device_set_desc(dev, "AMD FCH SMBus Controller");
 		break;
 	default:
 		return (ENXIO);