svn commit: r234213 - in stable/9/sys: i386/conf kern pci

[Andriy Gapon]

Author: avg
Date: Fri Apr 13 08:01:34 2012
New Revision: 234213
URL: http://svn.freebsd.org/changeset/base/234213

Log:
  MFC r234040: intpm: reflect the fact that SB800 and later AMD chipsets
  are not supported

Modified:
  stable/9/sys/pci/intpm.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/amd64/include/xen/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/ia64/efi/   (props changed)
  stable/9/sys/boot/ia64/ski/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
  stable/9/sys/boot/powerpc/ofw/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/contrib/dev/acpica/   (props changed)
  stable/9/sys/contrib/octeon-sdk/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)
  stable/9/sys/contrib/x86emu/   (props changed)
  stable/9/sys/fs/   (props changed)
  stable/9/sys/fs/ntfs/   (props changed)
  stable/9/sys/i386/conf/XENHVM   (props changed)
  stable/9/sys/kern/subr_witness.c   (props changed)

Modified: stable/9/sys/pci/intpm.c
==============================================================================
--- stable/9/sys/pci/intpm.c	Fri Apr 13 07:54:09 2012	(r234212)
+++ stable/9/sys/pci/intpm.c	Fri Apr 13 08:01:34 2012	(r234213)
@@ -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;