CVS commit: src/sys/arch/arm/ti
Module Name:src
Committed By: sekiya
Date: Mon Feb 27 21:15:09 UTC 2023
Modified Files:
src/sys/arch/arm/ti: if_cpsw.c
Log Message:
Uncomment and protect sanity checks that would drop into the debugger with a
CPSW_DEBUG_DMA define.
This handles a condition where checking for DMA_RXEOQ in the received packet
results in the console being spammed with "rxeoq" messages, which soon results
in a kernel panic. The corresponding Debugger() call for this check was
commented out.
The TI documentation ("AM335x and AMIC110 Sitara™ Processors Technical
Reference Manual") documents the EOQ bit thus:
(14.3.2.4.1.2.4) This bit is set by the EMAC when the EMAC identifies
that a descriptor is the last for a given packet received (also sets
the EOP flag), and there are no more descriptors in the receive list
(next descriptor pointer is NULL). The software application can use
this bit to detect when the EMAC receiver for the corresponding channel
has halted. This is useful when the application appends additional free
buffer descriptors to an active receive queue. Note that this flag is
valid on EOP descriptors only.
Moving this check (and the offending printf() ) into a debug #ifdef results in
the BeagleBone Green surviving the nightly checks; it would always drop into
the debugger before this change.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/ti/if_cpsw.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/ti
Module Name:src
Committed By: sekiya
Date: Mon Feb 27 21:15:09 UTC 2023
Modified Files:
src/sys/arch/arm/ti: if_cpsw.c
Log Message:
Uncomment and protect sanity checks that would drop into the debugger with a
CPSW_DEBUG_DMA define.
This handles a condition where checking for DMA_RXEOQ in the received packet
results in the console being spammed with "rxeoq" messages, which soon results
in a kernel panic. The corresponding Debugger() call for this check was
commented out.
The TI documentation ("AM335x and AMIC110 Sitara™ Processors Technical
Reference Manual") documents the EOQ bit thus:
(14.3.2.4.1.2.4) This bit is set by the EMAC when the EMAC identifies
that a descriptor is the last for a given packet received (also sets
the EOP flag), and there are no more descriptors in the receive list
(next descriptor pointer is NULL). The software application can use
this bit to detect when the EMAC receiver for the corresponding channel
has halted. This is useful when the application appends additional free
buffer descriptors to an active receive queue. Note that this flag is
valid on EOP descriptors only.
Moving this check (and the offending printf() ) into a debug #ifdef results in
the BeagleBone Green surviving the nightly checks; it would always drop into
the debugger before this change.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/ti/if_cpsw.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/arch/arm/ti/if_cpsw.c
diff -u src/sys/arch/arm/ti/if_cpsw.c:1.16 src/sys/arch/arm/ti/if_cpsw.c:1.17
--- src/sys/arch/arm/ti/if_cpsw.c:1.16 Sun Sep 18 15:47:09 2022
+++ src/sys/arch/arm/ti/if_cpsw.c Mon Feb 27 21:15:09 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cpsw.c,v 1.16 2022/09/18 15:47:09 thorpej Exp $ */
+/* $NetBSD: if_cpsw.c,v 1.17 2023/02/27 21:15:09 sekiya Exp $ */
/*
* Copyright (c) 2013 Jonathan A. Kollasch
@@ -53,7 +53,7 @@
*/
#include
-__KERNEL_RCSID(1, "$NetBSD: if_cpsw.c,v 1.16 2022/09/18 15:47:09 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: if_cpsw.c,v 1.17 2023/02/27 21:15:09 sekiya Exp $");
#include
#include
@@ -95,6 +95,8 @@ __KERNEL_RCSID(1, "$NetBSD: if_cpsw.c,v
CTASSERT(powerof2(CPSW_NTXDESCS));
CTASSERT(powerof2(CPSW_NRXDESCS));
+#undef CPSW_DEBUG_DMA /* define this for DMA debugging */
+
#define CPSW_PAD_LEN (ETHER_MIN_LEN - ETHER_CRC_LEN)
#define TXDESC_NEXT(x) cpsw_txdesc_adjust((x), 1)
@@ -1181,10 +1183,12 @@ cpsw_rxintr(void *arg)
return 1;
}
+#if defined(CPSW_DEBUG_DMA)
if ((dw[3] & (CPDMA_BD_SOP | CPDMA_BD_EOP)) !=
(CPDMA_BD_SOP | CPDMA_BD_EOP)) {
- //Debugger();
+ Debugger();
}
+#endif
bus_dmamap_sync(sc->sc_bdt, dm, 0, dm->dm_mapsize,
BUS_DMASYNC_POSTREAD);
@@ -1219,10 +1223,12 @@ next:
cpsw_rxdesc_paddr(sc, i));
}
+#if defined(CPSW_DEBUG_DMA)
if (sc->sc_rxeoq) {
device_printf(sc->sc_dev, "rxeoq\n");
- //Debugger();
+ Debugger();
}
+#endif
cpsw_write_4(sc, CPSW_CPDMA_CPDMA_EOI_VECTOR, CPSW_INTROFF_RX);
@@ -1269,9 +1275,11 @@ cpsw_txintr(void *arg)
cpsw_get_txdesc(sc, sc->sc_txhead, );
+#if defined(CPSW_DEBUG_DMA)
if (dw[2] == 0) {
//Debugger();
}
+#endif
if (ISSET(dw[3], CPDMA_BD_SOP) == 0)
goto next;
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: sekiya
Date: Tue Aug 9 23:58:46 UTC 2022
Modified Files:
src/sys/dev/ic: dwc_gmac.c
Log Message:
Turn off AWIN_GMAC_MAC_CONF_ACS, so that all received packets retain FCS
bytes.
ether_input() can now trust M_HASFCS to accurately represent the packet
contents.
Discussed on tech-net@
To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/sys/dev/ic/dwc_gmac.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/ic/dwc_gmac.c
diff -u src/sys/dev/ic/dwc_gmac.c:1.76 src/sys/dev/ic/dwc_gmac.c:1.77
--- src/sys/dev/ic/dwc_gmac.c:1.76 Fri Aug 5 21:03:43 2022
+++ src/sys/dev/ic/dwc_gmac.c Tue Aug 9 23:58:46 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_gmac.c,v 1.76 2022/08/05 21:03:43 sekiya Exp $ */
+/* $NetBSD: dwc_gmac.c,v 1.77 2022/08/09 23:58:46 sekiya Exp $ */
/*-
* Copyright (c) 2013, 2014 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
#include
-__KERNEL_RCSID(1, "$NetBSD: dwc_gmac.c,v 1.76 2022/08/05 21:03:43 sekiya Exp $");
+__KERNEL_RCSID(1, "$NetBSD: dwc_gmac.c,v 1.77 2022/08/09 23:58:46 sekiya Exp $");
/* #define DWC_GMAC_DEBUG 1 */
@@ -803,7 +803,6 @@ dwc_gmac_miibus_statchg(struct ifnet *if
conf |= AWIN_GMAC_MAC_CONF_FRAMEBURST
| AWIN_GMAC_MAC_CONF_DISABLERXOWN
| AWIN_GMAC_MAC_CONF_DISABLEJABBER
- | AWIN_GMAC_MAC_CONF_ACS
| AWIN_GMAC_MAC_CONF_RXENABLE
| AWIN_GMAC_MAC_CONF_TXENABLE;
switch (IFM_SUBTYPE(mii->mii_media_active)) {
@@ -1229,8 +1228,6 @@ dwc_gmac_rx_intr(struct dwc_gmac_softc *
struct mbuf *m, *mnew;
int i, len, error;
- uint16_t etype;
-
mutex_enter(>sc_rxq.r_mtx);
for (i = sc->sc_rxq.r_cur; ; i = RX_NEXT(i)) {
bus_dmamap_sync(sc->sc_dmat, sc->sc_dma_ring_map,
@@ -1313,29 +1310,8 @@ dwc_gmac_rx_intr(struct dwc_gmac_softc *
/* finalize mbuf */
m->m_pkthdr.len = m->m_len = len;
m_set_rcvif(m, ifp);
+ m->m_flags |= M_HASFCS;
-#define ETYPE_OFFSET 20
- etype = (m->m_data[ETYPE_OFFSET] << 8) + m->m_data[ETYPE_OFFSET+1];
-
- /*
- * The hardware doesn't trim the four FCS bytes for us, so
- * we need to trim it ourselves.
- * Having the upper layer remove it by passing M_HASFCS breaks
- * protocols that don't have FCS bytes at the end of the packet
- * (AppleTalk, for example), so we do it here instead.
- */
-
- switch (etype) {
- case ETHERTYPE_ATALK:
- case ETHERTYPE_AARP:
-/* No FCS removal needed */
-break;
- default:
-/* remove FCS */
-m_adj(m, -ETHER_CRC_LEN);
-break;
- }
-
if_percpuq_enqueue(sc->sc_ipq, m);
skip:
CVS commit: src/sys/dev/ic
Module Name:src Committed By: sekiya Date: Tue Aug 9 23:58:46 UTC 2022 Modified Files: src/sys/dev/ic: dwc_gmac.c Log Message: Turn off AWIN_GMAC_MAC_CONF_ACS, so that all received packets retain FCS bytes. ether_input() can now trust M_HASFCS to accurately represent the packet contents. Discussed on tech-net@ To generate a diff of this commit: cvs rdiff -u -r1.76 -r1.77 src/sys/dev/ic/dwc_gmac.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: sekiya
Date: Fri Aug 5 21:03:43 UTC 2022
Modified Files:
src/sys/dev/ic: dwc_gmac.c
Log Message:
Do not unilaterally set M_HASFCS; this breaks protocols that lack CRC bytes
(such as AppleTalk).
Instead, remove/preserve the final four bytes in the packet ourselves on a per-
protocol basis, as we do in arch/arm/xscale/ixp425_if_npe.c (and dev/ic/gem.c,
and so forth).
To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 src/sys/dev/ic/dwc_gmac.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/ic/dwc_gmac.c
diff -u src/sys/dev/ic/dwc_gmac.c:1.75 src/sys/dev/ic/dwc_gmac.c:1.76
--- src/sys/dev/ic/dwc_gmac.c:1.75 Sat Sep 11 20:28:06 2021
+++ src/sys/dev/ic/dwc_gmac.c Fri Aug 5 21:03:43 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_gmac.c,v 1.75 2021/09/11 20:28:06 andvar Exp $ */
+/* $NetBSD: dwc_gmac.c,v 1.76 2022/08/05 21:03:43 sekiya Exp $ */
/*-
* Copyright (c) 2013, 2014 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
#include
-__KERNEL_RCSID(1, "$NetBSD: dwc_gmac.c,v 1.75 2021/09/11 20:28:06 andvar Exp $");
+__KERNEL_RCSID(1, "$NetBSD: dwc_gmac.c,v 1.76 2022/08/05 21:03:43 sekiya Exp $");
/* #define DWC_GMAC_DEBUG 1 */
@@ -1229,6 +1229,8 @@ dwc_gmac_rx_intr(struct dwc_gmac_softc *
struct mbuf *m, *mnew;
int i, len, error;
+ uint16_t etype;
+
mutex_enter(>sc_rxq.r_mtx);
for (i = sc->sc_rxq.r_cur; ; i = RX_NEXT(i)) {
bus_dmamap_sync(sc->sc_dmat, sc->sc_dma_ring_map,
@@ -1311,8 +1313,29 @@ dwc_gmac_rx_intr(struct dwc_gmac_softc *
/* finalize mbuf */
m->m_pkthdr.len = m->m_len = len;
m_set_rcvif(m, ifp);
- m->m_flags |= M_HASFCS;
+#define ETYPE_OFFSET 20
+ etype = (m->m_data[ETYPE_OFFSET] << 8) + m->m_data[ETYPE_OFFSET+1];
+
+ /*
+ * The hardware doesn't trim the four FCS bytes for us, so
+ * we need to trim it ourselves.
+ * Having the upper layer remove it by passing M_HASFCS breaks
+ * protocols that don't have FCS bytes at the end of the packet
+ * (AppleTalk, for example), so we do it here instead.
+ */
+
+ switch (etype) {
+ case ETHERTYPE_ATALK:
+ case ETHERTYPE_AARP:
+/* No FCS removal needed */
+break;
+ default:
+/* remove FCS */
+m_adj(m, -ETHER_CRC_LEN);
+break;
+ }
+
if_percpuq_enqueue(sc->sc_ipq, m);
skip:
CVS commit: src/sys/dev/ic
Module Name:src Committed By: sekiya Date: Fri Aug 5 21:03:43 UTC 2022 Modified Files: src/sys/dev/ic: dwc_gmac.c Log Message: Do not unilaterally set M_HASFCS; this breaks protocols that lack CRC bytes (such as AppleTalk). Instead, remove/preserve the final four bytes in the packet ourselves on a per- protocol basis, as we do in arch/arm/xscale/ixp425_if_npe.c (and dev/ic/gem.c, and so forth). To generate a diff of this commit: cvs rdiff -u -r1.75 -r1.76 src/sys/dev/ic/dwc_gmac.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc/etc.evbarm
Module Name:src
Committed By: sekiya
Date: Mon Nov 28 06:15:48 UTC 2011
Modified Files:
src/etc/etc.evbarm: Makefile.inc
Log Message:
Enable SHEEVAPLUG for build.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/etc/etc.evbarm/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/etc.evbarm/Makefile.inc
diff -u src/etc/etc.evbarm/Makefile.inc:1.23 src/etc/etc.evbarm/Makefile.inc:1.24
--- src/etc/etc.evbarm/Makefile.inc:1.23 Thu Oct 30 15:41:33 2008
+++ src/etc/etc.evbarm/Makefile.inc Mon Nov 28 06:15:48 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.23 2008/10/30 15:41:33 cliff Exp $
+# $NetBSD: Makefile.inc,v 1.24 2011/11/28 06:15:48 sekiya Exp $
#
# etc.evbarm/Makefile.inc -- evbarm-specific etc Makefile targets
#
@@ -9,7 +9,7 @@
.if ${MACHINE_ARCH} == arm
# Little endian platforms
EVBARM_BOARDS= ADI_BRH CP3100 GEMINI GUMSTIX INTEGRATOR \
- IQ80310 IQ80321 SMDK2410 SMDK2800 \
+ IQ80310 IQ80321 SHEEVAPLUG SMDK2410 SMDK2800 \
TEAMASA_NPWR TISDP2420 TS7200 TWINTAIL
.else
# Big endian platforms
CVS commit: src/distrib/notes/common
Module Name:src Committed By: sekiya Date: Mon Nov 28 06:16:40 UTC 2011 Modified Files: src/distrib/notes/common: contents Log Message: Note kern-SHEEVAPLUG. To generate a diff of this commit: cvs rdiff -u -r1.168 -r1.169 src/distrib/notes/common/contents Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/common/contents diff -u src/distrib/notes/common/contents:1.168 src/distrib/notes/common/contents:1.169 --- src/distrib/notes/common/contents:1.168 Fri May 27 15:43:00 2011 +++ src/distrib/notes/common/contents Mon Nov 28 06:16:40 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: contents,v 1.168 2011/05/27 15:43:00 tsutsui Exp $ +.\ $NetBSD: contents,v 1.169 2011/11/28 06:16:40 sekiya Exp $ .\ .\ Copyright (c) 1999-2005 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -575,6 +575,8 @@ install the kernel that matches your har (see below) .It Sy kern-IQ80321 (see below) +.It Sy kern-SHEEVAPLUG +(see below) .It Sy kern-TEAMASA_NPWR .Pp These sets contain a
CVS commit: src/etc/etc.evbarm
Module Name:src Committed By: sekiya Date: Mon Nov 28 06:15:48 UTC 2011 Modified Files: src/etc/etc.evbarm: Makefile.inc Log Message: Enable SHEEVAPLUG for build. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/etc/etc.evbarm/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/notes/common
Module Name:src Committed By: sekiya Date: Mon Nov 28 06:16:40 UTC 2011 Modified Files: src/distrib/notes/common: contents Log Message: Note kern-SHEEVAPLUG. To generate a diff of this commit: cvs rdiff -u -r1.168 -r1.169 src/distrib/notes/common/contents Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: sekiya Date: Mon Nov 14 00:12:37 UTC 2011 Modified Files: src/sys/arch/evbarm/conf: SHEEVAPLUG Log Message: Increase SYMTAB_SPACE. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/conf/SHEEVAPLUG Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/conf/SHEEVAPLUG diff -u src/sys/arch/evbarm/conf/SHEEVAPLUG:1.9 src/sys/arch/evbarm/conf/SHEEVAPLUG:1.10 --- src/sys/arch/evbarm/conf/SHEEVAPLUG:1.9 Sat Jul 23 21:12:57 2011 +++ src/sys/arch/evbarm/conf/SHEEVAPLUG Mon Nov 14 00:12:37 2011 @@ -1,4 +1,4 @@ -# $NetBSD: SHEEVAPLUG,v 1.9 2011/07/23 21:12:57 jakllsch Exp $ +# $NetBSD: SHEEVAPLUG,v 1.10 2011/11/14 00:12:37 sekiya Exp $ # # This configuration supports for generically Marvell SheevaPlug # @@ -163,7 +163,7 @@ options DDB # in-kernel debugger #options KGDB #options DEBUG_KGDB makeoptions DEBUG=-g -O2 # compile full symbol table -options SYMTAB_SPACE=70 +options SYMTAB_SPACE=80 #options AUDIO_DEBUG=2 config netbsd root on ? type ?
CVS commit: src/sys/dev/mii
Module Name:src
Committed By: sekiya
Date: Sat Nov 12 11:10:49 UTC 2011
Modified Files:
src/sys/dev/mii: makphy.c miidevs
Log Message:
Add support for makphy 0x0029 variation found on most recent Globalscale
Dreamplug.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/mii/makphy.c
cvs rdiff -u -r1.103 -r1.104 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/makphy.c
diff -u src/sys/dev/mii/makphy.c:1.35 src/sys/dev/mii/makphy.c:1.36
--- src/sys/dev/mii/makphy.c:1.35 Sat Dec 11 18:10:42 2010
+++ src/sys/dev/mii/makphy.c Sat Nov 12 11:10:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: makphy.c,v 1.35 2010/12/11 18:10:42 matt Exp $ */
+/* $NetBSD: makphy.c,v 1.36 2011/11/12 11:10:49 sekiya Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: makphy.c,v 1.35 2010/12/11 18:10:42 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: makphy.c,v 1.36 2011/11/12 11:10:49 sekiya Exp $);
#include sys/param.h
#include sys/systm.h
@@ -116,6 +116,9 @@ static const struct mii_phydesc makphys[
{ MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1116R,
MII_STR_xxMARVELL_E1116R },
+ { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1116R_29,
+ MII_STR_xxMARVELL_E1116R_29 },
+
{ 0,0,
NULL },
};
Index: src/sys/dev/mii/miidevs
diff -u src/sys/dev/mii/miidevs:1.103 src/sys/dev/mii/miidevs:1.104
--- src/sys/dev/mii/miidevs:1.103 Wed Nov 2 19:55:57 2011
+++ src/sys/dev/mii/miidevs Sat Nov 12 11:10:49 2011
@@ -1,4 +1,4 @@
-$NetBSD: miidevs,v 1.103 2011/11/02 19:55:57 jakllsch Exp $
+$NetBSD: miidevs,v 1.104 2011/11/12 11:10:49 sekiya Exp $
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -241,6 +241,7 @@ model xxMARVELL E 0x000c Marvell 88
model xxMARVELL E1145 0x000d Marvell 88E1145 Quad Gigabit PHY
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
/* Myson Technology PHYs */
model xxMYSON MTD972 0x MTD972 10/100 media interface
CVS commit: src/sys/dev/mii
Module Name:src
Committed By: sekiya
Date: Sat Nov 12 11:11:08 UTC 2011
Modified Files:
src/sys/dev/mii: miidevs.h miidevs_data.h
Log Message:
Regen.
To generate a diff of this commit:
cvs rdiff -u -r1.106 -r1.107 src/sys/dev/mii/miidevs.h
cvs rdiff -u -r1.94 -r1.95 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.106 src/sys/dev/mii/miidevs.h:1.107
--- src/sys/dev/mii/miidevs.h:1.106 Wed Nov 2 19:56:40 2011
+++ src/sys/dev/mii/miidevs.h Sat Nov 12 11:11:07 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: miidevs.h,v 1.106 2011/11/02 19:56:40 jakllsch Exp $ */
+/* $NetBSD: miidevs.h,v 1.107 2011/11/12 11:11:07 sekiya Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
@@ -346,6 +346,8 @@
#define MII_STR_xxMARVELL_E1116 Marvell 88E1116 Gigabit PHY
#define MII_MODEL_xxMARVELL_E1116R 0x0024
#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
/* Myson Technology PHYs */
#define MII_MODEL_xxMYSON_MTD972 0x
Index: src/sys/dev/mii/miidevs_data.h
diff -u src/sys/dev/mii/miidevs_data.h:1.94 src/sys/dev/mii/miidevs_data.h:1.95
--- src/sys/dev/mii/miidevs_data.h:1.94 Wed Nov 2 19:56:40 2011
+++ src/sys/dev/mii/miidevs_data.h Sat Nov 12 11:11:07 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: miidevs_data.h,v 1.94 2011/11/02 19:56:40 jakllsch Exp $ */
+/* $NetBSD: miidevs_data.h,v 1.95 2011/11/12 11:11:07 sekiya Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
@@ -135,6 +135,7 @@ struct mii_knowndev mii_knowndevs[] = {
{ MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1145, MII_STR_xxMARVELL_E1145 },
{ MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1116, MII_STR_xxMARVELL_E1116 },
{ MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1116R, MII_STR_xxMARVELL_E1116R },
+ { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1116R_29, MII_STR_xxMARVELL_E1116R_29 },
{ MII_OUI_xxMYSON, MII_MODEL_xxMYSON_MTD972, MII_STR_xxMYSON_MTD972 },
{ MII_OUI_MYSON, MII_MODEL_MYSON_MTD803, MII_STR_MYSON_MTD803 },
{ MII_OUI_xxNATSEMI, MII_MODEL_xxNATSEMI_DP83840, MII_STR_xxNATSEMI_DP83840 },
CVS commit: src/sys/dev/mii
Module Name:src Committed By: sekiya Date: Sat Nov 12 11:10:49 UTC 2011 Modified Files: src/sys/dev/mii: makphy.c miidevs Log Message: Add support for makphy 0x0029 variation found on most recent Globalscale Dreamplug. To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/sys/dev/mii/makphy.c cvs rdiff -u -r1.103 -r1.104 src/sys/dev/mii/miidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/mii
Module Name:src Committed By: sekiya Date: Sat Nov 12 11:11:08 UTC 2011 Modified Files: src/sys/dev/mii: miidevs.h miidevs_data.h Log Message: Regen. To generate a diff of this commit: cvs rdiff -u -r1.106 -r1.107 src/sys/dev/mii/miidevs.h cvs rdiff -u -r1.94 -r1.95 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.
