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/ea61039b5dab
branches: netbsd-9
changeset: 462861:ea61039b5dab
user: martin <martin%NetBSD.org@localhost>
date: Mon Nov 25 16:44:31 2019 +0000
description:
Pull up following revision(s) (requested by msaitoh in ticket #476):
sys/dev/pci/if_stgereg.h: revision 1.6
sys/arch/amd64/conf/ALL: revision 1.124
sys/dev/mii/files.mii: revision 1.51
share/man/man4/vge.4: revision 1.8
share/man/man4/vge.4: revision 1.9
distrib/sets/lists/man/mi: revision 1.1656
sys/arch/i386/conf/ALL: revision 1.471
share/man/man4/mii.4: revision 1.28
sys/dev/pci/if_stge.c: revision 1.71
sys/dev/mii/ipgphy.c: revision 1.1
sys/dev/mii/ipgphy.c: revision 1.2
share/man/man4/Makefile: revision 1.684
sys/dev/mii/ipgphy.c: revision 1.3
sys/dev/mii/ipgphyreg.h: revision 1.1
sys/dev/mii/ipgphy.c: revision 1.4
sys/dev/mii/ipgphyreg.h: revision 1.2
sys/dev/mii/ipgphy.c: revision 1.5
sys/dev/mii/ipgphyreg.h: revision 1.3
sys/dev/DEVNAMES: revision 1.322
sys/arch/i386/conf/GENERIC: revision 1.1211
sys/arch/amd64/conf/GENERIC: revision 1.537
share/man/man4/ipgphy.4: revision 1.1
share/man/man4/ipgphy.4: revision 1.2
Add support IC Plus IP1000* PHYs. PR/kern 42314 first reported by
Tomokazu HARADA and patch provided by Andrius V.
New sentence, new line.
Fix date. Add RCS Id.
KNF. No functional change.
STGE_PhyCtrl is not PHY register but MAC register, so use ukphy_status()
for IP1000A device.
- Use auto-negotiation when forcing 1000BASE-T.
- Add XXX comment for strange pause setting code. I suspect this is wrong.
- On my environments, 1000BASE-T half duplex doesn't work, so we might remove
IFM_1000T_HDX from this device in future.
- Define IPGPHY_SCR's address.
- Whitespace fix.
Add missing NetBSD RCS Id. Reported by Andrius V.
diffstat:
distrib/sets/lists/man/mi | 5 +-
share/man/man4/Makefile | 4 +-
share/man/man4/ipgphy.4 | 36 ++++
share/man/man4/mii.4 | 3 +-
share/man/man4/vge.4 | 6 +-
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/ipgphy.c | 377 ++++++++++++++++++++++++++++++++++++++++++++
sys/dev/mii/ipgphyreg.h | 84 +++++++++
sys/dev/pci/if_stge.c | 129 +--------------
sys/dev/pci/if_stgereg.h | 131 +++++++++++++++-
15 files changed, 660 insertions(+), 144 deletions(-)
diffs (truncated from 1049 to 300 lines):
diff -r f68a861996c2 -r ea61039b5dab distrib/sets/lists/man/mi
--- a/distrib/sets/lists/man/mi Mon Nov 25 16:39:29 2019 +0000
+++ b/distrib/sets/lists/man/mi Mon Nov 25 16:44:31 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1649.2.3 2019/11/10 12:58:31 martin Exp $
+# $NetBSD: mi,v 1.1649.2.4 2019/11/25 16:44:32 martin Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1336,6 +1336,7 @@
./usr/share/man/cat4/ip6.0 man-sys-catman .cat
./usr/share/man/cat4/ipf.0 man-ipf-catman ipfilter,.cat
./usr/share/man/cat4/ipfilter.0 man-ipf-catman ipfilter,.cat
+./usr/share/man/cat4/ipgphy.0 man-sys-catman .cat
./usr/share/man/cat4/ipip.0 man-obsolete obsolete
./usr/share/man/cat4/ipkdb.0 man-obsolete obsolete
./usr/share/man/cat4/ipl.0 man-ipf-catman ipfilter,.cat
@@ -4476,6 +4477,7 @@
./usr/share/man/html4/ip6.html man-sys-htmlman html
./usr/share/man/html4/ipf.html man-ipf-htmlman ipfilter,html
./usr/share/man/html4/ipfilter.html man-ipf-htmlman ipfilter,html
+./usr/share/man/html4/ipgphy.html man-sys-htmlman html
./usr/share/man/html4/ipkdb.html man-obsolete obsolete
./usr/share/man/html4/ipl.html man-ipf-htmlman ipfilter,html
./usr/share/man/html4/ipmi.html man-sys-htmlman html
@@ -7452,6 +7454,7 @@
./usr/share/man/man4/ip6.4 man-sys-man .man
./usr/share/man/man4/ipf.4 man-sys-man ipfilter,.man
./usr/share/man/man4/ipfilter.4 man-sys-man ipfilter,.man
+./usr/share/man/man4/ipgphy.4 man-sys-man .man
./usr/share/man/man4/ipip.4 man-obsolete obsolete
./usr/share/man/man4/ipkdb.4 man-obsolete obsolete
./usr/share/man/man4/ipl.4 man-sys-man ipfilter,.man
diff -r f68a861996c2 -r ea61039b5dab share/man/man4/Makefile
--- a/share/man/man4/Makefile Mon Nov 25 16:39:29 2019 +0000
+++ b/share/man/man4/Makefile Mon Nov 25 16:44:31 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.680.2.1 2019/09/23 07:04:40 martin Exp $
+# $NetBSD: Makefile,v 1.680.2.2 2019/11/25 16:44:31 martin Exp $
# @(#)Makefile 8.1 (Berkeley) 6/18/93
MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \
@@ -32,7 +32,7 @@
ibmcd.4 ibmhawk.4 ichsmb.4 icmp.4 icp.4 icsphy.4 iee.4 ieee80211.4 \
ifmedia.4 igmafb.4 igphy.4 igsfb.4 iha.4 ihidev.4 ihphy.4 iic.4 ims.4 \
inet.4 ikphy.4 inphy.4 intersil7170.4 intro.4 \
- ioasic.4 ioat.4 iop.4 iophy.4 iopsp.4 ip.4 ipmi.4 ipw.4 \
+ 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 \
diff -r f68a861996c2 -r ea61039b5dab share/man/man4/ipgphy.4
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/man/man4/ipgphy.4 Mon Nov 25 16:44:31 2019 +0000
@@ -0,0 +1,36 @@
+.\" $NetBSD: ipgphy.4,v 1.2.2.2 2019/11/25 16:44:31 martin Exp $
+.\"
+.\" $OpenBSD: ipgphy.4,v 1.5 2009/08/08 17:12:40 naddy Exp $
+.\"
+.\" Copyright (c) 2006 Brad Smith <brad%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 7, 2019
+.Dt IPGPHY 4
+.Os
+.Sh NAME
+.Nm ipgphy
+.Nd IC Plus IP1000A/IP1001 10/100/Gigabit Ethernet PHY
+.Sh SYNOPSIS
+.Cd "ipgphy* at mii?"
+.Sh DESCRIPTION
+The
+.Nm
+driver supports the IC Plus IP1000A/IP1001 10/100/Gigabit Ethernet PHY
+interface.
+.Sh SEE ALSO
+.Xr ifmedia 4 ,
+.Xr intro 4 ,
+.Xr mii 4 ,
+.Xr ifconfig 8
diff -r f68a861996c2 -r ea61039b5dab share/man/man4/mii.4
--- a/share/man/man4/mii.4 Mon Nov 25 16:39:29 2019 +0000
+++ b/share/man/man4/mii.4 Mon Nov 25 16:44:31 2019 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: mii.4,v 1.27 2014/03/03 09:10:00 wiz Exp $
+.\" $NetBSD: mii.4,v 1.27.28.1 2019/11/25 16:44:31 martin Exp $
.\"
.\" Copyright (c) 1998, 2002 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -49,6 +49,7 @@
.Cd "ikphy* at mii? phy ? # Intel 82563 PHYs"
.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 "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 f68a861996c2 -r ea61039b5dab share/man/man4/vge.4
--- a/share/man/man4/vge.4 Mon Nov 25 16:39:29 2019 +0000
+++ b/share/man/man4/vge.4 Mon Nov 25 16:44:31 2019 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: vge.4,v 1.7 2014/03/18 18:20:39 riastradh Exp $
+.\" $NetBSD: vge.4,v 1.7.28.1 2019/11/25 16:44:31 martin Exp $
.\"
.\" Copyright (c) 2004
.\" Bill Paul <wpaul%windriver.com@localhost>. All rights reserved.
@@ -41,7 +41,8 @@
.Sh SYNOPSIS
.Cd "vge* at pci? dev ? function ?"
.Pp
-Configuration of PHYs is also necessary. See
+Configuration of PHYs is also necessary.
+See
.Xr mii 4 .
.Sh DESCRIPTION
The
@@ -180,6 +181,7 @@
.Sh SEE ALSO
.Xr arp 4 ,
.Xr ciphy 4 ,
+.Xr ipgphy 4 ,
.Xr mii 4 ,
.Xr netintro 4 ,
.Xr ukphy 4 ,
diff -r f68a861996c2 -r ea61039b5dab sys/arch/amd64/conf/ALL
--- a/sys/arch/amd64/conf/ALL Mon Nov 25 16:39:29 2019 +0000
+++ b/sys/arch/amd64/conf/ALL Mon Nov 25 16:44:31 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.120.2.1 2019/08/09 15:59:52 martin Exp $
+# $NetBSD: ALL,v 1.120.2.2 2019/11/25 16:44:31 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.1 $"
+#ident "ALL-$Revision: 1.120.2.2 $"
maxusers 64 # estimated number of users
@@ -1104,6 +1104,7 @@
ikphy* at mii? phy ? # Intel 82563 PHYs
inphy* at mii? phy ? # Intel 82555 PHYs
iophy* at mii? phy ? # Intel 82553 PHYs
+ipgphy* at mii? phy ? # IC PLUS IP1000A/IP1001 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 f68a861996c2 -r ea61039b5dab sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC Mon Nov 25 16:39:29 2019 +0000
+++ b/sys/arch/amd64/conf/GENERIC Mon Nov 25 16:44:31 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.531.2.4 2019/11/21 18:17:59 martin Exp $
+# $NetBSD: GENERIC,v 1.531.2.5 2019/11/25 16:44:31 martin Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.531.2.4 $"
+#ident "GENERIC-$Revision: 1.531.2.5 $"
maxusers 64 # estimated number of users
@@ -877,6 +877,7 @@
ikphy* at mii? phy ? # Intel 82563 PHYs
inphy* at mii? phy ? # Intel 82555 PHYs
iophy* at mii? phy ? # Intel 82553 PHYs
+ipgphy* at mii? phy ? # IC PLUS IP1000A/IP1001 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 f68a861996c2 -r ea61039b5dab sys/arch/i386/conf/ALL
--- a/sys/arch/i386/conf/ALL Mon Nov 25 16:39:29 2019 +0000
+++ b/sys/arch/i386/conf/ALL Mon Nov 25 16:44:31 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.469 2019/07/24 23:13:46 tnn Exp $
+# $NetBSD: ALL,v 1.469.2.1 2019/11/25 16:44:32 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.469 $"
+#ident "ALL-$Revision: 1.469.2.1 $"
maxusers 64 # estimated number of users
@@ -1209,6 +1209,7 @@
ikphy* at mii? phy ? # Intel 82563 PHYs
inphy* at mii? phy ? # Intel 82555 PHYs
iophy* at mii? phy ? # Intel 82553 PHYs
+ipgphy* at mii? phy ? # IC PLUS IP1000A/IP1001 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 f68a861996c2 -r ea61039b5dab sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC Mon Nov 25 16:39:29 2019 +0000
+++ b/sys/arch/i386/conf/GENERIC Mon Nov 25 16:44:31 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1208.2.2 2019/11/21 18:17:59 martin Exp $
+# $NetBSD: GENERIC,v 1.1208.2.3 2019/11/25 16:44:32 martin Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.1208.2.2 $"
+#ident "GENERIC-$Revision: 1.1208.2.3 $"
maxusers 64 # estimated number of users
@@ -1120,6 +1120,7 @@
ikphy* at mii? phy ? # Intel 82563 PHYs
inphy* at mii? phy ? # Intel 82555 PHYs
iophy* at mii? phy ? # Intel 82553 PHYs
+ipgphy* at mii? phy ? # IC PLUS IP1000A/IP1001 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 f68a861996c2 -r ea61039b5dab sys/dev/DEVNAMES
--- a/sys/dev/DEVNAMES Mon Nov 25 16:39:29 2019 +0000
+++ b/sys/dev/DEVNAMES Mon Nov 25 16:44:31 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: DEVNAMES,v 1.321 2019/05/08 13:40:17 isaki Exp $
+# $NetBSD: DEVNAMES,v 1.321.2.1 2019/11/25 16:44:32 martin Exp $
#
# This file contains all used device names and defined attributes in
# alphabetical order. New devices added to the system somewhere should first
@@ -659,6 +659,7 @@
ipaqbus hpcarm
ipaqlcd hpcarm
ipaqpcic hpcarm
+ipgphy MI
ipmi amd64
ipmi i386
ipmi xen
diff -r f68a861996c2 -r ea61039b5dab sys/dev/mii/files.mii
--- a/sys/dev/mii/files.mii Mon Nov 25 16:39:29 2019 +0000
+++ b/sys/dev/mii/files.mii Mon Nov 25 16:44:31 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.mii,v 1.50 2014/11/15 19:18:18 christos Exp $
+# $NetBSD: files.mii,v 1.50.26.1 2019/11/25 16:44:31 martin Exp $
defflag opt_mii.h MIIVERBOSE
@@ -99,6 +99,10 @@
attach ikphy at mii
file dev/mii/ikphy.c ikphy
+device ipgphy: mii_phy
+attach ipgphy at mii
+file dev/mii/ipgphy.c ipgphy
+
device sqphy: mii_phy
attach sqphy at mii
file dev/mii/sqphy.c sqphy
diff -r f68a861996c2 -r ea61039b5dab sys/dev/mii/ipgphy.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/dev/mii/ipgphy.c Mon Nov 25 16:44:31 2019 +0000
@@ -0,0 +1,377 @@
+/* $NetBSD: ipgphy.c,v 1.6.2.2 2019/11/25 16:44:31 martin Exp $ */
+/* $OpenBSD: ipgphy.c,v 1.19 2015/07/19 06:28:12 yuo Exp $ */
+
+/*-
+ * Copyright (c) 2006, 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
Home |
Main Index |
Thread Index |
Old Index