[src/trunk]: src Attach amdtemp(4) at pchb(4) instead of in place of pchb(4).

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src Attach amdtemp(4) at pchb(4) instead of in place of pchb(4).
From: jakllsch <jakllsch%NetBSD.org@localhost>
Date: Mon, 06 Apr 2020 21:01:37 +0000
details:   https://anonhg.NetBSD.org/src/rev/bf0d60dee730
branches:  trunk
changeset: 768539:bf0d60dee730
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Thu Aug 18 20:55:20 2011 +0000

description:
Attach amdtemp(4) at pchb(4) instead of in place of pchb(4).

Should fix PR#45268.

diffstat:

 share/man/man4/amdtemp.4      |  6 +++---
 sys/arch/amd64/conf/GENERIC   |  6 +++---
 sys/arch/amd64/conf/XEN3_DOM0 |  4 ++--
 sys/arch/i386/conf/ALL        |  6 +++---
 sys/arch/i386/conf/GENERIC    |  6 +++---
 sys/arch/i386/conf/XEN3_DOM0  |  4 ++--
 sys/arch/x86/pci/files.pci    |  8 +++++---
 sys/arch/x86/pci/pchb.c       |  6 ++++--
 8 files changed, 25 insertions(+), 21 deletions(-)

diffs (199 lines):

diff -r 77de50a8e1a5 -r bf0d60dee730 share/man/man4/amdtemp.4
--- a/share/man/man4/amdtemp.4  Thu Aug 18 19:48:03 2011 +0000
+++ b/share/man/man4/amdtemp.4  Thu Aug 18 20:55:20 2011 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: amdtemp.4,v 1.4 2008/11/20 10:33:24 wiz Exp $
+.\" $NetBSD: amdtemp.4,v 1.5 2011/08/18 20:55:21 jakllsch 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 November 19, 2008
+.Dd August 18, 2011
 .Dt AMDTEMP 4
 .Os
 .Sh NAME
 .Nm amdtemp
 .Nd AMD CPU on-die digital thermal sensor
 .Sh SYNOPSIS
-.Cd "amdtemp* at pci? dev ? function ?"
+.Cd "amdtemp* at pchb?"
 .Sh DESCRIPTION
 The
 .Nm
diff -r 77de50a8e1a5 -r bf0d60dee730 sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC       Thu Aug 18 19:48:03 2011 +0000
+++ b/sys/arch/amd64/conf/GENERIC       Thu Aug 18 20:55:20 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.333 2011/08/11 07:36:17 mbalmer Exp $
+# $NetBSD: GENERIC,v 1.334 2011/08/18 20:55:21 jakllsch Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.333 $"
+#ident                 "GENERIC-$Revision: 1.334 $"
 
 maxusers       64              # estimated number of users
 
@@ -428,7 +428,7 @@
 
 # Hardware monitors
 
-amdtemp* at pci? dev ? function ?      # AMD CPU Temperature sensors
+amdtemp* at pchb?                      # AMD CPU Temperature sensors
 
 # Winbond LPC Super I/O
 #wbsio*        at isa? port 0x2e
diff -r 77de50a8e1a5 -r bf0d60dee730 sys/arch/amd64/conf/XEN3_DOM0
--- a/sys/arch/amd64/conf/XEN3_DOM0     Thu Aug 18 19:48:03 2011 +0000
+++ b/sys/arch/amd64/conf/XEN3_DOM0     Thu Aug 18 20:55:20 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.70 2011/07/23 21:12:57 jakllsch Exp $
+# $NetBSD: XEN3_DOM0,v 1.71 2011/08/18 20:55:21 jakllsch Exp $
 
 include        "arch/amd64/conf/std.xen"
 
@@ -293,7 +293,7 @@
 
 # Hardware monitors
 
-amdtemp* at pci? dev ? function ?      # AMD CPU Temperature sensors
+amdtemp* at pchb?                      # AMD CPU Temperature sensors
 
 # AMD 768 and 8111 power/ACPI controllers
 amdpm* at pci? dev ? function ?        # RNG and SMBus 1.0 interface
diff -r 77de50a8e1a5 -r bf0d60dee730 sys/arch/i386/conf/ALL
--- a/sys/arch/i386/conf/ALL    Thu Aug 18 19:48:03 2011 +0000
+++ b/sys/arch/i386/conf/ALL    Thu Aug 18 20:55:20 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.318 2011/08/11 07:38:56 mbalmer Exp $
+# $NetBSD: ALL,v 1.319 2011/08/18 20:55:20 jakllsch Exp $
 # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
 #
 # ALL machine description file
@@ -17,7 +17,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "ALL-$Revision: 1.318 $"
+#ident                 "ALL-$Revision: 1.319 $"
 
 maxusers       64              # estimated number of users
 
@@ -472,7 +472,7 @@
 elanpex*       at elansc?
 
 # Temperatures
