From owner-p4-projects@FreeBSD.ORG  Tue Dec  9 17:15:35 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 70EBA1065677; Tue,  9 Dec 2008 17:15:35 +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 36A2F106564A
	for <perforce@freebsd.org>; Tue,  9 Dec 2008 17:15:35 +0000 (UTC)
	(envelope-from nwhitehorn@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 265538FC17
	for <perforce@freebsd.org>; Tue,  9 Dec 2008 17:15:35 +0000 (UTC)
	(envelope-from nwhitehorn@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB9HFZRW077822
	for <perforce@freebsd.org>; Tue, 9 Dec 2008 17:15:35 GMT
	(envelope-from nwhitehorn@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB9HFZuM077820
	for perforce@freebsd.org; Tue, 9 Dec 2008 17:15:35 GMT
	(envelope-from nwhitehorn@freebsd.org)
Date: Tue, 9 Dec 2008 17:15:35 GMT
Message-Id: <200812091715.mB9HFZuM077820@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	nwhitehorn@freebsd.org using -f
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 154405 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
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: Tue, 09 Dec 2008 17:15:35 -0000

http://perforce.freebsd.org/chv.cgi?CH=154405

Change 154405 by nwhitehorn@nwhitehorn_trantor on 2008/12/09 17:14:34

	Have the OFW memory routines check address-cells instead of relying
	on the value of ppc64 to figure out the number of cells in a physical 
	memory address.

Affected files ...

.. //depot/projects/ppc-g5/sys/powerpc/aim/ofw_machdep.c#8 edit

Differences ...

==== //depot/projects/ppc-g5/sys/powerpc/aim/ofw_machdep.c#8 (text+ko) ====

@@ -147,12 +147,22 @@
 mem_regions(struct mem_region **memp, int *memsz,
 		struct mem_region **availp, int *availsz)
 {
-	int phandle;
+	phandle_t phandle;
 	int asz, msz, fsz;
 	int i, j;
 	int still_merging;
+	cell_t address_cells;
 
 	asz = msz = 0;
+
+	/*
+	 * Get #address-cells from root node, defaulting to 1 if it cannot
+	 * be found.
+	 */
+	phandle = OF_finddevice("/");
+	if (OF_getprop(phandle, "#address-cells", &address_cells, 
+	    sizeof(address_cells)) < sizeof(address_cells))
+		address_cells = 1;
 	
 	/*
 	 * Get memory.
@@ -174,7 +184,7 @@
 		}
 	}
 
-	if (ppc64) {
+	if (address_cells == 2) {
 	    struct mem_region64 OFmem64[OFMEM_REGIONS + 1];
 	    if ((phandle == -1) || (msz = OF_getprop(phandle, "reg",
 			  OFmem64, sizeof OFmem64[0] * OFMEM_REGIONS)) <= 0) {