From owner-svn-soc-all@freebsd.org  Fri May 27 14:39:58 2016
Return-Path: <owner-svn-soc-all@freebsd.org>
Delivered-To: svn-soc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2D795B4B6A8
 for <svn-soc-all@mailman.ysv.freebsd.org>;
 Fri, 27 May 2016 14:39:58 +0000 (UTC)
 (envelope-from vincenzo@FreeBSD.org)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 21B4512C9
 for <svn-soc-all@FreeBSD.org>; Fri, 27 May 2016 14:39:58 +0000 (UTC)
 (envelope-from vincenzo@FreeBSD.org)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id u4REdwQP045062
 for <svn-soc-all@FreeBSD.org>; Fri, 27 May 2016 14:39:58 GMT
 (envelope-from vincenzo@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id u4REdvro045036
 for svn-soc-all@FreeBSD.org; Fri, 27 May 2016 14:39:57 GMT
 (envelope-from vincenzo@FreeBSD.org)
Date: Fri, 27 May 2016 14:39:57 GMT
Message-Id: <201605271439.u4REdvro045036@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to
 vincenzo@FreeBSD.org using -f
From: vincenzo@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r304039 - soc2016/vincenzo/head/sys/dev/netmap
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all/>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 27 May 2016 14:39:58 -0000

Author: vincenzo
Date: Fri May 27 14:39:57 2016
New Revision: 304039
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=304039

Log:
  ptnet: read MAC address from I/O registers

Modified:
  soc2016/vincenzo/head/sys/dev/netmap/if_ptnet.c

Modified: soc2016/vincenzo/head/sys/dev/netmap/if_ptnet.c
==============================================================================
--- soc2016/vincenzo/head/sys/dev/netmap/if_ptnet.c	Fri May 27 14:39:41 2016	(r304038)
+++ soc2016/vincenzo/head/sys/dev/netmap/if_ptnet.c	Fri May 27 14:39:57 2016	(r304039)
@@ -178,6 +178,7 @@
 #endif
 	struct ptnet_softc *sc;
 	struct ifnet *ifp;
+	uint32_t macreg;
 	int err, rid;
 
 	device_printf(dev, "%s\n", __func__);
@@ -253,7 +254,15 @@
 	ifmedia_add(&sc->media, IFM_ETHER | IFM_10G_T | IFM_FDX, 0, NULL);
 	ifmedia_set(&sc->media, IFM_ETHER | IFM_10G_T | IFM_FDX);
 
-	memset(sc->hwaddr, 0, sizeof(sc->hwaddr));
+	macreg = bus_read_4(sc->iomem, PTNET_IO_MAC_HI);
+	sc->hwaddr[0] = (macreg >> 8) & 0xff;
+	sc->hwaddr[1] = macreg & 0xff;
+	macreg = bus_read_4(sc->iomem, PTNET_IO_MAC_LO);
+	sc->hwaddr[2] = (macreg >> 24) & 0xff;
+	sc->hwaddr[3] = (macreg >> 16) & 0xff;
+	sc->hwaddr[4] = (macreg >> 8) & 0xff;
+	sc->hwaddr[5] = macreg & 0xff;
+
 	ether_ifattach(ifp, sc->hwaddr);
 
 	ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);