From owner-freebsd-bugs@FreeBSD.ORG Fri Mar 7 06:30:01 2008 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F2C97106566C for ; Fri, 7 Mar 2008 06:30:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id D05C38FC1A for ; Fri, 7 Mar 2008 06:30:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m276U1hr070405 for ; Fri, 7 Mar 2008 06:30:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m276U1t1070404; Fri, 7 Mar 2008 06:30:01 GMT (envelope-from gnats) Resent-Date: Fri, 7 Mar 2008 06:30:01 GMT Resent-Message-Id: <200803070630.m276U1t1070404@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Phil Oleson Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7BF021065673 for ; 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 ; 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 ; 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 To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: kern/121459: [patches] MFC icsphy to RELENG_6 X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Phil Oleson List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Mar 2008 06:30:02 -0000 >Number: 121459 >Category: kern >Synopsis: [patches] MFC icsphy to RELENG_6 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Mar 07 06:30:01 UTC 2008 >Closed-Date: >Last-Modified: >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: >Unformatted: