From owner-p4-projects@FreeBSD.ORG  Wed Mar 17 17:42:43 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BD0DD1065673; Wed, 17 Mar 2010 17:42:43 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 816011065670
	for <perforce@freebsd.org>; Wed, 17 Mar 2010 17:42:43 +0000 (UTC)
	(envelope-from raj@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 700238FC14
	for <perforce@freebsd.org>; Wed, 17 Mar 2010 17:42:43 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o2HHghhq060814
	for <perforce@freebsd.org>; Wed, 17 Mar 2010 17:42:43 GMT
	(envelope-from raj@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o2HHgh3U060812
	for perforce@freebsd.org; Wed, 17 Mar 2010 17:42:43 GMT
	(envelope-from raj@freebsd.org)
Date: Wed, 17 Mar 2010 17:42:43 GMT
Message-Id: <201003171742.o2HHgh3U060812@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	raj@freebsd.org using -f
From: Rafal Jaworowski <raj@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 175768 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 17 Mar 2010 17:42:44 -0000

http://p4web.freebsd.org/chv.cgi?CH=175768

Change 175768 by raj@raj_fdt on 2010/03/17 17:42:16

	Teach tsec(4) to obtain its PHY address from the device tree.

Affected files ...

.. //depot/projects/fdt/sys/dev/tsec/if_tsec.c#3 edit
.. //depot/projects/fdt/sys/dev/tsec/if_tsec.h#3 edit
.. //depot/projects/fdt/sys/dev/tsec/if_tsec_fdt.c#3 edit

Differences ...

==== //depot/projects/fdt/sys/dev/tsec/if_tsec.c#3 (text+ko) ====

@@ -1563,7 +1563,7 @@
 
 	sc = device_get_softc(dev);
 
-	if (device_get_unit(dev) != phy)
+	if (sc->phyaddr != phy)
 		return (0);
 
 	sc = tsec0_sc;
@@ -1591,9 +1591,8 @@
 
 	sc = device_get_softc(dev);
 
-	if (device_get_unit(dev) != phy)
-		device_printf(dev, "Trying to write to an alien PHY(%d)\n",
-		    phy);
+	if (sc->phyaddr != phy)
+		return (0);
 
 	sc = tsec0_sc;
 

==== //depot/projects/fdt/sys/dev/tsec/if_tsec.h#3 (text+ko) ====

@@ -131,6 +131,8 @@
 
 	/* currently received frame */
 	struct mbuf	*frame;
+
+	int		phyaddr;
 };
 
 /* interface to get/put generic objects */

==== //depot/projects/fdt/sys/dev/tsec/if_tsec_fdt.c#3 (text+ko) ====

@@ -50,6 +50,7 @@
 #include <net/if_media.h>
 #include <net/if_arp.h>
 
+#include <dev/fdt/fdt_common.h>
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
 #include <dev/ofw/ofw_bus.h>
@@ -160,6 +161,10 @@
 	if (device_get_unit(dev) == 0)
 		tsec0_sc = sc;
 
+	/* Get phy address from fdt */
+	if (fdt_get_phyaddr(sc->node, &sc->phyaddr) != 0)
+		return (ENXIO);
+
 	/* Init timer */
 	callout_init(&sc->tsec_callout, 1);