From olivleh1@kartoffel.salatschuessel.net  Sun Jan 10 14:59:48 2010
Return-Path: <olivleh1@kartoffel.salatschuessel.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C49E31065672;
	Sun, 10 Jan 2010 14:59:48 +0000 (UTC)
	(envelope-from olivleh1@kartoffel.salatschuessel.net)
Received: from kartoffel.salatschuessel.net (f048079031.adsl.alicedsl.de [78.48.79.31])
	by mx1.freebsd.org (Postfix) with ESMTP id 2D4018FC12;
	Sun, 10 Jan 2010 14:59:47 +0000 (UTC)
Received: from kartoffel.salatschuessel.net (localhost [127.0.0.1])
	by kartoffel.salatschuessel.net (8.14.3/8.14.3) with ESMTP id o0AExjeX003737;
	Sun, 10 Jan 2010 15:59:45 +0100 (CET)
	(envelope-from olivleh1@kartoffel.salatschuessel.net)
Received: (from olivleh1@localhost)
	by kartoffel.salatschuessel.net (8.14.3/8.14.3/Submit) id o0AExjJQ003736;
	Sun, 10 Jan 2010 15:59:45 +0100 (CET)
	(envelope-from olivleh1)
Message-Id: <201001101459.o0AExjJQ003736@kartoffel.salatschuessel.net>
Date: Sun, 10 Jan 2010 15:59:45 +0100 (CET)
From: Oliver Lehmann <oliver@freebsd.org>
Reply-To: Oliver Lehmann <oliver@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Oliver Lehmann <oliver@freebsd.org>
Subject: nfsmb.c - add missing MCP chip IDs
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         142571
>Category:       kern
>Synopsis:       [nfsmb] nfsmb.c - add missing MCP chip IDs
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    gavin
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jan 10 15:00:11 UTC 2010
>Closed-Date:    Tue Feb 23 22:10:43 UTC 2010
>Last-Modified:  Tue Feb 23 22:10:43 UTC 2010
>Originator:     Oliver Lehmann
>Release:        FreeBSD 8.0-STABLE amd64
>Organization:
>Environment:
System: FreeBSD kartoffel.salatschuessel.net 8.0-STABLE FreeBSD 8.0-STABLE #0: Sun Dec 13 15:03:04 CET 2009 olivleh1@kartoffel.salatschuessel.net:/usr/obj/usr/src/sys/GENERIC amd64


>Description:
	I'm having an ASUS Atom ION board with a MCP79 SMB controller. It
	is not detected by the nfsmb.c which is in the tree right now.
	This update detects the SMB controller (and the older versions)
>How-To-Repeat:
>Fix:

--- nfsmb.c.diff begins here ---
--- nfsmb.c.orig	2010-01-07 19:35:04.000000000 +0100
+++ nfsmb.c	2010-01-07 06:27:34.000000000 +0100
@@ -65,6 +65,10 @@
 #define	NFSMB_DEVICEID_NF4_55_SMB	0x0368
 #define	NFSMB_DEVICEID_NF4_61_SMB	0x03eb
 #define	NFSMB_DEVICEID_NF4_65_SMB	0x0446
+#define	NFSMB_DEVICEID_NF4_67_SMB	0x0542
+#define	NFSMB_DEVICEID_NF4_73_SMB	0x07d8
+#define	NFSMB_DEVICEID_NF4_78S_SMB	0x0752
+#define	NFSMB_DEVICEID_NF4_79_SMB	0x0aa2
 
 /* PCI Configuration space registers */
 #define	NF2PCI_SMBASE_1		PCIR_BAR(4)
@@ -158,6 +162,10 @@
 		case NFSMB_DEVICEID_NF4_55_SMB:
 		case NFSMB_DEVICEID_NF4_61_SMB:
 		case NFSMB_DEVICEID_NF4_65_SMB:
+		case NFSMB_DEVICEID_NF4_67_SMB:
+		case NFSMB_DEVICEID_NF4_73_SMB:
+		case NFSMB_DEVICEID_NF4_78S_SMB:
+		case NFSMB_DEVICEID_NF4_79_SMB:
 			device_set_desc(dev, "nForce2/3/4 MCP SMBus Controller");
 			return (BUS_PROBE_DEFAULT);
 		}
@@ -245,6 +253,10 @@
 	case NFSMB_DEVICEID_NF4_55_SMB:
 	case NFSMB_DEVICEID_NF4_61_SMB:
 	case NFSMB_DEVICEID_NF4_65_SMB:
+	case NFSMB_DEVICEID_NF4_67_SMB:
+	case NFSMB_DEVICEID_NF4_73_SMB:
+	case NFSMB_DEVICEID_NF4_78S_SMB:
+	case NFSMB_DEVICEID_NF4_79_SMB:
 		/* Trying to add secondary device as slave */
 		nfsmb_sc->subdev = device_add_child(dev, "nfsmb", -1);
 		if (!nfsmb_sc->subdev) {
--- nfsmb.c.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->gavin 
Responsible-Changed-By: gavin 
Responsible-Changed-When: Fri Jan 22 20:19:08 UTC 2010 
Responsible-Changed-Why:  
Take 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/142571: commit references a PR
Date: Sun, 24 Jan 2010 14:58:06 +0000 (UTC)

 Author: gavin
 Date: Sun Jan 24 14:57:54 2010
 New Revision: 202931
 URL: http://svn.freebsd.org/changeset/base/202931
 
 Log:
   Add support for four more nfsmb controllers, shipping on at least the
   ASUS Atom ION boards.
   
   PR:		kern/142571
   Submitted by:	oliver
   Approved by:	ed (mentor)
   MFC after:	1 week
 
 Modified:
   head/sys/pci/nfsmb.c
 
 Modified: head/sys/pci/nfsmb.c
 ==============================================================================
 --- head/sys/pci/nfsmb.c	Sun Jan 24 14:44:05 2010	(r202930)
 +++ head/sys/pci/nfsmb.c	Sun Jan 24 14:57:54 2010	(r202931)
 @@ -65,6 +65,10 @@ static int nfsmb_debug = 0;
  #define	NFSMB_DEVICEID_NF4_55_SMB	0x0368
  #define	NFSMB_DEVICEID_NF4_61_SMB	0x03eb
  #define	NFSMB_DEVICEID_NF4_65_SMB	0x0446
 +#define	NFSMB_DEVICEID_NF4_67_SMB	0x0542
 +#define	NFSMB_DEVICEID_NF4_73_SMB	0x07d8
 +#define	NFSMB_DEVICEID_NF4_78S_SMB	0x0752
 +#define	NFSMB_DEVICEID_NF4_79_SMB	0x0aa2
  
  /* PCI Configuration space registers */
  #define	NF2PCI_SMBASE_1		PCIR_BAR(4)
 @@ -158,6 +162,10 @@ nfsmb_probe(device_t dev)
  		case NFSMB_DEVICEID_NF4_55_SMB:
  		case NFSMB_DEVICEID_NF4_61_SMB:
  		case NFSMB_DEVICEID_NF4_65_SMB:
 +		case NFSMB_DEVICEID_NF4_67_SMB:
 +		case NFSMB_DEVICEID_NF4_73_SMB:
 +		case NFSMB_DEVICEID_NF4_78S_SMB:
 +		case NFSMB_DEVICEID_NF4_79_SMB:
  			device_set_desc(dev, "nForce2/3/4 MCP SMBus Controller");
  			return (BUS_PROBE_DEFAULT);
  		}
 @@ -245,6 +253,10 @@ nfsmb_attach(device_t dev)
  	case NFSMB_DEVICEID_NF4_55_SMB:
  	case NFSMB_DEVICEID_NF4_61_SMB:
  	case NFSMB_DEVICEID_NF4_65_SMB:
 +	case NFSMB_DEVICEID_NF4_67_SMB:
 +	case NFSMB_DEVICEID_NF4_73_SMB:
 +	case NFSMB_DEVICEID_NF4_78S_SMB:
 +	case NFSMB_DEVICEID_NF4_79_SMB:
  		/* Trying to add secondary device as slave */
  		nfsmb_sc->subdev = device_add_child(dev, "nfsmb", -1);
  		if (!nfsmb_sc->subdev) {
 _______________________________________________
 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: open->patched 
State-Changed-By: gavin 
State-Changed-When: Sun Jan 24 15:06:44 UTC 2010 
State-Changed-Why:  
Fixed in head, MFC in one week 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/142571: commit references a PR
Date: Sun, 31 Jan 2010 19:42:08 +0000 (UTC)

 Author: gavin
 Date: Sun Jan 31 19:41:58 2010
 New Revision: 203313
 URL: http://svn.freebsd.org/changeset/base/203313
 
 Log:
   Merge r202931 from head:
   
     Add support for four more nfsmb controllers, shipping on at least the
     ASUS Atom ION boards.
   
   PR:		kern/142571
   Submitted by:	oliver
   Approved by:	ed (mentor, implicit)
 
 Modified:
   stable/8/sys/pci/nfsmb.c
 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)
 
 Modified: stable/8/sys/pci/nfsmb.c
 ==============================================================================
 --- stable/8/sys/pci/nfsmb.c	Sun Jan 31 19:38:58 2010	(r203312)
 +++ stable/8/sys/pci/nfsmb.c	Sun Jan 31 19:41:58 2010	(r203313)
 @@ -65,6 +65,10 @@ static int nfsmb_debug = 0;
  #define	NFSMB_DEVICEID_NF4_55_SMB	0x0368
  #define	NFSMB_DEVICEID_NF4_61_SMB	0x03eb
  #define	NFSMB_DEVICEID_NF4_65_SMB	0x0446
 +#define	NFSMB_DEVICEID_NF4_67_SMB	0x0542
 +#define	NFSMB_DEVICEID_NF4_73_SMB	0x07d8
 +#define	NFSMB_DEVICEID_NF4_78S_SMB	0x0752
 +#define	NFSMB_DEVICEID_NF4_79_SMB	0x0aa2
  
  /* PCI Configuration space registers */
  #define	NF2PCI_SMBASE_1		PCIR_BAR(4)
 @@ -158,6 +162,10 @@ nfsmb_probe(device_t dev)
  		case NFSMB_DEVICEID_NF4_55_SMB:
  		case NFSMB_DEVICEID_NF4_61_SMB:
  		case NFSMB_DEVICEID_NF4_65_SMB:
 +		case NFSMB_DEVICEID_NF4_67_SMB:
 +		case NFSMB_DEVICEID_NF4_73_SMB:
 +		case NFSMB_DEVICEID_NF4_78S_SMB:
 +		case NFSMB_DEVICEID_NF4_79_SMB:
  			device_set_desc(dev, "nForce2/3/4 MCP SMBus Controller");
  			return (BUS_PROBE_DEFAULT);
  		}
 @@ -245,6 +253,10 @@ nfsmb_attach(device_t dev)
  	case NFSMB_DEVICEID_NF4_55_SMB:
  	case NFSMB_DEVICEID_NF4_61_SMB:
  	case NFSMB_DEVICEID_NF4_65_SMB:
 +	case NFSMB_DEVICEID_NF4_67_SMB:
 +	case NFSMB_DEVICEID_NF4_73_SMB:
 +	case NFSMB_DEVICEID_NF4_78S_SMB:
 +	case NFSMB_DEVICEID_NF4_79_SMB:
  		/* Trying to add secondary device as slave */
  		nfsmb_sc->subdev = device_add_child(dev, "nfsmb", -1);
  		if (!nfsmb_sc->subdev) {
 _______________________________________________
 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: gavin 
State-Changed-When: Tue Feb 23 22:10:02 UTC 2010 
State-Changed-Why:  
Fixed in head, stable/8 and stable/7.  Thank you for your bug report! 

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