Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src Port SMSC LAN87xx 10/100 Ethernet PHY driver from FreeBSD wi...



details:   https://anonhg.NetBSD.org/src/rev/2f9c7c1618fa
branches:  trunk
changeset: 846125:2f9c7c1618fa
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Fri Nov 01 02:53:22 2019 +0000

description:
Port SMSC LAN87xx 10/100 Ethernet PHY driver from FreeBSD with some cleanup
and IFM_NONE support.

diffstat:

 distrib/sets/lists/man/mi   |    5 +-
 share/man/man4/Makefile     |    5 +-
 share/man/man4/smscphy.4    |   63 +++++++++++
 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/smscphy.c       |  251 ++++++++++++++++++++++++++++++++++++++++++++
 10 files changed, 340 insertions(+), 13 deletions(-)

diffs (truncated from 512 to 300 lines):

diff -r 6d379661b50b -r 2f9c7c1618fa distrib/sets/lists/man/mi
--- a/distrib/sets/lists/man/mi Thu Oct 31 17:09:13 2019 +0000
+++ b/distrib/sets/lists/man/mi Fri Nov 01 02:53:22 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1661 2019/10/30 12:06:25 msaitoh Exp $
+# $NetBSD: mi,v 1.1662 2019/11/01 02:53:22 msaitoh Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -1712,6 +1712,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
@@ -4823,6 +4824,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
@@ -7841,6 +7843,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 6d379661b50b -r 2f9c7c1618fa share/man/man4/Makefile
--- a/share/man/man4/Makefile   Thu Oct 31 17:09:13 2019 +0000
+++ b/share/man/man4/Makefile   Fri Nov 01 02:53:22 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.687 2019/10/30 12:06:25 msaitoh Exp $
+#      $NetBSD: Makefile,v 1.688 2019/11/01 02:53:23 msaitoh Exp $
 #      @(#)Makefile    8.1 (Berkeley) 6/18/93
 
 MAN=   aac.4 ac97.4 acardide.4 aceride.4 acphy.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 6d379661b50b -r 2f9c7c1618fa share/man/man4/smscphy.4
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/share/man/man4/smscphy.4  Fri Nov 01 02:53:22 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 6d379661b50b -r 2f9c7c1618fa sys/arch/amd64/conf/ALL
--- a/sys/arch/amd64/conf/ALL   Thu Oct 31 17:09:13 2019 +0000
+++ b/sys/arch/amd64/conf/ALL   Fri Nov 01 02:53:22 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.127 2019/10/30 12:06:25 msaitoh Exp $
+# $NetBSD: ALL,v 1.128 2019/11/01 02:53:23 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.127 $"
+#ident         "ALL-$Revision: 1.128 $"
 
 maxusers       64              # estimated number of users
 
@@ -1116,6 +1116,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 6d379661b50b -r 2f9c7c1618fa sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC       Thu Oct 31 17:09:13 2019 +0000
+++ b/sys/arch/amd64/conf/GENERIC       Fri Nov 01 02:53:22 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.543 2019/10/30 12:06:25 msaitoh Exp $
+# $NetBSD: GENERIC,v 1.544 2019/11/01 02:53:23 msaitoh Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident         "GENERIC-$Revision: 1.543 $"
+#ident         "GENERIC-$Revision: 1.544 $"
 
 maxusers       64              # estimated number of users
 
@@ -886,6 +886,7 @@
 qsphy* at mii? phy ?                   # Quality Semiconductor QS6612 PHYs
 rgephy* at mii? phy ?                  # Realtek 8169S/8110 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 6d379661b50b -r 2f9c7c1618fa sys/arch/i386/conf/ALL
--- a/sys/arch/i386/conf/ALL    Thu Oct 31 17:09:13 2019 +0000
+++ b/sys/arch/i386/conf/ALL    Fri Nov 01 02:53:22 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.473 2019/10/30 12:06:25 msaitoh Exp $
+# $NetBSD: ALL,v 1.474 2019/11/01 02:53:23 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.473 $"
+#ident         "ALL-$Revision: 1.474 $"
 
 maxusers       64              # estimated number of users
 
@@ -1220,6 +1220,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 6d379661b50b -r 2f9c7c1618fa sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC        Thu Oct 31 17:09:13 2019 +0000
+++ b/sys/arch/i386/conf/GENERIC        Fri Nov 01 02:53:22 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1214 2019/10/30 12:06:25 msaitoh Exp $
+# $NetBSD: GENERIC,v 1.1215 2019/11/01 02:53:23 msaitoh Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident         "GENERIC-$Revision: 1.1214 $"
+#ident         "GENERIC-$Revision: 1.1215 $"
 
 maxusers       64              # estimated number of users
 
@@ -1134,6 +1134,7 @@
 rdcphy* at mii? phy ?                  # RDC R6040 10/100 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 6d379661b50b -r 2f9c7c1618fa sys/dev/DEVNAMES
--- a/sys/dev/DEVNAMES  Thu Oct 31 17:09:13 2019 +0000
+++ b/sys/dev/DEVNAMES  Fri Nov 01 02:53:22 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: DEVNAMES,v 1.324 2019/10/30 12:06:26 msaitoh Exp $
+#      $NetBSD: DEVNAMES,v 1.325 2019/11/01 02:53:23 msaitoh Exp $
 #
 # This file contains all used device names and defined attributes in
 # alphabetical order. New devices added to the system somewhere should first
@@ -1260,6 +1260,7 @@
 smap                   playstation2
 smc93cx6               MI              Attribute
 smg                    vax
+smscphy                        MI
 smsh                   MI
 sn                     arc
 sn                     mac68k
diff -r 6d379661b50b -r 2f9c7c1618fa sys/dev/mii/files.mii
--- a/sys/dev/mii/files.mii     Thu Oct 31 17:09:13 2019 +0000
+++ b/sys/dev/mii/files.mii     Fri Nov 01 02:53:22 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.mii,v 1.52 2019/10/30 12:06:26 msaitoh Exp $
+#      $NetBSD: files.mii,v 1.53 2019/11/01 02:53:22 msaitoh Exp $
 
 defflag        opt_mii.h       MIIVERBOSE
 
@@ -166,3 +166,7 @@
 device micphy: mii_phy, ukphy_subr
 attach micphy at mii
 file   dev/mii/micphy.c                        micphy
+
+device smscphy: mii_phy
+attach smscphy at mii
+file   dev/mii/smscphy.c                       smscphy
diff -r 6d379661b50b -r 2f9c7c1618fa sys/dev/mii/smscphy.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/dev/mii/smscphy.c     Fri Nov 01 02:53:22 2019 +0000
@@ -0,0 +1,251 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
+ * Copyright (c) 2006 Benno Rice.  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, 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 ``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 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.
+ */
+
+#include <sys/cdefs.h>
+/* $FreeBSD: head/sys/dev/mii/smscphy.c 326255 2017-11-27 14:52:40Z pfg $ */
+
+/*
+ * Driver for the SMSC LAN8710A
+ */
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/device.h>
+#include <sys/socket.h>
+#include <sys/errno.h>



Home | Main Index | Thread Index | Old Index