From owner-p4-projects@FreeBSD.ORG  Fri Feb 15 12:19:04 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id C6AB5CF8; Fri, 15 Feb 2013 12:19:04 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 8A94BCF4
 for <perforce@freebsd.org>; Fri, 15 Feb 2013 12:19:04 +0000 (UTC)
 (envelope-from bz@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:1900:2254:2068::682:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 77612848
 for <perforce@freebsd.org>; Fri, 15 Feb 2013 12:19:04 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r1FCJ4o2018254
 for <perforce@freebsd.org>; Fri, 15 Feb 2013 12:19:04 GMT
 (envelope-from bz@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r1FCJ4fI018251
 for perforce@freebsd.org; Fri, 15 Feb 2013 12:19:04 GMT
 (envelope-from bz@freebsd.org)
Date: Fri, 15 Feb 2013 12:19:04 GMT
Message-Id: <201302151219.r1FCJ4fI018251@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 bz@freebsd.org using -f
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Subject: PERFORCE change 222055 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.14
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/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: Fri, 15 Feb 2013 12:19:05 -0000

http://p4web.freebsd.org/@@222055?ac=10

Change 222055 by bz@bz_zenith on 2013/02/15 12:18:57

	Try to read the Ethernet config space from cfi as well if isf fails.
	Rename the local varibale and fix a bug releasing on the wrong
	device resource previously.

Affected files ...

.. //depot/projects/ctsrd/beribsd/src/sys/dev/altera/atse/if_atse.c#13 edit

Differences ...

==== //depot/projects/ctsrd/beribsd/src/sys/dev/altera/atse/if_atse.c#13 (text+ko) ====

@@ -630,18 +630,21 @@
 atse_ethernet_option_bits_read_fdt(device_t dev)
 {
 	struct resource *res;
-	device_t isfdev;
+	device_t fdev;
 	int i, rid;
 
 	if (atse_ethernet_option_bits_flag & ATSE_ETHERNET_OPTION_BITS_READ)
 		return (0);
 
-	isfdev = device_find_child(device_get_parent(dev), "isf", 0);
-	if (isfdev == NULL)
-		return (ENOENT);
+	fdev = device_find_child(device_get_parent(dev), "isf", 0);
+	if (fdev == NULL) {
+		fdev = device_find_child(device_get_parent(dev), "cfi", 0);
+		if (fdev == NULL)
+			return (ENOENT);
+	}
 
 	rid = 0;
-	res = bus_alloc_resource_any(isfdev, SYS_RES_MEMORY, &rid,
+	res = bus_alloc_resource_any(fdev, SYS_RES_MEMORY, &rid,
 	    RF_ACTIVE | RF_SHAREABLE);
 	if (res == NULL)
 		return (ENXIO);
@@ -650,7 +653,7 @@
 		atse_ethernet_option_bits[i] = bus_read_1(res,
 		    ALTERA_ETHERNET_OPTION_BITS_OFF + i);
 
-	bus_release_resource(dev, SYS_RES_MEMORY, rid, res);
+	bus_release_resource(fdev, SYS_RES_MEMORY, rid, res);
 	atse_ethernet_option_bits_flag |= ATSE_ETHERNET_OPTION_BITS_READ;
 
 	return (0);