Source-Changes-HG archive

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

[src/netbsd-9]: src/sys/dev/mii Pull up following revision(s) (requested by m...



details:   https://anonhg.NetBSD.org/src/rev/4f7e361cd312
branches:  netbsd-9
changeset: 963781:4f7e361cd312
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Apr 14 16:43:12 2020 +0000

description:
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.

diffstat:

 sys/dev/mii/brgphy.c |   5 +++--
 sys/dev/mii/miidevs  |  20 ++++++++++++++------
 sys/dev/mii/rdcphy.c |   8 +++++---
 3 files changed, 22 insertions(+), 11 deletions(-)

diffs (149 lines):

diff -r 8c5a94973f4a -r 4f7e361cd312 sys/dev/mii/brgphy.c
--- a/sys/dev/mii/brgphy.c      Sun Apr 12 17:57:13 2020 +0000
+++ b/sys/dev/mii/brgphy.c      Tue Apr 14 16:43:12 2020 +0000
@@ -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 <sys/cdefs.h>
-__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 <sys/param.h>
 #include <sys/systm.h>
@@ -178,6 +178,7 @@
        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,
diff -r 8c5a94973f4a -r 4f7e361cd312 sys/dev/mii/miidevs
--- a/sys/dev/mii/miidevs       Sun Apr 12 17:57:13 2020 +0000
+++ b/sys/dev/mii/miidevs       Tue Apr 14 16:43:12 2020 +0000
@@ -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 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 AQUANTIA                   0x0017b6        Aquantia Corporation
 oui BROADCOM3                  0x001be9        Broadcom Corporation
 oui LEVEL1                     0x00207b        Level 1
-oui VIA                                0x004063        VIA Technologies
 oui MARVELL                    0x005043        Marvell Semiconductor
 oui QUALSEMI                   0x006051        Quality Semiconductor
 oui AMLOGIC                    0x006051        Amlogic
@@ -81,7 +82,6 @@
 oui TSC                                0x00c039        TDK Semiconductor
 oui MYSON                      0x00c0b4        Myson Technology
 oui ATTANSIC                   0x00c82e        Attansic Technology
-oui RDC                                0x00d02d        RDC Semiconductor
 oui JMICRON                    0x00d831        JMicron
 oui PMCSIERRA                  0x00e004        PMC-Sierra
 oui SIS                                0x00e006        Silicon Integrated Systems
@@ -96,6 +96,7 @@
 /* Unregistered or wrong OUI */
 oui yyREALTEK                  0x000004        Realtek
 oui yyAMD                      0x000058        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 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 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 BCM54213PE 1000BASE-T media interface
 model BROADCOM4 BCM5725C       0x0038 BCM5725C 1000BASE-T media interface
 model xxBROADCOM_ALT1 BCM5906  0x0004 BCM5906 10/100baseTX media interface
 
@@ -356,7 +359,9 @@
 model xxQUALSEMI QS6612                0x0000 QS6612 10/100 media interface
 
 /* RDC Semiconductor PHYs */
-model RDC R6040                        0x0003 R6040 10/100 media interface
+model xxRDC R6040              0x0003 R6040 10/100 media interface
+model xxRDC R6040_2            0x0005 R6040 10/100 media interface
+model xxRDC R6040_3            0x0006 R6040 10/100 media interface
 
 /* RealTek PHYs */
 model xxREALTEK RTL8169S       0x0011 RTL8169S/8110S/8211 1000BASE-T media interface
@@ -383,6 +388,9 @@
 model SMSC LAN8741A            0x0012 SMSC LAN8741A 10/100 media interface
 model SMSC LAN8742             0x0013 SMSC LAN8742 10/100 media interface
 
+/* Teranetics PHY */
+model TERANETICS TN1010                0x0001 Teranetics TN1010 10GBase-T PHY
+
 /* Texas Instruments PHYs */
 model TI TLAN10T               0x0001 ThunderLAN 10BASE-T media interface
 model TI 100VGPMI              0x0002 ThunderLAN 100VG-AnyLan media interface
@@ -393,8 +401,8 @@
 model xxTSC 78Q2121            0x0015 78Q2121 100BASE-TX media interface
 
 /* VIA Technologies PHYs */
-model VIA VT6103               0x0032  VT6103 10/100 PHY
-model VIA VT6103_2             0x0034  VT6103 10/100 PHY
+model xxVIA VT6103             0x0032  VT6103 10/100 PHY
+model xxVIA VT6103_2           0x0034  VT6103 10/100 PHY
 
 /* Vitesse PHYs (Now Microsemi) */
 model xxVITESSE VSC8601                0x0002 VSC8601 10/100/1000 PHY
diff -r 8c5a94973f4a -r 4f7e361cd312 sys/dev/mii/rdcphy.c
--- a/sys/dev/mii/rdcphy.c      Sun Apr 12 17:57:13 2020 +0000
+++ b/sys/dev/mii/rdcphy.c      Tue Apr 14 16:43:12 2020 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: rdcphy.c,v 1.4 2019/03/25 09:20:46 msaitoh Exp $        */
+/*      $NetBSD: rdcphy.c,v 1.4.4.1 2020/04/14 16:43:12 martin Exp $        */
 
 /*-
  * Copyright (c) 2010, Pyun YongHyeon <yongari%FreeBSD.org@localhost>
@@ -33,7 +33,7 @@
  * Driver for the RDC Semiconductor R6040 10/100 PHY.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rdcphy.c,v 1.4 2019/03/25 09:20:46 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rdcphy.c,v 1.4.4.1 2020/04/14 16:43:12 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -74,7 +74,9 @@
 };
 
 static const struct mii_phydesc rdcphys[] = {
-       MII_PHY_DESC(RDC, R6040),
+       MII_PHY_DESC(xxRDC, R6040),
+       MII_PHY_DESC(xxRDC, R6040_2),
+       MII_PHY_DESC(xxRDC, R6040_3),
        MII_PHY_END,
 };
 



Home | Main Index | Thread Index | Old Index