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

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

details:   https://anonhg.NetBSD.org/src/rev/7c0b1eda35e4
branches:  netbsd-10
changeset: 372672:7c0b1eda35e4
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Dec 19 11:37:14 2022 +0000

description:
Pull up following revision(s) (requested by reinoud in ticket #3):

        sys/dev/pci/amdccp_pci.c: revision 1.4
        sys/arch/x86/pci/amdsmn.c: revision 1.15
        sys/dev/acpi/amdccp_acpi.c: revision 1.6
        sys/dev/fdt/amdccp_fdt.c: revision 1.7

Add amdsmn(4) and amdccp(4) power management stubs.

diffstat:

 sys/arch/x86/pci/amdsmn.c  |  8 ++++++--
 sys/dev/acpi/amdccp_acpi.c |  5 +++--
 sys/dev/fdt/amdccp_fdt.c   |  5 +++--
 sys/dev/pci/amdccp_pci.c   |  5 +++--
 4 files changed, 15 insertions(+), 8 deletions(-)

diffs (110 lines):

diff -r 31cc31ca557e -r 7c0b1eda35e4 sys/arch/x86/pci/amdsmn.c
--- a/sys/arch/x86/pci/amdsmn.c Fri Dec 16 19:12:49 2022 +0000
+++ b/sys/arch/x86/pci/amdsmn.c Mon Dec 19 11:37:14 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: amdsmn.c,v 1.14 2022/10/01 15:50:05 msaitoh Exp $      */
+/*     $NetBSD: amdsmn.c,v 1.14.4.1 2022/12/19 11:37:14 martin Exp $   */
 
 /*-
  * Copyright (c) 2017, 2019 Conrad Meyer <cem%FreeBSD.org@localhost>
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdsmn.c,v 1.14 2022/10/01 15:50:05 msaitoh Exp $ ");
+__KERNEL_RCSID(0, "$NetBSD: amdsmn.c,v 1.14.4.1 2022/12/19 11:37:14 martin Exp $ ");
 
 /*
  * Driver for the AMD Family 15h (model 60+) and 17h CPU
@@ -159,6 +159,8 @@
 
        // aprint_normal(": AMD Family 17h System Management Network\n");
        aprint_normal(": AMD System Management Network\n");
+
+       pmf_device_register(self, NULL, NULL);
        amdsmn_rescan(self, NULL, NULL);
 }
 
@@ -178,6 +180,8 @@
 {
        struct amdsmn_softc *sc = device_private(self);
 
+       pmf_device_deregister(self);
+
        mutex_destroy(&sc->smn_lock);
        aprint_normal_dev(self,"detach!\n");
 
diff -r 31cc31ca557e -r 7c0b1eda35e4 sys/dev/acpi/amdccp_acpi.c
--- a/sys/dev/acpi/amdccp_acpi.c        Fri Dec 16 19:12:49 2022 +0000
+++ b/sys/dev/acpi/amdccp_acpi.c        Mon Dec 19 11:37:14 2022 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: amdccp_acpi.c,v 1.5 2021/01/29 15:49:55 thorpej Exp $ */
+/* $NetBSD: amdccp_acpi.c,v 1.5.18.1 2022/12/19 11:37:15 martin Exp $ */
 
 /*
  * Copyright (c) 2018 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdccp_acpi.c,v 1.5 2021/01/29 15:49:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdccp_acpi.c,v 1.5.18.1 2022/12/19 11:37:15 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -103,6 +103,7 @@
 #endif
 
        amdccp_common_attach(sc);
+       pmf_device_register(self, NULL, NULL);
 
 done:
        acpi_resource_cleanup(&res);
diff -r 31cc31ca557e -r 7c0b1eda35e4 sys/dev/fdt/amdccp_fdt.c
--- a/sys/dev/fdt/amdccp_fdt.c  Fri Dec 16 19:12:49 2022 +0000
+++ b/sys/dev/fdt/amdccp_fdt.c  Mon Dec 19 11:37:14 2022 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: amdccp_fdt.c,v 1.6 2021/01/27 03:10:21 thorpej Exp $ */
+/* $NetBSD: amdccp_fdt.c,v 1.6.18.1 2022/12/19 11:37:15 martin Exp $ */
 
 /*
  * Copyright (c) 2018 Jonathan A. Kollasch
@@ -28,7 +28,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: amdccp_fdt.c,v 1.6 2021/01/27 03:10:21 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdccp_fdt.c,v 1.6.18.1 2022/12/19 11:37:15 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -89,4 +89,5 @@
        aprint_normal(": AMD CCP\n");
 
        amdccp_common_attach(sc);
+       pmf_device_register(self, NULL, NULL);
 }
diff -r 31cc31ca557e -r 7c0b1eda35e4 sys/dev/pci/amdccp_pci.c
--- a/sys/dev/pci/amdccp_pci.c  Fri Dec 16 19:12:49 2022 +0000
+++ b/sys/dev/pci/amdccp_pci.c  Mon Dec 19 11:37:14 2022 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: amdccp_pci.c,v 1.3 2022/10/26 13:35:25 msaitoh Exp $ */
+/* $NetBSD: amdccp_pci.c,v 1.3.2.1 2022/12/19 11:37:14 martin Exp $ */
 
 /*-
  * Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdccp_pci.c,v 1.3 2022/10/26 13:35:25 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdccp_pci.c,v 1.3.2.1 2022/12/19 11:37:14 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -122,4 +122,5 @@
        }
 
        amdccp_common_attach(sc);
+       pmf_device_register(self, NULL, NULL);
 }