-amdtemp* at pci? dev ? function ?      # AMD CPU Temperature sensors
+amdtemp* at pchb?                      # AMD CPU Temperature sensors
 
 # PCI bridges
 amdpcib* at pci? dev ? function ?      # AMD 8111 PCI-ISA w/ HPET
diff -r 77de50a8e1a5 -r bf0d60dee730 sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC        Thu Aug 18 19:48:03 2011 +0000
+++ b/sys/arch/i386/conf/GENERIC        Thu Aug 18 20:55:20 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1047 2011/08/11 07:38:56 mbalmer Exp $
+# $NetBSD: GENERIC,v 1.1048 2011/08/18 20:55:20 jakllsch Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.1047 $"
+#ident                 "GENERIC-$Revision: 1.1048 $"
 
 maxusers       64              # estimated number of users
 
@@ -444,7 +444,7 @@
 gpio*  at elansc?
 
 # Temperatures
-amdtemp* at pci? dev ? function ?      # AMD CPU Temperature sensors
+amdtemp* at pchb?                      # AMD CPU Temperature sensors
 
 # PCI bridges
 #amdpcib* at pci? dev ? function ?     # AMD 8111 PCI-ISA w/ HPET
diff -r 77de50a8e1a5 -r bf0d60dee730 sys/arch/i386/conf/XEN3_DOM0
--- a/sys/arch/i386/conf/XEN3_DOM0      Thu Aug 18 19:48:03 2011 +0000
+++ b/sys/arch/i386/conf/XEN3_DOM0      Thu Aug 18 20:55:20 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: XEN3_DOM0,v 1.54 2011/07/23 21:12:58 jakllsch Exp $
+#      $NetBSD: XEN3_DOM0,v 1.55 2011/08/18 20:55:20 jakllsch Exp $
 #
 #      XEN3_0: Xen 3.0 domain0 kernel
 
@@ -270,7 +270,7 @@
 
 # Hardware monitors
 
-amdtemp* at pci? dev ? function ?      # AMD CPU Temperature sensors
+amdtemp* at pchb?                      # AMD CPU Temperature sensors
 
 # AMD 768 and 8111 power/ACPI controllers
 amdpm* at pci? dev ? function ?        # RNG and SMBus 1.0 interface
diff -r 77de50a8e1a5 -r bf0d60dee730 sys/arch/x86/pci/files.pci
--- a/sys/arch/x86/pci/files.pci        Thu Aug 18 19:48:03 2011 +0000
+++ b/sys/arch/x86/pci/files.pci        Thu Aug 18 20:55:20 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.pci,v 1.12 2011/06/15 06:43:20 jruoho Exp $
+#      $NetBSD: files.pci,v 1.13 2011/08/18 20:55:20 jakllsch Exp $
 
 device         aapic
 attach         aapic at pci
@@ -7,7 +7,9 @@
 file   arch/x86/pci/agp_machdep.c      agp
 
 # PCI-Host bridge chipsets
-device pchb:   pcibus, agpbus, agp_ali, agp_amd, agp_amd64, agp_i810,
+define amdtempbus {}
+device pchb:   pcibus, agpbus, amdtempbus,
+               agp_ali, agp_amd, agp_amd64, agp_i810,
                agp_intel, agp_sis, agp_via
 attach pchb at pci
 file   arch/x86/pci/pchb.c             pchb            needs-flag
@@ -27,7 +29,7 @@
 
 # AMD Processors -- Miscellaneous Control
 device amdtemp: sysmon_envsys
-attach amdtemp at pci
+attach amdtemp at amdtempbus
 file   arch/x86/pci/amdtemp.c          amdtemp
 
 # PCI-LPC bridges
diff -r 77de50a8e1a5 -r bf0d60dee730 sys/arch/x86/pci/pchb.c
--- a/sys/arch/x86/pci/pchb.c   Thu Aug 18 19:48:03 2011 +0000
+++ b/sys/arch/x86/pci/pchb.c   Thu Aug 18 20:55:20 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pchb.c,v 1.26 2011/07/01 18:22:08 dyoung Exp $ */
+/*     $NetBSD: pchb.c,v 1.27 2011/08/18 20:55:20 jakllsch Exp $ */
 
 /*-
  * Copyright (c) 1996, 1998, 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.26 2011/07/01 18:22:08 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.27 2011/08/18 20:55:20 jakllsch Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -439,6 +439,8 @@
                memset(&pba.pba_intrtag, 0, sizeof(pba.pba_intrtag));
                config_found_ia(self, "pcibus", &pba, pcibusprint);
        }
+
+       config_found_ia(self, "amdtempbus", aux, NULL);
 }
 
 int
Prev by Date: [src/trunk]: src/sys/modules/amdtemp Catch up to current reality.
Next by Date: [src/trunk]: src/sys/arch Change bcond/BCOND to regimm/REGIMM to better match...
Previous by Thread: [src/trunk]: src/sys/modules/amdtemp Catch up to current reality.
Next by Thread: [src/trunk]: src/sys/arch Change bcond/BCOND to regimm/REGIMM to better match...
Indexes:
Home | Main Index | Thread Index | Old Index