From owner-p4-projects@FreeBSD.ORG Sat Oct 20 19:56:53 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF2BA16A41B; Sat, 20 Oct 2007 19:56:52 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A6C8616A419 for ; Sat, 20 Oct 2007 19:56:52 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 974BD13C481 for ; Sat, 20 Oct 2007 19:56:52 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9KJuqLA042849 for ; Sat, 20 Oct 2007 19:56:52 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9KJuq1J042846 for perforce@freebsd.org; Sat, 20 Oct 2007 19:56:52 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 20 Oct 2007 19:56:52 GMT Message-Id: <200710201956.l9KJuq1J042846@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 127835 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Oct 2007 19:56:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=127835 Change 127835 by kmacy@kmacy_home:ethng on 2007/10/20 19:56:20 add iwch_provider.c to the build Affected files ... .. //depot/projects/ethng/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cxio_hal.h#3 edit .. //depot/projects/ethng/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_provider.c#1 add .. //depot/projects/ethng/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_provider.h#2 edit .. //depot/projects/ethng/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_user.h#1 add Differences ... ==== //depot/projects/ethng/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cxio_hal.h#3 (text+ko) ==== @@ -202,4 +202,16 @@ return hiBitSetTab[val & 0xff] - 1; } +#define cxfree(a) free((a), M_DEVBUF); +#define kmalloc(a, b) malloc((a), M_DEVBUF, (b)) +#define kzalloc(a, b) malloc((a), M_DEVBUF, (b)|M_ZERO) + +static inline __attribute__((const)) +unsigned long roundup_pow_of_two(unsigned long n) +{ + return 1UL << flsl(n - 1); +} + +#define PAGE_ALIGN(x) roundup2((x), PAGE_SIZE) + #endif ==== //depot/projects/ethng/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_provider.h#2 (text+ko) ==== @@ -69,12 +69,7 @@ struct t3_cq cq; spinlock_t lock; atomic_t refcnt; -#ifdef notyet - /* - * replace with a condition variable - */ - wait_queue_head_t wait; -#endif + struct cv wait; u32 __user *user_rptr_addr; }; @@ -132,16 +127,9 @@ struct t3_wq wq; spinlock_t lock; atomic_t refcnt; -#ifdef notyet - /* - * CV - */ - wait_queue_head_t wait; -#endif + struct cv wait; enum IWCH_QP_FLAGS flags; -#ifdef notyet - struct timer_list timer; -#endif + struct callout timer; }; static inline int qp_quiesced(struct iwch_qp *qhp)