[src/netbsd-3]: src Pull up following revision(s) (requested by tls in ticket...

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

details:   https://anonhg.NetBSD.org/src/rev/930b5f88a0a7
branches:  netbsd-3
changeset: 577812:930b5f88a0a7
user:      riz <riz%NetBSD.org@localhost>
date:      Sun Feb 05 17:28:54 2006 +0000

description:
Pull up following revision(s) (requested by tls in ticket #1159):
        sys/dev/pci/amdpm.c: revision 1.10
        share/man/man4/amdpm.4: revision 1.4
Add support for the AMD8111 RNG; from Nicolas Joly in PR kern/32284.

diffstat:

 share/man/man4/amdpm.4 |  11 ++++++-----
 sys/dev/pci/amdpm.c    |  19 ++++++++++++++-----
 2 files changed, 20 insertions(+), 10 deletions(-)

diffs (88 lines):

diff -r d8ca4bb4a1fb -r 930b5f88a0a7 share/man/man4/amdpm.4
--- a/share/man/man4/amdpm.4    Sun Feb 05 17:26:10 2006 +0000
+++ b/share/man/man4/amdpm.4    Sun Feb 05 17:28:54 2006 +0000
@@ -1,6 +1,6 @@
-.\" $NetBSD: amdpm.4,v 1.3 2003/01/19 21:25:39 atatat Exp $
+.\" $NetBSD: amdpm.4,v 1.3.6.1 2006/02/05 17:28:54 riz Exp $
 .\"
-.\" Copyright (c) 2002 The NetBSD Foundation, Inc.
+.\" Copyright (c) 2002, 2006 The NetBSD Foundation, Inc.
 .\" All rights reserved.
 .\"
 .\" This code is derived from software contributed to The NetBSD Foundation
@@ -34,18 +34,19 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd June 2, 2002
+.Dd January 29, 2006
 .Dt AMDPM 4
 .Os
 .Sh NAME
 .Nm amdpm
-.Nd AMD768 Power Management Controller
+.Nd AMD768 Power Management Controller and AMD8111 System Management Controller
 .Sh SYNOPSIS
 .Cd "amdpm* at pci? dev ? function ?"
 .Sh DESCRIPTION
 The
 .Nm
-provides support for the AMD768 Power Management Controller.
+provides support for the AMD768 Power Management Controller,
+and for the AMD8111 System Management Controller.
 .Sh SEE ALSO
 .Xr pci 4 ,
 .Xr rnd 4
diff -r d8ca4bb4a1fb -r 930b5f88a0a7 sys/dev/pci/amdpm.c
--- a/sys/dev/pci/amdpm.c       Sun Feb 05 17:26:10 2006 +0000
+++ b/sys/dev/pci/amdpm.c       Sun Feb 05 17:28:54 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: amdpm.c,v 1.7.14.1 2006/02/05 17:26:10 riz Exp $       */
+/*     $NetBSD: amdpm.c,v 1.7.14.2 2006/02/05 17:28:54 riz Exp $       */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdpm.c,v 1.7.14.1 2006/02/05 17:26:10 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdpm.c,v 1.7.14.2 2006/02/05 17:28:54 riz Exp $");
 
 #include "opt_amdpm.h"
 
@@ -90,9 +90,15 @@
 {
        struct pci_attach_args *pa = aux;
 
-       if (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_AMD &&
-           PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_AMD_PBC768_PMC)
+       if (PCI_VENDOR(pa->pa_id) != PCI_VENDOR_AMD)
+               return (0);
+
+       switch (PCI_PRODUCT(pa->pa_id)) {
+       case PCI_PRODUCT_AMD_PBC768_PMC:
+       case PCI_PRODUCT_AMD_PBC8111_ACPI:
                return (1);
+       }
+
        return (0);
 }
 
@@ -101,12 +107,15 @@
 {
        struct amdpm_softc *sc = (struct amdpm_softc *) self;
        struct pci_attach_args *pa = aux;
+       char devinfo[256];
        pcireg_t reg;
        u_int32_t pmreg;
        int i;
 
        aprint_naive("\n");
-       aprint_normal("\n");
+       pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof(devinfo));
+       aprint_normal(": %s (rev. 0x%02x)\n", devinfo,
+           PCI_REVISION(pa->pa_class));
 
        sc->sc_pc = pa->pa_pc;
        sc->sc_tag = pa->pa_tag;