From csp@isi.edu  Wed Apr 10 11:44:44 2002
Return-Path: <csp@isi.edu>
Received: from purple.nge.isi.edu (purple.nge.isi.edu [65.114.169.200])
	by hub.freebsd.org (Postfix) with ESMTP id C365037B417
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 10 Apr 2002 11:44:43 -0700 (PDT)
Received: from purple.nge.isi.edu (localhost.nge.isi.edu [127.0.0.1])
	by purple.nge.isi.edu (8.12.2/8.12.2) with ESMTP id g3AIibtk000372
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 10 Apr 2002 14:44:37 -0400 (EDT)
	(envelope-from csp@purple.nge.isi.edu)
Received: (from csp@localhost)
	by purple.nge.isi.edu (8.12.2/8.12.2/Submit) id g3AIiaab000371;
	Wed, 10 Apr 2002 14:44:36 -0400 (EDT)
Message-Id: <200204101844.g3AIiaab000371@purple.nge.isi.edu>
Date: Wed, 10 Apr 2002 14:44:36 -0400 (EDT)
From: Colin Perkins <csp@isi.edu>
Reply-To: Colin Perkins <csp@isi.edu>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: ICH3 SMbus controller not correctly detected
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         36972
>Category:       i386
>Synopsis:       ICH3 SMbus controller not correctly detected
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    jhb
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Apr 10 11:50:01 PDT 2002
>Closed-Date:    Sun May 19 20:58:01 PDT 2002
>Last-Modified:  Sun May 19 20:58:01 PDT 2002
>Originator:     Colin Perkins
>Release:        FreeBSD 4.5-STABLE i386
>Organization:
USC/ISI
>Environment:
System: FreeBSD purple.nge.isi.edu 4.5-STABLE FreeBSD 4.5-STABLE #9: Wed Apr 10 14:28:42 EDT 2002 root@purple.nge.isi.edu:/usr/src/sys/compile/PURPLE i386

>Description:

Intel ICH3 SMbus controller is not detected when booting (tested on
ThinkPad X22, but doubt that the problem is specific to that host).
Patch enclosed.

>How-To-Repeat:

Reboot. Dmesg will show:
  ichsmb0: <SMBus controller> port 0x1880-0x189f irq 5 at device 31.3 on pci0
with enclosed patch, it shows:
  ichsmb0: <Intel 82801CA (ICH3) SMBus controller> port 0x1880-0x189f irq 5 at device 31.3 on pci0
  smbus0: <System Management Bus> on ichsmb0
  smb0: <SMBus general purpose I/O> on smbus0
instead (detecting the smbus0 and smb0 devices correctly).

>Fix:

Patch to /usr/src/sys/dev/ichsmb/ichsmb_pci.c as shown below.

*** ichsmb_pci.c.orig   Wed Apr 10 14:06:57 2002
--- ichsmb_pci.c        Wed Apr 10 14:27:14 2002
***************
*** 67,72 ****
--- 67,73 ----
  #define ID_81801AA                    0x24138086
  #define ID_81801AB                    0x24238086
  #define ID_82801BA                    0x24438086
+ #define ID_82801CA                    0x24838086
  
  #define PCIS_SERIALBUS_SMBUS_PROGIF   0x00
  
***************
*** 121,126 ****
--- 122,130 ----
                break;
        case ID_82801BA:
                device_set_desc(dev, "Intel 82801BA (ICH2) SMBus controller");
