Bug 143118

Summary: Device ID for ichwd on the NM10 Express chipset watchdog timer
Product: Base System Reporter: Koshin sumitani <ksumitani>
Component: kernAssignee: Remko Lodder <remko>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: 7.2-RELEASE   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
file.diff none

Description Koshin sumitani 2010-01-23 13:50:01 UTC
Device ID to add support for the ichwd driver on the Intel NM10 Express chipset

Fix: > diff -u ichwd.c.orig ichwd.c
How-To-Repeat: kldload ichwd... The ID is not there, so the driver does not work
Comment 1 dfilter service freebsd_committer freebsd_triage 2010-01-24 10:50:31 UTC
Author: remko
Date: Sun Jan 24 10:50:20 2010
New Revision: 202917
URL: http://svn.freebsd.org/changeset/base/202917

Log:
  Add support for the NM10 chipset.
  
  PR:		kern/143118
  Submitted by:	Koshin sumitani <ksumitani at mui dot biglobe dot ne dot jp>
  Approved by:	imp (mentor, implicit)
  MFC after:	3 days

Modified:
  head/sys/dev/ichwd/ichwd.c
  head/sys/dev/ichwd/ichwd.h

Modified: head/sys/dev/ichwd/ichwd.c
==============================================================================
--- head/sys/dev/ichwd/ichwd.c	Sun Jan 24 10:35:26 2010	(r202916)
+++ head/sys/dev/ichwd/ichwd.c	Sun Jan 24 10:50:20 2010	(r202917)
@@ -93,6 +93,7 @@ static struct ichwd_device ichwd_devices
 	{ DEVICEID_ICH7DH,   "Intel ICH7DH watchdog timer",	7 },
 	{ DEVICEID_ICH7M,    "Intel ICH7M watchdog timer",	7 },
 	{ DEVICEID_ICH7MDH,  "Intel ICH7MDH watchdog timer",	7 },
+	{ DEVICEID_NM10,     "Intel NM10 watchdog timer",	7 },
 	{ DEVICEID_ICH8,     "Intel ICH8 watchdog timer",	8 },
 	{ DEVICEID_ICH8DH,   "Intel ICH8DH watchdog timer",	8 },
 	{ DEVICEID_ICH8DO,   "Intel ICH8DO watchdog timer",	8 },

