From owner-svn-src-projects@FreeBSD.ORG  Mon Jul  6 18:18:27 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B07101065672;
	Mon,  6 Jul 2009 18:18:27 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9FC668FC1F;
	Mon,  6 Jul 2009 18:18:27 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n66IIRIE088957;
	Mon, 6 Jul 2009 18:18:27 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n66IIRpf088954;
	Mon, 6 Jul 2009 18:18:27 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <200907061818.n66IIRpf088954@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Mon, 6 Jul 2009 18:18:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r195414 - projects/mips/sys/mips/octeon1
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Jul 2009 18:18:27 -0000

Author: imp
Date: Mon Jul  6 18:18:27 2009
New Revision: 195414
URL: http://svn.freebsd.org/changeset/base/195414

Log:
  64-bit fixes: fix printf formats and prefer MIPS_PHYS_TO_KSEG0.

Modified:
  projects/mips/sys/mips/octeon1/octeon_ebt3000_cf.c
  projects/mips/sys/mips/octeon1/octeon_machdep.c

Modified: projects/mips/sys/mips/octeon1/octeon_ebt3000_cf.c
==============================================================================
--- projects/mips/sys/mips/octeon1/octeon_ebt3000_cf.c	Mon Jul  6 18:17:48 2009	(r195413)
+++ projects/mips/sys/mips/octeon1/octeon_ebt3000_cf.c	Mon Jul  6 18:18:27 2009	(r195414)
@@ -509,7 +509,7 @@ static void cf_identify (driver_t *drv, 
     	if (!octeon_board_real())
 		return;
 
-	base_addr = (void *) OCTEON_PHYS2PTR(OCTEON_CF_COMMON_BASE_ADDR);
+	base_addr = (void *) MIPS_PHYS_TO_KSEG0(OCTEON_CF_COMMON_BASE_ADDR);
 
         for (bus_region = 0; bus_region < 8; bus_region++)
         {

Modified: projects/mips/sys/mips/octeon1/octeon_machdep.c
==============================================================================
--- projects/mips/sys/mips/octeon1/octeon_machdep.c	Mon Jul  6 18:17:48 2009	(r195413)
+++ projects/mips/sys/mips/octeon1/octeon_machdep.c	Mon Jul  6 18:18:27 2009	(r195414)
@@ -563,8 +563,9 @@ void ciu_dump_interrutps_enabled (int co
         }
 
 	ciu_intr_bits =  oct_read64(ciu_intr_reg_addr);
-        printf(" CIU core %d  int: %d  en: %d  ip: %d  Add: 0x%llX  enabled: 0x%llX   SR: %X\n",
-               core_num, intx, enx, ciu_ip, ciu_intr_reg_addr, ciu_intr_bits, mips_rd_status());
+        printf(" CIU core %d  int: %d  en: %d  ip: %d  Add: %p  enabled: 0x%llX  SR: %x\n",
+	    core_num, intx, enx, ciu_ip, (void *)ciu_intr_reg_addr,
+	    (unsigned long long)ciu_intr_bits, mips_rd_status());
 }