+               break;
+       case ID_82801CA:
+               device_set_desc(dev, "Intel 82801CA (ICH3) SMBus controller");
                break;
        default:
                if (pci_get_class(dev) == PCIC_SERIALBUS



>Release-Note:
>Audit-Trail:

From: Larry Rosenman <ler@lerctr.org>
To: freebsd-gnats-submit@freebsd.org
Cc: re@freebsd.org
Subject: i386/36972: ICH3 SMBus controller
Date: 07 May 2002 14:43:43 -0500

 Can this patch make 4.6-REL?  It's to allow the detection of the ICH3
 SMBus controller.  It works on my Fujitsu Lifebook C6651 as well as the
 author's system. 
 
 
 -- 
 Larry Rosenman                     http://www.lerctr.org/~ler
 Phone: +1 972-414-9812                 E-Mail: ler@lerctr.org
 US Mail: 1905 Steamboat Springs Drive, Garland, TX 75044-6749
 
State-Changed-From-To: open->analyzed 
State-Changed-By: jhb 
State-Changed-When: Tue May 7 17:43:12 PDT 2002 
State-Changed-Why:  
I'll take this one and commit it to current and MFC it afterwards. 


Responsible-Changed-From-To: freebsd-bugs->jhb-bugs 
Responsible-Changed-By: jhb 
Responsible-Changed-When: Tue May 7 17:43:12 PDT 2002 
Responsible-Changed-Why:  
I'll take this one and commit it to current and MFC it afterwards. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=36972 
Responsible-Changed-From-To: jhb-bugs->jhb 
Responsible-Changed-By: jhb 
Responsible-Changed-When: Tue May 7 17:53:19 PDT 2002 
Responsible-Changed-Why:  
I am jhb@, not jhb-bugs@, oops. 

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

From: John Baldwin <jhb@FreeBSD.org>
To: Larry Rosenman <ler@lerctr.org>
Cc: re@freebsd.org, freebsd-gnats-submit@freebsd.org
Subject: RE: i386/36972: ICH3 SMBus controller
Date: Tue, 07 May 2002 21:00:30 -0400 (EDT)

 On 07-May-2002 Larry Rosenman wrote:
 > Can this patch make 4.6-REL?  It's to allow the detection of the ICH3
 > SMBus controller.  It works on my Fujitsu Lifebook C6651 as well as the
 > author's system. 
 
 I've committed this to current and assuming there are no problems with it
 in the next week re@ will consider MFC'ing it in a week.  Thanks for pointing
 this easy PR out.
 
 -- 
 
 John Baldwin <jhb@FreeBSD.org>  <><  http://www.FreeBSD.org/~jhb/
 "Power Users Use the Power to Serve!"  -  http://www.FreeBSD.org/

From: Larry Rosenman <ler@lerctr.org>
To: John Baldwin <jhb@FreeBSD.org>
Cc: re@FreeBSD.org, freebsd-gnats-submit@FreeBSD.org
Subject: RE: i386/36972: ICH3 SMBus controller
Date: 16 May 2002 13:56:13 -0500

 On Tue, 2002-05-07 at 20:00, John Baldwin wrote:
 > 
 > On 07-May-2002 Larry Rosenman wrote:
 > > Can this patch make 4.6-REL?  It's to allow the detection of the ICH3
 > > SMBus controller.  It works on my Fujitsu Lifebook C6651 as well as the
 > > author's system. 
 > 
 > I've committed this to current and assuming there are no problems with it
 > in the next week re@ will consider MFC'ing it in a week.  Thanks for pointing
 > this easy PR out.
 Can this be MFC'd now?
 
 
 > 
 > -- 
 > 
 > John Baldwin <jhb@FreeBSD.org>  <><  http://www.FreeBSD.org/~jhb/
 > "Power Users Use the Power to Serve!"  -  http://www.FreeBSD.org/
 -- 
 Larry Rosenman                     http://www.lerctr.org/~ler
 Phone: +1 972-414-9812                 E-Mail: ler@lerctr.org
 US Mail: 1905 Steamboat Springs Drive, Garland, TX 75044-6749
 

From: Larry Rosenman <ler@lerctr.org>
To: John Baldwin <jhb@FreeBSD.org>
Cc: re@FreeBSD.org, freebsd-gnats-submit@FreeBSD.org
Subject: RE: i386/36972: ICH3 SMBus controller
Date: 18 May 2002 19:32:15 -0500

 On Tue, 2002-05-07 at 20:00, John Baldwin wrote:
 > 
 > On 07-May-2002 Larry Rosenman wrote:
 > > Can this patch make 4.6-REL?  It's to allow the detection of the ICH3
 > > SMBus controller.  It works on my Fujitsu Lifebook C6651 as well as the
 > > author's system. 
 > 
 > I've committed this to current and assuming there are no problems with it
 > in the next week re@ will consider MFC'ing it in a week.  Thanks for pointing
 > this easy PR out.
 can this be MFC'd before the release?
 > 
 > -- 
 > 
 > John Baldwin <jhb@FreeBSD.org>  <><  http://www.FreeBSD.org/~jhb/
 > "Power Users Use the Power to Serve!"  -  http://www.FreeBSD.org/
 -- 
 Larry Rosenman                     http://www.lerctr.org/~ler
 Phone: +1 972-414-9812                 E-Mail: ler@lerctr.org
 US Mail: 1905 Steamboat Springs Drive, Garland, TX 75044-6749
 

From: John Baldwin <jhb@FreeBSD.org>
To: Larry Rosenman <ler@lerctr.org>
Cc: freebsd-gnats-submit@FreeBSD.org, re@FreeBSD.org
Subject: RE: i386/36972: ICH3 SMBus controller
Date: Sat, 18 May 2002 20:42:39 -0400 (EDT)

 On 19-May-2002 Larry Rosenman wrote:
 > On Tue, 2002-05-07 at 20:00, John Baldwin wrote:
 >> 
 >> On 07-May-2002 Larry Rosenman wrote:
 >> > Can this patch make 4.6-REL?  It's to allow the detection of the ICH3
 >> > SMBus controller.  It works on my Fujitsu Lifebook C6651 as well as the
 >> > author's system. 
 >> 
 >> I've committed this to current and assuming there are no problems with it
 >> in the next week re@ will consider MFC'ing it in a week.  Thanks for
 >> pointing
 >> this easy PR out.
 > can this be MFC'd before the release?
 
 The patch is below, anyone else object to it?
 
 Index: ichsmb_pci.c
 ===================================================================
 RCS file: /usr/cvs/src/sys/dev/ichsmb/ichsmb_pci.c,v
 retrieving revision 1.1.2.1
 diff -u -r1.1.2.1 ichsmb_pci.c
 --- ichsmb_pci.c        9 Oct 2000 00:52:43 -0000       1.1.2.1
 +++ ichsmb_pci.c        19 May 2002 00:39:42 -0000
 @@ -67,6 +67,7 @@
  #define ID_81801AA                     0x24138086
  #define ID_81801AB                     0x24238086
  #define ID_82801BA                     0x24438086
 +#define ID_82801CA                     0x24838086
  
  #define PCIS_SERIALBUS_SMBUS_PROGIF    0x00
  
 @@ -121,6 +122,9 @@
                 break;
         case ID_82801BA:
                 device_set_desc(dev, "Intel 82801BA (ICH2) SMBus controller");
 +               break;
 +       case ID_82801CA:
 +               device_set_desc(dev, "Intel 82801CA (ICH3) SMBus controller");
                 break;
         default:
                 if (pci_get_class(dev) == PCIC_SERIALBUS
 
 -- 
 
 John Baldwin <jhb@FreeBSD.org>  <><  http://www.FreeBSD.org/~jhb/
 "Power Users Use the Power to Serve!"  -  http://www.FreeBSD.org/

From: "Bruce A. Mah" <bmah@FreeBSD.org>
To: John Baldwin <jhb@FreeBSD.org>
Cc: Larry Rosenman <ler@lerctr.org>,
	freebsd-gnats-submit@FreeBSD.org, re@FreeBSD.org
Subject: Re: i386/36972: ICH3 SMBus controller 
Date: Sat, 18 May 2002 21:08:25 -0700

 If memory serves me right, John Baldwin wrote:
 
 > The patch is below, anyone else object to it?
 
 No objections...I'm not familiar with this code but it doesn't look like
 it can break anything.  It'd be cool if someone can make sure it does
 what it was intended to do (post-commit, I mean), and yell if it
 doesn't.
 
 Bruce.
 
 
 

From: Larry Rosenman <ler@lerctr.org>
To: bmah@FreeBSD.org
Cc: John Baldwin <jhb@FreeBSD.org>, freebsd-gnats-submit@FreeBSD.org,
	re@FreeBSD.org
Subject: Re: i386/36972: ICH3 SMBus controller
Date: 19 May 2002 03:06:20 -0500

 On Sat, 2002-05-18 at 23:08, Bruce A. Mah wrote:
 > If memory serves me right, John Baldwin wrote:
 > 
 > > The patch is below, anyone else object to it?
 > 
 > No objections...I'm not familiar with this code but it doesn't look like
 > it can break anything.  It'd be cool if someone can make sure it does
 > what it was intended to do (post-commit, I mean), and yell if it
 > doesn't.
 I'll be happy to.  I've been running with that patch manually applied
 here and it does recognize the chip and attach the SMB0 device.
 
 I doubt it will break....
 
 
 > 
 > Bruce.
 > 
 > 
 -- 
 Larry Rosenman                     http://www.lerctr.org/~ler
 Phone: +1 972-414-9812                 E-Mail: ler@lerctr.org
 US Mail: 1905 Steamboat Springs Drive, Garland, TX 75044-6749
 

From: "Bruce A. Mah" <bmah@FreeBSD.org>
To: Larry Rosenman <ler@lerctr.org>
Cc: bmah@FreeBSD.org, John Baldwin <jhb@FreeBSD.org>,
	freebsd-gnats-submit@FreeBSD.org, re@FreeBSD.org
Subject: Re: i386/36972: ICH3 SMBus controller 
Date: Sun, 19 May 2002 12:41:13 -0700

 If memory serves me right, Larry Rosenman wrote:
 > On Sat, 2002-05-18 at 23:08, Bruce A. Mah wrote:
 > > If memory serves me right, John Baldwin wrote:
 > > 
 > > > The patch is below, anyone else object to it?
 > > 
 > > No objections...I'm not familiar with this code but it doesn't look like
 > > it can break anything.  It'd be cool if someone can make sure it does
 > > what it was intended to do (post-commit, I mean), and yell if it
 > > doesn't.
 > I'll be happy to.  I've been running with that patch manually applied
 > here and it does recognize the chip and attach the SMB0 device.
 > 
 > I doubt it will break....
 
 Me too, but more testing has never hurt anybody.  :-)
 
 John, want to go ahead?
 
 Bruce.
 
 

From: Brian Somers <brian@Awfulhak.org>
To: John Baldwin <jhb@FreeBSD.org>
Cc: Larry Rosenman <ler@lerctr.org>,
	freebsd-gnats-submit@FreeBSD.org, re@FreeBSD.org, brian@Awfulhak.org
Subject: Re: i386/36972: ICH3 SMBus controller 
Date: Mon, 20 May 2002 01:27:51 +0100

 > On 19-May-2002 Larry Rosenman wrote:
 > > On Tue, 2002-05-07 at 20:00, John Baldwin wrote:
 > >> 
 > >> On 07-May-2002 Larry Rosenman wrote:
 > >> > Can this patch make 4.6-REL?  It's to allow the detection of the ICH3
 > >> > SMBus controller.  It works on my Fujitsu Lifebook C6651 as well as the
 > >> > author's system. 
 > >> 
 > >> I've committed this to current and assuming there are no problems with it
 > >> in the next week re@ will consider MFC'ing it in a week.  Thanks for
 > >> pointing
 > >> this easy PR out.
 > > can this be MFC'd before the release?
 > 
 > The patch is below, anyone else object to it?
 [.....]
 
 Looks good to me.
 
 > -- 
 > 
 > John Baldwin <jhb@FreeBSD.org>  <><  http://www.FreeBSD.org/~jhb/
 > "Power Users Use the Power to Serve!"  -  http://www.FreeBSD.org/
 
 -- 
 Brian <brian@Awfulhak.org>                    <brian@freebsd-services.com>
       <http://www.Awfulhak.org>                   <brian@[uk.]FreeBSD.org>
 Don't _EVER_ lose your sense of humour !          <brian@[uk.]OpenBSD.org>
 
 
State-Changed-From-To: analyzed->closed 
State-Changed-By: jhb 
State-Changed-When: Sun May 19 20:56:29 PDT 2002 
State-Changed-Why:  
Committed to stable. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=36972 
>Unformatted:
