From nobody@FreeBSD.org  Sat Jan 23 13:49:40 2010
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 503EF106566B
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 23 Jan 2010 13:49:40 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 3EC8D8FC1B
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 23 Jan 2010 13:49:40 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o0NDndAQ006440
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 23 Jan 2010 13:49:39 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id o0NDndFM006439;
	Sat, 23 Jan 2010 13:49:39 GMT
	(envelope-from nobody)
Message-Id: <201001231349.o0NDndFM006439@www.freebsd.org>
Date: Sat, 23 Jan 2010 13:49:39 GMT
From: Koshin sumitani <ksumitani@mui.biglobe.ne.jp>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Device ID for ichwd on the NM10 Express chipset watchdog timer
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         143118
>Category:       kern
>Synopsis:       Device ID for ichwd on the NM10 Express chipset watchdog timer
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    remko
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jan 23 13:50:01 UTC 2010
>Closed-Date:    Mon Jul 12 17:51:27 UTC 2010
>Last-Modified:  Mon Jul 12 18:00:15 UTC 2010
>Originator:     Koshin sumitani
>Release:        7.2-RELEASE
>Organization:
>Environment:
FreeBSD temp1.localhost 7.2-RELEASE FreeBSD 7.2-RELEASE #3: Sat Jan 16 16:23:41 JST 2010
>Description:
Device ID to add support for the ichwd driver on the Intel NM10 Express chipset
>How-To-Repeat:
kldload ichwd... The ID is not there, so the driver does not work
>Fix:
> diff -u ichwd.c.orig ichwd.c
--- ichwd.c.orig        2010-01-23 22:46:17.000000000 +0900
+++ ichwd.c     2010-01-13 23:31:15.000000000 +0900
@@ -91,6 +91,7 @@
        { DEVICEID_ICH7,     "Intel ICH7 watchdog timer",       7 },
        { DEVICEID_ICH7DH,   "Intel ICH7DH watchdog timer",     7 },
        { DEVICEID_ICH7M,    "Intel ICH7M watchdog timer",      7 },
+       { DEVICEID_NM10,     "Intel NM10 watchdog timer",       7 },
        { DEVICEID_ICH7MDH,  "Intel ICH7MDH watchdog timer",    7 },
        { DEVICEID_ICH8,     "Intel ICH8 watchdog timer",       8 },
        { DEVICEID_ICH8DH,   "Intel ICH8DH watchdog timer",     8 },
> diff -u ichwd.h.orig ichwd.h
--- ichwd.h.orig        2010-01-23 22:46:17.000000000 +0900
+++ ichwd.h     2010-01-13 23:30:29.000000000 +0900
@@ -83,6 +83,7 @@
 #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


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->remko 
Responsible-Changed-By: remko 
Responsible-Changed-When: Sun Jan 24 10:50:45 UTC 2010 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=143118 
State-Changed-From-To: open->patched 
State-Changed-By: remko 
State-Changed-When: Sun Jan 24 10:50:48 UTC 2010 
State-Changed-Why:  
imported in head. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=143118 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/143118: commit references a PR
Date: Sun, 24 Jan 2010 10:50:31 +0000 (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"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/143118: commit references a PR
Date: Mon, 12 Jul 2010 17:46:39 +0000 (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"
 
State-Changed-From-To: patched->closed 
State-Changed-By: remko 
State-Changed-When: Mon Jul 12 17:51:26 UTC 2010 
State-Changed-Why:  
Merged to all branches, thanks for the patience 

http://www.freebsd.org/cgi/query-pr.cgi?pr=143118 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/143118: commit references a PR
Date: Mon, 12 Jul 2010 17:50:58 +0000 (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"
 
>Unformatted:
