From oz@nixil.net  Fri Mar  7 06:20:11 2008
Return-Path: <oz@nixil.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7BF021065673
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  7 Mar 2008 06:20:11 +0000 (UTC)
	(envelope-from oz@nixil.net)
Received: from nixil.net (nixil.net [161.58.222.1])
	by mx1.freebsd.org (Postfix) with ESMTP id 2A0668FC24
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  7 Mar 2008 06:20:11 +0000 (UTC)
	(envelope-from oz@nixil.net)
Received: from nixil.net (localhost [127.0.0.1])
	by nixil.net (8.13.6.20060614/8.13.6) with ESMTP id m276KAUb007934
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT)
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 6 Mar 2008 23:20:10 -0700 (MST)
Received: (from oz@localhost)
	by nixil.net (8.13.6.20060614/8.13.6/Submit) id m276KAdi007933;
	Thu, 6 Mar 2008 23:20:10 -0700 (MST)
Message-Id: <200803070620.m276KAdi007933@nixil.net>
Date: Thu, 6 Mar 2008 23:20:10 -0700 (MST)
From: Phil Oleson <oz@nixil.net>
Reply-To: Phil Oleson <oz@nixil.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patches] MFC icsphy to RELENG_6
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         121459
>Category:       kern
>Synopsis:       [patches] MFC icsphy to RELENG_6
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    yongari
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Mar 07 06:30:01 UTC 2008
>Closed-Date:    Wed Mar 19 01:18:33 UTC 2008
>Last-Modified:  Wed Mar 19 01:20:01 UTC 2008
>Originator:     Phil Oleson
>Release:        FreeBSD 4.7-RELEASE-p28 i386
>Organization:
N/A
>Environment:
System: FreeBSD nixil.net 4.7-RELEASE-p28 FreeBSD 4.7-RELEASE-p28 #47: Tue Apr 10 10:28:38 MDT 2007 root@nixil.net:/usr/compile/nixil i386


>Description:
	My nic needs the icsphy mii driver. This was discovered when testing out the new 
vr(4) driver from Pyun YongHyeon, on my RELENG_6 box.  Adding this code to mii makes it work.

>How-To-Repeat:
	N/A
>Fix:

MFC the following file from RELENG_7:

src/sys/dev/mii/icsphy.c
src/sys/dev/mii/icsphyreg.h	

the following patches are to connect these files into a RELENG_6 system.

--- patch-a begins here ---
--- src/sys/conf/files.orig	2008-02-10 09:02:50.000000000 -0700
+++ src/sys/conf/files	2008-03-06 22:43:47.000000000 -0700
@@ -740,6 +740,8 @@
 dev/mii/exphy.c			optional exphy
 dev/mii/gentbi.c		optional miibus
 dev/mii/gentbi.c		optional mii
+dev/mii/icsphy.c		optional miibus
+dev/mii/icsphy.c		optional icsphy
 dev/mii/inphy.c			optional miibus
 dev/mii/inphy.c			optional inphy
 dev/mii/ip1000phy.c		optional miibus
--- patch-a ends here ---

--- patch-b begins here ---
--- src/sys/dev/mii/miidevs.orig	2008-03-06 22:56:03.000000000 -0700
+++ src/sys/dev/mii/miidevs	2008-03-06 22:56:51.000000000 -0700
@@ -145,7 +145,10 @@
 model xxDAVICOM DM9101		0x0000 DM9101 10/100 media interface
 
 /* Integrated Circuit Systems PHYs */
+model xxICS 1889		0x0001 ICS1889 10/100 media interface
 model xxICS 1890		0x0002 ICS1890 10/100 media interface
+model xxICS 1892		0x0003 ICS1892 10/100 media interface
+model xxICS 1893		0x0004 ICS1893 10/100 media interface
 
 /* IC Plus Corp. PHYs */
 model ICPLUS IP1000A		0x0008 IC Plus 10/100/1000 media interface
--- patch-b ends here ---

--- patch-c begins here ---
--- src/sys/modules/mii/Makefile.orig	2008-02-10 09:02:50.000000000 -0700
+++ src/sys/modules/mii/Makefile	2008-03-06 22:45:36.000000000 -0700
@@ -4,7 +4,7 @@
 
 KMOD=	miibus
 SRCS=	acphy.c amphy.c bmtphy.c brgphy.c bus_if.h ciphy.c dcphy.c device_if.h
-SRCS+=	e1000phy.c exphy.c gentbi.c inphy.c ip1000phy.c
+SRCS+=	e1000phy.c exphy.c gentbi.c icsphy.c inphy.c ip1000phy.c
 SRCS+=	lxtphy.c miibus_if.c miibus_if.h mii.c miidevs.h mii_physubr.c
 SRCS+=	mlphy.c nsgphy.c nsphy.c nsphyter.c pci_if.h pnaphy.c pnphy.c qsphy.c
 SRCS+=	rgephy.c rlphy.c ruephy.c tdkphy.c tlphy.c ukphy.c ukphy_subr.c
--- patch-c ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->yongari 
Responsible-Changed-By: yongari 
Responsible-Changed-When: Fri Mar 7 06:48:41 UTC 2008 
Responsible-Changed-Why:  
Grab. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=121459 
State-Changed-From-To: open->closed 
State-Changed-By: yongari 
State-Changed-When: Wed Mar 19 01:18:02 UTC 2008 
State-Changed-Why:  
MFC done. Thank you very much! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/121459: commit references a PR
Date: Wed, 19 Mar 2008 01:11:45 +0000 (UTC)

 yongari     2008-03-19 01:11:39 UTC
 
   FreeBSD src repository
 
   Modified files:        (Branch: RELENG_6)
     sys/conf             files 
     sys/dev/mii          miidevs 
     sys/modules/mii      Makefile 
   Added files:           (Branch: RELENG_6)
     sys/dev/mii          icsphy.c icsphyreg.h 
   Log:
   MFC icsphy(4) to RELENG_6.
   icsphy(4) is required to support PHYs found on Xbox and VIA Rhine
   ethernet controllers.
   
   PR:     kern/121459
   
   Revision     Changes    Path
   1.1031.2.72  +2 -0      src/sys/conf/files
   1.1.6.1      +302 -0    src/sys/dev/mii/icsphy.c (new)
   1.1.6.1      +136 -0    src/sys/dev/mii/icsphyreg.h (new)
   1.30.2.14    +3 -0      src/sys/dev/mii/miidevs
   1.26.8.4     +1 -1      src/sys/modules/mii/Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
