[src/netbsd-6]: src/sys/dev/pci Pull up following revision(s) (requested by t...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/fe050b4528d5
branches:  netbsd-6
changeset: 773902:fe050b4528d5
user:      riz <riz%NetBSD.org@localhost>
date:      Thu Mar 08 17:32:50 2012 +0000

description:
Pull up following revision(s) (requested by tsutsui in ticket #95):
        sys/dev/pci/agp_amd64.c: revision 1.7
- make agp_amd64_attach() also checks AMD64 Family 10h CPU's
  misc configuration devices
- print proper error message if no misc configuration device is found
Fixes kernel crash right after starting Xserver with radeondrm
on ASRock AM2NF3-VSTA (AM2 + nForce3 250 AGP) with Athlon II X2 CPU.

diffstat:

 sys/dev/pci/agp_amd64.c |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (31 lines):

diff -r 42e2e06cfe51 -r fe050b4528d5 sys/dev/pci/agp_amd64.c
--- a/sys/dev/pci/agp_amd64.c   Thu Mar 08 17:27:52 2012 +0000
+++ b/sys/dev/pci/agp_amd64.c   Thu Mar 08 17:32:50 2012 +0000
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agp_amd64.c,v 1.6 2010/11/13 13:52:04 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp_amd64.c,v 1.6.14.1 2012/03/08 17:32:50 riz Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -224,13 +224,16 @@
                tag = pci_make_tag(pa->pa_pc, 0, i, 3);
                id = pci_conf_read(pa->pa_pc, tag, PCI_ID_REG);
                if (PCI_VENDOR(id) == PCI_VENDOR_AMD &&
-                   PCI_PRODUCT(id) == PCI_PRODUCT_AMD_AMD64_MISC) {
+                   (PCI_PRODUCT(id) == PCI_PRODUCT_AMD_AMD64_MISC ||
+                    PCI_PRODUCT(id) == PCI_PRODUCT_AMD_AMD64_F10_MISC)) {
                        asc->mctrl_tag[n] = tag;
                        n++;
                }
        }
-       if (n == 0)
+       if (n == 0) {
+               aprint_error(": No Miscellaneous Control unit found.\n");
                return ENXIO;
+       }
        asc->n_mctrl = n;
 
        aprint_normal(": %d Miscellaneous Control unit(s) found.\n",