[src/netbsd-8]: src/sys/arch/x86/pci Pull up following revision(s) (requested...

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

details:   https://anonhg.NetBSD.org/src/rev/f60b892dcb70
branches:  netbsd-8
changeset: 446718:f60b892dcb70
user:      martin <martin%NetBSD.org@localhost>
date:      Sat Dec 15 13:38:59 2018 +0000

description:
Pull up following revision(s) (requested by is in ticket #1137):

        sys/arch/x86/pci/amdnb_misc.c: revision 1.3
        sys/arch/x86/pci/amdtemp.c: revision 1.22

Added support for AMD family 16h cpu sensors - (just like 10h-14h).
(Tested on netbsd-8.0 release.)

diffstat:

 sys/arch/x86/pci/amdnb_misc.c |  6 ++++--
 sys/arch/x86/pci/amdtemp.c    |  9 ++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diffs (78 lines):

diff -r bafbbd2cc2d0 -r f60b892dcb70 sys/arch/x86/pci/amdnb_misc.c
--- a/sys/arch/x86/pci/amdnb_misc.c     Fri Dec 14 12:15:17 2018 +0000
+++ b/sys/arch/x86/pci/amdnb_misc.c     Sat Dec 15 13:38:59 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: amdnb_misc.c,v 1.2 2012/04/16 16:07:24 cegger Exp $ */
+/*     $NetBSD: amdnb_misc.c,v 1.2.36.1 2018/12/15 13:38:59 martin Exp $ */
 /*
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdnb_misc.c,v 1.2 2012/04/16 16:07:24 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdnb_misc.c,v 1.2.36.1 2018/12/15 13:38:59 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -67,6 +67,8 @@
        case PCI_PRODUCT_AMD_AMD64_F11_MISC:
        case PCI_PRODUCT_AMD_F14_NB:            /* Family 12h, too */
        case PCI_PRODUCT_AMD_F15_MISC:
+       case PCI_PRODUCT_AMD_F16_NB:
+       case PCI_PRODUCT_AMD_F16_30_NB:
                break;
        default:
                return 0;
diff -r bafbbd2cc2d0 -r f60b892dcb70 sys/arch/x86/pci/amdtemp.c
--- a/sys/arch/x86/pci/amdtemp.c        Fri Dec 14 12:15:17 2018 +0000
+++ b/sys/arch/x86/pci/amdtemp.c        Sat Dec 15 13:38:59 2018 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: amdtemp.c,v 1.20 2017/06/01 02:45:08 chs Exp $ */
+/*      $NetBSD: amdtemp.c,v 1.20.2.1 2018/12/15 13:38:59 martin 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.20 2017/06/01 02:45:08 chs Exp $ ");
+__KERNEL_RCSID(0, "$NetBSD: amdtemp.c,v 1.20.2.1 2018/12/15 13:38:59 martin Exp $ ");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -212,7 +212,7 @@
 
 
        /* Not yet supported CPUs */
-       if (family > 0x15)
+       if (family > 0x16)
                return 0;
 
        return 1;
@@ -257,6 +257,7 @@
        case 0x12: /* AMD Lynx/Sabine (Llano) */
        case 0x14: /* AMD Brazos (Ontario/Zacate/Desna) */
        case 0x15:
+       case 0x16:
                amdtemp_family10_init(sc);
                break;
 
@@ -284,6 +285,7 @@
        case 0x12:
        case 0x14:
        case 0x15:
+       case 0x16:
                amdtemp_family10_setup_sensors(sc, device_unit(self));
                break;
        }
@@ -312,6 +314,7 @@
        case 0x12:
        case 0x14:
        case 0x15:
+       case 0x16:
                sc->sc_sme->sme_refresh = amdtemp_family10_refresh;
                break;
        }