From dan@dan.emsphone.com  Mon Aug 15 20:06:31 2011
Return-Path: <dan@dan.emsphone.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2A46F106564A
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 15 Aug 2011 20:06:31 +0000 (UTC)
	(envelope-from dan@dan.emsphone.com)
Received: from email2.allantgroup.com (email2.emsphone.com [199.67.51.116])
	by mx1.freebsd.org (Postfix) with ESMTP id CE17C8FC1C
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 15 Aug 2011 20:06:30 +0000 (UTC)
Received: from dan.emsphone.com (dan.emsphone.com [199.67.51.101])
	by email2.allantgroup.com (8.14.4/8.14.4) with ESMTP id p7FK6RxZ078457
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO)
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 15 Aug 2011 15:06:27 -0500 (CDT)
	(envelope-from dan@dan.emsphone.com)
Received: from dan.emsphone.com (smmsp@localhost [127.0.0.1])
	by dan.emsphone.com (8.14.5/8.14.5) with ESMTP id p7FK6R5E070047
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO)
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 15 Aug 2011 15:06:27 -0500 (CDT)
	(envelope-from dan@dan.emsphone.com)
Received: (from dan@localhost)
	by dan.emsphone.com (8.14.5/8.14.5/Submit) id p7FK6QUW070046;
	Mon, 15 Aug 2011 15:06:26 -0500 (CDT)
	(envelope-from dan)
Message-Id: <201108152006.p7FK6QUW070046@dan.emsphone.com>
Date: Mon, 15 Aug 2011 15:06:26 -0500 (CDT)
From: Dan Nelson <dnelson@allantgroup.com>
Reply-To: Dan Nelson <dnelson@allantgroup.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] missing ichwd entry for H57 chipset
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         159800
>Category:       kern
>Synopsis:       [ichwd] [patch] missing ichwd entry for H57 chipset
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    gavin
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Aug 15 20:10:06 UTC 2011
>Closed-Date:    Wed Aug 17 17:08:49 UTC 2011
>Last-Modified:  Wed Aug 17 17:10:07 UTC 2011
>Originator:     Dan Nelson
>Release:        FreeBSD 8.2-STABLE i386
>Organization:
>Environment:
System: FreeBSD dan.emsphone.com 8.2-STABLE FreeBSD 8.2-STABLE #633 r224868M: Sun Aug 14 14:39:52 CDT 2011 zsh@dan.emsphone.com:/usr/src-svn/sys/i386/compile/DANSMP i386


	
>Description:

My new(ish) desktop uses the Intel H57 chipset, which has watchdog support
that is not detected by the ichwd driver.  The following patch enables it:

	
>How-To-Repeat:
	
>Fix:

	

Index: ichwd.c
===================================================================
--- ichwd.c	(revision 224868)
+++ ichwd.c	(working copy)
@@ -111,6 +111,7 @@
 	{ DEVICEID_ICH10DO,  "Intel ICH10DO watchdog timer",	10 },
 	{ DEVICEID_ICH10R,   "Intel ICH10R watchdog timer",	10 },
 	{ DEVICEID_H55,      "Intel H55 watchdog timer",	10 },
+	{ DEVICEID_H57,      "Intel H57 watchdog timer",	10 },
 	{ DEVICEID_PATSBURG_LPC1, "Intel Patsburg watchdog timer",	10 },
 	{ DEVICEID_PATSBURG_LPC2, "Intel Patsburg watchdog timer",	10 },
 	{ DEVICEID_PPT0,     "Intel Panther Point watchdog timer",	10 },
Index: ichwd.h
===================================================================
--- ichwd.h	(revision 224868)
+++ ichwd.h	(working copy)
@@ -137,6 +137,7 @@
 #define DEVICEID_ICH10DO	0x3a14
 #define DEVICEID_ICH10R		0x3a16
 #define DEVICEID_H55		0x3b06
+#define DEVICEID_H57		0x3b08
 
 /* ICH LPC Interface Bridge Registers (ICH5 and older) */
 #define ICH_GEN_STA		0xd4

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->patched 
State-Changed-By: gavin 
State-Changed-When: Wed Aug 17 15:36:06 UTC 2011 
State-Changed-Why:  
Fixed in head in r211908, needs merging. 


Responsible-Changed-From-To: freebsd-bugs->gavin 
Responsible-Changed-By: gavin 
Responsible-Changed-When: Wed Aug 17 15:36:06 UTC 2011 
Responsible-Changed-Why:  
Take 

