Bug 143068

Summary:

Device ID for ichwd on the H55 Express chipset watchdog timer

Product:

Base System

Reporter:

mike

Component:

kern

Assignee:

Ed Maste <emaste>

Status:

Closed FIXED

Severity:

Affects Only Me

Priority:

Normal

Version:

Unspecified

Hardware:

Any

OS:

Any

Attachments:

Description	Flags
file.diff	none

Description mike 2010-01-21 21:20:31 UTC

Device ID to add support for the ichwd driver on the Intel H55 Express chipset (intel i3 cpus)

Fix: 1(ich10)# diff -u orig/ichwd.c ichwd.c 
How-To-Repeat: kldload ichwd... The ID is not there, so the driver does not work

Comment 1 Ed Maste freebsd_committer

2010-01-22 03:38:23 UTC

Responsible Changed
From-To: freebsd-bugs->emaste

Grab

Comment 2 Andriy Gapon 2010-01-22 13:03:22 UTC

According to
  http://www.intel.com/Assets/PDF/specupdate/322170.pdf
  Section "PCH Device and Revision Identification" (page 9)
I'd simply call it "H55 Chipset", i.e. dropped "EXP" and "Express" from ID and
description respectively.

Maybe other other devices belonging to the same chipset family could also be added
along the way.

-- 
Andriy Gapon

Comment 3 Ed Maste freebsd_committer

2010-01-22 16:05:21 UTC

State Changed
From-To: open->patched

Committed as r202812.

Comment 4 dfilter service freebsd_committer

2010-01-22 16:05:25 UTC

Author: emaste
Date: Fri Jan 22 16:05:10 2010
New Revision: 202812
URL: http://svn.freebsd.org/changeset/base/202812

Log:
  Add H55 ID from Mike Tancsa, with minor rewording from avg@.
  
  PR:		kern/143068
  Submitted by:	Mike Tancsa (Sentex)
  MFC after:	1 week

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	Fri Jan 22 15:12:01 2010	(r202811)
+++ head/sys/dev/ichwd/ichwd.c	Fri Jan 22 16:05:10 2010	(r202812)
@@ -109,6 +109,7 @@ 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_H55,      "Intel H55 watchdog timer",	10 },
 	{ 0, NULL, 0 },
 };
 

Modified: head/sys/dev/ichwd/ichwd.h
==============================================================================
--- head/sys/dev/ichwd/ichwd.h	Fri Jan 22 15:12:01 2010	(r202811)
+++ head/sys/dev/ichwd/ichwd.h	Fri Jan 22 16:05:10 2010	(r202812)
@@ -99,6 +99,7 @@ struct ichwd_softc {
 #define DEVICEID_ICH10D		0x3a1a
 #define DEVICEID_ICH10DO	0x3a14
 #define DEVICEID_ICH10R		0x3a16
+#define DEVICEID_H55		0x3b06
 
 /* 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"

Comment 5 dfilter service freebsd_committer

2010-02-23 01:00:25 UTC

Author: emaste
Date: Tue Feb 23 01:00:15 2010
New Revision: 204234
URL: http://svn.freebsd.org/changeset/base/204234

Log:
  MFC r202812:
  
    Add H55 ID from Mike Tancsa, with minor rewording from avg@.
  
  PR:		kern/143068
  Submitted by:	Mike Tancsa (Sentex)

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)
  stable/8/sys/dev/xen/xenpci/   (props changed)
  stable/8/sys/netinet/   (props changed)

Modified: stable/8/sys/dev/ichwd/ichwd.c
==============================================================================
--- stable/8/sys/dev/ichwd/ichwd.c	Tue Feb 23 00:41:40 2010	(r204233)
+++ stable/8/sys/dev/ichwd/ichwd.c	Tue Feb 23 01:00:15 2010	(r204234)
@@ -109,6 +109,7 @@ 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_H55,      "Intel H55 watchdog timer",	10 },
 	{ 0, NULL, 0 },
 };
 

Modified: stable/8/sys/dev/ichwd/ichwd.h
==============================================================================
--- stable/8/sys/dev/ichwd/ichwd.h	Tue Feb 23 00:41:40 2010	(r204233)
+++ stable/8/sys/dev/ichwd/ichwd.h	Tue Feb 23 01:00:15 2010	(r204234)
@@ -99,6 +99,7 @@ struct ichwd_softc {
 #define DEVICEID_ICH10D		0x3a1a
 #define DEVICEID_ICH10DO	0x3a14
 #define DEVICEID_ICH10R		0x3a16
+#define DEVICEID_H55		0x3b06
 
 /* 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"

Comment 6 dfilter service freebsd_committer

2010-02-23 01:24:10 UTC

Author: emaste
Date: Tue Feb 23 01:24:01 2010
New Revision: 204240
URL: http://svn.freebsd.org/changeset/base/204240

Log:
  MFC r202812:
  
    Add H55 ID from Mike Tancsa, with minor rewording from avg@.
  
  PR:		kern/143068
  Submitted by:	Mike Tancsa (Sentex)

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	Tue Feb 23 01:08:03 2010	(r204239)
+++ stable/7/sys/dev/ichwd/ichwd.c	Tue Feb 23 01:24:01 2010	(r204240)
@@ -109,6 +109,7 @@ 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_H55,      "Intel H55 watchdog timer",	10 },
 	{ 0, NULL, 0 },
 };
 

Modified: stable/7/sys/dev/ichwd/ichwd.h
==============================================================================
--- stable/7/sys/dev/ichwd/ichwd.h	Tue Feb 23 01:08:03 2010	(r204239)
+++ stable/7/sys/dev/ichwd/ichwd.h	Tue Feb 23 01:24:01 2010	(r204240)
@@ -99,6 +99,7 @@ struct ichwd_softc {
 #define DEVICEID_ICH10D		0x3a1a
 #define DEVICEID_ICH10DO	0x3a14
 #define DEVICEID_ICH10R		0x3a16
+#define DEVICEID_H55		0x3b06
 
 /* 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"

Comment 7 Ed Maste freebsd_committer

2010-02-23 01:24:22 UTC

State Changed
From-To: patched->closed

MFC'd to 8 and 7 now.