Module Name: src
Committed By: martin
Date: Mon Nov 25 15:57:23 UTC 2019
Modified Files:
src/sys/dev/mii [netbsd-8]: miidevs rlphy.c
Log Message:
Pull up the following revisions, requested by msaitoh in ticket #1457:
sys/dev/mii/miidevs 1.155-1.157, 1.159-1.160
sys/dev/mii/rlphy.c 1.37 via patch
- miidevs update:
- Add Teranetics, Aquantia and Renesas.
- Change ICPLUS(0x0090c3) to xxICPLUS(0x0009c3).
- Fix typo. from vezhlys.
- Rename JMICRON 0x0021 from JMC250 to JMP211
- Rename JMICRON 0x0022 from JMC260 to JMP202
- rlphy(4): Print model name if it's ICPLUS IP101 to avoid printing
"Realtek internal PHY".
To generate a diff of this commit:
cvs rdiff -u -r1.125.6.7 -r1.125.6.8 src/sys/dev/mii/miidevs
cvs rdiff -u -r1.30 -r1.30.10.1 src/sys/dev/mii/rlphy.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/miidevs
diff -u src/sys/dev/mii/miidevs:1.125.6.7 src/sys/dev/mii/miidevs:1.125.6.8
--- src/sys/dev/mii/miidevs:1.125.6.7 Thu Oct 24 15:58:45 2019
+++ src/sys/dev/mii/miidevs Mon Nov 25 15:57:23 2019
@@ -1,4 +1,4 @@
-$NetBSD: miidevs,v 1.125.6.7 2019/10/24 15:58:45 martin Exp $
+$NetBSD: miidevs,v 1.125.6.8 2019/11/25 15:57:23 martin Exp $
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -65,7 +65,9 @@ oui ALTIMA 0x0010a9 Altima Communicati
oui ENABLESEMI 0x0010dd Enable Semiconductor
oui SUNPLUS 0x001105 Sunplus Technology
oui ATHEROS 0x001374 Atheros
+oui TERANETICS 0x0014a6 Teranetics
oui RALINK2 0x0017a5 Ralink Technology
+oui AQUANTIA 0x0017b6 Aquantia Corporation
oui BROADCOM3 0x001be9 Broadcom Corporation
oui LEVEL1 0x00207b Level 1
oui VIA 0x004063 VIA Technologies
@@ -74,7 +76,6 @@ oui QUALSEMI 0x006051 Quality Semicond
oui AMLOGIC 0x006051 Amlogic
oui DAVICOM 0x00606e Davicom Semiconductor
oui SMSC 0x00800f SMSC
-oui ICPLUS 0x0090c3 IC Plus Corp.
oui SEEQ 0x00a07d Seeq
oui ICS 0x00a0be Integrated Circuit Systems
oui INTEL 0x00aa00 Intel
@@ -91,8 +92,9 @@ oui XAQTI 0x00e0ae XaQti Corp.
oui NATSEMI 0x080017 National Semiconductor
oui TI 0x080028 Texas Instruments
oui BROADCOM4 0x18c086 Broadcom Corporation
+oui RENESAS 0x749050 Renesas
-/* Unregisterd or wrong OUI */
+/* Unregistered or wrong OUI */
oui yyREALTEK 0x000004 Realtek
oui yyAMD 0x000058 Advanced Micro Devices
oui xxMYSON 0x00032d Myson Technology
@@ -104,6 +106,7 @@ oui xxQUALSEMI 0x00068a Quality Semico
oui xxREALTEK 0x000732 Realtek
oui xxBROADCOM 0x000818 Broadcom Corporation
oui xxPMCSIERRA 0x0009c0 PMC-Sierra
+oui xxICPLUS 0x0009c3 IC Plus Corp.
oui xxMARVELL 0x000ac2 Marvell Semiconductor
oui xxINTEL 0x001f00 Intel
oui xxBROADCOM_ALT1 0x0050ef Broadcom Corporation
@@ -241,10 +244,10 @@ model xxDAVICOM DM9161B 0x000b DM9161[B
model xxDAVICOM DM9601 0x000c DM9601 internal 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
+model xxICPLUS IP100 0x0004 IP100 10/100 PHY
+model xxICPLUS IP101 0x0005 IP101 10/100 PHY
+model xxICPLUS IP1000A 0x0008 IP1000A 10/100/1000 PHY
+model xxICPLUS IP1001 0x0019 IP1001 10/100/1000 PHY
/* Integrated Circuit Systems PHYs */
model ICS 1889 0x0001 ICS1889 10/100 media interface
@@ -277,8 +280,8 @@ model ATTANSIC I82578 0x0004 Intel 8257
/* JMicron PHYs */
-model JMICRON JMC250 0x0021 JMC250 10/100/1000 media interface
-model JMICRON JMC260 0x0022 JMC260 10/100 media interface
+model JMICRON JMP211 0x0021 JMP211 10/100/1000 media interface
+model JMICRON JMP202 0x0022 JMP202 10/100 media interface
/* Level 1 PHYs */
model xxLEVEL1 LXT970 0x0000 LXT970 10/100 media interface
Index: src/sys/dev/mii/rlphy.c
diff -u src/sys/dev/mii/rlphy.c:1.30 src/sys/dev/mii/rlphy.c:1.30.10.1
--- src/sys/dev/mii/rlphy.c:1.30 Thu Jul 7 06:55:41 2016
+++ src/sys/dev/mii/rlphy.c Mon Nov 25 15:57:23 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rlphy.c,v 1.30 2016/07/07 06:55:41 msaitoh Exp $ */
+/* $NetBSD: rlphy.c,v 1.30.10.1 2019/11/25 15:57:23 martin Exp $ */
/* $OpenBSD: rlphy.c,v 1.20 2005/07/31 05:27:30 pvalchev Exp $ */
/*
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rlphy.c,v 1.30 2016/07/07 06:55:41 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rlphy.c,v 1.30.10.1 2019/11/25 15:57:23 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -79,8 +79,8 @@ const struct mii_phy_funcs rlphy_funcs =
static const struct mii_phydesc rlphys[] = {
{ MII_OUI_yyREALTEK, MII_MODEL_yyREALTEK_RTL8201L,
MII_STR_yyREALTEK_RTL8201L },
- { MII_OUI_ICPLUS, MII_MODEL_ICPLUS_IP101,
- MII_STR_ICPLUS_IP101 },
+ { MII_OUI_xxICPLUS, MII_MODEL_xxICPLUS_IP101,
+ MII_STR_xxICPLUS_IP101 },
{ 0, 0,
NULL },
@@ -125,6 +125,9 @@ rlphyattach(device_t parent, device_t se
rsc->sc_rtl8201l = 1;
aprint_normal(": %s, rev. %d\n", MII_STR_yyREALTEK_RTL8201L,
MII_REV(ma->mii_id2));
+ } else if (MII_MODEL(ma->mii_id2) == MII_MODEL_xxICPLUS_IP101) {
+ aprint_normal(": %s, rev. %d\n", MII_STR_xxICPLUS_IP101,
+ MII_REV(ma->mii_id2));
} else
aprint_normal(": Realtek internal PHY\n");