http://www.freebsd.org/cgi/query-pr.cgi?pr=159800 
State-Changed-From-To: patched->closed 
State-Changed-By: gavin 
State-Changed-When: Wed Aug 17 17:08:08 UTC 2011 
State-Changed-Why:  
r211908 merged from head. 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/159800: commit references a PR
Date: Wed, 17 Aug 2011 17:04:53 +0000 (UTC)

 Author: gavin
 Date: Wed Aug 17 17:04:43 2011
 New Revision: 224948
 URL: http://svn.freebsd.org/changeset/base/224948
 
 Log:
   Merge r211908 from head (originally by jfv):
   
     Add Intel Cougar Point PCH LPC Controller Device IDs
     for watchdog support. Also add additional Intel Ibex
     Peak (5 Series/3400 Series) PCH IDs.
   
   PR:		kern/159800
 
 Modified:
   stable/8/sys/dev/ichwd/ichwd.c
   stable/8/sys/dev/ichwd/ichwd.h
 Directory Properties:
   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)
 
 Modified: stable/8/sys/dev/ichwd/ichwd.c
 ==============================================================================
 --- stable/8/sys/dev/ichwd/ichwd.c	Wed Aug 17 15:45:40 2011	(r224947)
 +++ stable/8/sys/dev/ichwd/ichwd.c	Wed Aug 17 17:04:43 2011	(r224948)
 @@ -110,7 +110,53 @@ static struct ichwd_device ichwd_devices
  	{ DEVICEID_ICH10D,   "Intel ICH10D watchdog timer",	10 },
  	{ DEVICEID_ICH10DO,  "Intel ICH10DO watchdog timer",	10 },
  	{ DEVICEID_ICH10R,   "Intel ICH10R watchdog timer",	10 },
 +	{ DEVICEID_PCH,      "Intel PCH watchdog timer",	10 },
 +	{ DEVICEID_PCHM,     "Intel PCH watchdog timer",	10 },
 +	{ DEVICEID_P55,      "Intel P55 watchdog timer",	10 },
 +	{ DEVICEID_PM55,     "Intel PM55 watchdog timer",	10 },
  	{ DEVICEID_H55,      "Intel H55 watchdog timer",	10 },
 +	{ DEVICEID_QM57,     "Intel QM57 watchdog timer",       10 },
 +	{ DEVICEID_H57,      "Intel H57 watchdog timer",        10 },
 +	{ DEVICEID_HM55,     "Intel HM55 watchdog timer",       10 },
 +	{ DEVICEID_Q57,      "Intel Q57 watchdog timer",        10 },
 +	{ DEVICEID_HM57,     "Intel HM57 watchdog timer",       10 },
 +	{ DEVICEID_PCHMSFF,  "Intel PCHMSFF watchdog timer",    10 },
 +	{ DEVICEID_QS57,     "Intel QS57 watchdog timer",       10 },
 +	{ DEVICEID_3400,     "Intel 3400 watchdog timer",       10 },
 +	{ DEVICEID_3420,     "Intel 3420 watchdog timer",       10 },
 +	{ DEVICEID_3450,     "Intel 3450 watchdog timer",       10 },
 +	{ DEVICEID_CPT0,     "Intel Cougar Point watchdog timer",	10 },
 +	{ DEVICEID_CPT1,     "Intel Cougar Point watchdog timer",	10 },
 +	{ DEVICEID_CPT2,     "Intel Cougar Point watchdog timer",	10 },
 +	{ DEVICEID_CPT3,     "Intel Cougar Point watchdog timer",	10 },
 +	{ DEVICEID_CPT4,     "Intel Cougar Point watchdog timer",	10 },
 +	{ DEVICEID_CPT5,     "Intel Cougar Point watchdog timer",	10 },
 +	{ DEVICEID_CPT6,     "Intel Cougar Point watchdog timer",	10 },
 +	{ DEVICEID_CPT7,     "Intel Cougar Point watchdog timer",	10 },
 +	{ DEVICEID_CPT8,     "Intel Cougar Point watchdog timer",	10 },
 +	{ DEVICEID_CPT9,     "Intel Cougar Point watchdog timer",	10 },
 +	{ DEVICEID_CPT10,    "Intel Cougar Point watchdog timer",	10 },
 +	{ DEVICEID_CPT11,    "Intel Cougar Point watchdog timer",	10 },
 +	{ DEVICEID_CPT12,    "Intel Cougar Point watchdog timer",	10 },
 +	{ DEVICEID_CPT13,    "Intel Cougar Point watchdog timer",	10 },
 +	{ DEVICEID_CPT14,    "Intel Cougar Point watchdog timer",	10 },
 +	{ DEVICEID_CPT15,    "Intel Cougar Point watchdog timer",	10 },
 +	{ DEVICEID_CPT16,    "Intel Cougar Point watchdog timer",	10 },
 +	{ DEVICEID_CPT17,    "Intel Cougar Point watchdog timer",	10 },
 +	{ DEVICEID_CPT18,    "Intel Cougar Point watchdog timer",	10 },
 +	{ DEVICEID_CPT19,    "Intel Cougar Point watchdog timer",	10 },
 +	{ DEVICEID_CPT20,    "Intel Cougar Point watchdog timer",	10 },
 +	{ DEVICEID_CPT21,    "Intel Cougar Point watchdog timer",	10 },
 +	{ DEVICEID_CPT22,    "Intel Cougar Point watchdog timer",	10 },
 +	{ DEVICEID_CPT23,    "Intel Cougar Point watchdog timer",	10 },
 +	{ DEVICEID_CPT23,    "Intel Cougar Point watchdog timer",	10 },
 +	{ DEVICEID_CPT25,    "Intel Cougar Point watchdog timer",	10 },
 +	{ DEVICEID_CPT26,    "Intel Cougar Point watchdog timer",	10 },
 +	{ DEVICEID_CPT27,    "Intel Cougar Point watchdog timer",	10 },
 +	{ DEVICEID_CPT28,    "Intel Cougar Point watchdog timer",	10 },
 +	{ DEVICEID_CPT29,    "Intel Cougar Point watchdog timer",	10 },
 +	{ DEVICEID_CPT30,    "Intel Cougar Point watchdog timer",	10 },
 +	{ DEVICEID_CPT31,    "Intel Cougar Point watchdog timer",	10 },
  	{ DEVICEID_PATSBURG_LPC1, "Intel Patsburg watchdog timer",	10 },
  	{ DEVICEID_PATSBURG_LPC2, "Intel Patsburg watchdog timer",	10 },
  	{ DEVICEID_PPT0,     "Intel Panther Point watchdog timer",	10 },
 
 Modified: stable/8/sys/dev/ichwd/ichwd.h
 ==============================================================================
 --- stable/8/sys/dev/ichwd/ichwd.h	Wed Aug 17 15:45:40 2011	(r224947)
 +++ stable/8/sys/dev/ichwd/ichwd.h	Wed Aug 17 17:04:43 2011	(r224948)
 @@ -65,6 +65,38 @@ struct ichwd_softc {
  };
  
  #define VENDORID_INTEL		0x8086
 +#define DEVICEID_CPT0		0x1c40
 +#define DEVICEID_CPT1		0x1c41
 +#define DEVICEID_CPT2		0x1c42
 +#define DEVICEID_CPT3		0x1c43
 +#define DEVICEID_CPT4		0x1c44
 +#define DEVICEID_CPT5		0x1c45
 +#define DEVICEID_CPT6		0x1c46
 +#define DEVICEID_CPT7		0x1c47
 +#define DEVICEID_CPT8		0x1c48
 +#define DEVICEID_CPT9		0x1c49
 +#define DEVICEID_CPT10		0x1c4a
 +#define DEVICEID_CPT11		0x1c4b
 +#define DEVICEID_CPT12		0x1c4c
 +#define DEVICEID_CPT13		0x1c4d
 +#define DEVICEID_CPT14		0x1c4e
 +#define DEVICEID_CPT15		0x1c4f
 +#define DEVICEID_CPT16		0x1c50
 +#define DEVICEID_CPT17		0x1c51
 +#define DEVICEID_CPT18		0x1c52
 +#define DEVICEID_CPT19		0x1c53
 +#define DEVICEID_CPT20		0x1c54
 +#define DEVICEID_CPT21		0x1c55
 +#define DEVICEID_CPT22		0x1c56
 +#define DEVICEID_CPT23		0x1c57
 +#define DEVICEID_CPT24		0x1c58
 +#define DEVICEID_CPT25		0x1c59
 +#define DEVICEID_CPT26		0x1c5a
 +#define DEVICEID_CPT27		0x1c5b
 +#define DEVICEID_CPT28		0x1c5c
 +#define DEVICEID_CPT29		0x1c5d
 +#define DEVICEID_CPT30		0x1c5e
 +#define DEVICEID_CPT31		0x1c5f
  #define DEVICEID_PATSBURG_LPC1	0x1d40
  #define DEVICEID_PATSBURG_LPC2	0x1d41
  #define DEVICEID_PPT0		0x1e40
 @@ -136,7 +168,21 @@ struct ichwd_softc {
  #define DEVICEID_ICH10D		0x3a1a
  #define DEVICEID_ICH10DO	0x3a14
  #define DEVICEID_ICH10R		0x3a16
 +#define DEVICEID_PCH		0x3b00
 +#define DEVICEID_PCHM		0x3b01
 +#define DEVICEID_P55		0x3b02
 +#define DEVICEID_PM55		0x3b03
  #define DEVICEID_H55		0x3b06
 +#define DEVICEID_QM57		0x3b07
 +#define DEVICEID_H57		0x3b08
 +#define DEVICEID_HM55		0x3b09
 +#define DEVICEID_Q57		0x3b0a
 +#define DEVICEID_HM57		0x3b0b
 +#define DEVICEID_PCHMSFF	0x3b0d
 +#define DEVICEID_QS57		0x3b0f
 +#define DEVICEID_3400		0x3b12
 +#define DEVICEID_3420		0x3b14
 +#define DEVICEID_3450		0x3b16
  
  /* ICH LPC Interface Bridge Registers (ICH5 and older) */
  #define ICH_GEN_STA		0xd4
 _______________________________________________
 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:
