Module Name:    src
Committed By:   reinoud
Date:           Sun Dec 18 15:50:32 UTC 2022

Modified Files:
        src/sys/arch/x86/pci: amdsmn.c
        src/sys/dev/acpi: amdccp_acpi.c
        src/sys/dev/fdt: amdccp_fdt.c
        src/sys/dev/pci: amdccp_pci.c

Log Message:
Add amdsmn(4) and amdccp(4) power management stubs.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/x86/pci/amdsmn.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/acpi/amdccp_acpi.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/fdt/amdccp_fdt.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/pci/amdccp_pci.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/x86/pci/amdsmn.c
diff -u src/sys/arch/x86/pci/amdsmn.c:1.14 src/sys/arch/x86/pci/amdsmn.c:1.15
--- src/sys/arch/x86/pci/amdsmn.c:1.14	Sat Oct  1 15:50:05 2022
+++ src/sys/arch/x86/pci/amdsmn.c	Sun Dec 18 15:50:32 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: amdsmn.c,v 1.14 2022/10/01 15:50:05 msaitoh Exp $	*/
+/*	$NetBSD: amdsmn.c,v 1.15 2022/12/18 15:50:32 reinoud Exp $	*/
 
 /*-
  * Copyright (c) 2017, 2019 Conrad Meyer <c...@freebsd.org>
@@ -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.15 2022/12/18 15:50:32 reinoud Exp $ ");
 
 /*
  * Driver for the AMD Family 15h (model 60+) and 17h CPU
@@ -159,6 +159,8 @@ amdsmn_attach(device_t parent, device_t 
 
 	// 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 @@ amdsmn_detach(device_t self, int flags)
 {
 	struct amdsmn_softc *sc = device_private(self);
 
+	pmf_device_deregister(self);
+
 	mutex_destroy(&sc->smn_lock);
 	aprint_normal_dev(self,"detach!\n");
 

Index: src/sys/dev/acpi/amdccp_acpi.c
diff -u src/sys/dev/acpi/amdccp_acpi.c:1.5 src/sys/dev/acpi/amdccp_acpi.c:1.6
--- src/sys/dev/acpi/amdccp_acpi.c:1.5	Fri Jan 29 15:49:55 2021
+++ src/sys/dev/acpi/amdccp_acpi.c	Sun Dec 18 15:50:32 2022
@@ -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.6 2022/12/18 15:50:32 reinoud 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.6 2022/12/18 15:50:32 reinoud Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -103,6 +103,7 @@ amdccp_acpi_attach(device_t parent, devi
 #endif
 
 	amdccp_common_attach(sc);
+	pmf_device_register(self, NULL, NULL);
 
 done:
 	acpi_resource_cleanup(&res);

Index: src/sys/dev/fdt/amdccp_fdt.c
diff -u src/sys/dev/fdt/amdccp_fdt.c:1.6 src/sys/dev/fdt/amdccp_fdt.c:1.7
--- src/sys/dev/fdt/amdccp_fdt.c:1.6	Wed Jan 27 03:10:21 2021
+++ src/sys/dev/fdt/amdccp_fdt.c	Sun Dec 18 15:50:32 2022
@@ -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.7 2022/12/18 15:50:32 reinoud 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.7 2022/12/18 15:50:32 reinoud Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -89,4 +89,5 @@ amdccp_fdt_attach(device_t parent, devic
 	aprint_normal(": AMD CCP\n");
 
 	amdccp_common_attach(sc);
+	pmf_device_register(self, NULL, NULL);
 }

Index: src/sys/dev/pci/amdccp_pci.c
diff -u src/sys/dev/pci/amdccp_pci.c:1.3 src/sys/dev/pci/amdccp_pci.c:1.4
--- src/sys/dev/pci/amdccp_pci.c:1.3	Wed Oct 26 13:35:25 2022
+++ src/sys/dev/pci/amdccp_pci.c	Sun Dec 18 15:50:32 2022
@@ -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.4 2022/12/18 15:50:32 reinoud 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.4 2022/12/18 15:50:32 reinoud Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -122,4 +122,5 @@ amdccp_pci_attach(device_t parent, devic
 	}
 
 	amdccp_common_attach(sc);
+	pmf_device_register(self, NULL, NULL);
 }

Reply via email to