--envbJBWh7q8WU6mo
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

On Sun, Dec 23, 2007 at 11:59:02AM +0100, Bernd Ernesti wrote:
> > ukphy0 at nfe0 phy 1: Generic IEEE 802.3u media interface
> > ukphy0: OUI 0x000ac2, model 0x0021, rev. 1
> > ukphy0: 10baseT, 10baseT-FDX, 100baseTX, 100baseTX-FDX, 1000baseT, 1000baseT-FDX, auto
> 
> I guess thats a 88E1116 Gigabit PHY.
> 
> Googling for marvel phy 0x0021 brought this page up:
>  http://people.freebsd.org/~yongari/msk/msk.HEAD.diff
> 
> Maybe just adding the phy number to miidevs and makphy.c (sys/dev/pci/mii)
> would be enough.

I created the attached diff, and it's now recognized as makphy and I can
still use it to transfer date (tested 100 MBit only for now).
Ok to commit?
 Thomas

--envbJBWh7q8WU6mo
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="makphy.diff"

Index: makphy.c
===================================================================
RCS file: /cvsroot/src/sys/dev/mii/makphy.c,v
retrieving revision 1.24
diff -u -r1.24 makphy.c
--- makphy.c	9 Dec 2007 20:28:03 -0000	1.24
+++ makphy.c	25 Dec 2007 11:45:38 -0000
@@ -116,6 +116,9 @@
 	{ MII_OUI_xxMARVELL,		MII_MODEL_xxMARVELL_E1111,
 	  MII_STR_xxMARVELL_E1111 },
 
+	{ MII_OUI_xxMARVELL,		MII_MODEL_xxMARVELL_E1116,
+	  MII_STR_xxMARVELL_E1116 },
+
 	{ 0,				0,
 	  NULL },
 };
Index: miidevs
===================================================================
RCS file: /cvsroot/src/sys/dev/mii/miidevs,v
retrieving revision 1.73
diff -u -r1.73 miidevs
--- miidevs	12 Oct 2007 10:13:07 -0000	1.73
+++ miidevs	25 Dec 2007 11:45:39 -0000
@@ -193,6 +193,7 @@
 model xxMARVELL E1000_5		0x0005 Marvell 88E1000 Gigabit PHY
 model xxMARVELL E6060		0x0008 Marvell 88E6060 10/100 5-port PHY switch
 model xxMARVELL E1111		0x000c Marvell 88E1111 Gigabit PHY
+model xxMARVELL E1116		0x0021 Marvell 88E1116 Gigabit PHY
 
 /* Myson Technology PHYs */
 model xxMYSON MTD972		0x0000 MTD972 10/100 media interface
Index: miidevs.h
===================================================================
RCS file: /cvsroot/src/sys/dev/mii/miidevs.h,v
retrieving revision 1.76
diff -u -r1.76 miidevs.h
--- miidevs.h	12 Oct 2007 10:14:03 -0000	1.76
+++ miidevs.h	25 Dec 2007 11:45:39 -0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: miidevs.h,v 1.76 2007/10/12 10:14:03 tsutsui Exp $	*/
+/*	$NetBSD$	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
@@ -263,6 +263,8 @@
 #define	MII_STR_xxMARVELL_E6060	"Marvell 88E6060 10/100 5-port PHY switch"
 #define	MII_MODEL_xxMARVELL_E1111	0x000c
 #define	MII_STR_xxMARVELL_E1111	"Marvell 88E1111 Gigabit PHY"
+#define	MII_MODEL_xxMARVELL_E1116	0x0021
+#define	MII_STR_xxMARVELL_E1116	"Marvell 88E1116 Gigabit PHY"
 
 /* Myson Technology PHYs */
 #define	MII_MODEL_xxMYSON_MTD972	0x0000
Index: miidevs_data.h
===================================================================
RCS file: /cvsroot/src/sys/dev/mii/miidevs_data.h,v
retrieving revision 1.66
diff -u -r1.66 miidevs_data.h
--- miidevs_data.h	12 Oct 2007 10:14:04 -0000	1.66
+++ miidevs_data.h	25 Dec 2007 11:45:39 -0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: miidevs_data.h,v 1.66 2007/10/12 10:14:04 tsutsui Exp $	*/
+/*	$NetBSD$	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
@@ -107,6 +107,7 @@
  { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1000_5, MII_STR_xxMARVELL_E1000_5 },
  { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E6060, MII_STR_xxMARVELL_E6060 },
  { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1111, MII_STR_xxMARVELL_E1111 },
+ { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1116, MII_STR_xxMARVELL_E1116 },
  { 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 },

--envbJBWh7q8WU6mo--