From owner-svn-src-head@FreeBSD.ORG  Sat Jan  4 10:19:22 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 196591CF;
 Sat,  4 Jan 2014 10:19:22 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 04B6814FB;
 Sat,  4 Jan 2014 10:19:22 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04AJLPK053721;
 Sat, 4 Jan 2014 10:19:21 GMT (envelope-from br@svn.freebsd.org)
Received: (from br@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04AJL7K053720;
 Sat, 4 Jan 2014 10:19:21 GMT (envelope-from br@svn.freebsd.org)
Message-Id: <201401041019.s04AJL7K053720@svn.freebsd.org>
From: Ruslan Bukin <br@FreeBSD.org>
Date: Sat, 4 Jan 2014 10:19:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r260256 - head/sys/dev/ffec
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 04 Jan 2014 10:19:22 -0000

Author: br
Date: Sat Jan  4 10:19:21 2014
New Revision: 260256
URL: http://svnweb.freebsd.org/changeset/base/260256

Log:
  ENET on Vybrid Family SoC don't advertise its media capabilities
  themselves properly, so force auto-negotiation.
  
  Tested on mvf600.
  
  Reviewed by:	ian

Modified:
  head/sys/dev/ffec/if_ffec.c

Modified: head/sys/dev/ffec/if_ffec.c
==============================================================================
--- head/sys/dev/ffec/if_ffec.c	Sat Jan  4 09:57:23 2014	(r260255)
+++ head/sys/dev/ffec/if_ffec.c	Sat Jan  4 10:19:21 2014	(r260256)
@@ -96,6 +96,7 @@ enum {
 	FECTYPE_GENERIC,
 	FECTYPE_IMX53,
 	FECTYPE_IMX6,
+	FECTYPE_MVF,
 };
 
 /*
@@ -112,8 +113,8 @@ static struct ofw_compat_data compat_dat
 	{"fsl,imx51-fec",	FECTYPE_GENERIC},
 	{"fsl,imx53-fec",	FECTYPE_IMX53},
 	{"fsl,imx6q-fec",	FECTYPE_IMX6 | FECFLAG_GBE},
-	{"fsl,mvf600-fec",	FECTYPE_GENERIC},
-	{"fsl,vf-fec",		FECTYPE_GENERIC},
+	{"fsl,mvf600-fec",	FECTYPE_MVF},
+	{"fsl,mvf-fec",		FECTYPE_MVF},
 	{NULL,		 	FECTYPE_NONE},
 };
 
@@ -1686,7 +1687,8 @@ ffec_attach(device_t dev)
 
 	/* Attach the mii driver. */
 	error = mii_attach(dev, &sc->miibus, ifp, ffec_media_change,
-	    ffec_media_status, BMSR_DEFCAPMASK, MII_PHY_ANY, MII_OFFSET_ANY, 0);
+	    ffec_media_status, BMSR_DEFCAPMASK, MII_PHY_ANY, MII_OFFSET_ANY,
+	    (sc->fectype & FECTYPE_MVF) ? MIIF_FORCEANEG : 0);
 	if (error != 0) {
 		device_printf(dev, "PHY attach failed\n");
 		goto out;