CVS commit: [netbsd-6] src/sys/dev/mii
Module Name:src
Committed By: bouyer
Date: Sun Nov 15 17:45:44 UTC 2015
Modified Files:
src/sys/dev/mii [netbsd-6]: atphy.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1325):
sys/dev/mii/atphy.c: revision 1.17
Fix incorrect argument of mii_anar(). Fixes PR#50206.
XXX pullup -[567]
To generate a diff of this commit:
cvs rdiff -u -r1.11.8.2 -r1.11.8.3 src/sys/dev/mii/atphy.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/mii/atphy.c
diff -u src/sys/dev/mii/atphy.c:1.11.8.2 src/sys/dev/mii/atphy.c:1.11.8.3
--- src/sys/dev/mii/atphy.c:1.11.8.2 Wed Feb 4 11:35:04 2015
+++ src/sys/dev/mii/atphy.c Sun Nov 15 17:45:44 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: atphy.c,v 1.11.8.2 2015/02/04 11:35:04 martin Exp $ */
+/* $NetBSD: atphy.c,v 1.11.8.3 2015/11/15 17:45:44 bouyer Exp $ */
/* $OpenBSD: atphy.c,v 1.1 2008/09/25 20:47:16 brad Exp $ */
/*-
@@ -33,7 +33,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: atphy.c,v 1.11.8.2 2015/02/04 11:35:04 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atphy.c,v 1.11.8.3 2015/11/15 17:45:44 bouyer Exp $");
#include
#include
@@ -226,7 +226,7 @@ atphy_service(struct mii_softc *sc, stru
return EINVAL;
}
- anar = mii_anar(ife->ifm_media);
+ anar = mii_anar(IFM_SUBTYPE(ife->ifm_media));
if (((ife->ifm_media & IFM_GMASK) & IFM_FDX) != 0) {
bmcr |= BMCR_FDX;
/* Enable pause. */
CVS commit: [netbsd-6] src/sys/dev/mii
Module Name:src
Committed By: martin
Date: Wed Feb 4 11:35:04 UTC 2015
Modified Files:
src/sys/dev/mii [netbsd-6]: atphy.c brgphy.c ciphy.c mii_physubr.c
rgephy.c urlphy.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1245):
sys/dev/mii/rgephy.c: revision 1.30
sys/dev/mii/brgphy.c: revision 1.64
sys/dev/mii/atphy.c: revision 1.13
sys/dev/mii/urlphy.c: revision 1.26
sys/dev/mii/ciphy.c: revision 1.20
sys/dev/mii/mii_physubr.c: revision 1.76
Fix a bug that the auto negotiation timer isn't cleard as we expected.
To not to forget clearing the timer and to reduce the code duplication,
clear mii_ticks in *mii_phy_auto().
To generate a diff of this commit:
cvs rdiff -u -r1.11.8.1 -r1.11.8.2 src/sys/dev/mii/atphy.c
cvs rdiff -u -r1.59.8.7 -r1.59.8.8 src/sys/dev/mii/brgphy.c
cvs rdiff -u -r1.19.18.1 -r1.19.18.2 src/sys/dev/mii/ciphy.c
cvs rdiff -u -r1.73.2.1 -r1.73.2.2 src/sys/dev/mii/mii_physubr.c
cvs rdiff -u -r1.29.14.1 -r1.29.14.2 src/sys/dev/mii/rgephy.c
cvs rdiff -u -r1.25.20.1 -r1.25.20.2 src/sys/dev/mii/urlphy.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/mii/atphy.c
diff -u src/sys/dev/mii/atphy.c:1.11.8.1 src/sys/dev/mii/atphy.c:1.11.8.2
--- src/sys/dev/mii/atphy.c:1.11.8.1 Tue Nov 4 09:23:20 2014
+++ src/sys/dev/mii/atphy.c Wed Feb 4 11:35:04 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: atphy.c,v 1.11.8.1 2014/11/04 09:23:20 martin Exp $ */
+/* $NetBSD: atphy.c,v 1.11.8.2 2015/02/04 11:35:04 martin Exp $ */
/* $OpenBSD: atphy.c,v 1.1 2008/09/25 20:47:16 brad Exp $ */
/*-
@@ -33,7 +33,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: atphy.c,v 1.11.8.1 2014/11/04 09:23:20 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: atphy.c,v 1.11.8.2 2015/02/04 11:35:04 martin Exp $);
#include sys/param.h
#include sys/systm.h
@@ -287,7 +287,6 @@ done:
if (sc-mii_ticks = sc-mii_anegticks)
break;
- sc-mii_ticks = 0;
atphy_mii_phy_auto(sc);
break;
}
@@ -403,6 +402,7 @@ atphy_mii_phy_auto(struct mii_softc *sc)
{
uint16_t anar;
+ sc-mii_ticks = 0;
anar = BMSR_MEDIA_TO_ANAR(sc-mii_capabilities) | ANAR_CSMA;
if (sc-mii_flags MIIF_DOPAUSE)
anar |= ANAR_X_PAUSE_TOWARDS;
Index: src/sys/dev/mii/brgphy.c
diff -u src/sys/dev/mii/brgphy.c:1.59.8.7 src/sys/dev/mii/brgphy.c:1.59.8.8
--- src/sys/dev/mii/brgphy.c:1.59.8.7 Sun Dec 7 16:39:55 2014
+++ src/sys/dev/mii/brgphy.c Wed Feb 4 11:35:04 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: brgphy.c,v 1.59.8.7 2014/12/07 16:39:55 martin Exp $ */
+/* $NetBSD: brgphy.c,v 1.59.8.8 2015/02/04 11:35:04 martin Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: brgphy.c,v 1.59.8.7 2014/12/07 16:39:55 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: brgphy.c,v 1.59.8.8 2015/02/04 11:35:04 martin Exp $);
#include sys/param.h
#include sys/systm.h
@@ -803,6 +803,7 @@ brgphy_mii_phy_auto(struct mii_softc *sc
{
int anar, ktcr = 0;
+ sc-mii_ticks = 0;
brgphy_loop(sc);
PHY_RESET(sc);
Index: src/sys/dev/mii/ciphy.c
diff -u src/sys/dev/mii/ciphy.c:1.19.18.1 src/sys/dev/mii/ciphy.c:1.19.18.2
--- src/sys/dev/mii/ciphy.c:1.19.18.1 Sun Nov 9 12:13:16 2014
+++ src/sys/dev/mii/ciphy.c Wed Feb 4 11:35:04 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ciphy.c,v 1.19.18.1 2014/11/09 12:13:16 martin Exp $ */
+/* $NetBSD: ciphy.c,v 1.19.18.2 2015/02/04 11:35:04 martin Exp $ */
/*-
* Copyright (c) 2004
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ciphy.c,v 1.19.18.1 2014/11/09 12:13:16 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: ciphy.c,v 1.19.18.2 2015/02/04 11:35:04 martin Exp $);
/*
* Driver for the Cicada CS8201 10/100/1000 copper PHY.
@@ -275,7 +275,6 @@ setit:
if (++sc-mii_ticks = MII_ANEGTICKS)
break;
- sc-mii_ticks = 0;
mii_phy_auto(sc, 0);
return (0);
}
Index: src/sys/dev/mii/mii_physubr.c
diff -u src/sys/dev/mii/mii_physubr.c:1.73.2.1 src/sys/dev/mii/mii_physubr.c:1.73.2.2
--- src/sys/dev/mii/mii_physubr.c:1.73.2.1 Tue Nov 4 09:23:20 2014
+++ src/sys/dev/mii/mii_physubr.c Wed Feb 4 11:35:04 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: mii_physubr.c,v 1.73.2.1 2014/11/04 09:23:20 martin Exp $ */
+/* $NetBSD: mii_physubr.c,v 1.73.2.2 2015/02/04 11:35:04 martin Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mii_physubr.c,v 1.73.2.1 2014/11/04 09:23:20 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: mii_physubr.c,v 1.73.2.2 2015/02/04 11:35:04 martin Exp $);
#include sys/param.h
#include sys/device.h
@@ -202,6 +202,7 @@ mii_phy_auto(struct mii_softc *sc, int w
struct mii_data *mii = sc-mii_pdata;
struct ifmedia_entry *ife = mii-mii_media.ifm_cur;
+ sc-mii_ticks = 0;
if ((sc-mii_flags
CVS commit: [netbsd-6] src/sys/dev/mii
Module Name:src Committed By: martin Date: Sun Dec 7 15:20:59 UTC 2014 Modified Files: src/sys/dev/mii [netbsd-6]: miidevs Log Message: Pull up the following changes, requested by msaitoh in #1204: sys/dev/mii/miidevs 1.110-1.111, 1.114-1.118, 1.120-1.122 (patch) Add some PHYs into miidevs: - Add SMSC OUI and LAN8700 and LAN8710/LAN8720 PHY IDs. - Add Intel I210 internal PHY. - Add Intel I217 PHY. - Add some IC Plus Corp. devices. - Add Marvell 88E1543 Quad Port Gb PHY. - Add Micrel KSZ9021RN. - Add BCM5706 1000BASE-T/SX. - BCM5714 and BCM5780 are used for both copper and fiber, so modify the descriptions. - Add Realtek RTL8251. To generate a diff of this commit: cvs rdiff -u -r1.105.4.2 -r1.105.4.3 src/sys/dev/mii/miidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/mii/miidevs diff -u src/sys/dev/mii/miidevs:1.105.4.2 src/sys/dev/mii/miidevs:1.105.4.3 --- src/sys/dev/mii/miidevs:1.105.4.2 Sat Sep 7 16:39:32 2013 +++ src/sys/dev/mii/miidevs Sun Dec 7 15:20:59 2014 @@ -1,4 +1,4 @@ -$NetBSD: miidevs,v 1.105.4.2 2013/09/07 16:39:32 bouyer Exp $ +$NetBSD: miidevs,v 1.105.4.3 2014/12/07 15:20:59 martin Exp $ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -66,6 +66,7 @@ oui INTEL 0x00aa00 Intel oui JMICRON 0x00d831 JMicron oui LEVEL1 0x00207b Level 1 oui MARVELL 0x005043 Marvell Semiconductor +oui MICREL 0x0010a1 Micrel oui MYSON 0x00c0b4 Myson Technology oui NATSEMI 0x080017 National Semiconductor oui PMCSIERRA 0x00e004 PMC-Sierra @@ -74,6 +75,7 @@ oui REALTEK 0x00e04c RealTek oui QUALSEMI 0x006051 Quality Semiconductor oui SEEQ 0x00a07d Seeq oui SIS0x00e006 Silicon Integrated Systems +oui SMSC 0x00800f SMSC oui TI0x080028 Texas Instruments oui TSC0x00c039 TDK Semiconductor oui XAQTI 0x00e0ae XaQti Corp. @@ -159,13 +161,14 @@ model BROADCOM BCM5462 0x000d BCM5462 1 model BROADCOM BCM5421 0x000e BCM5421 1000BASE-T media interface model BROADCOM BCM5752 0x0010 BCM5752 1000BASE-T media interface model BROADCOM BCM5701 0x0011 BCM5701 1000BASE-T media interface +model BROADCOM BCM5706 0x0015 BCM5706 1000BASE-T/SX media interface model BROADCOM BCM5703 0x0016 BCM5703 1000BASE-T media interface model BROADCOM BCM5750 0x0018 BCM5750 1000BASE-T media interface model BROADCOM BCM5704 0x0019 BCM5704 1000BASE-T media interface model BROADCOM BCM5705 0x001a BCM5705 1000BASE-T media interface model BROADCOM BCM54K2 0x002e BCM54K2 1000BASE-T media interface -model BROADCOM BCM5714 0x0034 BCM5714 1000BASE-T media interface -model BROADCOM BCM5780 0x0035 BCM5780 1000BASE-T media interface +model BROADCOM BCM5714 0x0034 BCM5714 1000BASE-T/X media interface +model BROADCOM BCM5780 0x0035 BCM5780 1000BASE-T/X media interface model BROADCOM BCM5708C 0x0036 BCM5708C 1000BASE-T media interface model BROADCOM2 BCM5325 0x0003 BCM5325 10/100 5-port PHY switch model BROADCOM2 BCM5906 0x0004 BCM5906 10/100baseTX media interface @@ -205,7 +208,10 @@ model xxDAVICOM DM9101 0x DM9101 (A model xxDAVICOM DM9102 0x0004 DM9102 10/100 media interface /* IC Plus Corp. PHYs */ +model ICPLUS IP100 0x0004 IP100 10/100 PHY model ICPLUS IP101 0x0005 IP101 10/100 PHY +model ICPLUS IP1000A 0x0008 IP1000A 10/100/1000 PHY +model ICPLUS IP1001 0x0019 IP1001 10/100/1000 PHY /* Integrated Circuit Systems PHYs */ model ICS 1889 0x0001 ICS1889 10/100 media interface @@ -224,6 +230,8 @@ model yyINTEL I82553 0x0035 i82553 10/1 model yyINTEL I82566 0x0039 i82566 10/100/1000 media interface model INTEL I82577 0x0005 i82577 10/100/1000 media interface model INTEL I82579 0x0009 i82579 10/100/1000 media interface +model INTEL I217 0x000a i217 10/100/1000 media interface +model xxMARVELL I210 0x I210 10/100/1000 media interface model xxMARVELL I82563 0x000a i82563 10/100/1000 media interface model yyINTEL IGP01E1000 0x0038 Intel IGP01E1000 Gigabit PHY @@ -252,6 +260,10 @@ model xxMARVELL E1145 0x000d Marvell 88 model xxMARVELL E1116 0x0021 Marvell 88E1116 Gigabit PHY model xxMARVELL E1116R 0x0024 Marvell 88E1116R Gigabit PHY model xxMARVELL E1116R_29 0x0029 Marvell 88E1116R Gigabit PHY +model xxMARVELL E1543 0x002a Marvell 88E1543 Alaska Quad Port Gb PHY + +/* Micrel PHYs */ +model MICREL KSZ9021RNI 0x0021 Micrel KSZ9021RNI 10/100/1000 PHY /* Myson Technology PHYs */ model xxMYSON MTD972 0x MTD972 10/100 media interface @@ -281,6 +293,7 @@ model RDC R6040 0x0003 R6040 10/100 me /* RealTek PHYs */ model yyREALTEK RTL8201L 0x0020 RTL8201L 10/100 media interface model xxREALTEK RTL8169S 0x0011 RTL8169S/8110S/8211 1000BASE-T media interface +model REALTEK RTL8251 0x RTL8251 1000BASE-T media interface model REALTEK RTL8169S 0x0011 RTL8169S/8110S/8211 1000BASE-T media interface /*
CVS commit: [netbsd-6] src/sys/dev/mii
Module Name:src Committed By: martin Date: Sun Dec 7 15:21:37 UTC 2014 Modified Files: src/sys/dev/mii [netbsd-6]: miidevs.h miidevs_data.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.108.4.2 -r1.108.4.3 src/sys/dev/mii/miidevs.h cvs rdiff -u -r1.96.4.2 -r1.96.4.3 src/sys/dev/mii/miidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/mii/miidevs.h diff -u src/sys/dev/mii/miidevs.h:1.108.4.2 src/sys/dev/mii/miidevs.h:1.108.4.3 --- src/sys/dev/mii/miidevs.h:1.108.4.2 Sat Sep 7 16:41:08 2013 +++ src/sys/dev/mii/miidevs.h Sun Dec 7 15:21:37 2014 @@ -1,10 +1,10 @@ -/* $NetBSD: miidevs.h,v 1.108.4.2 2013/09/07 16:41:08 bouyer Exp $ */ +/* $NetBSD: miidevs.h,v 1.108.4.3 2014/12/07 15:21:37 martin Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: miidevs,v 1.105.4.2 2013/09/07 16:39:32 bouyer Exp + * NetBSD: miidevs,v 1.105.4.3 2014/12/07 15:20:59 martin Exp */ /*- @@ -73,6 +73,7 @@ #define MII_OUI_JMICRON 0x00d831 /* JMicron */ #define MII_OUI_LEVEL1 0x00207b /* Level 1 */ #define MII_OUI_MARVELL 0x005043 /* Marvell Semiconductor */ +#define MII_OUI_MICREL 0x0010a1 /* Micrel */ #define MII_OUI_MYSON 0x00c0b4 /* Myson Technology */ #define MII_OUI_NATSEMI 0x080017 /* National Semiconductor */ #define MII_OUI_PMCSIERRA 0x00e004 /* PMC-Sierra */ @@ -81,6 +82,7 @@ #define MII_OUI_QUALSEMI 0x006051 /* Quality Semiconductor */ #define MII_OUI_SEEQ 0x00a07d /* Seeq */ #define MII_OUI_SIS 0x00e006 /* Silicon Integrated Systems */ +#define MII_OUI_SMSC 0x00800f /* SMSC */ #define MII_OUI_TI 0x080028 /* Texas Instruments */ #define MII_OUI_TSC 0x00c039 /* TDK Semiconductor */ #define MII_OUI_XAQTI 0x00e0ae /* XaQti Corp. */ @@ -199,6 +201,8 @@ #define MII_STR_BROADCOM_BCM5752 BCM5752 1000BASE-T media interface #define MII_MODEL_BROADCOM_BCM5701 0x0011 #define MII_STR_BROADCOM_BCM5701 BCM5701 1000BASE-T media interface +#define MII_MODEL_BROADCOM_BCM5706 0x0015 +#define MII_STR_BROADCOM_BCM5706 BCM5706 1000BASE-T/SX media interface #define MII_MODEL_BROADCOM_BCM5703 0x0016 #define MII_STR_BROADCOM_BCM5703 BCM5703 1000BASE-T media interface #define MII_MODEL_BROADCOM_BCM5750 0x0018 @@ -210,9 +214,9 @@ #define MII_MODEL_BROADCOM_BCM54K2 0x002e #define MII_STR_BROADCOM_BCM54K2 BCM54K2 1000BASE-T media interface #define MII_MODEL_BROADCOM_BCM5714 0x0034 -#define MII_STR_BROADCOM_BCM5714 BCM5714 1000BASE-T media interface +#define MII_STR_BROADCOM_BCM5714 BCM5714 1000BASE-T/X media interface #define MII_MODEL_BROADCOM_BCM5780 0x0035 -#define MII_STR_BROADCOM_BCM5780 BCM5780 1000BASE-T media interface +#define MII_STR_BROADCOM_BCM5780 BCM5780 1000BASE-T/X media interface #define MII_MODEL_BROADCOM_BCM5708C 0x0036 #define MII_STR_BROADCOM_BCM5708C BCM5708C 1000BASE-T media interface #define MII_MODEL_BROADCOM2_BCM5325 0x0003 @@ -284,8 +288,14 @@ #define MII_STR_xxDAVICOM_DM9102 DM9102 10/100 media interface /* IC Plus Corp. PHYs */ +#define MII_MODEL_ICPLUS_IP100 0x0004 +#define MII_STR_ICPLUS_IP100 IP100 10/100 PHY #define MII_MODEL_ICPLUS_IP101 0x0005 #define MII_STR_ICPLUS_IP101 IP101 10/100 PHY +#define MII_MODEL_ICPLUS_IP1000A 0x0008 +#define MII_STR_ICPLUS_IP1000A IP1000A 10/100/1000 PHY +#define MII_MODEL_ICPLUS_IP1001 0x0019 +#define MII_STR_ICPLUS_IP1001 IP1001 10/100/1000 PHY /* Integrated Circuit Systems PHYs */ #define MII_MODEL_ICS_1889 0x0001 @@ -318,6 +328,10 @@ #define MII_STR_INTEL_I82577 i82577 10/100/1000 media interface #define MII_MODEL_INTEL_I82579 0x0009 #define MII_STR_INTEL_I82579 i82579 10/100/1000 media interface +#define MII_MODEL_INTEL_I217 0x000a +#define MII_STR_INTEL_I217 i217 10/100/1000 media interface +#define MII_MODEL_xxMARVELL_I210 0x +#define MII_STR_xxMARVELL_I210 I210 10/100/1000 media interface #define MII_MODEL_xxMARVELL_I82563 0x000a #define MII_STR_xxMARVELL_I82563 i82563 10/100/1000 media interface @@ -367,6 +381,12 @@ #define MII_STR_xxMARVELL_E1116R Marvell 88E1116R Gigabit PHY #define MII_MODEL_xxMARVELL_E1116R_29 0x0029 #define MII_STR_xxMARVELL_E1116R_29 Marvell 88E1116R Gigabit PHY +#define MII_MODEL_xxMARVELL_E1543 0x002a +#define MII_STR_xxMARVELL_E1543 Marvell 88E1543 Alaska Quad Port Gb PHY + +/* Micrel PHYs */ +#define MII_MODEL_MICREL_KSZ9021RNI 0x0021 +#define MII_STR_MICREL_KSZ9021RNI Micrel KSZ9021RNI 10/100/1000 PHY /* Myson Technology PHYs */ #define MII_MODEL_xxMYSON_MTD972 0x @@ -414,6 +434,8 @@ #define MII_STR_yyREALTEK_RTL8201L RTL8201L 10/100 media interface #define MII_MODEL_xxREALTEK_RTL8169S 0x0011 #define MII_STR_xxREALTEK_RTL8169S RTL8169S/8110S/8211 1000BASE-T media interface +#define MII_MODEL_REALTEK_RTL8251 0x +#define MII_STR_REALTEK_RTL8251 RTL8251 1000BASE-T media interface #define MII_MODEL_REALTEK_RTL8169S 0x0011 #define MII_STR_REALTEK_RTL8169S
CVS commit: [netbsd-6] src/sys/dev/mii
Module Name:src
Committed By: martin
Date: Tue Nov 4 09:23:20 UTC 2014
Modified Files:
src/sys/dev/mii [netbsd-6]: atphy.c brgphy.c mii.h mii_physubr.c
rgephy.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1146):
sys/dev/mii/mii_physubr.c: revision 1.79
sys/dev/mii/rgephy.c: revision 1.33
sys/dev/mii/brgphy.c: revision 1.66
sys/dev/mii/atphy.c: revision 1.15
sys/dev/mii/mii.h: revision 1.17
The bit location of link ability is different between 1000Base-X and others
(See annex 28B.2 and 28D). The old mii.h defined ANAR_X_PAUSE_* macros. Those
macros were named for 1000Base-X, but the bit definitions were not for
1000Base-X but for others (e.g. 1000BaseT). So there was bug in auto
negotiation for 1000Base-X, but there was no bug for other media. Define new
macro named ANAR_PAUSE_* and ANLPAR_PAUSE_* for other than 1000Base-X and fix
the bit definitions of ANAR_X_PAUSE_* and ANLPPAR_X_*. Change some PHY drivers
to use true macro. Same as other *BSDs.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/dev/mii/atphy.c
cvs rdiff -u -r1.59.8.4 -r1.59.8.5 src/sys/dev/mii/brgphy.c
cvs rdiff -u -r1.14 -r1.14.18.1 src/sys/dev/mii/mii.h
cvs rdiff -u -r1.73 -r1.73.2.1 src/sys/dev/mii/mii_physubr.c
cvs rdiff -u -r1.29 -r1.29.14.1 src/sys/dev/mii/rgephy.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/mii/atphy.c
diff -u src/sys/dev/mii/atphy.c:1.11 src/sys/dev/mii/atphy.c:1.11.8.1
--- src/sys/dev/mii/atphy.c:1.11 Sun Oct 2 21:42:19 2011
+++ src/sys/dev/mii/atphy.c Tue Nov 4 09:23:20 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: atphy.c,v 1.11 2011/10/02 21:42:19 jmcneill Exp $ */
+/* $NetBSD: atphy.c,v 1.11.8.1 2014/11/04 09:23:20 martin Exp $ */
/* $OpenBSD: atphy.c,v 1.1 2008/09/25 20:47:16 brad Exp $ */
/*-
@@ -33,7 +33,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: atphy.c,v 1.11 2011/10/02 21:42:19 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: atphy.c,v 1.11.8.1 2014/11/04 09:23:20 martin Exp $);
#include sys/param.h
#include sys/systm.h
@@ -231,7 +231,7 @@ atphy_service(struct mii_softc *sc, stru
bmcr |= BMCR_FDX;
/* Enable pause. */
if (sc-mii_flags MIIF_DOPAUSE)
-anar |= ANAR_X_PAUSE_TOWARDS;
+anar |= ANAR_PAUSE_TOWARDS;
}
if ((sc-mii_extcapabilities (EXTSR_1000TFDX |
Index: src/sys/dev/mii/brgphy.c
diff -u src/sys/dev/mii/brgphy.c:1.59.8.4 src/sys/dev/mii/brgphy.c:1.59.8.5
--- src/sys/dev/mii/brgphy.c:1.59.8.4 Mon Nov 18 02:38:15 2013
+++ src/sys/dev/mii/brgphy.c Tue Nov 4 09:23:20 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: brgphy.c,v 1.59.8.4 2013/11/18 02:38:15 msaitoh Exp $ */
+/* $NetBSD: brgphy.c,v 1.59.8.5 2014/11/04 09:23:20 martin Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: brgphy.c,v 1.59.8.4 2013/11/18 02:38:15 msaitoh Exp $);
+__KERNEL_RCSID(0, $NetBSD: brgphy.c,v 1.59.8.5 2014/11/04 09:23:20 martin Exp $);
#include sys/param.h
#include sys/systm.h
@@ -638,7 +638,7 @@ brgphy_mii_phy_auto(struct mii_softc *sc
} else {
anar = BMSR_MEDIA_TO_ANAR(sc-mii_capabilities) | ANAR_CSMA;
if (sc-mii_flags MIIF_DOPAUSE)
- anar |= ANAR_FC | ANAR_X_PAUSE_ASYM;
+ anar |= ANAR_FC | ANAR_PAUSE_ASYM;
}
PHY_WRITE(sc, MII_ANAR, anar);
DELAY(1000);
Index: src/sys/dev/mii/mii.h
diff -u src/sys/dev/mii/mii.h:1.14 src/sys/dev/mii/mii.h:1.14.18.1
--- src/sys/dev/mii/mii.h:1.14 Mon Oct 19 18:41:14 2009
+++ src/sys/dev/mii/mii.h Tue Nov 4 09:23:20 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: mii.h,v 1.14 2009/10/19 18:41:14 bouyer Exp $ */
+/* $NetBSD: mii.h,v 1.14.18.1 2014/11/04 09:23:20 martin Exp $ */
/*
* Copyright (c) 1997 Manuel Bouyer. All rights reserved.
@@ -107,6 +107,7 @@
#define ANAR_NP 0x8000 /* Next page (ro) */
#define ANAR_ACK 0x4000 /* link partner abilities acknowledged (ro) */
#define ANAR_RF 0x2000 /* remote fault (ro) */
+ /* Annex 28B.2 */
#define ANAR_FC 0x0400 /* local device supports PAUSE */
#define ANAR_T4 0x0200 /* local device supports 100bT4 */
#define ANAR_TX_FD 0x0100 /* local device supports 100bTx FD */
@@ -114,13 +115,18 @@
#define ANAR_10_FD 0x0040 /* local device supports 10bT FD */
#define ANAR_10 0x0020 /* local device supports 10bT */
#define ANAR_CSMA 0x0001 /* protocol selector CSMA/CD */
+#define ANAR_PAUSE_NONE (0 10)
+#define ANAR_PAUSE_SYM (1 10)
+#define ANAR_PAUSE_ASYM (2 10)
+#define ANAR_PAUSE_TOWARDS (3 10)
+ /* Annex 28D */
#define ANAR_X_FD 0x0020 /* local device supports 1000BASE-X FD */
#define ANAR_X_HD 0x0040 /* local device supports 1000BASE-X HD */
-#define ANAR_X_PAUSE_NONE (0 10)
-#define ANAR_X_PAUSE_SYM (1 10)
-#define ANAR_X_PAUSE_ASYM (2 10)
-#define ANAR_X_PAUSE_TOWARDS (3 10)
+#define ANAR_X_PAUSE_NONE (0 7)
+#define
CVS commit: [netbsd-6] src/sys/dev/mii
Module Name:src
Committed By: msaitoh
Date: Mon Nov 18 02:38:15 UTC 2013
Modified Files:
src/sys/dev/mii [netbsd-6]: brgphy.c
Log Message:
Fix commpile error. This diff was in ticket #983.
To generate a diff of this commit:
cvs rdiff -u -r1.59.8.3 -r1.59.8.4 src/sys/dev/mii/brgphy.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/mii/brgphy.c
diff -u src/sys/dev/mii/brgphy.c:1.59.8.3 src/sys/dev/mii/brgphy.c:1.59.8.4
--- src/sys/dev/mii/brgphy.c:1.59.8.3 Sun Nov 17 18:24:05 2013
+++ src/sys/dev/mii/brgphy.c Mon Nov 18 02:38:15 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: brgphy.c,v 1.59.8.3 2013/11/17 18:24:05 bouyer Exp $ */
+/* $NetBSD: brgphy.c,v 1.59.8.4 2013/11/18 02:38:15 msaitoh Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: brgphy.c,v 1.59.8.3 2013/11/17 18:24:05 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: brgphy.c,v 1.59.8.4 2013/11/18 02:38:15 msaitoh Exp $);
#include sys/param.h
#include sys/systm.h
@@ -710,19 +710,19 @@ brgphy_reset(struct mii_softc *sc)
if (bsc-sc_isbge) {
if (!(sc-mii_flags MIIF_HAVEFIBER)) {
- if (bsc-sc_phyflags BGE_PHY_ADC_BUG)
+ if (bsc-sc_phyflags BGEPHYF_ADC_BUG)
brgphy_adc_bug(sc);
- if (bsc-sc_phyflags BGE_PHY_5704_A0_BUG)
+ if (bsc-sc_phyflags BGEPHYF_5704_A0_BUG)
brgphy_5704_a0_bug(sc);
- if (bsc-sc_phyflags BGE_PHY_BER_BUG)
+ if (bsc-sc_phyflags BGEPHYF_BER_BUG)
brgphy_ber_bug(sc);
- else if (bsc-sc_phyflags BGE_PHY_JITTER_BUG) {
+ else if (bsc-sc_phyflags BGEPHYF_JITTER_BUG) {
PHY_WRITE(sc, BRGPHY_MII_AUXCTL, 0x0c00);
PHY_WRITE(sc, BRGPHY_MII_DSP_ADDR_REG,
0x000a);
if (bsc-sc_phyflags
- BGE_PHY_ADJUST_TRIM) {
+ BGEPHYF_ADJUST_TRIM) {
PHY_WRITE(sc, BRGPHY_MII_DSP_RW_PORT,
0x110b);
PHY_WRITE(sc, BRGPHY_TEST1,
@@ -747,12 +747,12 @@ brgphy_reset(struct mii_softc *sc)
PHY_WRITE(sc, BRGPHY_MII_EPHY_PTEST, 0x12);
/* Enable Ethernet@Wirespeed */
- if (!(bsc-sc_phyflags BGE_PHY_NO_WIRESPEED))
+ if (!(bsc-sc_phyflags BGEPHYF_NO_WIRESPEED))
brgphy_eth_wirespeed(sc);
#if 0
/* Enable Link LED on Dell boxes */
- if (bsc-sc_phyflags BGE_PHY_NO_3LED) {
+ if (bsc-sc_phyflags BGEPHYF_NO_3LED) {
PHY_WRITE(sc, BRGPHY_MII_PHY_EXTCTL,
PHY_READ(sc, BRGPHY_MII_PHY_EXTCTL)
~BRGPHY_PHY_EXTCTL_3_LED);
CVS commit: [netbsd-6] src/sys/dev/mii
Module Name:src
Committed By: bouyer
Date: Sat Sep 7 16:41:08 UTC 2013
Modified Files:
src/sys/dev/mii [netbsd-6]: miidevs.h miidevs_data.h
Log Message:
regen for ticket 939
To generate a diff of this commit:
cvs rdiff -u -r1.108.4.1 -r1.108.4.2 src/sys/dev/mii/miidevs.h
cvs rdiff -u -r1.96.4.1 -r1.96.4.2 src/sys/dev/mii/miidevs_data.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/mii/miidevs.h
diff -u src/sys/dev/mii/miidevs.h:1.108.4.1 src/sys/dev/mii/miidevs.h:1.108.4.2
--- src/sys/dev/mii/miidevs.h:1.108.4.1 Wed Oct 24 03:42:25 2012
+++ src/sys/dev/mii/miidevs.h Sat Sep 7 16:41:08 2013
@@ -1,10 +1,10 @@
-/* $NetBSD: miidevs.h,v 1.108.4.1 2012/10/24 03:42:25 riz Exp $ */
+/* $NetBSD: miidevs.h,v 1.108.4.2 2013/09/07 16:41:08 bouyer Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: miidevs,v 1.105.4.1 2012/10/24 03:41:51 riz Exp
+ * NetBSD: miidevs,v 1.105.4.2 2013/09/07 16:39:32 bouyer Exp
*/
/*-
@@ -225,8 +225,12 @@
#define MII_STR_BROADCOM2_BCM5482 BCM5482 1000BASE-T media interface
#define MII_MODEL_BROADCOM2_BCM5755 0x000c
#define MII_STR_BROADCOM2_BCM5755 BCM5755 1000BASE-T media interface
+#define MII_MODEL_BROADCOM2_BCM5756 0x000d
+#define MII_STR_BROADCOM2_BCM5756 BCM5756 1000BASE-T media interface XXX
#define MII_MODEL_BROADCOM2_BCM5754 0x000e
#define MII_STR_BROADCOM2_BCM5754 BCM5754/5787 1000BASE-T media interface
+#define MII_MODEL_BROADCOM2_BCM5708S 0x0015
+#define MII_STR_BROADCOM2_BCM5708S BCM5708S 1000/2500baseSX PHY
#define MII_MODEL_BROADCOM2_BCM5785 0x0016
#define MII_STR_BROADCOM2_BCM5785 BCM5785 1000BASE-T media interface
#define MII_MODEL_BROADCOM2_BCM5709CAX 0x002c
@@ -241,8 +245,16 @@
#define MII_STR_BROADCOM2_BCM5761 BCM5761 10/100/1000baseT PHY
#define MII_MODEL_BROADCOM2_BCM5709S 0x003f
#define MII_STR_BROADCOM2_BCM5709S BCM5709S 1000/2500baseSX PHY
+#define MII_MODEL_BROADCOM3_BCM57780 0x0019
+#define MII_STR_BROADCOM3_BCM57780 BCM57780 1000BASE-T media interface
+#define MII_MODEL_BROADCOM3_BCM5717C 0x0020
+#define MII_STR_BROADCOM3_BCM5717C BCM5717C 1000BASE-T media interface
+#define MII_MODEL_BROADCOM3_BCM5719C 0x0022
+#define MII_STR_BROADCOM3_BCM5719C BCM5719C 1000BASE-T media interface
#define MII_MODEL_BROADCOM3_BCM57765 0x0024
#define MII_STR_BROADCOM3_BCM57765 BCM57765 1000BASE-T media interface
+#define MII_MODEL_BROADCOM3_BCM5720C 0x0036
+#define MII_STR_BROADCOM3_BCM5720C BCM5720C 1000BASE-T media interface
#define MII_MODEL_xxBROADCOM_ALT1_BCM5906 0x0004
#define MII_STR_xxBROADCOM_ALT1_BCM5906 BCM5906 10/100baseTX media interface
Index: src/sys/dev/mii/miidevs_data.h
diff -u src/sys/dev/mii/miidevs_data.h:1.96.4.1 src/sys/dev/mii/miidevs_data.h:1.96.4.2
--- src/sys/dev/mii/miidevs_data.h:1.96.4.1 Wed Oct 24 03:42:25 2012
+++ src/sys/dev/mii/miidevs_data.h Sat Sep 7 16:41:08 2013
@@ -1,10 +1,10 @@
-/* $NetBSD: miidevs_data.h,v 1.96.4.1 2012/10/24 03:42:25 riz Exp $ */
+/* $NetBSD: miidevs_data.h,v 1.96.4.2 2013/09/07 16:41:08 bouyer Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: miidevs,v 1.105.4.1 2012/10/24 03:41:51 riz Exp
+ * NetBSD: miidevs,v 1.105.4.2 2013/09/07 16:39:32 bouyer Exp
*/
/*-
@@ -83,7 +83,9 @@ struct mii_knowndev mii_knowndevs[] = {
{ MII_OUI_BROADCOM2, MII_MODEL_BROADCOM2_BCM5481, MII_STR_BROADCOM2_BCM5481 },
{ MII_OUI_BROADCOM2, MII_MODEL_BROADCOM2_BCM5482, MII_STR_BROADCOM2_BCM5482 },
{ MII_OUI_BROADCOM2, MII_MODEL_BROADCOM2_BCM5755, MII_STR_BROADCOM2_BCM5755 },
+ { MII_OUI_BROADCOM2, MII_MODEL_BROADCOM2_BCM5756, MII_STR_BROADCOM2_BCM5756 },
{ MII_OUI_BROADCOM2, MII_MODEL_BROADCOM2_BCM5754, MII_STR_BROADCOM2_BCM5754 },
+ { MII_OUI_BROADCOM2, MII_MODEL_BROADCOM2_BCM5708S, MII_STR_BROADCOM2_BCM5708S },
{ MII_OUI_BROADCOM2, MII_MODEL_BROADCOM2_BCM5785, MII_STR_BROADCOM2_BCM5785 },
{ MII_OUI_BROADCOM2, MII_MODEL_BROADCOM2_BCM5709CAX, MII_STR_BROADCOM2_BCM5709CAX },
{ MII_OUI_BROADCOM2, MII_MODEL_BROADCOM2_BCM5722, MII_STR_BROADCOM2_BCM5722 },
@@ -91,7 +93,11 @@ struct mii_knowndev mii_knowndevs[] = {
{ MII_OUI_BROADCOM2, MII_MODEL_BROADCOM2_BCM5709C, MII_STR_BROADCOM2_BCM5709C },
{ MII_OUI_BROADCOM2, MII_MODEL_BROADCOM2_BCM5761, MII_STR_BROADCOM2_BCM5761 },
{ MII_OUI_BROADCOM2, MII_MODEL_BROADCOM2_BCM5709S, MII_STR_BROADCOM2_BCM5709S },
+ { MII_OUI_BROADCOM3, MII_MODEL_BROADCOM3_BCM57780, MII_STR_BROADCOM3_BCM57780 },
+ { MII_OUI_BROADCOM3, MII_MODEL_BROADCOM3_BCM5717C, MII_STR_BROADCOM3_BCM5717C },
+ { MII_OUI_BROADCOM3, MII_MODEL_BROADCOM3_BCM5719C, MII_STR_BROADCOM3_BCM5719C },
{ MII_OUI_BROADCOM3, MII_MODEL_BROADCOM3_BCM57765, MII_STR_BROADCOM3_BCM57765 },
+ { MII_OUI_BROADCOM3, MII_MODEL_BROADCOM3_BCM5720C, MII_STR_BROADCOM3_BCM5720C },
{ MII_OUI_xxBROADCOM_ALT1, MII_MODEL_xxBROADCOM_ALT1_BCM5906, MII_STR_xxBROADCOM_ALT1_BCM5906 },
{
CVS commit: [netbsd-6] src/sys/dev/mii
Module Name:src Committed By: riz Date: Wed Oct 24 03:41:51 UTC 2012 Modified Files: src/sys/dev/mii [netbsd-6]: miidevs Log Message: Pull up following revision(s) (requested by msaitoh in ticket #633): sys/dev/mii/miidevs: revision 1.106 sys/dev/mii/miidevs: revision 1.107 sys/dev/mii/miidevs: revision 1.108 sys/dev/mii/miidevs: revision 1.109 Sync a comment with a fact. There is MII_OUI() in miivar.h not mii.h after 2001. Add VSC8221 Add AR8035 Add another Broadcom OUI and BCM57765 1000BASE-T media interface. Per PR kern/46961. To generate a diff of this commit: cvs rdiff -u -r1.105 -r1.105.4.1 src/sys/dev/mii/miidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/mii/miidevs diff -u src/sys/dev/mii/miidevs:1.105 src/sys/dev/mii/miidevs:1.105.4.1 --- src/sys/dev/mii/miidevs:1.105 Fri Nov 25 23:28:14 2011 +++ src/sys/dev/mii/miidevs Wed Oct 24 03:41:51 2012 @@ -1,4 +1,4 @@ -$NetBSD: miidevs,v 1.105 2011/11/25 23:28:14 jakllsch Exp $ +$NetBSD: miidevs,v 1.105.4.1 2012/10/24 03:41:51 riz Exp $ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -40,7 +40,7 @@ $NetBSD: miidevs,v 1.105 2011/11/25 23:2 * mapping; the bit positions are defined in IEEE 802-1990, figure 5.2. * (There is a formal 802.3 interpretation, number 1-07/98 of July 09 1998, * about this.) - * The MII_OUI() macro in mii.h reflects this. + * The MII_OUI() macro in miivar.h reflects this. * If a vendor uses a different mapping, an xx prefixed OUI is defined here * which is mangled accordingly to compensate. */ @@ -56,6 +56,7 @@ oui ATHEROS 0x001374 Atheros oui ATTANSIC 0x00c82e Attansic Technology oui BROADCOM 0x001018 Broadcom Corporation oui BROADCOM2 0x000af7 Broadcom Corporation +oui BROADCOM3 0x001be9 Broadcom Corporation oui CICADA 0x0003F1 Cicada Semiconductor oui DAVICOM 0x00606e Davicom Semiconductor oui ENABLESEMI 0x0010dd Enable Semiconductor @@ -122,6 +123,7 @@ model ATHEROS F2 0x0002 F2 10/100 PHY model ATTANSIC L1 0x0001 L1 10/100/1000 PHY model ATTANSIC L2 0x0002 L2 10/100 PHY model ATTANSIC AR8021 0x0004 Atheros AR8021 10/100/1000 PHY +model ATTANSIC AR8035 0x0007 Atheros AR8035 10/100/1000 PHY /* Altima Communications PHYs */ /* Don't know the model for ACXXX */ @@ -178,6 +180,7 @@ model BROADCOM2 BCM5784 0x003a BCM5784 model BROADCOM2 BCM5709C 0x003c BCM5709 10/100/1000baseT PHY model BROADCOM2 BCM5761 0x003d BCM5761 10/100/1000baseT PHY model BROADCOM2 BCM5709S 0x003f BCM5709S 1000/2500baseSX PHY +model BROADCOM3 BCM57765 0x0024 BCM57765 1000BASE-T media interface model xxBROADCOM_ALT1 BCM5906 0x0004 BCM5906 10/100baseTX media interface /* Cicada Semiconductor PHYs (now owned by Vitesse?) */ @@ -186,6 +189,7 @@ model CICADA CS8204 0x0004 Cicada CS820 model CICADA VSC8211 0x000b Cicada VSC8211 10/100/1000TX PHY model CICADA CS8201A 0x0020 Cicada CS8201 10/100/1000TX PHY model CICADA CS8201B 0x0021 Cicada CS8201 10/100/1000TX PHY +model xxCICADA VSC8221 0x0015 Vitesse VSC8221 10/100/1000BASE-T PHY model xxCICADA VSC8244 0x002c Vitesse VSC8244 Quad 10/100/1000BASE-T PHY model xxCICADA CS8201B 0x0021 Cicada CS8201 10/100/1000TX PHY