Modified: head/sys/dev/ichwd/ichwd.h
==============================================================================
--- head/sys/dev/ichwd/ichwd.h	Sun Jan 24 10:35:26 2010	(r202916)
+++ head/sys/dev/ichwd/ichwd.h	Sun Jan 24 10:50:20 2010	(r202917)
@@ -83,6 +83,7 @@ struct ichwd_softc {
 #define DEVICEID_ICH7		0x27b8
 #define DEVICEID_ICH7DH		0x27b0
 #define DEVICEID_ICH7M		0x27b9
+#define DEVICEID_NM10		0x27bc
 #define DEVICEID_ICH7MDH	0x27bd
 #define DEVICEID_ICH8		0x2810
 #define DEVICEID_ICH8DH		0x2812
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
Comment 2 Remko Lodder freebsd_committer freebsd_triage 2010-01-24 10:50:45 UTC
Responsible Changed
From-To: freebsd-bugs->remko

I'll take it.
Comment 3 Remko Lodder freebsd_committer freebsd_triage 2010-01-24 10:50:48 UTC
State Changed
From-To: open->patched

imported in head.
Comment 4 dfilter service freebsd_committer freebsd_triage 2010-07-12 18:46:39 UTC
Author: remko
Date: Mon Jul 12 17:46:19 2010
New Revision: 209952
URL: http://svn.freebsd.org/changeset/base/209952

Log:
  MFC r202917
  
   Add support for the NM10 chipset.
  
   PR:		kern/143118
   Submitted by:	Koshin sumitani <ksumitani at mui dot biglobe dot ne dot jp>
   Approved by:	imp (mentor, implicit)
   MFC after:	3 days

Modified:
  stable/8/sys/dev/ichwd/ichwd.c
  stable/8/sys/dev/ichwd/ichwd.h
Directory Properties:
  stable/8/etc/   (props changed)
  stable/8/libexec/   (props changed)
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/dev/ichwd/ichwd.c
==============================================================================
--- stable/8/sys/dev/ichwd/ichwd.c	Mon Jul 12 17:18:58 2010	(r209951)
+++ stable/8/sys/dev/ichwd/ichwd.c	Mon Jul 12 17:46:19 2010	(r209952)
@@ -93,6 +93,7 @@ static struct ichwd_device ichwd_devices
 	{ DEVICEID_ICH7DH,   "Intel ICH7DH watchdog timer",	7 },
 	{ DEVICEID_ICH7M,    "Intel ICH7M watchdog timer",	7 },
 	{ DEVICEID_ICH7MDH,  "Intel ICH7MDH watchdog timer",	7 },
+	{ DEVICEID_NM10,     "Intel NM10 watchdog timer",	7 },
 	{ DEVICEID_ICH8,     "Intel ICH8 watchdog timer",	8 },
 	{ DEVICEID_ICH8DH,   "Intel ICH8DH watchdog timer",	8 },
 	{ DEVICEID_ICH8DO,   "Intel ICH8DO watchdog timer",	8 },

Modified: stable/8/sys/dev/ichwd/ichwd.h
==============================================================================
--- stable/8/sys/dev/ichwd/ichwd.h	Mon Jul 12 17:18:58 2010	(r209951)
+++ stable/8/sys/dev/ichwd/ichwd.h	Mon Jul 12 17:46:19 2010	(r209952)
@@ -83,6 +83,7 @@ struct ichwd_softc {
 #define DEVICEID_ICH7		0x27b8
 #define DEVICEID_ICH7DH		0x27b0
 #define DEVICEID_ICH7M		0x27b9
+#define DEVICEID_NM10		0x27bc
 #define DEVICEID_ICH7MDH	0x27bd
 #define DEVICEID_ICH8		0x2810
 #define DEVICEID_ICH8DH		0x2812
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
Comment 5 dfilter service freebsd_committer freebsd_triage 2010-07-12 18:50:58 UTC
Author: remko
Date: Mon Jul 12 17:50:38 2010
New Revision: 209953
URL: http://svn.freebsd.org/changeset/base/209953

Log:
  MFC r202917
  
   Add support for the NM10 chipset.
  
   PR:		kern/143118
   Submitted by:	Koshin sumitani <ksumitani at mui dot biglobe dot ne dot jp>
   Approved by:	imp (mentor, implicit)
   MFC after:	3 days

Modified:
  stable/7/sys/dev/ichwd/ichwd.c
  stable/7/sys/dev/ichwd/ichwd.h
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/ichwd/ichwd.c
==============================================================================
--- stable/7/sys/dev/ichwd/ichwd.c	Mon Jul 12 17:46:19 2010	(r209952)
+++ stable/7/sys/dev/ichwd/ichwd.c	Mon Jul 12 17:50:38 2010	(r209953)
@@ -93,6 +93,7 @@ static struct ichwd_device ichwd_devices
 	{ DEVICEID_ICH7DH,   "Intel ICH7DH watchdog timer",	7 },
 	{ DEVICEID_ICH7M,    "Intel ICH7M watchdog timer",	7 },
 	{ DEVICEID_ICH7MDH,  "Intel ICH7MDH watchdog timer",	7 },
+	{ DEVICEID_NM10,     "Intel NM10 watchdog timer",	7 },
 	{ DEVICEID_ICH8,     "Intel ICH8 watchdog timer",	8 },
 	{ DEVICEID_ICH8DH,   "Intel ICH8DH watchdog timer",	8 },
 	{ DEVICEID_ICH8DO,   "Intel ICH8DO watchdog timer",	8 },

Modified: stable/7/sys/dev/ichwd/ichwd.h
==============================================================================
--- stable/7/sys/dev/ichwd/ichwd.h	Mon Jul 12 17:46:19 2010	(r209952)
+++ stable/7/sys/dev/ichwd/ichwd.h	Mon Jul 12 17:50:38 2010	(r209953)
@@ -83,6 +83,7 @@ struct ichwd_softc {
 #define DEVICEID_ICH7		0x27b8
 #define DEVICEID_ICH7DH		0x27b0
 #define DEVICEID_ICH7M		0x27b9
+#define DEVICEID_NM10		0x27bc
 #define DEVICEID_ICH7MDH	0x27bd
 #define DEVICEID_ICH8		0x2810
 #define DEVICEID_ICH8DH		0x2812
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
Comment 6 Remko Lodder freebsd_committer freebsd_triage 2010-07-12 18:51:26 UTC
State Changed
From-To: patched->closed

Merged to all branches, thanks for the patience