From 7d9ca96411d10924697eed225c3c8b3b25a86cba Mon Sep 17 00:00:00 2001 From: Kip Macy Date: Wed, 14 Mar 2007 06:35:38 +0000 Subject: [PATCH] add cxgb_config.h to define values that are defined in the Makefile when compiled as a module move prefetch out of cxgb_sge.c into header under arch conditional compilation --- sys/dev/cxgb/cxgb_config.h | 46 ++++++++++++++++++++++++++++++++++++++ sys/dev/cxgb/cxgb_osdep.h | 14 ++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 sys/dev/cxgb/cxgb_config.h diff --git a/sys/dev/cxgb/cxgb_config.h b/sys/dev/cxgb/cxgb_config.h new file mode 100644 index 000000000000..2a95f88cceee --- /dev/null +++ b/sys/dev/cxgb/cxgb_config.h @@ -0,0 +1,46 @@ +/************************************************************************** + +Copyright (c) 2007, Chelsio Inc. +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + 3. Neither the name of the Chelsio Corporation nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. + + +$FreeBSD$ + +***************************************************************************/ +#ifndef _CXGB_CONFIG_H_ +#define _CXGB_CONFIG_H_ + +#ifndef CONFIG_DEFINED +#define CONFIG_CHELSIO_T3_CORE +#define CHELSIO_FW_MAJOR 3 +#define CHELSIO_FW_MINOR 2 +#define DEFAULT_JUMBO +#endif + +#endif diff --git a/sys/dev/cxgb/cxgb_osdep.h b/sys/dev/cxgb/cxgb_osdep.h index bf4bffa64187..e3ab7c85b936 100644 --- a/sys/dev/cxgb/cxgb_osdep.h +++ b/sys/dev/cxgb/cxgb_osdep.h @@ -43,6 +43,7 @@ POSSIBILITY OF SUCH DAMAGE. #include #include +#include #ifndef _CXGB_OSDEP_H_ #define _CXGB_OSDEP_H_ @@ -102,6 +103,19 @@ struct t3_mbuf_hdr { #define rmb() __asm volatile("lfence":::"memory") #define wmb() __asm volatile("sfence" ::: "memory") #define smp_mb() mb() + +#define USE_PREFETCH +#ifdef USE_PREFETCH +#define L1_CACHE_BYTES 64 +static __inline +void prefetch(void *x) +{ + __asm volatile("prefetcht0 %0" :: "m" (*(unsigned long *)x)); +} +#else +#define prefetch(x) +#endif + #endif #define DBG_RX (1 << 0) static const int debug_flags = DBG_RX;