Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Add jmphy(4) from OpenBSD.
details: https://anonhg.NetBSD.org/src/rev/5dcd0ea64e67
branches: trunk
changeset: 460666:5dcd0ea64e67
user: msaitoh <msaitoh%NetBSD.org@localhost>
date: Wed Oct 30 12:06:25 2019 +0000
description:
Add jmphy(4) from OpenBSD.
diffstat:
distrib/sets/lists/man/mi | 5 +-
share/man/man4/Makefile | 4 +-
share/man/man4/jme.4 | 5 +-
share/man/man4/mii.4 | 3 +-
sys/arch/amd64/conf/ALL | 5 +-
sys/arch/amd64/conf/GENERIC | 5 +-
sys/arch/i386/conf/ALL | 5 +-
sys/arch/i386/conf/GENERIC | 5 +-
sys/dev/DEVNAMES | 3 +-
sys/dev/mii/files.mii | 6 +-
sys/dev/mii/jmphy.c | 358 ++++++++++++++++++++++++++++++++++++++++++++
sys/dev/mii/jmphyreg.h | 116 ++++++++++++++
12 files changed, 504 insertions(+), 16 deletions(-)
diffs (truncated from 717 to 300 lines):
diff -r 6468bd558d88 -r 5dcd0ea64e67 distrib/sets/lists/man/mi
--- a/distrib/sets/lists/man/mi Wed Oct 30 12:02:01 2019 +0000
+++ b/distrib/sets/lists/man/mi Wed Oct 30 12:06:25 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1660 2019/10/28 13:04:18 maxv Exp $
+# $NetBSD: mi,v 1.1661 2019/10/30 12:06:25 msaitoh 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
@@ -4522,6 +4523,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
@@ -7505,6 +7507,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
diff -r 6468bd558d88 -r 5dcd0ea64e67 share/man/man4/Makefile
--- a/share/man/man4/Makefile Wed Oct 30 12:02:01 2019 +0000
+++ b/share/man/man4/Makefile Wed Oct 30 12:06:25 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.686 2019/10/28 02:56:40 ozaki-r Exp $
+# $NetBSD: Makefile,v 1.687 2019/10/30 12:06:25 msaitoh 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 \
diff -r 6468bd558d88 -r 5dcd0ea64e67 share/man/man4/jme.4
--- a/share/man/man4/jme.4 Wed Oct 30 12:02:01 2019 +0000
+++ b/share/man/man4/jme.4 Wed Oct 30 12:06:25 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.8 2019/10/30 12:06:25 msaitoh 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 6468bd558d88 -r 5dcd0ea64e67 share/man/man4/mii.4
--- a/share/man/man4/mii.4 Wed Oct 30 12:02:01 2019 +0000
+++ b/share/man/man4/mii.4 Wed Oct 30 12:06:25 2019 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: mii.4,v 1.28 2019/10/07 11:53:40 msaitoh Exp $
+.\" $NetBSD: mii.4,v 1.29 2019/10/30 12:06:25 msaitoh 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 6468bd558d88 -r 5dcd0ea64e67 sys/arch/amd64/conf/ALL
--- a/sys/arch/amd64/conf/ALL Wed Oct 30 12:02:01 2019 +0000
+++ b/sys/arch/amd64/conf/ALL Wed Oct 30 12:06:25 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.126 2019/10/28 03:01:11 ozaki-r Exp $
+# $NetBSD: ALL,v 1.127 2019/10/30 12:06:25 msaitoh 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.126 $"
+#ident "ALL-$Revision: 1.127 $"
maxusers 64 # estimated number of users
@@ -1106,6 +1106,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
diff -r 6468bd558d88 -r 5dcd0ea64e67 sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC Wed Oct 30 12:02:01 2019 +0000
+++ b/sys/arch/amd64/conf/GENERIC Wed Oct 30 12:06:25 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.542 2019/10/28 03:01:11 ozaki-r Exp $
+# $NetBSD: GENERIC,v 1.543 2019/10/30 12:06:25 msaitoh Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.542 $"
+#ident "GENERIC-$Revision: 1.543 $"
maxusers 64 # estimated number of users
@@ -877,6 +877,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
diff -r 6468bd558d88 -r 5dcd0ea64e67 sys/arch/i386/conf/ALL
--- a/sys/arch/i386/conf/ALL Wed Oct 30 12:02:01 2019 +0000
+++ b/sys/arch/i386/conf/ALL Wed Oct 30 12:06:25 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.472 2019/10/08 18:50:44 maxv Exp $
+# $NetBSD: ALL,v 1.473 2019/10/30 12:06:25 msaitoh 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.472 $"
+#ident "ALL-$Revision: 1.473 $"
maxusers 64 # estimated number of users
@@ -1210,6 +1210,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
diff -r 6468bd558d88 -r 5dcd0ea64e67 sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC Wed Oct 30 12:02:01 2019 +0000
+++ b/sys/arch/i386/conf/GENERIC Wed Oct 30 12:06:25 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1213 2019/10/25 17:39:57 martin Exp $
+# $NetBSD: GENERIC,v 1.1214 2019/10/30 12:06:25 msaitoh Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.1213 $"
+#ident "GENERIC-$Revision: 1.1214 $"
maxusers 64 # estimated number of users
@@ -1124,6 +1124,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
diff -r 6468bd558d88 -r 5dcd0ea64e67 sys/dev/DEVNAMES
--- a/sys/dev/DEVNAMES Wed Oct 30 12:02:01 2019 +0000
+++ b/sys/dev/DEVNAMES Wed Oct 30 12:06:25 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: DEVNAMES,v 1.323 2019/10/25 17:39:56 martin Exp $
+# $NetBSD: DEVNAMES,v 1.324 2019/10/30 12:06:26 msaitoh Exp $
#
# This file contains all used device names and defined attributes in
# alphabetical order. New devices added to the system somewhere should first
@@ -708,6 +708,7 @@
j720ssp hpcarm
j720tp hpcarm
jme MI
+jmphy MI
joy arc
joy bebox
joy cats
diff -r 6468bd558d88 -r 5dcd0ea64e67 sys/dev/mii/files.mii
--- a/sys/dev/mii/files.mii Wed Oct 30 12:02:01 2019 +0000
+++ b/sys/dev/mii/files.mii Wed Oct 30 12:06:25 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.mii,v 1.51 2019/10/07 11:53:40 msaitoh Exp $
+# $NetBSD: files.mii,v 1.52 2019/10/30 12:06:26 msaitoh Exp $
defflag opt_mii.h MIIVERBOSE
@@ -103,6 +103,10 @@
attach ipgphy at mii
file dev/mii/ipgphy.c ipgphy
+device jmphy: mii_phy
+attach jmphy at mii
+file dev/mii/jmphy.c jmphy
+
device sqphy: mii_phy
attach sqphy at mii
file dev/mii/sqphy.c sqphy
diff -r 6468bd558d88 -r 5dcd0ea64e67 sys/dev/mii/jmphy.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/dev/mii/jmphy.c Wed Oct 30 12:06:25 2019 +0000
@@ -0,0 +1,358 @@
+/* $NetBSD: jmphy.c,v 1.1 2019/10/30 12:06:26 msaitoh Exp $ */
+/* $OpenBSD: jmphy.c,v 1.6 2015/03/14 03:38:48 jsg Exp $ */
+/*-
+ * Copyright (c) 2008, Pyun YongHyeon <yongari%FreeBSD.org@localhost>
+ * All rights reserved.
+ *
+ * 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 unmodified, 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 AUTHOR 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 AUTHOR 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 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD: src/sys/dev/mii/jmphy.c,v 1.1 2008/05/27 01:16:40 yongari Exp $
+ * $DragonFly: src/sys/dev/netif/mii_layer/jmphy.c,v 1.1 2008/07/22 11:28:49 sephe Exp $
+ */
+
+/*
+ * Driver for the JMicron JMP211 10/100/1000, JMP202 10/100 PHY.
+ */
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/device.h>
+#include <sys/socket.h>
+
+#include <net/if.h>
+#include <net/if_media.h>
+
+#include <dev/mii/mii.h>
+#include <dev/mii/miivar.h>
+#include <dev/mii/miidevs.h>
+#include <dev/mii/jmphyreg.h>
+
+static int jmphy_service(struct mii_softc *, struct mii_data *, int);
+static void jmphy_status(struct mii_softc *);
+static int jmphy_match(device_t, cfdata_t, void *);
+static void jmphy_attach(device_t, device_t, void *);
+static void jmphy_reset(struct mii_softc *);
+static uint16_t jmphy_anar(struct ifmedia_entry *);
+static int jmphy_auto(struct mii_softc *, struct ifmedia_entry *);
+
+static const struct mii_phy_funcs jmphy_funcs = {
+ jmphy_service, jmphy_status, jmphy_reset,
+};
+
Home |
Main Index |
Thread Index |
Old Index