From owner-svn-src-all@FreeBSD.ORG Mon Jan 25 19:25:22 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3E3871065693; Mon, 25 Jan 2010 19:25:22 +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 1498C8FC19; Mon, 25 Jan 2010 19:25:22 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o0PJPLoe055567; Mon, 25 Jan 2010 19:25:21 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0PJPLDl055565; Mon, 25 Jan 2010 19:25:21 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201001251925.o0PJPLDl055565@svn.freebsd.org> From: Warner Losh Date: Mon, 25 Jan 2010 19:25:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r202984 - head/sys/mips/cavium/dev/rgmii X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Jan 2010 19:25:22 -0000 Author: imp Date: Mon Jan 25 19:25:21 2010 New Revision: 202984 URL: http://svn.freebsd.org/changeset/base/202984 Log: Turn on debugging on the fpa unit. Fix some printfs that were only enabled for debugging. This should be turned off before we release, but we need it for the moment. Modified: head/sys/mips/cavium/dev/rgmii/octeon_fpa.c Modified: head/sys/mips/cavium/dev/rgmii/octeon_fpa.c ============================================================================== --- head/sys/mips/cavium/dev/rgmii/octeon_fpa.c Mon Jan 25 19:01:38 2010 (r202983) +++ head/sys/mips/cavium/dev/rgmii/octeon_fpa.c Mon Jan 25 19:25:21 2010 (r202984) @@ -18,7 +18,7 @@ __FBSDID("$FreeBSD$"); #include "octeon_fpa.h" -//#define FPA_DEBUG 1 +#define FPA_DEBUG 1 /* * octeon_dump_fpa @@ -112,7 +112,7 @@ void octeon_enable_fpa (void) } -//#define FPA_DEBUG_TERSE 1 +#define FPA_DEBUG_TERSE 1 /* * octeon_fpa_fill_pool_mem @@ -165,13 +165,13 @@ void octeon_fpa_fill_pool_mem (u_int poo * already preallocated extra */ #ifdef FPA_DEBUG - printf(" %% Huge MemBlock 0x%X Bytes %u\n", memory, bytes); + printf(" %% Huge MemBlock %p Bytes %u\n", memory, bytes); #endif memory = (void *) OCTEON_ALIGN(memory); #ifdef FPA_DEBUG_TERSE - printf("FPA fill: %u Count: %u SizeBytes: %u SizeBytesAligned: %u 1st: 0x%X = %p\n", + printf("FPA fill: %u Count: %u SizeBytes: %u SizeBytesAligned: %u 1st: %p = 0x%X\n", pool, elem_num, elem_size_bytes, block_size, memory, (void *)OCTEON_PTR2PHYS(memory)); #endif @@ -180,7 +180,7 @@ void octeon_fpa_fill_pool_mem (u_int poo while (elem_num--) { #ifdef FPA_DEBUG if (((elems - elem_num) < 4) || (elem_num < 4)) - printf(" %% Block %d: 0x%X Phys 0x%X Bytes %u\n", block, memory, OCTEON_PTR2PHYS(memory), elem_size_bytes); + printf(" %% Block %d: %p Phys 0x%X Bytes %u\n", block, memory, OCTEON_PTR2PHYS(memory), elem_size_bytes); block++; #endif octeon_fpa_free(memory, pool, 0);