CVS commit: [netbsd-9] src/sys/dev/mii
Module Name:src
Committed By: martin
Date: Fri Jul 10 10:18:32 UTC 2020
Modified Files:
src/sys/dev/mii [netbsd-9]: miidevs.h miidevs_data.h
Log Message:
Regen for ticket #990
To generate a diff of this commit:
cvs rdiff -u -r1.151.2.7 -r1.151.2.8 src/sys/dev/mii/miidevs.h
cvs rdiff -u -r1.139.2.7 -r1.139.2.8 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.151.2.7 src/sys/dev/mii/miidevs.h:1.151.2.8
--- src/sys/dev/mii/miidevs.h:1.151.2.7 Tue Apr 14 16:44:10 2020
+++ src/sys/dev/mii/miidevs.h Fri Jul 10 10:18:32 2020
@@ -1,10 +1,10 @@
-/* $NetBSD: miidevs.h,v 1.151.2.7 2020/04/14 16:44:10 martin Exp $ */
+/* $NetBSD: miidevs.h,v 1.151.2.8 2020/07/10 10:18:32 martin Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: miidevs,v 1.153.2.6 2020/04/14 16:43:12 martin Exp
+ * NetBSD: miidevs,v 1.153.2.7 2020/07/10 10:18:01 martin Exp
*/
/*-
@@ -630,8 +630,28 @@
#define MII_STR_xxVITESSE_VSC8601 "VSC8601 10/100/1000 PHY"
#define MII_MODEL_xxVITESSE_VSC8641 0x0003
#define MII_STR_xxVITESSE_VSC8641 "Vitesse VSC8641 10/100/1000TX PHY"
+#define MII_MODEL_xxVITESSE_VSC8504 0x000c
+#define MII_STR_xxVITESSE_VSC8504 "Vitesse VSC8504 quad 10/100/1000TX PHY"
+#define MII_MODEL_xxVITESSE_VSC8552 0x000e
+#define MII_STR_xxVITESSE_VSC8552 "Vitesse VSC8552 dual 10/100/1000TX PHY"
+#define MII_MODEL_xxVITESSE_VSC8502 0x0012
+#define MII_STR_xxVITESSE_VSC8502 "Vitesse VSC8502 dual 10/100/1000TX PHY"
#define MII_MODEL_xxVITESSE_VSC8501 0x0013
#define MII_STR_xxVITESSE_VSC8501 "Vitesse VSC8501 10/100/1000TX PHY"
+#define MII_MODEL_xxVITESSE_VSC8531 0x0017
+#define MII_STR_xxVITESSE_VSC8531 "Vitesse VSC8531 10/100/1000TX PHY"
+#define MII_MODEL_xxVITESSE_VSC8662 0x0026
+#define MII_STR_xxVITESSE_VSC8662 "Vitesse VSC866[24] dual/quad 1000T 100FX 1000X PHY"
+#define MII_MODEL_xxVITESSE_VSC8514 0x0027
+#define MII_STR_xxVITESSE_VSC8514 "Vitesse VSC8514 quad 1000T PHY"
+#define MII_MODEL_xxVITESSE_VSC8512 0x002e
+#define MII_STR_xxVITESSE_VSC8512 "Vitesse VSC8512 12port 1000T PHY"
+#define MII_MODEL_xxVITESSE_VSC8522 0x002f
+#define MII_STR_xxVITESSE_VSC8522 "Vitesse VSC8522 12port 1000T PHY"
+#define MII_MODEL_xxVITESSE_VSC8658 0x0035
+#define MII_STR_xxVITESSE_VSC8658 "Vitesse VSC8658 octal 1000T 100FX 1000X PHY"
+#define MII_MODEL_xxVITESSE_VSC8541 0x0037
+#define MII_STR_xxVITESSE_VSC8541 "Vitesse VSC8541 1000T PHY"
/* XaQti Corp. PHYs */
#define MII_MODEL_xxXAQTI_XMACII 0x
Index: src/sys/dev/mii/miidevs_data.h
diff -u src/sys/dev/mii/miidevs_data.h:1.139.2.7 src/sys/dev/mii/miidevs_data.h:1.139.2.8
--- src/sys/dev/mii/miidevs_data.h:1.139.2.7 Tue Apr 14 16:44:10 2020
+++ src/sys/dev/mii/miidevs_data.h Fri Jul 10 10:18:32 2020
@@ -1,10 +1,10 @@
-/* $NetBSD: miidevs_data.h,v 1.139.2.7 2020/04/14 16:44:10 martin Exp $ */
+/* $NetBSD: miidevs_data.h,v 1.139.2.8 2020/07/10 10:18:32 martin Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: miidevs,v 1.153.2.6 2020/04/14 16:43:12 martin Exp
+ * NetBSD: miidevs,v 1.153.2.7 2020/07/10 10:18:01 martin Exp
*/
/*-
@@ -258,7 +258,17 @@ struct mii_knowndev mii_knowndevs[] = {
{ MII_OUI_xxVIA, MII_MODEL_xxVIA_VT6103_2, MII_STR_xxVIA_VT6103_2 },
{ MII_OUI_xxVITESSE, MII_MODEL_xxVITESSE_VSC8601, MII_STR_xxVITESSE_VSC8601 },
{ MII_OUI_xxVITESSE, MII_MODEL_xxVITESSE_VSC8641, MII_STR_xxVITESSE_VSC8641 },
+ { MII_OUI_xxVITESSE, MII_MODEL_xxVITESSE_VSC8504, MII_STR_xxVITESSE_VSC8504 },
+ { MII_OUI_xxVITESSE, MII_MODEL_xxVITESSE_VSC8552, MII_STR_xxVITESSE_VSC8552 },
+ { MII_OUI_xxVITESSE, MII_MODEL_xxVITESSE_VSC8502, MII_STR_xxVITESSE_VSC8502 },
{ MII_OUI_xxVITESSE, MII_MODEL_xxVITESSE_VSC8501, MII_STR_xxVITESSE_VSC8501 },
+ { MII_OUI_xxVITESSE, MII_MODEL_xxVITESSE_VSC8531, MII_STR_xxVITESSE_VSC8531 },
+ { MII_OUI_xxVITESSE, MII_MODEL_xxVITESSE_VSC8662, MII_STR_xxVITESSE_VSC8662 },
+ { MII_OUI_xxVITESSE, MII_MODEL_xxVITESSE_VSC8514, MII_STR_xxVITESSE_VSC8514 },
+ { MII_OUI_xxVITESSE, MII_MODEL_xxVITESSE_VSC8512, MII_STR_xxVITESSE_VSC8512 },
+ { MII_OUI_xxVITESSE, MII_MODEL_xxVITESSE_VSC8522, MII_STR_xxVITESSE_VSC8522 },
+ { MII_OUI_xxVITESSE, MII_MODEL_xxVITESSE_VSC8658, MII_STR_xxVITESSE_VSC8658 },
+ { MII_OUI_xxVITESSE, MII_MODEL_xxVITESSE_VSC8541, MII_STR_xxVITESSE_VSC8541 },
{ MII_OUI_xxXAQTI, MII_MODEL_xxXAQTI_XMACII, MII_STR_xxXAQTI_XMACII },
{ 0, 0, NULL }
};
CVS commit: [netbsd-9] src/sys/dev/mii
Module Name:src Committed By: martin Date: Fri Jul 10 10:18:01 UTC 2020 Modified Files: src/sys/dev/mii [netbsd-9]: miidevs Log Message: Pull up following revision(s) (requested by msaitoh in ticket #990): sys/dev/mii/miidevs: revision 1.168 Add some Microsemi (Vitesse) devices. To generate a diff of this commit: cvs rdiff -u -r1.153.2.6 -r1.153.2.7 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.153.2.6 src/sys/dev/mii/miidevs:1.153.2.7 --- src/sys/dev/mii/miidevs:1.153.2.6 Tue Apr 14 16:43:12 2020 +++ src/sys/dev/mii/miidevs Fri Jul 10 10:18:01 2020 @@ -1,4 +1,4 @@ -$NetBSD: miidevs,v 1.153.2.6 2020/04/14 16:43:12 martin Exp $ +$NetBSD: miidevs,v 1.153.2.7 2020/07/10 10:18:01 martin Exp $ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -407,7 +407,17 @@ model xxVIA VT6103_2 0x0034 VT6103 10/1 /* Vitesse PHYs (Now Microsemi) */ model xxVITESSE VSC8601 0x0002 VSC8601 10/100/1000 PHY model xxVITESSE VSC8641 0x0003 Vitesse VSC8641 10/100/1000TX PHY +model xxVITESSE VSC8504 0x000c Vitesse VSC8504 quad 10/100/1000TX PHY +model xxVITESSE VSC8552 0x000e Vitesse VSC8552 dual 10/100/1000TX PHY +model xxVITESSE VSC8502 0x0012 Vitesse VSC8502 dual 10/100/1000TX PHY model xxVITESSE VSC8501 0x0013 Vitesse VSC8501 10/100/1000TX PHY +model xxVITESSE VSC8531 0x0017 Vitesse VSC8531 10/100/1000TX PHY +model xxVITESSE VSC8662 0x0026 Vitesse VSC866[24] dual/quad 1000T 100FX 1000X PHY +model xxVITESSE VSC8514 0x0027 Vitesse VSC8514 quad 1000T PHY +model xxVITESSE VSC8512 0x002e Vitesse VSC8512 12port 1000T PHY +model xxVITESSE VSC8522 0x002f Vitesse VSC8522 12port 1000T PHY +model xxVITESSE VSC8658 0x0035 Vitesse VSC8658 octal 1000T 100FX 1000X PHY +model xxVITESSE VSC8541 0x0037 Vitesse VSC8541 1000T PHY /* XaQti Corp. PHYs */ model xxXAQTI XMACII 0x XaQti Corp. XMAC II gigabit interface
CVS commit: [netbsd-9] src/sys/dev/mii
Module Name:src Committed By: martin Date: Tue Apr 14 16:44:10 UTC 2020 Modified Files: src/sys/dev/mii [netbsd-9]: miidevs.h miidevs_data.h Log Message: Regen for ticket #831 To generate a diff of this commit: cvs rdiff -u -r1.151.2.6 -r1.151.2.7 src/sys/dev/mii/miidevs.h cvs rdiff -u -r1.139.2.6 -r1.139.2.7 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.151.2.6 src/sys/dev/mii/miidevs.h:1.151.2.7 --- src/sys/dev/mii/miidevs.h:1.151.2.6 Thu Mar 19 19:23:14 2020 +++ src/sys/dev/mii/miidevs.h Tue Apr 14 16:44:10 2020 @@ -1,10 +1,10 @@ -/* $NetBSD: miidevs.h,v 1.151.2.6 2020/03/19 19:23:14 martin Exp $ */ +/* $NetBSD: miidevs.h,v 1.151.2.7 2020/04/14 16:44:10 martin Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: miidevs,v 1.153.2.5 2020/03/19 19:21:37 martin Exp + * NetBSD: miidevs,v 1.153.2.6 2020/04/14 16:43:12 martin Exp */ /*- @@ -60,10 +60,12 @@ #define MII_OUI_TRIDIUM 0x0001f0 /* Tridium */ #define MII_OUI_DATATRACK 0x0002c6 /* Data Track Technology */ #define MII_OUI_AGERE 0x00053d /* Agere */ +#define MII_OUI_QUAKE 0x000897 /* Quake Technologies */ #define MII_OUI_BANKSPEED 0x0006b8 /* Bankspeed Pty */ #define MII_OUI_NETEXCELL 0x0008bb /* NetExcell */ #define MII_OUI_NETAS 0x0009c3 /* Netas */ #define MII_OUI_BROADCOM2 0x000af7 /* Broadcom Corporation */ +#define MII_OUI_AELUROS 0x000b25 /* Aeluros */ #define MII_OUI_RALINK 0x000c43 /* Ralink Technology */ #define MII_OUI_ASIX 0x000ec6 /* ASIX */ #define MII_OUI_BROADCOM 0x001018 /* Broadcom Corporation */ @@ -76,7 +78,6 @@ #define MII_OUI_AQUANTIA 0x0017b6 /* Aquantia Corporation */ #define MII_OUI_BROADCOM3 0x001be9 /* Broadcom Corporation */ #define MII_OUI_LEVEL1 0x00207b /* Level 1 */ -#define MII_OUI_VIA 0x004063 /* VIA Technologies */ #define MII_OUI_MARVELL 0x005043 /* Marvell Semiconductor */ #define MII_OUI_QUALSEMI 0x006051 /* Quality Semiconductor */ #define MII_OUI_AMLOGIC 0x006051 /* Amlogic */ @@ -88,7 +89,6 @@ #define MII_OUI_TSC 0x00c039 /* TDK Semiconductor */ #define MII_OUI_MYSON 0x00c0b4 /* Myson Technology */ #define MII_OUI_ATTANSIC 0x00c82e /* Attansic Technology */ -#define MII_OUI_RDC 0x00d02d /* RDC Semiconductor */ #define MII_OUI_JMICRON 0x00d831 /* JMicron */ #define MII_OUI_PMCSIERRA 0x00e004 /* PMC-Sierra */ #define MII_OUI_SIS 0x00e006 /* Silicon Integrated Systems */ @@ -103,6 +103,7 @@ /* Unregistered or wrong OUI */ #define MII_OUI_yyREALTEK 0x04 /* Realtek */ #define MII_OUI_yyAMD 0x58 /* Advanced Micro Devices */ +#define MII_OUI_xxVIA 0x0002c6 /* VIA Technologies */ #define MII_OUI_xxMYSON 0x00032d /* Myson Technology */ #define MII_OUI_xxTSC 0x00039c /* TDK Semiconductor */ #define MII_OUI_xxASIX 0x000674 /* Asix Semiconductor */ @@ -121,6 +122,7 @@ #define MII_OUI_xxVITESSE 0x008083 /* Vitesse Semiconductor */ #define MII_OUI_xxPMCSIERRA2 0x009057 /* PMC-Sierra */ #define MII_OUI_xxCICADA 0x00c08f /* Cicada Semiconductor */ +#define MII_OUI_xxRDC 0x00d02d /* RDC Semiconductor */ #define MII_OUI_xxNATSEMI 0x1000e8 /* National Semiconductor */ #define MII_OUI_xxLEVEL1 0x782000 /* Level 1 */ #define MII_OUI_xxXAQTI 0xace000 /* XaQti Corp. */ @@ -295,6 +297,8 @@ #define MII_STR_BROADCOM3_BCM53125 "BCM53125 1000BASE-T switch" #define MII_MODEL_BROADCOM3_BCM5720C 0x0036 #define MII_STR_BROADCOM3_BCM5720C "BCM5720C 1000BASE-T media interface" +#define MII_MODEL_BROADCOM4_BCM54213PE 0x000a +#define MII_STR_BROADCOM4_BCM54213PE "BCM54213PE 1000BASE-T media interface" #define MII_MODEL_BROADCOM4_BCM5725C 0x0038 #define MII_STR_BROADCOM4_BCM5725C "BCM5725C 1000BASE-T media interface" #define MII_MODEL_xxBROADCOM_ALT1_BCM5906 0x0004 @@ -548,8 +552,12 @@ #define MII_STR_xxQUALSEMI_QS6612 "QS6612 10/100 media interface" /* RDC Semiconductor PHYs */ -#define MII_MODEL_RDC_R6040 0x0003 -#define MII_STR_RDC_R6040 "R6040 10/100 media interface" +#define MII_MODEL_xxRDC_R6040 0x0003 +#define MII_STR_xxRDC_R6040 "R6040 10/100 media interface" +#define MII_MODEL_xxRDC_R6040_2 0x0005 +#define MII_STR_xxRDC_R6040_2 "R6040 10/100 media interface" +#define MII_MODEL_xxRDC_R6040_3 0x0006 +#define MII_STR_xxRDC_R6040_3 "R6040 10/100 media interface" /* RealTek PHYs */ #define MII_MODEL_xxREALTEK_RTL8169S 0x0011 @@ -593,6 +601,10 @@ #define MII_MODEL_SMSC_LAN8742 0x0013 #define MII_STR_SMSC_LAN8742 "SMSC LAN8742 10/100 media interface" +/* Teranetics PHY */ +#define MII_MODEL_TERANETICS_TN1010 0x0001 +#define MII_STR_TERANETICS_TN1010 "Teranetics TN1010 10GBase-T PHY" + /* Texas Instruments PHYs */ #define MII_MODEL_TI_TLAN10T 0x0001 #define MII_STR_TI_TLAN10T "ThunderLAN 10BASE-T media interface" @@ -608,10 +620,10 @@ #define MII_STR_xxTSC_78Q2121 "78Q2121 100BASE-TX media interface" /* VIA
CVS commit: [netbsd-9] src/sys/dev/mii
Module Name:src Committed By: martin Date: Tue Apr 14 16:43:12 UTC 2020 Modified Files: src/sys/dev/mii [netbsd-9]: brgphy.c miidevs rdcphy.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #831): sys/dev/mii/rdcphy.c: revision 1.6 sys/dev/mii/rdcphy.c: revision 1.8 sys/dev/mii/miidevs: revision 1.162 sys/dev/mii/miidevs: revision 1.163 sys/dev/mii/miidevs: revision 1.164 sys/dev/mii/miidevs: revision 1.165 sys/dev/mii/miidevs: revision 1.167 sys/dev/mii/brgphy.c: revision 1.87 Change the OUI macro name of RDC to xxRDC. 0x00d02d is non-bitreverse value of official 0x000bb4. From Andrius V. RDC -> xxRDC. No functional change. Add BCM54213PE Match BCM54213PE Use xxVIA instead of VIA. 0x004063 is VIA's official OUI but VT6103 use 0x0002c6. 0x0002c6 is non-bitreversed value of 0x004063. Reported by Andrius V. - Add Quake Technologies and Aeluros' OUI - Add Teranetics TN1010 10GBase-T PHY Add two new RDC PHYs from Andrius V. Add two new RDC PHYs from Andrius V. To generate a diff of this commit: cvs rdiff -u -r1.84 -r1.84.4.1 src/sys/dev/mii/brgphy.c cvs rdiff -u -r1.153.2.5 -r1.153.2.6 src/sys/dev/mii/miidevs cvs rdiff -u -r1.4 -r1.4.4.1 src/sys/dev/mii/rdcphy.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.84 src/sys/dev/mii/brgphy.c:1.84.4.1 --- src/sys/dev/mii/brgphy.c:1.84 Thu Apr 11 08:50:20 2019 +++ src/sys/dev/mii/brgphy.c Tue Apr 14 16:43:12 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: brgphy.c,v 1.84 2019/04/11 08:50:20 msaitoh Exp $ */ +/* $NetBSD: brgphy.c,v 1.84.4.1 2020/04/14 16:43:12 martin Exp $ */ /*- * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc. @@ -62,7 +62,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: brgphy.c,v 1.84 2019/04/11 08:50:20 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: brgphy.c,v 1.84.4.1 2020/04/14 16:43:12 martin Exp $"); #include #include @@ -178,6 +178,7 @@ static const struct mii_phydesc brgphys[ MII_PHY_DESC(BROADCOM3, BCM5720C), MII_PHY_DESC(BROADCOM3, BCM57765), MII_PHY_DESC(BROADCOM3, BCM57780), + MII_PHY_DESC(BROADCOM4, BCM54213PE), MII_PHY_DESC(BROADCOM4, BCM5725C), MII_PHY_DESC(xxBROADCOM_ALT1, BCM5906), MII_PHY_END, Index: src/sys/dev/mii/miidevs diff -u src/sys/dev/mii/miidevs:1.153.2.5 src/sys/dev/mii/miidevs:1.153.2.6 --- src/sys/dev/mii/miidevs:1.153.2.5 Thu Mar 19 19:21:37 2020 +++ src/sys/dev/mii/miidevs Tue Apr 14 16:43:12 2020 @@ -1,4 +1,4 @@ -$NetBSD: miidevs,v 1.153.2.5 2020/03/19 19:21:37 martin Exp $ +$NetBSD: miidevs,v 1.153.2.6 2020/04/14 16:43:12 martin Exp $ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -53,10 +53,12 @@ oui AMD0x1a Advanced Micro Devic oui TRIDIUM 0x0001f0 Tridium oui DATATRACK 0x0002c6 Data Track Technology oui AGERE 0x00053d Agere +oui QUAKE 0x000897 Quake Technologies oui BANKSPEED 0x0006b8 Bankspeed Pty oui NETEXCELL 0x0008bb NetExcell oui NETAS 0x0009c3 Netas oui BROADCOM2 0x000af7 Broadcom Corporation +oui AELUROS 0x000b25 Aeluros oui RALINK 0x000c43 Ralink Technology oui ASIX 0x000ec6 ASIX oui BROADCOM 0x001018 Broadcom Corporation @@ -69,7 +71,6 @@ oui RALINK2 0x0017a5 Ralink Technology oui AQUANTIA 0x0017b6 Aquantia Corporation oui BROADCOM3 0x001be9 Broadcom Corporation oui LEVEL1 0x00207b Level 1 -oui VIA0x004063 VIA Technologies oui MARVELL 0x005043 Marvell Semiconductor oui QUALSEMI 0x006051 Quality Semiconductor oui AMLOGIC 0x006051 Amlogic @@ -81,7 +82,6 @@ oui INTEL 0x00aa00 Intel oui TSC0x00c039 TDK Semiconductor oui MYSON 0x00c0b4 Myson Technology oui ATTANSIC 0x00c82e Attansic Technology -oui RDC0x00d02d RDC Semiconductor oui JMICRON 0x00d831 JMicron oui PMCSIERRA 0x00e004 PMC-Sierra oui SIS0x00e006 Silicon Integrated Systems @@ -96,6 +96,7 @@ oui RENESAS 0x749050 Renesas /* Unregistered or wrong OUI */ oui yyREALTEK 0x04 Realtek oui yyAMD 0x58 Advanced Micro Devices +oui xxVIA 0x0002c6 VIA Technologies oui xxMYSON 0x00032d Myson Technology oui xxTSC 0x00039c TDK Semiconductor oui xxASIX 0x000674 Asix Semiconductor @@ -114,6 +115,7 @@ oui yyASIX 0x007063 Asix Semiconductor oui xxVITESSE 0x008083 Vitesse Semiconductor oui xxPMCSIERRA2 0x009057 PMC-Sierra oui xxCICADA 0x00c08f Cicada Semiconductor +oui xxRDC 0x00d02d RDC Semiconductor oui xxNATSEMI 0x1000e8 National Semiconductor oui xxLEVEL1 0x782000 Level 1 oui xxXAQTI 0xace000 XaQti Corp. @@ -214,6 +216,7 @@ model BROADCOM3 BCM5719C 0x0022 BCM5719C model BROADCOM3 BCM57765 0x0024 BCM57765 1000BASE-T media interface model BROADCOM3 BCM53125 0x0032 BCM53125 1000BASE-T switch model BROADCOM3 BCM5720C 0x0036 BCM5720C 1000BASE-T media interface +model BROADCOM4 BCM54213PE 0x000a
CVS commit: [netbsd-9] src/sys/dev/mii
Module Name:src
Committed By: martin
Date: Thu Mar 19 19:23:14 UTC 2020
Modified Files:
src/sys/dev/mii [netbsd-9]: miidevs.h miidevs_data.h
Log Message:
Regen (for ticket #786)
To generate a diff of this commit:
cvs rdiff -u -r1.151.2.5 -r1.151.2.6 src/sys/dev/mii/miidevs.h
cvs rdiff -u -r1.139.2.5 -r1.139.2.6 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.151.2.5 src/sys/dev/mii/miidevs.h:1.151.2.6
--- src/sys/dev/mii/miidevs.h:1.151.2.5 Mon Nov 25 16:55:09 2019
+++ src/sys/dev/mii/miidevs.h Thu Mar 19 19:23:14 2020
@@ -1,10 +1,10 @@
-/* $NetBSD: miidevs.h,v 1.151.2.5 2019/11/25 16:55:09 martin Exp $ */
+/* $NetBSD: miidevs.h,v 1.151.2.6 2020/03/19 19:23:14 martin Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: miidevs,v 1.153.2.4 2019/11/25 16:53:29 martin Exp
+ * NetBSD: miidevs,v 1.153.2.5 2020/03/19 19:21:37 martin Exp
*/
/*-
@@ -71,7 +71,6 @@
#define MII_OUI_ALTIMA 0x0010a9 /* Altima Communications */
#define MII_OUI_ENABLESEMI 0x0010dd /* Enable Semiconductor */
#define MII_OUI_SUNPLUS 0x001105 /* Sunplus Technology */
-#define MII_OUI_ATHEROS 0x001374 /* Atheros */
#define MII_OUI_TERANETICS 0x0014a6 /* Teranetics */
#define MII_OUI_RALINK2 0x0017a5 /* Ralink Technology */
#define MII_OUI_AQUANTIA 0x0017b6 /* Aquantia Corporation */
@@ -168,13 +167,7 @@
#define MII_MODEL_xxAMLOGIC_GXL 0x
#define MII_STR_xxAMLOGIC_GXL "Meson GXL internal PHY"
-/* Atheros PHYs */
-#define MII_MODEL_ATHEROS_F1 0x0001
-#define MII_STR_ATHEROS_F1 "F1 10/100/1000 PHY"
-#define MII_MODEL_ATHEROS_F2 0x0002
-#define MII_STR_ATHEROS_F2 "F2 10/100 PHY"
-
-/* Attansic PHYs */
+/* Attansic/Atheros PHYs */
#define MII_MODEL_ATTANSIC_L1 0x0001
#define MII_STR_ATTANSIC_L1 "L1 10/100/1000 PHY"
#define MII_MODEL_ATTANSIC_L2 0x0002
Index: src/sys/dev/mii/miidevs_data.h
diff -u src/sys/dev/mii/miidevs_data.h:1.139.2.5 src/sys/dev/mii/miidevs_data.h:1.139.2.6
--- src/sys/dev/mii/miidevs_data.h:1.139.2.5 Mon Nov 25 16:55:09 2019
+++ src/sys/dev/mii/miidevs_data.h Thu Mar 19 19:23:14 2020
@@ -1,10 +1,10 @@
-/* $NetBSD: miidevs_data.h,v 1.139.2.5 2019/11/25 16:55:09 martin Exp $ */
+/* $NetBSD: miidevs_data.h,v 1.139.2.6 2020/03/19 19:23:14 martin Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: miidevs,v 1.153.2.4 2019/11/25 16:53:29 martin Exp
+ * NetBSD: miidevs,v 1.153.2.5 2020/03/19 19:21:37 martin Exp
*/
/*-
@@ -55,8 +55,6 @@ struct mii_knowndev mii_knowndevs[] = {
{ MII_OUI_ALTIMA, MII_MODEL_ALTIMA_Am79C874, MII_STR_ALTIMA_Am79C874 },
{ MII_OUI_AMLOGIC, MII_MODEL_AMLOGIC_GXL, MII_STR_AMLOGIC_GXL },
{ MII_OUI_xxAMLOGIC, MII_MODEL_xxAMLOGIC_GXL, MII_STR_xxAMLOGIC_GXL },
- { MII_OUI_ATHEROS, MII_MODEL_ATHEROS_F1, MII_STR_ATHEROS_F1 },
- { MII_OUI_ATHEROS, MII_MODEL_ATHEROS_F2, MII_STR_ATHEROS_F2 },
{ MII_OUI_ATTANSIC, MII_MODEL_ATTANSIC_L1, MII_STR_ATTANSIC_L1 },
{ MII_OUI_ATTANSIC, MII_MODEL_ATTANSIC_L2, MII_STR_ATTANSIC_L2 },
{ MII_OUI_ATTANSIC, MII_MODEL_ATTANSIC_AR8021, MII_STR_ATTANSIC_AR8021 },
CVS commit: [netbsd-9] src/sys/dev/mii
Module Name:src
Committed By: martin
Date: Tue Jan 28 11:04:14 UTC 2020
Modified Files:
src/sys/dev/mii [netbsd-9]: makphy.c makphyreg.h
Log Message:
Pull up the following, requested by msaitoh in ticket #663:
sys/dev/mii/makphy.c1.61, 1.63-1.64 via patch
sys/dev/mii/makphyreg.h 1.10
- Remove ESSR_FIBER_LINK bit check in makphyattach(). This bit is
valid only when the link is up, so it's not good to check in the
attach function.
- There is an environment that both copper and fiber bits are set in
EXTSR but it support copper only. To resolve this problem, check the
ESSR register's HWCFG_MODE bit and drop unsupported bits.
- If the chip is in Fiber/Copper auto select mode, check which media is
selected. Currently, the code supports 88E1011, 88E and 88E1112
only.
- Fix comment. KNF.
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.60.2.1 src/sys/dev/mii/makphy.c
cvs rdiff -u -r1.9 -r1.9.6.1 src/sys/dev/mii/makphyreg.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/makphy.c
diff -u src/sys/dev/mii/makphy.c:1.60 src/sys/dev/mii/makphy.c:1.60.2.1
--- src/sys/dev/mii/makphy.c:1.60 Wed Jul 3 17:40:29 2019
+++ src/sys/dev/mii/makphy.c Tue Jan 28 11:04:14 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: makphy.c,v 1.60 2019/07/03 17:40:29 maxv Exp $ */
+/* $NetBSD: makphy.c,v 1.60.2.1 2020/01/28 11:04:14 martin Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: makphy.c,v 1.60 2019/07/03 17:40:29 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: makphy.c,v 1.60.2.1 2020/01/28 11:04:14 martin Exp $");
#include
#include
@@ -201,21 +201,6 @@ page0:
break;
}
- switch (model) {
- case MII_MODEL_xxMARVELL_E1011:
- case MII_MODEL_xxMARVELL_E1112:
- if (PHY_READ(sc, MAKPHY_ESSR, ) != 0) {
- aprint_verbose_dev(self,
- "Failed to read MAKPHY_ESSR\n");
- break;
- }
- if (reg & ESSR_FIBER_LINK)
- sc->mii_flags |= MIIF_HAVEFIBER;
- break;
- default:
- break;
- }
-
PHY_RESET(sc);
PHY_READ(sc, MII_BMSR, >mii_capabilities);
@@ -223,6 +208,55 @@ page0:
if (sc->mii_capabilities & BMSR_EXTSTAT)
PHY_READ(sc, MII_EXTSR, >mii_extcapabilities);
+ if (((sc->mii_extcapabilities & (EXTSR_1000TFDX | EXTSR_1000THDX))
+ != 0)
+ && ((sc->mii_extcapabilities & (EXTSR_1000XFDX | EXTSR_1000XHDX))
+ != 0)) {
+ bool fiberonly = false, copperonly = false;
+
+ /* Both copper and fiber are set. check MODE[] */
+ switch (sc->mii_mpd_model) {
+ case MII_MODEL_xxMARVELL_E1011:
+ case MII_MODEL_xxMARVELL_E:
+ /* These devices have ESSR register */
+ PHY_READ(sc, MAKPHY_ESSR, );
+ if ((reg & ESSR_AUTOSEL_DISABLE) != 0) {
+switch (reg & ESSR_HWCFG_MODE) {
+case ESSR_RTBI_FIBER:
+case ESSR_RGMII_FIBER:
+case ESSR_RGMII_SGMII: /* right? */
+case ESSR_TBI_FIBER:
+case ESSR_GMII_FIBER:
+ fiberonly = true;
+ break;
+case ESSR_SGMII_WC_COPPER:
+case ESSR_SGMII_WOC_COPPER:
+case ESSR_RTBI_COPPER:
+case ESSR_RGMII_COPPER:
+case ESSR_GMII_COPPER:
+ copperonly = true;
+default:
+ break;
+}
+ }
+ break;
+ default:
+ break;
+ }
+ if (fiberonly || copperonly)
+ aprint_debug_dev(self, "both copper and fiber are set "
+ "but MODE[] is %s only.\n",
+ fiberonly ? "fiber" : "copper");
+ if (fiberonly)
+ sc->mii_extcapabilities
+ &= ~(EXTSR_1000TFDX | EXTSR_1000THDX);
+ else if (copperonly) {
+ sc->mii_extcapabilities
+ &= ~(EXTSR_1000XFDX | EXTSR_1000XHDX);
+ sc->mii_flags &= ~MIIF_IS_1000X;
+ }
+ }
+
aprint_normal_dev(self, "");
if ((sc->mii_capabilities & BMSR_MEDIAMASK) == 0 &&
(sc->mii_extcapabilities & EXTSR_MEDIAMASK) == 0)
@@ -240,9 +274,7 @@ makphy_reset(struct mii_softc *sc)
mii_phy_reset(sc);
- /*
- * Initialize PHY Specific Control Register.
- */
+ /* Initialize PHY Specific Control Register. */
PHY_READ(sc, MAKPHY_PSCR, );
/* Assert CRS on transmit. */
@@ -387,7 +419,7 @@ static void
makphy_status(struct mii_softc *sc)
{
struct mii_data *mii = sc->mii_pdata;
- uint16_t bmcr, gsr, pssr;
+ uint16_t bmcr, gsr, pssr, essr;
mii->mii_media_status = IFM_AVALID;
mii->mii_media_active = IFM_ETHER;
@@ -425,10 +457,45 @@ makphy_status(struct mii_softc *sc)
}
}
- /* XXX FIXME: Use different page for Fiber on newer chips */
+ /*
+ * XXX The following code support Fiber/Copper auto select mode
+ * only for 88E1011, 88E and 88E1112. For other chips, the document
+ * is required.
+ */
if (sc->mii_flags & MIIF_IS_1000X) {
+ /* Not in Fiber/Copper auto select mode */
+ mii->mii_media_active |= IFM_1000_SX;
+ } else if ((sc->mii_mpd_model == MII_MODEL_xxMARVELL_E1011) ||
+ (sc->mii_mpd_model == MII_MODEL_xxMARVELL_E)) {
+ /* Fiber/Copper auto select mode */
+
+
CVS commit: [netbsd-9] src/sys/dev/mii
Module Name:src
Committed By: martin
Date: Sun Jan 26 11:11:13 UTC 2020
Modified Files:
src/sys/dev/mii [netbsd-9]: ihphy.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #649):
sys/dev/mii/ihphy.c: revision 1.15
Remove extra 10ms delay in ihphy_reset(). The delay are in if_wm.c side.
It's required for hardware full reset and it't not requred on soft reset.
When ihphy.c was added in 9 years ago, some workaround code were not in
if_wm.c yet and the initialization code was not good.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.14.4.1 src/sys/dev/mii/ihphy.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/ihphy.c
diff -u src/sys/dev/mii/ihphy.c:1.14 src/sys/dev/mii/ihphy.c:1.14.4.1
--- src/sys/dev/mii/ihphy.c:1.14 Mon Mar 25 07:34:13 2019
+++ src/sys/dev/mii/ihphy.c Sun Jan 26 11:11:13 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ihphy.c,v 1.14 2019/03/25 07:34:13 msaitoh Exp $ */
+/* $NetBSD: ihphy.c,v 1.14.4.1 2020/01/26 11:11:13 martin Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ihphy.c,v 1.14 2019/03/25 07:34:13 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ihphy.c,v 1.14.4.1 2020/01/26 11:11:13 martin Exp $");
#include
#include
@@ -291,14 +291,6 @@ ihphy_reset(struct mii_softc *sc)
PHY_WRITE(sc, MII_BMCR, BMCR_RESET | BMCR_ISO);
- /*
- * Regarding reset, the data sheet specifies (page 55):
- *
- * "After PHY reset, a delay of 10 ms is required before
- * any register access using MDIO."
- */
- delay(1);
-
/* Wait another 100ms for it to complete. */
for (i = 0; i < 100; i++) {
PHY_READ(sc, MII_BMCR, );
CVS commit: [netbsd-9] src/sys/dev/mii
Module Name:src Committed By: martin Date: Wed Dec 11 14:54:47 UTC 2019 Modified Files: src/sys/dev/mii [netbsd-9]: files.mii Log Message: Pull up following revision(s) (requested by msaitoh in ticket #543): sys/dev/mii/files.mii: revision 1.54 Add ukphy_subr flag to ipgphy to make kernel compilable with ipgphy and without ukphy. Pointed out by Hauke. To generate a diff of this commit: cvs rdiff -u -r1.50.26.2 -r1.50.26.3 src/sys/dev/mii/files.mii 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/files.mii diff -u src/sys/dev/mii/files.mii:1.50.26.2 src/sys/dev/mii/files.mii:1.50.26.3 --- src/sys/dev/mii/files.mii:1.50.26.2 Mon Nov 25 16:53:55 2019 +++ src/sys/dev/mii/files.mii Wed Dec 11 14:54:47 2019 @@ -1,4 +1,4 @@ -# $NetBSD: files.mii,v 1.50.26.2 2019/11/25 16:53:55 martin Exp $ +# $NetBSD: files.mii,v 1.50.26.3 2019/12/11 14:54:47 martin Exp $ defflag opt_mii.h MIIVERBOSE @@ -99,7 +99,7 @@ device ikphy: mii_phy attach ikphy at mii file dev/mii/ikphy.cikphy -device ipgphy: mii_phy +device ipgphy: mii_phy, ukphy_subr attach ipgphy at mii file dev/mii/ipgphy.c ipgphy
CVS commit: [netbsd-9] src/sys/dev/mii
Module Name:src Committed By: martin Date: Mon Dec 9 12:49:39 UTC 2019 Modified Files: src/sys/dev/mii [netbsd-9]: devlist2h.awk Log Message: Pull up following revision(s) (requested by uwe in ticket #521): sys/dev/mii/devlist2h.awk: revision 1.10 Fix s/product/model/ search-and-destroy accident that affected license. Back in 1998 thorpej@ adapted this from one of the several versions we have in the tree but needed s/product/model/ in the text of the script. Unfortunately that also affected the license text: "This model includes software..." and "...or promote models". To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.9.4.1 src/sys/dev/mii/devlist2h.awk 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/devlist2h.awk diff -u src/sys/dev/mii/devlist2h.awk:1.9 src/sys/dev/mii/devlist2h.awk:1.9.4.1 --- src/sys/dev/mii/devlist2h.awk:1.9 Mon Mar 25 09:46:24 2019 +++ src/sys/dev/mii/devlist2h.awk Mon Dec 9 12:49:39 2019 @@ -1,5 +1,5 @@ #! /usr/bin/awk -f -# $NetBSD: devlist2h.awk,v 1.9 2019/03/25 09:46:24 msaitoh Exp $ +# $NetBSD: devlist2h.awk,v 1.9.4.1 2019/12/09 12:49:39 martin Exp $ # # Copyright (c) 1998 The NetBSD Foundation, Inc. # All rights reserved. @@ -41,8 +41,8 @@ #documentation and/or other materials provided with the distribution. # 3. All advertising materials mentioning features or use of this software #must display the following acknowledgement: -# This model includes software developed by Christopher G. Demetriou. -# 4. The name of the author(s) may not be used to endorse or promote models +# This product includes software developed by Christopher G. Demetriou. +# 4. The name of the author(s) may not be used to endorse or promote products #derived from this software without specific prior written permission # # THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
