From owner-svn-src-projects@FreeBSD.ORG Sun Jun 14 06:11:52 2009 Return-Path: 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 704BB106566C; Sun, 14 Jun 2009 06:11:52 +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 347828FC1C; Sun, 14 Jun 2009 06:11:52 +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 n5E6Bq4A037330; Sun, 14 Jun 2009 06:11:52 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5E6BppG037324; Sun, 14 Jun 2009 06:11:51 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <200906140611.n5E6BppG037324@svn.freebsd.org> From: Warner Losh Date: Sun, 14 Jun 2009 06:11:51 +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: r194162 - projects/mips/sys/mips/octeon1/dev/rgmii X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Jun 2009 06:11:52 -0000 Author: imp Date: Sun Jun 14 06:11:51 2009 New Revision: 194162 URL: http://svn.freebsd.org/changeset/base/194162 Log: First pass to make compile. It doesn't completely yet, but it's a start. Modified: projects/mips/sys/mips/octeon1/dev/rgmii/octeon_fau.c projects/mips/sys/mips/octeon1/dev/rgmii/octeon_fpa.c projects/mips/sys/mips/octeon1/dev/rgmii/octeon_ipd.c projects/mips/sys/mips/octeon1/dev/rgmii/octeon_pko.c projects/mips/sys/mips/octeon1/dev/rgmii/octeon_rgmx.c projects/mips/sys/mips/octeon1/dev/rgmii/octeon_rgmx.h Modified: projects/mips/sys/mips/octeon1/dev/rgmii/octeon_fau.c ============================================================================== --- projects/mips/sys/mips/octeon1/dev/rgmii/octeon_fau.c Sun Jun 14 06:11:13 2009 (r194161) +++ projects/mips/sys/mips/octeon1/dev/rgmii/octeon_fau.c Sun Jun 14 06:11:51 2009 (r194162) @@ -7,6 +7,7 @@ #include #include +#include #include "octeon_fau.h" /* @@ -39,6 +40,3 @@ void octeon_fau_enable (void) void octeon_fau_disable (void) { } - - - Modified: projects/mips/sys/mips/octeon1/dev/rgmii/octeon_fpa.c ============================================================================== --- projects/mips/sys/mips/octeon1/dev/rgmii/octeon_fpa.c Sun Jun 14 06:11:13 2009 (r194161) +++ projects/mips/sys/mips/octeon1/dev/rgmii/octeon_fpa.c Sun Jun 14 06:11:51 2009 (r194162) @@ -11,6 +11,7 @@ #include +#include #include "octeon_fpa.h" Modified: projects/mips/sys/mips/octeon1/dev/rgmii/octeon_ipd.c ============================================================================== --- projects/mips/sys/mips/octeon1/dev/rgmii/octeon_ipd.c Sun Jun 14 06:11:13 2009 (r194161) +++ projects/mips/sys/mips/octeon1/dev/rgmii/octeon_ipd.c Sun Jun 14 06:11:51 2009 (r194162) @@ -7,6 +7,7 @@ #include #include +#include #include "octeon_ipd.h" /* Modified: projects/mips/sys/mips/octeon1/dev/rgmii/octeon_pko.c ============================================================================== --- projects/mips/sys/mips/octeon1/dev/rgmii/octeon_pko.c Sun Jun 14 06:11:13 2009 (r194161) +++ projects/mips/sys/mips/octeon1/dev/rgmii/octeon_pko.c Sun Jun 14 06:11:51 2009 (r194162) @@ -9,6 +9,7 @@ #include #include +#include #include "octeon_fau.h" #include "octeon_fpa.h" #include "octeon_pko.h" @@ -172,7 +173,7 @@ static void octeon_pko_doorbell_data_dum octeon_pko_port_status_t status; octeon_pko_get_port_status(port, 0, &status); - printf("\n Port #%d Pkts %d Bytes %lld DoorBell %lld", + printf("\n Port #%lld Pkts %ld Bytes %lld DoorBell %lld", port, status.packets, status.octets, status.doorbell); } @@ -208,7 +209,7 @@ void octeon_pko_show (u_int start_port, gmx_int0_ports = (16 >> octeon_pko_gmx_mode.bits.mode0); gmx_int1_ports = (16 >> octeon_pko_gmx_mode.bits.mode1); octeon_pko_crc_ports.word64 = oct_read64(OCTEON_PKO_REG_CRC_ENABLE); - printf("\n Total Queues: 0..%d Ports GMX0 %d GMX1 %d CRC 0x%llX", + printf("\n Total Queues: 0..%d Ports GMX0 %d GMX1 %d CRC 0x%X", queue_max - 1, gmx_int0_ports, gmx_int1_ports, octeon_pko_crc_ports.bits.crc_ports_mask); @@ -228,7 +229,8 @@ void octeon_pko_show (u_int start_port, printf("\n Port # %d Queue %3d [%d] BufPtr: 0x%llX Mask: %X%s", octeon_pko_queue_cfg.bits.port, octeon_pko_queue_cfg.bits.queue, octeon_pko_queue_cfg.bits.index, - octeon_pko_queue_cfg.bits.buf_ptr, octeon_pko_queue_cfg.bits.qos_mask, + (uint64_t)octeon_pko_queue_cfg.bits.buf_ptr, + octeon_pko_queue_cfg.bits.qos_mask, (octeon_pko_queue_cfg.bits.tail)? " Last":""); } printf("\n"); @@ -236,7 +238,7 @@ void octeon_pko_show (u_int start_port, for (port = start_port; port < (end_port + 1); port++) { octeon_pko_get_port_status(port, 0, &status); - printf("\n Port #%d Packets %d Bytes %lld DoorBell %lld", + printf("\n Port #%d Packets %ld Bytes %lld DoorBell %lld", port, status.packets, status.octets, status.doorbell); octeon_pko_doorbell_data_dump(port); @@ -264,7 +266,7 @@ octeon_pko_status_t octeon_pko_config_po octeon_pko_queue_cfg_t qconfig; if ((port >= OCTEON_PKO_PORTS_MAX) && (port != OCTEON_PKO_PORT_ILLEGAL)) { - printf("\n%% Error: octeon_pko_config_port: Invalid port %llu", port); + printf("\n%% Error: octeon_pko_config_port: Invalid port %u", port); return (OCTEON_PKO_INVALID_PORT); } Modified: projects/mips/sys/mips/octeon1/dev/rgmii/octeon_rgmx.c ============================================================================== --- projects/mips/sys/mips/octeon1/dev/rgmii/octeon_rgmx.c Sun Jun 14 06:11:13 2009 (r194161) +++ projects/mips/sys/mips/octeon1/dev/rgmii/octeon_rgmx.c Sun Jun 14 06:11:51 2009 (r194162) @@ -48,6 +48,8 @@ __FBSDID("$FreeBSD$"); #include #include +#include + #include "octeon_fau.h" #include "octeon_fpa.h" #include "octeon_ipd.h" @@ -1880,20 +1882,20 @@ static void rgmx_timer_periodic (void) * Now look for anamolous conditions */ if (sc != get_rgmx_softc(port)) { - printf(" port %u sc 0x%X not in sync with index: %u\n", + printf(" port %u sc %p not in sync with index: %u\n", port, sc, index); continue; } if (sc->port != port) { - printf(" port %u sc 0x%X port-> %u not in sync with index: %u\n", + printf(" port %u sc %p port-> %u not in sync with index: %u\n", port, sc, sc->port, index); continue; } ifp = sc->ifp; if (ifp == NULL) { - printf(" port %u sc 0x%X . Bad ifp 0x%X\n", port, sc, ifp); + printf(" port %u sc %p . Bad ifp %p\n", port, sc, ifp); continue; } Modified: projects/mips/sys/mips/octeon1/dev/rgmii/octeon_rgmx.h ============================================================================== --- projects/mips/sys/mips/octeon1/dev/rgmii/octeon_rgmx.h Sun Jun 14 06:11:13 2009 (r194161) +++ projects/mips/sys/mips/octeon1/dev/rgmii/octeon_rgmx.h Sun Jun 14 06:11:51 2009 (r194162) @@ -439,8 +439,9 @@ static inline octeon_wqe_t *octeon_pow_w result.word64 = oct_read64(ptr.word64); - printf("WQE Result: 0x%llX No-work %llX Addr %llX Ptr: %llX\n", - result.word64, result.s_work.no_work, result.s_work.addr, OCTEON_PHYS2PTR(result.s_work.addr)); + printf("WQE Result: 0x%llX No-work %X Addr %llX Ptr: %p\n", + result.word64, result.s_work.no_work, (uint64_t)result.s_work.addr, + OCTEON_PHYS2PTR(result.s_work.addr)); if (result.s_work.no_work || !result.s_work.addr) { return NULL;