Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-8]: src Pull up following revision(s) (requested by pgoyette in t...



details:   https://anonhg.NetBSD.org/src/rev/f21901716ecb
branches:  netbsd-8
changeset: 434604:f21901716ecb
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Feb 05 13:06:54 2018 +0000

description:
Pull up following revision(s) (requested by pgoyette in ticket #524):

        distrib/sets/lists/man/mi                       1.1574
        distrib/sets/lists/modules/md.amd64             1.73
        distrib/sets/lists/modules/md.i386              1.76
        share/man/man4/amdtemp.4                        1.11
        share/man/man4/man4.x86/Makefile                1.17
        share/man/man4/man4.x86/amdsmn.4                1.1-1.3
        share/man/man4/man4.x86/amdzentemp.4            1.1-1.6
        sys/arch/amd64/conf/ALL                         1.79,1.80
        sys/arch/amd64/conf/GENERIC                     1.482,1.484
        sys/arch/amd64/conf/XEN3_DOM0                   1.146,1.147
        sys/arch/x86/pci/amdsmn.c                       1.1-1.2
        sys/arch/x86/pci/amdsmn.h                       1.1
        sys/arch/x86/pci/amdzentemp.c                   1.1-1.7
        sys/arch/x86/pci/files.pci                      1.22,1.23
        sys/modules/amdzentemp/amdzentemp.ioconf        1.2


Add amdzentemp from FreeBSD via Ian Clark.

man pages for amdsmn and amdzentemp.

Some clean-up on the HISTORY and AUTHORS sections, and addition of a BUGS
section to document the fact that we don't yet handle the required temp
offset, nor do we expose the available thermal-trip value.

Add missing article 'a'

KNF: Put back the blank line following the empty variable declarations
Put back the variable declaration, too, and mark it __diagused
Otherwise a DIAGNOSTIC kernel will complain about the variable being
undeclared.

Correct placement of __diagused attribute.

Modularize the amdsmn(4) driver, and update dependency for amdzentemp(4),
Create amdsmn(4) amd amdzentemp(4) modules for X86.

diffstat:

 distrib/sets/lists/man/mi                |    8 +-
 distrib/sets/lists/modules/md.amd64      |    6 +-
 distrib/sets/lists/modules/md.i386       |    6 +-
 share/man/man4/amdtemp.4                 |    6 +-
 share/man/man4/man4.x86/Makefile         |    5 +-
 share/man/man4/man4.x86/amdsmn.4         |   88 ++++++++++
 share/man/man4/man4.x86/amdzentemp.4     |  100 ++++++++++++
 sys/arch/amd64/conf/ALL                  |   12 +-
 sys/arch/amd64/conf/GENERIC              |    7 +-
 sys/arch/amd64/conf/XEN3_DOM0            |    5 +-
 sys/arch/x86/pci/amdsmn.c                |  183 ++++++++++++++++++++++
 sys/arch/x86/pci/amdsmn.h                |   32 +++
 sys/arch/x86/pci/amdzentemp.c            |  252 +++++++++++++++++++++++++++++++
 sys/arch/x86/pci/files.pci               |   13 +-
 sys/modules/amdzentemp/amdzentemp.ioconf |   11 +
 15 files changed, 716 insertions(+), 18 deletions(-)

diffs (truncated from 932 to 300 lines):

diff -r 4729f953fe6e -r f21901716ecb distrib/sets/lists/man/mi
--- a/distrib/sets/lists/man/mi Sun Feb 04 12:53:51 2018 +0000
+++ b/distrib/sets/lists/man/mi Mon Feb 05 13:06:54 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1557 2017/05/27 21:02:55 bouyer Exp $
+# $NetBSD: mi,v 1.1557.2.1 2018/02/05 13:06:54 martin Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -1994,6 +1994,8 @@
 ./usr/share/man/cat4/x68k/powsw.0              man-sys-catman          .cat
 ./usr/share/man/cat4/x68k/vs.0                 man-sys-catman          .cat
 ./usr/share/man/cat4/x86/amdpcib.0             man-sys-catman          .cat
+./usr/share/man/cat4/x86/amdsmn.0              man-sys-catman          .cat
+./usr/share/man/cat4/x86/amdzentemp.0          man-sys-catman          .cat
 ./usr/share/man/cat4/x86/apic.0                        man-sys-catman          .cat
 ./usr/share/man/cat4/x86/balloon.0             man-sys-catman          .cat
 ./usr/share/man/cat4/x86/coretemp.0            man-sys-catman          .cat
@@ -5029,6 +5031,8 @@
 ./usr/share/man/html4/x68k/powsw.html          man-sys-htmlman         html
 ./usr/share/man/html4/x68k/vs.html             man-sys-htmlman         html
 ./usr/share/man/html4/x86/amdpcib.html         man-sys-htmlman         html
+./usr/share/man/html4/x86/amdsmn.html          man-sys-htmlman         html
+./usr/share/man/html4/x86/amdzentemp.html      man-sys-htmlman         html
 ./usr/share/man/html4/x86/apic.html            man-sys-htmlman         html
 ./usr/share/man/html4/x86/balloon.html         man-sys-htmlman         html
 ./usr/share/man/html4/x86/coretemp.html                man-sys-htmlman         html
@@ -7996,6 +8000,8 @@
 ./usr/share/man/man4/x68k/powsw.4              man-sys-man             .man
 ./usr/share/man/man4/x68k/vs.4                 man-sys-man             .man
 ./usr/share/man/man4/x86/amdpcib.4             man-sys-man             .man
+./usr/share/man/man4/x86/amdsmn.4              man-sys-man             .man
+./usr/share/man/man4/x86/amdzentemp.4          man-sys-man             .man
 ./usr/share/man/man4/x86/apic.4                        man-sys-man             .man
 ./usr/share/man/man4/x86/balloon.4             man-sys-man             .man
 ./usr/share/man/man4/x86/coretemp.4            man-sys-man             .man
diff -r 4729f953fe6e -r f21901716ecb distrib/sets/lists/modules/md.amd64
--- a/distrib/sets/lists/modules/md.amd64       Sun Feb 04 12:53:51 2018 +0000
+++ b/distrib/sets/lists/modules/md.amd64       Mon Feb 05 13:06:54 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.72 2016/12/15 12:56:52 kre Exp $
+# $NetBSD: md.amd64,v 1.72.6.1 2018/02/05 13:06:55 martin Exp $
 #
 # NOTE that there are two sets of files here:
 # @MODULEDIR@ and amd64-xen
@@ -31,8 +31,12 @@
 ./@MODULEDIR@/acpiwmi/acpiwmi.kmod             base-kernel-modules     kmod
 ./@MODULEDIR@/aibs                             base-kernel-modules     kmod
 ./@MODULEDIR@/aibs/aibs.kmod                   base-kernel-modules     kmod
+./@MODULEDIR@/amdsmn                           base-kernel-modules     kmod
+./@MODULEDIR@/amdsmn/amdsmn.kmod               base-kernel-modules     kmod
 ./@MODULEDIR@/amdtemp                          base-kernel-modules     kmod
 ./@MODULEDIR@/amdtemp/amdtemp.kmod             base-kernel-modules     kmod
+./@MODULEDIR@/amdzentemp                       base-kernel-modules     kmod
+./@MODULEDIR@/amdzentemp/amdzentemp.kmod       base-kernel-modules     kmod
 ./@MODULEDIR@/aps                              base-kernel-modules     kmod
 ./@MODULEDIR@/aps/aps.kmod                     base-kernel-modules     kmod
 ./@MODULEDIR@/asus                             base-kernel-modules     kmod
diff -r 4729f953fe6e -r f21901716ecb distrib/sets/lists/modules/md.i386
--- a/distrib/sets/lists/modules/md.i386        Sun Feb 04 12:53:51 2018 +0000
+++ b/distrib/sets/lists/modules/md.i386        Mon Feb 05 13:06:54 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.73 2016/12/15 12:56:52 kre Exp $
+# $NetBSD: md.i386,v 1.73.6.1 2018/02/05 13:06:55 martin Exp $
 #
 # NOTE that there are three sets of files here:
 # @MODULEDIR@, i386-xen, and i386pae-xen
@@ -32,8 +32,12 @@
 ./@MODULEDIR@/acpiwmi/acpiwmi.kmod             base-kernel-modules     kmod
 ./@MODULEDIR@/aibs                             base-kernel-modules     kmod
 ./@MODULEDIR@/aibs/aibs.kmod                   base-kernel-modules     kmod
+./@MODULEDIR@/amdsmn                           base-kernel-modules     kmod
+./@MODULEDIR@/amdsmn/amdsmn.kmod               base-kernel-modules     kmod
 ./@MODULEDIR@/amdtemp                          base-kernel-modules     kmod
 ./@MODULEDIR@/amdtemp/amdtemp.kmod             base-kernel-modules     kmod
+./@MODULEDIR@/amdzentemp                       base-kernel-modules     kmod
+./@MODULEDIR@/amdzentemp/amdzentemp.kmod       base-kernel-modules     kmod
 ./@MODULEDIR@/aps                              base-kernel-modules     kmod
 ./@MODULEDIR@/aps/aps.kmod                     base-kernel-modules     kmod
 ./@MODULEDIR@/asus                             base-kernel-modules     kmod
diff -r 4729f953fe6e -r f21901716ecb share/man/man4/amdtemp.4
--- a/share/man/man4/amdtemp.4  Sun Feb 04 12:53:51 2018 +0000
+++ b/share/man/man4/amdtemp.4  Mon Feb 05 13:06:54 2018 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: amdtemp.4,v 1.9 2014/03/18 18:20:39 riastradh Exp $
+.\" $NetBSD: amdtemp.4,v 1.9.18.1 2018/02/05 13:06:55 martin Exp $
 .\"-
 .\" Copyright (c) 2008 Christoph Egger
 .\" All rights reserved.
@@ -26,14 +26,14 @@
 .\"
 .\" $FreeBSD: src/share/man/man4/coretemp.4,v 1.4 2007/10/15 20:00:19 netchild Exp $
 .\"
-.Dd March 2, 2012
+.Dd January 28, 2018
 .Dt AMDTEMP 4
 .Os
 .Sh NAME
 .Nm amdtemp
 .Nd AMD CPU on-die digital thermal sensor
 .Sh SYNOPSIS
-.Cd "amdtemp* at pchb?"
+.Cd "amdtemp* at amdnb_miscbus?"
 .Sh DESCRIPTION
 The
 .Nm
diff -r 4729f953fe6e -r f21901716ecb share/man/man4/man4.x86/Makefile
--- a/share/man/man4/man4.x86/Makefile  Sun Feb 04 12:53:51 2018 +0000
+++ b/share/man/man4/man4.x86/Makefile  Mon Feb 05 13:06:54 2018 +0000
@@ -1,8 +1,9 @@
-#      $NetBSD: Makefile,v 1.16 2015/05/04 02:43:18 pgoyette Exp $
+#      $NetBSD: Makefile,v 1.16.8.1 2018/02/05 13:06:55 martin Exp $
 
 MAN=   amdpcib.4 apic.4 balloon.4 coretemp.4 est.4 fdc.4 \
        fwhrng.4 hpet.4 ichlpcib.4 lpt.4 mem.4 odcm.4 powernow.4 \
-       soekrisgpio.4 tco.4 tprof_amdpmi.4 tprof_pmi.4 vmt.4 vmx.4
+       soekrisgpio.4 tco.4 tprof_amdpmi.4 tprof_pmi.4 vmt.4 vmx.4 \
+       amdsmn.4 amdzentemp.4
 
 MLINKS+=apic.4 ioapic.4 \
        apic.4 lapic.4
diff -r 4729f953fe6e -r f21901716ecb share/man/man4/man4.x86/amdsmn.4
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/share/man/man4/man4.x86/amdsmn.4  Mon Feb 05 13:06:54 2018 +0000
@@ -0,0 +1,88 @@
+.\"    $NetBSD: amdsmn.4,v 1.3.2.2 2018/02/05 13:06:55 martin Exp $
+.\"
+.\" Copyright (c) 2018 Ian Clark <mrrooster%gmail.com@localhost>
+.\" All rights reserved.
+.\"
+.\" This code is derived from the FreeBSD amdsmn driver by
+.\" Conrad Meyer <cem%FreeBSD.org@localhost>
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"-
+.\" Copyright (c) 2017 Conrad Meyer <cem%FreeBSD.org@localhost>
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\" $FreeBSD: head/share/man/man4/amdsmn.4 323184 2017-09-05 15:13:41Z cem $
+.\"
+.Dd January 22, 2018
+.Dt AMDSMN 4 x86
+.Os
+.Sh NAME
+.Nm amdsmn
+.Nd device driver for AMD processor System Management Network
+.Sh SYNOPSIS
+.Cd "amdsmn* at pci?"
+.Sh DESCRIPTION
+The
+.Nm
+driver provides support for resources on the System Management Network bus
+in AMD Family 17h processors.
+.Sh SEE ALSO
+.Xr amdzentemp 4
+.Sh HISTORY
+The
+.Nm
+driver first appeared in
+.Fx
+and
+.Nx 9.0 .
+.Sh AUTHORS
+.An -nosplit
+Based on the
+.Fx
+driver by
+.An Conrad Meyer .
+It was adapted to
+.Nx
+by
+.An Ian Clark .
diff -r 4729f953fe6e -r f21901716ecb share/man/man4/man4.x86/amdzentemp.4
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/share/man/man4/man4.x86/amdzentemp.4      Mon Feb 05 13:06:54 2018 +0000
@@ -0,0 +1,100 @@
+.\" $NetBSD: amdzentemp.4,v 1.6.2.2 2018/02/05 13:06:55 martin Exp $
+.\"-
+.\" Copyright (c) 2008 Christoph Egger
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\" $FreeBSD: src/share/man/man4/coretemp.4,v 1.4 2007/10/15 20:00:19 netchild Exp $
+.\"
+.Dd January 28, 2018
+.Dt AMDZENTEMP 4 x86
+.Os
+.Sh NAME
+.Nm amdzentemp
+.Nd AMD Zen CPU family on-die digital thermal sensor
+.Sh SYNOPSIS
+.Cd "amdzentemp* at amdsmnbus?"
+.Sh DESCRIPTION
+The
+.Nm
+driver provides support for the on-die digital thermal sensor present
+on AMD Ryzen CPUs
+.Pp
+These sensors provide 0.125\(deC accuracy.
+There is one sensor for each CPU socket.
+.Pp
+The
+.Nm
+driver reports temperatures through the
+.Xr envsys 4
+API.
+.Bl -column "CPUN sensor0" "Units" "Typical Use" -offset indent
+.It Sy "Sensor" Ta Sy "Units" Ta Sy "Typical Use"
+.It CPU Ns Em N No sensor0 Ta \(*mK Ta cpu Ns Em N No temperature
+.El
+.Sh SEE ALSO
+.Xr amdtemp 4 ,
+.Xr envsys 4 ,
+.Xr envstat 8 ,
+.Xr powerd 8
+.Sh HISTORY
+The
+.Nm
+driver first appeared in
+.Ox 4.4
+named
+.Dq kate .
+It was then ported to
+.Nx 5.0
+under the name
+.Xr amdtemp 4 .
+The
+.Fx
+version of the driver was updated with support for newer AMD CPUs.
+For
+.Nx ,
+the support for the newer CPUs was separated into its own
+.Nm
+driver.
+.Sh AUTHORS
+.An -nosplit
+The
+.Nm
+driver was written by



Home | Main Index | Thread Index | Old Index