Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-9]: src Pull up following revision(s) (requested by msaitoh in ti...
details: https://anonhg.NetBSD.org/src/rev/fb8b862d22a1
branches: netbsd-9
changeset: 461423:fb8b862d22a1
user: martin <martin%NetBSD.org@localhost>
date: Mon Nov 25 20:47:24 2019 +0000
description:
Pull up following revision(s) (requested by msaitoh in ticket #478):
sys/dev/mii/smscphy.c: revision 1.1
sys/arch/amd64/conf/ALL: revision 1.127
sys/arch/amd64/conf/ALL: revision 1.128
sys/dev/mii/files.mii: revision 1.52
sys/dev/mii/files.mii: revision 1.53
sys/arch/i386/conf/ALL: revision 1.473
share/man/man4/mii.4: revision 1.29
sys/arch/i386/conf/ALL: revision 1.474
sys/arch/amd64/conf/GENERIC: revision 1.543
sys/arch/amd64/conf/GENERIC: revision 1.544
sys/dev/mii/jmphyreg.h: revision 1.1
share/man/man4/Makefile: revision 1.687
share/man/man4/smscphy.4: revision 1.1
share/man/man4/Makefile: revision 1.688
sys/dev/mii/jmphy.c: revision 1.1
sys/dev/DEVNAMES: revision 1.324
sys/dev/DEVNAMES: revision 1.325
distrib/sets/lists/man/mi: revision 1.1661
sys/arch/i386/conf/GENERIC: revision 1.1214
distrib/sets/lists/man/mi: revision 1.1662
sys/arch/i386/conf/GENERIC: revision 1.1215
share/man/man4/jmphy.4: revision 1.1
share/man/man4/jme.4: revision 1.8
Add jmphy(4) from OpenBSD.
Add jmphy.4.
Port SMSC LAN87xx 10/100 Ethernet PHY driver from FreeBSD with some cleanup
and IFM_NONE support.
diffstat:
distrib/sets/lists/man/mi | 8 +++++-
share/man/man4/Makefile | 7 ++--
share/man/man4/jme.4 | 5 ++-
share/man/man4/jmphy.4 | 61 +++++++++++++++++++++++++++++++++++++++++++
share/man/man4/mii.4 | 3 +-
share/man/man4/smscphy.4 | 63 +++++++++++++++++++++++++++++++++++++++++++++
sys/arch/amd64/conf/ALL | 6 ++-
sys/arch/amd64/conf/GENERIC | 6 ++-
sys/arch/i386/conf/ALL | 6 ++-
sys/arch/i386/conf/GENERIC | 6 ++-
sys/dev/DEVNAMES | 4 ++-
11 files changed, 159 insertions(+), 16 deletions(-)
diffs (truncated from 421 to 300 lines):
diff -r d0047060f78e -r fb8b862d22a1 distrib/sets/lists/man/mi
--- a/distrib/sets/lists/man/mi Mon Nov 25 17:03:50 2019 +0000
+++ b/distrib/sets/lists/man/mi Mon Nov 25 20:47:24 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1649.2.4 2019/11/25 16:44:32 martin Exp $
+# $NetBSD: mi,v 1.1649.2.5 2019/11/25 20:47:25 martin Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1379,6 +1379,7 @@
./usr/share/man/cat4/iy.0 man-sys-catman .cat
./usr/share/man/cat4/jme.0 man-sys-catman .cat
./usr/share/man/cat4/jmide.0 man-sys-catman .cat
+./usr/share/man/cat4/jmphy.0 man-sys-catman .cat
./usr/share/man/cat4/joy.0 man-sys-catman .cat
./usr/share/man/cat4/kame_ipsec.0 man-obsolete obsolete
./usr/share/man/cat4/kcov.0 man-sys-catman .cat
@@ -1709,6 +1710,7 @@
./usr/share/man/cat4/slip.0 man-sys-catman .cat
./usr/share/man/cat4/sm.0 man-sys-catman .cat
./usr/share/man/cat4/smsc.0 man-sys-catman .cat
+./usr/share/man/cat4/smscphy.0 man-sys-catman .cat
./usr/share/man/cat4/smscmon.0 man-sys-catman .cat
./usr/share/man/cat4/smsh.0 man-sys-catman .cat
./usr/share/man/cat4/sn.0 man-sys-catman .cat
@@ -4518,6 +4520,7 @@
./usr/share/man/html4/iy.html man-sys-htmlman html
./usr/share/man/html4/jme.html man-sys-htmlman html
./usr/share/man/html4/jmide.html man-sys-htmlman html
+./usr/share/man/html4/jmphy.html man-sys-htmlman html
./usr/share/man/html4/joy.html man-sys-htmlman html
./usr/share/man/html4/kame_ipsec.html man-obsolete obsolete
./usr/share/man/html4/kcov.html man-sys-htmlman html
@@ -4815,6 +4818,7 @@
./usr/share/man/html4/slip.html man-sys-htmlman html
./usr/share/man/html4/sm.html man-sys-htmlman html
./usr/share/man/html4/smsc.html man-sys-htmlman html
+./usr/share/man/html4/smscphy.html man-sys-htmlman html
./usr/share/man/html4/smscmon.html man-sys-htmlman html
./usr/share/man/html4/smsh.html man-sys-htmlman html
./usr/share/man/html4/sn.html man-sys-htmlman html
@@ -7497,6 +7501,7 @@
./usr/share/man/man4/iy.4 man-sys-man .man
./usr/share/man/man4/jme.4 man-sys-man .man
./usr/share/man/man4/jmide.4 man-sys-man .man
+./usr/share/man/man4/jmphy.4 man-sys-man .man
./usr/share/man/man4/joy.4 man-sys-man .man
./usr/share/man/man4/kame_ipsec.4 man-obsolete obsolete
./usr/share/man/man4/kcov.4 man-sys-man .man
@@ -7828,6 +7833,7 @@
./usr/share/man/man4/sm.4 man-sys-man .man
./usr/share/man/man4/smsc.4 man-sys-man .man
./usr/share/man/man4/smscmon.4 man-sys-man .man
+./usr/share/man/man4/smscphy.4 man-sys-man .man
./usr/share/man/man4/smsh.4 man-sys-man .man
./usr/share/man/man4/sn.4 man-sys-man .man
./usr/share/man/man4/sony.4 man-sys-man .man
diff -r d0047060f78e -r fb8b862d22a1 share/man/man4/Makefile
--- a/share/man/man4/Makefile Mon Nov 25 17:03:50 2019 +0000
+++ b/share/man/man4/Makefile Mon Nov 25 20:47:24 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.680.2.2 2019/11/25 16:44:31 martin Exp $
+# $NetBSD: Makefile,v 1.680.2.3 2019/11/25 20:47:25 martin Exp $
# @(#)Makefile 8.1 (Berkeley) 6/18/93
MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \
@@ -35,7 +35,7 @@
ioasic.4 ioat.4 iop.4 iophy.4 iopsp.4 ip.4 ipgphy.4 ipmi.4 ipw.4 \
irmce.4 isp.4 ismt.4 isv.4 itesio.4 iteide.4 iwi.4 iwm.4 iwn.4 ixg.4 \
ixpide.4 ixv.4 \
- jme.4 jmide.4 joy.4 \
+ jme.4 jmide.4 jmphy.4 joy.4 \
kcov.4 kloader.4 kse.4 ksyms.4 kttcp.4 \
l2tp.4 lc.4 ld.4 lii.4 lo.4 lua.4 lxtphy.4 \
mainbus.4 makphy.4 malo.4 mbe.4 mca.4 mcclock.4 mcx.4 md.4 mfb.4 \
@@ -58,7 +58,8 @@
scsi.4 sctp.4 sd.4 se.4 seeprom.4 sem.4 \
ses.4 sf.4 sfb.4 sgsmix.4 shb.4 shmif.4 shpcic.4 si70xxtemp.4 \
siisata.4 siop.4 sip.4 siside.4 sk.4 sl.4 slide.4 \
- sm.4 smsh.4 sn.4 sony.4 spc.4 speaker.4 spif.4 sqphy.4 srt.4 ss.4 \
+ sm.4 smscphy.4 smsh.4 sn.4 sony.4 spc.4 speaker.4 spif.4 sqphy.4 \
+ srt.4 ss.4 \
ssdfb.4 st.4 ste.4 stge.4 sti.4 stpcide.4 sv.4 strip.4 \
svwsata.4 swsensor.4 swwdog.4 sysmon.4 \
tap.4 tc.4 tcds.4 tcp.4 tcu.4 tdvfb.4 tea5767radio.4 termios.4 tfb.4 \
diff -r d0047060f78e -r fb8b862d22a1 share/man/man4/jme.4
--- a/share/man/man4/jme.4 Mon Nov 25 17:03:50 2019 +0000
+++ b/share/man/man4/jme.4 Mon Nov 25 20:47:24 2019 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: jme.4,v 1.7 2017/07/03 21:30:58 wiz Exp $
+.\" $NetBSD: jme.4,v 1.7.8.1 2019/11/25 20:47:25 martin Exp $
.\"
.\" Copyright (c) 2008 Manuel Bouyer
.\" All rights reserved.
@@ -23,7 +23,7 @@
.\" INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd October 17, 2008
+.Dd October 30, 2019
.Dt JME 4
.Os
.Sh NAME
@@ -69,6 +69,7 @@
.El
.Sh SEE ALSO
.Xr ifmedia 4 ,
+.Xr jmphy 4 ,
.Xr mii 4 ,
.Xr netintro 4 ,
.Xr pci 4 ,
diff -r d0047060f78e -r fb8b862d22a1 share/man/man4/jmphy.4
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/man/man4/jmphy.4 Mon Nov 25 20:47:24 2019 +0000
@@ -0,0 +1,61 @@
+.\" $NetBSD: jmphy.4,v 1.2.2.2 2019/11/25 20:47:25 martin Exp $
+.\" $openbsd: jmphy.4,v 1.2 2013/07/16 16:05:49 schwarze Exp $
+.\"
+.\" Copyright (c) 2008 Jonathan Gray <jsg%openbsd.org@localhost>
+.\"
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.Dd October 30 2019
+.Dt JMPHY 4
+.Os
+.Sh NAME
+.Nm jmphy
+.Nd JMicron JMP202/JMP211 10/100/Gigabit Ethernet PHY
+.Sh SYNOPSIS
+.Cd "jmphy* at mii?"
+.Sh DESCRIPTION
+The
+.Nm
+driver supports the JMicron JMP202 10/100 and
+JMP211 10/100/Gigabit Ethernet PHYs.
+.Sh SEE ALSO
+.Xr ifmedia 4 ,
+.Xr intro 4 ,
+.Xr jme 4 ,
+.Xr mii 4 ,
+.Xr ifconfig 8
+.Sh HISTORY
+The
+.Nm
+device driver first appeared in
+.Ox 4.5 .
+.Sh AUTHORS
+.An -nosplit
+The
+.Nm
+driver was written by
+.An Pyun YongHyeon
+for
+.Fx
+and ported to
+.Ox
+by
+.An Jonathan Gray Aq Mt jsg%openbsd.org@localhost
+and then ported to
+.Nx 9.0
+by
+.An Masanobu SAITOH.
+.Sh BUGS
+It the media is set to gigabit speed, it may not linkup or takes very log time
+to go link up.
+It depends on the link partnet.
diff -r d0047060f78e -r fb8b862d22a1 share/man/man4/mii.4
--- a/share/man/man4/mii.4 Mon Nov 25 17:03:50 2019 +0000
+++ b/share/man/man4/mii.4 Mon Nov 25 20:47:24 2019 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: mii.4,v 1.27.28.1 2019/11/25 16:44:31 martin Exp $
+.\" $NetBSD: mii.4,v 1.27.28.2 2019/11/25 20:47:25 martin Exp $
.\"
.\" Copyright (c) 1998, 2002 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -50,6 +50,7 @@
.Cd "inphy* at mii? phy ? # Intel 82555 PHYs"
.Cd "iophy* at mii? phy ? # Intel 82553 PHYs"
.Cd "ipgphy* at mii? phy ? # IC PLUS IP1000A/IP1001 PHYs"
+.Cd "jmphy* at mii? phy ? # JMicron
.Cd "lxtphy* at mii? phy ? # Level One LXT-970 PHYs"
.Cd "makphy* at mii? phy ? # Marvel 88E1000 Gig-E PHYs"
.Cd "micphy* at mii? phy ? # Micrel KSZ9021 Gig-E PHYs"
diff -r d0047060f78e -r fb8b862d22a1 share/man/man4/smscphy.4
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/man/man4/smscphy.4 Mon Nov 25 20:47:24 2019 +0000
@@ -0,0 +1,63 @@
+.\" $
+.\"
+.\" Copyright (c) 2019 The NetBSD Foundation, Inc.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to The NetBSD Foundation
+.\" by Masanobu SAITOH.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\" notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\" notice, this list of conditions and the following disclaimer in the
+.\" documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+.\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIHENCE OR OTHERWISE)
+.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+.\" POSSIBILITY OF SUCH DAMAGE.
+.\"
+.Dd November 1, 2019
+.Dt SMSCPHY 4
+.Os
+.Sh NAME
+.Nm smscphy
+.Nd SMSC LAN87xx 10/100 Ethernet PHYs
+.Sh SYNOPSIS
+.Cd "smscphy* at mii? phy ?"
+.Sh DESCRIPTION
+The
+.Nm
+driver supports SMSC LAN8700, LAN8710 and LAN8720 10/100 Ethernet PHYs.
+.Sh SEE ALSO
+.Xr ifmedia 4 ,
+.Xr intro 4 ,
+.Xr mii 4 ,
+.Xr ifconfig 8
+.Sh HISTORY
+The
+.Nm
+device driver first appeared in
+.Fx 8.0 .
+.Sh AUTHORS
+.An -nosplit
+The
+.Nm
+driver was written by
+.An Ben Gray
+for
+.Fx
+and ported to
+.Nx 9.0
+by
+.An Masanobu SAITOH.
diff -r d0047060f78e -r fb8b862d22a1 sys/arch/amd64/conf/ALL
--- a/sys/arch/amd64/conf/ALL Mon Nov 25 17:03:50 2019 +0000
+++ b/sys/arch/amd64/conf/ALL Mon Nov 25 20:47:24 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.120.2.2 2019/11/25 16:44:31 martin Exp $
+# $NetBSD: ALL,v 1.120.2.3 2019/11/25 20:47:24 martin Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.120.2.2 $"
+#ident "ALL-$Revision: 1.120.2.3 $"
maxusers 64 # estimated number of users
@@ -1105,6 +1105,7 @@
inphy* at mii? phy ? # Intel 82555 PHYs
iophy* at mii? phy ? # Intel 82553 PHYs
ipgphy* at mii? phy ? # IC PLUS IP1000A/IP1001 PHYs
+jmphy* at mii? phy ? # Jmicron JMP202/211 PHYs
lxtphy* at mii? phy ? # Level One LXT-970 PHYs
makphy* at mii? phy ? # Marvell Semiconductor 88E1000 PHYs
nsphy* at mii? phy ? # NS83840 PHYs
@@ -1114,6 +1115,7 @@
rdcphy* at mii? phy ? # RDC R6040 internal PHY
rgephy* at mii? phy ? # Realtek 8169S/8110S internal PHYs
rlphy* at mii? phy ? # Realtek 8139/8201L PHYs
+smscphy* at mii? phy ? # SMSC LAN87xx PHYs
sqphy* at mii? phy ? # Seeq 80220/80221/80223 PHYs
tlphy* at mii? phy ? # ThunderLAN PHYs
tqphy* at mii? phy ? # TDK Semiconductor PHYs
diff -r d0047060f78e -r fb8b862d22a1 sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC Mon Nov 25 17:03:50 2019 +0000
+++ b/sys/arch/amd64/conf/GENERIC Mon Nov 25 20:47:24 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.531.2.5 2019/11/25 16:44:31 martin Exp $
+# $NetBSD: GENERIC,v 1.531.2.6 2019/11/25 20:47:24 martin Exp $
Home |
Main Index |
Thread Index |
Old Index