From owner-svn-src-user@FreeBSD.ORG Thu Apr 22 00:12:58 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AEBB7106564A; Thu, 22 Apr 2010 00:12:58 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 85FA58FC18; Thu, 22 Apr 2010 00:12:58 +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 o3M0CwnA010489; Thu, 22 Apr 2010 00:12:58 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3M0CwBq010487; Thu, 22 Apr 2010 00:12:58 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201004220012.o3M0CwBq010487@svn.freebsd.org> From: Juli Mallett Date: Thu, 22 Apr 2010 00:12:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r207030 - user/jmallett/octeon/sys/mips/cavium X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Apr 2010 00:12:58 -0000 Author: jmallett Date: Thu Apr 22 00:12:58 2010 New Revision: 207030 URL: http://svn.freebsd.org/changeset/base/207030 Log: o) Include stdarg. o) Make our pool configuration look more like the standard ones, and satisfy cvmx-fpa*.c with numbered pool definitions. Modified: user/jmallett/octeon/sys/mips/cavium/cvmx_config.h Modified: user/jmallett/octeon/sys/mips/cavium/cvmx_config.h ============================================================================== --- user/jmallett/octeon/sys/mips/cavium/cvmx_config.h Thu Apr 22 00:12:03 2010 (r207029) +++ user/jmallett/octeon/sys/mips/cavium/cvmx_config.h Thu Apr 22 00:12:58 2010 (r207030) @@ -47,18 +47,12 @@ #include #include +#include #define asm __asm #define CVMX_DONT_INCLUDE_CONFIG -#define CVMX_FPA_PACKET_POOL 0 -#define CVMX_FPA_WQE_POOL 1 -#define CVMX_FPA_OUTPUT_BUFFER_POOL 2 -#define CVMX_FPA_WQE_POOL_SIZE (1 * CVMX_CACHE_LINE_SIZE) -#define CVMX_FPA_OUTPUT_BUFFER_POOL_SIZE (8 * CVMX_CACHE_LINE_SIZE) -#define CVMX_FPA_PACKET_POOL_SIZE (16 * CVMX_CACHE_LINE_SIZE) - /* Define to enable the use of simple executive packet output functions. ** For packet I/O setup enable the helper functions below. */ @@ -170,4 +164,23 @@ #define CVMX_PKO_QUEUES_PER_PORT_PCI 1 /**< PKO queues per port for PCI (ports 32-35) */ #define CVMX_PKO_QUEUES_PER_PORT_LOOP 1 /**< PKO queues per port for Loop devices (ports 36-39) */ +/************************* FPA allocation *********************************/ +/* Pool sizes in bytes, must be multiple of a cache line */ +#define CVMX_FPA_POOL_0_SIZE (16 * CVMX_CACHE_LINE_SIZE) +#define CVMX_FPA_POOL_1_SIZE (1 * CVMX_CACHE_LINE_SIZE) +#define CVMX_FPA_POOL_2_SIZE (8 * CVMX_CACHE_LINE_SIZE) +#define CVMX_FPA_POOL_3_SIZE (0 * CVMX_CACHE_LINE_SIZE) +#define CVMX_FPA_POOL_4_SIZE (0 * CVMX_CACHE_LINE_SIZE) +#define CVMX_FPA_POOL_5_SIZE (0 * CVMX_CACHE_LINE_SIZE) +#define CVMX_FPA_POOL_6_SIZE (0 * CVMX_CACHE_LINE_SIZE) +#define CVMX_FPA_POOL_7_SIZE (0 * CVMX_CACHE_LINE_SIZE) + +/* Pools in use */ +#define CVMX_FPA_PACKET_POOL (0) /**< Packet buffers */ +#define CVMX_FPA_PACKET_POOL_SIZE CVMX_FPA_POOL_0_SIZE +#define CVMX_FPA_WQE_POOL (1) /**< Work queue entrys */ +#define CVMX_FPA_WQE_POOL_SIZE CVMX_FPA_POOL_1_SIZE +#define CVMX_FPA_OUTPUT_BUFFER_POOL (2) /**< PKO queue command buffers */ +#define CVMX_FPA_OUTPUT_BUFFER_POOL_SIZE CVMX_FPA_POOL_2_SIZE + #endif /* !_CVMX_CONFIG_H */