[src/netbsd-6]: src/sys Pull up following revision(s) (requested by cegger in...

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

details:   https://anonhg.NetBSD.org/src/rev/f65e4048eefb
branches:  netbsd-6
changeset: 774008:f65e4048eefb
user:      riz <riz%NetBSD.org@localhost>
date:      Mon Apr 16 15:25:11 2012 +0000

description:
Pull up following revision(s) (requested by cegger in ticket #180):
        sys/arch/x86/pci/amdtemp.c: revision 1.14
        sys/dev/pci/pcidevs: revision 1.1115
Add AMD Family15h ids
- support AMD Family15h
- deregister pmf on detach

diffstat:

 sys/arch/x86/pci/amdtemp.c |  11 ++++++++---
 sys/dev/pci/pcidevs        |  26 +++++++++++++++++---------
 2 files changed, 25 insertions(+), 12 deletions(-)

diffs (107 lines):

diff -r 5e767b17f8b1 -r f65e4048eefb sys/arch/x86/pci/amdtemp.c
--- a/sys/arch/x86/pci/amdtemp.c        Thu Apr 12 20:13:08 2012 +0000
+++ b/sys/arch/x86/pci/amdtemp.c        Mon Apr 16 15:25:11 2012 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: amdtemp.c,v 1.12.8.1 2012/03/08 17:38:03 riz Exp $ */
+/*      $NetBSD: amdtemp.c,v 1.12.8.2 2012/04/16 15:25:11 riz Exp $ */
 /*      $OpenBSD: kate.c,v 1.2 2008/03/27 04:52:03 cnst Exp $   */
 
 /*
@@ -48,7 +48,7 @@
 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdtemp.c,v 1.12.8.1 2012/03/08 17:38:03 riz Exp $ ");
+__KERNEL_RCSID(0, "$NetBSD: amdtemp.c,v 1.12.8.2 2012/04/16 15:25:11 riz Exp $ ");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -197,6 +197,7 @@
        case PCI_PRODUCT_AMD_AMD64_F10_MISC:
        case PCI_PRODUCT_AMD_AMD64_F11_MISC:
        case PCI_PRODUCT_AMD_F14_NB:    /* Family12h too */
+       case PCI_PRODUCT_AMD_F15_MISC:
                break;
        default:
                return 0;
@@ -225,7 +226,7 @@
 
 
        /* Not yet supported CPUs */
-       if (family > 0x14)
+       if (family > 0x15)
                return 0;
 
        return 2;       /* supercede pchb(4) */
@@ -270,6 +271,7 @@
        case 0x11: /* AMD Griffin */
        case 0x12: /* AMD Lynx/Sabine (Llano) */
        case 0x14: /* AMD Brazos (Ontario/Zacate/Desna) */
+       case 0x15:
                amdtemp_family10_init(sc);
                break;
 
@@ -299,6 +301,7 @@
        case 0x11:
        case 0x12:
        case 0x14:
+       case 0x15:
                amdtemp_family10_setup_sensors(sc, device_unit(self));
                break;
        }
@@ -326,6 +329,7 @@
        case 0x11:
        case 0x12:
        case 0x14:
+       case 0x15:
                sc->sc_sme->sme_refresh = amdtemp_family10_refresh;
                break;
        }
@@ -358,6 +362,7 @@
 {
        struct amdtemp_softc *sc = device_private(self);
 
+       pmf_device_deregister(self);
        if (sc->sc_sme != NULL)
                sysmon_envsys_unregister(sc->sc_sme);
 
diff -r 5e767b17f8b1 -r f65e4048eefb sys/dev/pci/pcidevs
--- a/sys/dev/pci/pcidevs       Thu Apr 12 20:13:08 2012 +0000
+++ b/sys/dev/pci/pcidevs       Mon Apr 16 15:25:11 2012 +0000
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1102.2.3 2012/04/03 15:52:26 riz Exp $
+$NetBSD: pcidevs,v 1.1102.2.4 2012/04/16 15:25:12 riz Exp $
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -931,14 +931,22 @@
 product AMD AMD64_F11_MISC     0x1303  AMD64 Family11h Miscellaneous Configuration
 product AMD AMD64_F11_LINK     0x1304  AMD64 Family11h Link Configuration
 product AMD F14_RC     0x1510  Family14h Root Complex
-product AMD F14_HT     0x1700  Family14h HyperTransport Configuration
-product AMD F14_ADDR   0x1701  Family14h Address Map Configuration
-product AMD F14_DRAM   0x1702  Family14h DRAM Configuration
-product AMD F14_NB     0x1703  Family14h North Bridge Configuration
-product AMD F14_CSTATE 0x1704  Family14h CPU C-state Configuration
-product AMD F14_MISC   0x1716  Family14h Misc. Configuration
-product AMD F14_HB18   0x1718  Family14h Host Bridge
-product AMD F14_HB19   0x1719  Family14h Host Bridge
+product AMD F15_HT     0x1600  Family15h HyperTransport Configuration
+product AMD F15_ADDR   0x1601  Family15h Address Map Configuration
+product AMD F15_DRAM   0x1602  Family15h DRAM Configuration
+product AMD F15_MISC   0x1603  Family15h Miscellaneous Configuration
+product AMD F15_LINK   0x1604  Family15h Link Configuration
+product AMD F15_NB     0x1605  Family15h North Bridge Configuration
+product AMD F14_HT     0x1700  Family12h/14h HyperTransport Configuration
+product AMD F14_ADDR   0x1701  Family12h/14h Address Map Configuration
+product AMD F14_DRAM   0x1702  Family12h/14h DRAM Configuration
+product AMD F14_NB     0x1703  Family12h/14h North Bridge Configuration
+product AMD F14_CSTATE 0x1704  Family12h/14h CPU C-state Configuration
+product AMD F12_RC     0x1705  Family12h Root Complex
+product AMD F12_GPP0   0x1709  Family12h GPP0 Root Port
+product AMD F14_MISC   0x1716  Family12h/14h Misc. Configuration
+product AMD F14_HB18   0x1718  Family12h/14h Host Bridge
+product AMD F14_HB19   0x1719  Family12h/14h Host Bridge
 product AMD PCNET_PCI  0x2000  PCnet-PCI Ethernet
 product AMD PCNET_HOME 0x2001  PCnet-Home HomePNA Ethernet
 product AMD AM_1771_MBW        0x2003  Alchemy AM 1771 MBW