svn commit: r187539 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb pci

[Jung-uk Kim]

Author: jkim
Date: Wed Jan 21 17:07:46 2009
New Revision: 187539
URL: http://svn.freebsd.org/changeset/base/187539

Log:
  MFC: Add support for AMD64 Family 10h processors.
  
  PR:		kern/128331

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/pci/agp_amd64.c

Modified: stable/7/sys/pci/agp_amd64.c
==============================================================================
--- stable/7/sys/pci/agp_amd64.c	Wed Jan 21 17:07:23 2009	(r187538)
+++ stable/7/sys/pci/agp_amd64.c	Wed Jan 21 17:07:46 2009	(r187539)
@@ -167,14 +167,16 @@ agp_amd64_attach(device_t dev)
 {
 	struct agp_amd64_softc *sc = device_get_softc(dev);
 	struct agp_gatt *gatt;
+	uint32_t devid;
 	int i, n, error;
 
-	for (i = 0, n = 0; i < PCI_SLOTMAX && n < AMD64_MAX_MCTRL; i++)
-		if (pci_cfgregread(0, i, 3, 0, 4) == 0x11031022) {
+	for (i = 0, n = 0; i < PCI_SLOTMAX && n < AMD64_MAX_MCTRL; i++) {
+		devid = pci_cfgregread(0, i, 3, 0, 4);
+		if (devid == 0x11031022 || devid == 0x12031022) {
 			sc->mctrl[n] = i;
 			n++;
 		}
-
+	}
 	if (n == 0)
 		return (ENXIO);