cxgb3 - main header files
Subsystems (3)
PATCH 1/10 cxgb3 - main header files
From: Divy Le Ray <[email protected]>
This patch implements the main header files of
the Chelsio T3 network driver.
---
drivers/net/cxgb3/adapter.h | 255 ++++++++++++ drivers/net/cxgb3/common.h | 709 ++++++++++++++++++++++++++++++++++ drivers/net/cxgb3/cxgb3_ioctl.h | 165 ++++++++ drivers/net/cxgb3/firmware_exports.h | 144 +++++++ 4 files changed, 1273 insertions(+), 0 deletions(-)
drivers/net/cxgb3/adapter.h new file +255 -0
@@ -0,0 +1,255 @@ +/* +* This file is part of the Chelsio T3 Ethernet driver for Linux. +* +* Copyright (C) 2003-2006 Chelsio Communications. All rights reserved. +* +* This program is distributed in the hope that it will be useful, but WITHOUT +* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +* FITNESS FOR A PARTICULAR PURPOSE. See the LICENSE file included in this +* release for licensing terms and conditions. +*/ + +/* This file should not be included directly. Include common.h instead. */ + +#ifndef __T3_ADAPTER_H__ +#define __T3_ADAPTER_H__ + +#include <linux/pci.h> +#include <linux/spinlock.h> +#include <linux/interrupt.h> +#include <linux/timer.h> +#include <linux/cache.h> +#include "t3cdev.h" +#include <asm/semaphore.h> +#include <asm/bitops.h> +#include <asm/io.h> + +typedef irqreturn_t (*intr_handler_t ) (int ,void *); + +struct vlan_group ; + +struct port_info { +struct vlan_group *vlan_grp; +const struct port_type_info *port_type; +u8 port_id; +u8 rx_csum_offload; +u8 nqsets; +u8 first_qset; +struct cphy phy; +struct cmac mac; +struct link_config link_config; +struct net_device_stats netstats; +int activity; +}; + +enum {/* adapter flags */ +FULL_INIT_DONE = (1 <<0 ), +USING_MSI = (1 <<1 ), +USING_MSIX = (1 <<2 ), +}; + +struct rx_desc ; +struct rx_sw_desc ; + +struct sge_fl {/* SGE per free-buffer list state */ +unsigned int buf_size;/* size of each Rx buffer */ +unsigned int credits;/* # of available Rx buffers */ +unsigned int size;/* capacity of free list */ +unsigned int cidx;/* consumer index */ +unsigned int pidx;/* producer index */ +unsigned int gen;/* free list generation */ +struct rx_desc *desc;/* address of HW Rx descriptor ring */ +struct rx_sw_desc *sdesc;/* address of SW Rx descriptor ring */ +dma_addr_t phys_addr;/* physical address of HW ring start */ +unsigned int cntxt_id;/* SGE context id for the free list */ +unsigned long empty;/* # of times queue ran out of buffers */ +}; + +/* +* Bundle size for grouping offload RX packets for delivery to the stack. +* Don't make this too big as we do prefetch on each packet in a bundle. +*/ +# define RX_BUNDLE_SIZE 8 + +struct rsp_desc ; + +struct sge_rspq {/* state for an SGE response queue */ +unsigned int credits;/* # of pending response credits */ +unsigned int size;/* capacity of response queue */ +unsigned int cidx;/* consumer index */ +unsigned int gen;/* current generation bit */ +unsigned int polling;/* is the queue serviced through NAPI? */ +unsigned int holdoff_tmr;/* interrupt holdoff timer in 100ns */ +unsigned int next_holdoff;/* holdoff time for next interrupt */ +struct rsp_desc *desc;/* address of HW response ring */ +dma_addr_t phys_addr;/* physical address of the ring */ +unsigned int cntxt_id;/* SGE context id for the response q */ +spinlock_t lock;/* guards response processing */ +struct sk_buff *rx_head;/* offload packet receive queue head */ +struct sk_buff *rx_tail;/* offload packet receive queue tail */ + +unsigned long offload_pkts; +unsigned long offload_bundles; +unsigned long eth_pkts;/* # of ethernet packets */ +unsigned long pure_rsps;/* # of pure (non-data) responses */ +unsigned long imm_data;/* responses with immediate data */ +unsigned long rx_drops;/* # of packets dropped due to no mem */ +unsigned long async_notif;/* # of asynchronous notification events */ +unsigned long empty;/* # of times queue ran out of credits */ +unsigned long nomem;/* # of responses deferred due to no mem */ +unsigned long unhandled_irqs;/* # of spurious intrs */ +}; + +struct tx_desc ; +struct tx_sw_desc ; + +struct sge_txq {/* state for an SGE Tx queue */ +unsigned long flags;/* HW DMA fetch status */ +unsigned int in_use;/* # of in-use Tx descriptors */ +unsigned int size;/* # of descriptors */ +unsigned int processed;/* total # of descs HW has processed */ +unsigned int cleaned;/* total # of descs SW has reclaimed */ +unsigned int stop_thres;/* SW TX queue suspend threshold */ +unsigned int cidx;/* consumer index */ +unsigned int pidx;/* producer index */ +unsigned int gen;/* current value of generation bit */ +unsigned int unacked;/* Tx descriptors used since last COMPL */ +struct tx_desc *desc;/* address of HW Tx descriptor ring */ +struct tx_sw_desc *sdesc;/* address of SW Tx descriptor ring */ +spinlock_t lock;/* guards enqueueing of new packets */ +unsigned int token;/* WR token */ +dma_addr_t phys_addr;/* physical address of the ring */ +struct sk_buff_head sendq;/* List of backpressured offload packets */ +struct tasklet_struct qresume_tsk;/* restarts the queue */ +unsigned int cntxt_id;/* SGE context id for the Tx q */ +unsigned long stops;/* # of times q has been stopped */ +unsigned long restarts;/* # of queue restarts */ +}; + +enum {/* per port SGE statistics */ +SGE_PSTAT_TSO ,/* # of TSO requests */ +SGE_PSTAT_RX_CSUM_GOOD ,/* # of successful RX csum offloads */ +SGE_PSTAT_TX_CSUM ,/* # of TX checksum offloads */ +SGE_PSTAT_VLANEX ,/* # of VLAN tag extractions */ +SGE_PSTAT_VLANINS ,/* # of VLAN tag insertions */ + +SGE_PSTAT_MAX /* must be last */ +}; + +struct sge_qset {/* an SGE queue set */ +struct sge_rspq rspq; +struct sge_fl fl[SGE_RXQ_PER_SET ]; +struct sge_txq txq[SGE_TXQ_PER_SET ]; +struct net_device *netdev;/* associated net device */ +unsigned long txq_stopped;/* which Tx queues are stopped */ +struct timer_list tx_reclaim_timer;/* reclaims TX buffers */ +unsigned long port_stats[SGE_PSTAT_MAX ]; +}____cacheline_aligned ; + +struct sge { +struct sge_qset qs[SGE_QSETS ]; +spinlock_t reg_lock;/* guards non-atomic SGE registers (eg context) */ +}; + +struct adapter { +struct t3cdev tdev; +struct list_head adapter_list; +void __iomem *regs; +struct pci_dev *pdev; +unsigned long registered_device_map; +unsigned long open_device_map; +unsigned long flags; + +const char *name; +int msg_enable; +unsigned int mmio_len; + +struct adapter_params params; +unsigned int slow_intr_mask; +unsigned long irq_stats[IRQ_NUM_STATS ]; + +struct { +unsigned short vec; +char desc[22 ]; + } msix_info[SGE_QSETS +1 ]; + +/* T3 modules */ +struct sge sge; +struct mc7 pmrx; +struct mc7 pmtx; +struct mc7 cm; +struct mc5 mc5; + +struct net_device *port[MAX_NPORTS ]; +unsigned int check_task_cnt; +struct delayed_work adap_check_task; +struct work_struct ext_intr_handler_task; + +/* +* Dummy netdevices are needed when using multiple receive queues with +* NAPI as each netdevice can service only one queue. +*/ +struct net_device *dummy_netdev[SGE_QSETS -1 ]; + +struct dentry *debugfs_root; + +struct mutex mdio_lock; +spinlock_t stats_lock; +spinlock_t work_lock; +}; + +static inline u32 t3_read_reg (struct adapter *adapter,u32 reg_addr) +{ +u32 val =readl (adapter->regs + reg_addr); + +CH_DBG (adapter,MMIO ,"read register 0x%x value 0x%x\n" , reg_addr, val); +return val; +} + +static inline void t3_write_reg (struct adapter *adapter,u32 reg_addr,u32 val) +{ +CH_DBG (adapter,MMIO ,"setting register 0x%x to 0x%x\n" , reg_addr, val); +writel (val, adapter->regs + reg_addr); +} + +static inline struct port_info *adap2pinfo (struct adapter *adap,int idx) +{ +return netdev_priv (adap->port[idx]); +} + +/* +* We use the spare atalk_ptr to map a net device to its SGE queue set. +* This is a macro so it can be used as l-value. +*/ +#define dev2qset (netdev) ((netdev)->atalk_ptr) + +#define OFFLOAD_DEVMAP_BIT 15 + +#define tdev2adap (d) container_of(d, struct adapter, tdev) + +static inline int offload_running (struct adapter *adapter) +{ +return test_bit (OFFLOAD_DEVMAP_BIT , &adapter->open_device_map); +} + +int t3_offload_tx (struct t3cdev *tdev,struct sk_buff *skb); + +void t3_os_ext_intr_handler (struct adapter *adapter); +void t3_os_link_changed (struct adapter *adapter,int port_id,int link_status, +int speed,int duplex,int fc); + +void t3_sge_start (struct adapter *adap); +void t3_sge_stop (struct adapter *adap); +void t3_free_sge_resources (struct adapter *adap); +void t3_sge_err_intr_handler (struct adapter *adapter); +intr_handler_t t3_intr_handler (struct adapter *adap,int polling); +int t3_eth_xmit (struct sk_buff *skb,struct net_device *dev); +void t3_update_qset_coalesce (struct sge_qset *qs,const struct qset_params *p); +int t3_sge_alloc_qset (struct adapter *adapter,unsigned int id,int nports, +int irq_vec_idx,const struct qset_params *p, +int ntxq,struct net_device *netdev); +int t3_get_desc (const struct sge_qset *qs,unsigned int qnum,unsigned int idx, +unsigned char *data); +irqreturn_t t3_sge_intr_msix (int irq,void *cookie); + +#endif /* __T3_ADAPTER_H__ */
drivers/net/cxgb3/common.h new file +709 -0
709 lines not on this page · raw message
drivers/net/cxgb3/cxgb3_ioctl.h new file +165 -0
165 lines not on this page · raw message
drivers/net/cxgb3/firmware_exports.h new file +144 -0
144 lines not on this page · raw message
Quoted 6 lines · Divy Le Ray
From: Divy Le Ray <[email protected]>
This patch implements the main header files of
the Chelsio T3 network driver.Signed-off-by Divy Le Ray <[email protected]>
Once you think it's ready, email me a URL to a single patch that adds the driver to the latest linux-2.6.git kernel. Include in the email a description of the driver and signed-off-by line, which will get directly included in the git changelog.
Adding new drivers is a bit special, because we want to merge it as a single changeset, but that would create a patch too large to review on the common kernel mailing lists.
Jeff
Jeff,
You can grab the monolithic patch at this URL:
http://service.chelsio.com/kernel.org/cxgb3.patch.bz2
This patch adds support for the latest 1G/10G Chelsio adapter, T3. It is required by the T3 RDMA driver Steve Wise submitted.
Here is a brief description of its content:
drivers/net/cxgb3/adapter.h,drivers/net/cxgb3/common.h,drivers/net/cxgb3/cxgb3_ioctl.h,drivers/net/cxgb3/firmware_exports.h:
main header files
drivers/net/cxgb3/cxgb3_main.c
main source file
drivers/net/cxgb3/t3_hw.c
HW access routines
drivers/net/cxgb3/sge.c,drivers/net/cxgb3/sge_defs.h
scatter/gather engine
drivers/net/cxgb3/ael1002.c,drivers/net/cxgb3/mc5.c,drivers/net/cxgb3/vsc8211.c,drivers/net/cxgb3/xgmac.c
on board memory, MAC and PHY management
drivers/net/cxgb3/cxgb3_ctl_defs.h, drivers/net/cxgb3/cxgb3_defs.h, drivers/net/cxgb3/cxgb3_offload.h, drivers/net/cxgb3/l2t.h, drivers/net/cxgb3/t3_cpl.h, drivers/net/cxgb3/t3cdev.h
offload operations header files
drivers/net/cxgb3/cxgb3_offload.c,drivers/net/cxgb3/l2t.c
offload capabilities
drivers/net/cxgb3/regs.h
register definitions
drivers/net/Kconfigdrivers/net/Makefiledrivers/net/cxgb3/Makefiledrivers/net/cxgb3/version.h
build files and versioning
---
Quoted 7 lines · Divy Le Ray
Jeff,
You can grab the monolithic patch at this URL:
http://service.chelsio.com/kernel.org/cxgb3.patch.bz2This patch adds support for the latest 1G/10G Chelsio adapter, T3. It is required by the T3 RDMA driver Steve Wise submitted.
does this patch still contain all the private ioctls? They are being ripped out from another new driver, and cxgb3 should probably have the same treatment...
Quoted 11 lines · Jeff Garzik
Quoted 6 lines · Divy Le Ray
From: Divy Le Ray <[email protected]>
This patch implements the main header files of
the Chelsio T3 network driver.Signed-off-by Divy Le Ray <[email protected]>Once you think it's ready, email me a URL to a single patch that adds the driver to the latest linux-2.6.git kernel. Include in the email a description of the driver and signed-off-by line, which will get directly included in the git changelog.
Adding new drivers is a bit special, because we want to merge it as a single changeset, but that would create a patch too large to review on the common kernel mailing lists.
Jeff,
You can grab the monolithic patch at this URL:
http://service.chelsio.com/kernel.org/cxgb3.patch.bz2
This patch adds support for the latest 1G/10G Chelsio adapter, T3. It is required by the T3 RDMA driver Steve Wise submitted.
Here is a brief description of its content:
drivers/net/cxgb3/adapter.h,drivers/net/cxgb3/common.h,drivers/net/cxgb3/cxgb3_ioctl.h,drivers/net/cxgb3/firmware_exports.h:
main header files
drivers/net/cxgb3/cxgb3_main.c
main source file
drivers/net/cxgb3/t3_hw.c
HW access routines
drivers/net/cxgb3/sge.c,drivers/net/cxgb3/sge_defs.h
scatter/gather engine
drivers/net/cxgb3/ael1002.c,drivers/net/cxgb3/mc5.c,drivers/net/cxgb3/vsc8211.c,drivers/net/cxgb3/xgmac.c
on board memory, MAC and PHY management
drivers/net/cxgb3/cxgb3_ctl_defs.h, drivers/net/cxgb3/cxgb3_defs.h, drivers/net/cxgb3/cxgb3_offload.h, drivers/net/cxgb3/l2t.h, drivers/net/cxgb3/t3_cpl.h, drivers/net/cxgb3/t3cdev.h
offload operations header files
drivers/net/cxgb3/cxgb3_offload.c,drivers/net/cxgb3/l2t.c
offload capabilities
drivers/net/cxgb3/regs.h
register definitions
drivers/net/Kconfigdrivers/net/Makefiledrivers/net/cxgb3/Makefiledrivers/net/cxgb3/version.h
build files and versioning
---
Quoted 9 lines · Divy Le Ray
Quoted 8 lines · Jeff Garzik
Quoted 6 lines · Divy Le Ray
From: Divy Le Ray <[email protected]>
This patch implements the main header files of
the Chelsio T3 network driver.Signed-off-by Divy Le Ray <[email protected]>
Quoted 7 lines
Quoted 3 lines
Once you think it's ready, email me a URL to a single patch that adds the driver to the latest linux-2.6.git kernel. Include in the email a description of the driver and signed-off-by line, which will get directly included in the git changelog.
Adding new drivers is a bit special, because we want to merge it as a single changeset, but that would create a patch too large to review on the common kernel mailing lists.
Jeff,
You can grab the monolithic patch at this URL:
http://service.chelsio.com/kernel.org/cxgb3.patch.bz2
this is in my queue, thanks. Sorry I didn't indicate that earlier.
Jeff
Roland,
The T3 Ethernet driver is queued for inclusion into Jeff's tree.
How do you want to merge in the RDMA driver? I can give you a single monolithic patch if you want.
We also need to decide on the ib_req_notify_cq() issue.
Steve.
Quoted 29 lines · Jeff Garzik
Quoted 14 lines · Divy Le Ray
Quoted 13 lines · Jeff Garzik
Quoted 6 lines · Divy Le Ray
From: Divy Le Ray <[email protected]>
This patch implements the main header files of
the Chelsio T3 network driver.Signed-off-by Divy Le Ray <[email protected]>Once you think it's ready, email me a URL to a single patch that adds the driver to the latest linux-2.6.git kernel. Include in the email a description of the driver and signed-off-by line, which will get directly included in the git changelog.
Quoted 7 lines
Quoted 3 lines
Adding new drivers is a bit special, because we want to merge it as a single changeset, but that would create a patch too large to review on the common kernel mailing lists.
Jeff,
You can grab the monolithic patch at this URL:
http://service.chelsio.com/kernel.org/cxgb3.patch.bz2this is in my queue, thanks. Sorry I didn't indicate that earlier.
Jeff
Quoted 1 line
We also need to decide on the
ib_req_notify_cq()issue.
Let's clarify - do you oppose doing copy_from_user from a fixed address passed in during setup?
If OK with you, this seems the best way as it is the least controversial and least disruptive one.
Signature · 1 line
MST
Quoted 5 lines · Michael S. Tsirkin
Quoted 1 line
We also need to decide on the
ib_req_notify_cq()issue.Let's clarify - do you oppose doing
copy_from_userfrom a fixed address passed in during setup?
So far its been you and I arguing over this issue. Before I go implement it and retest everything, I'd like some indication that anyone else thinks its the right thing to do vs adding the extra parameter to ib_req_notify_cq().
Quoted 3 lines
If OK with you, this seems the best way as it is the least controversial and least disruptive one.
In the interest of expediting this I'll go implement it...
Steve.
Quoted 6 lines
In the interest of expediting this I'll go implement it...
Steve.
Here it is. I think this is the correct way to solve the issue (now that I've implemented it :). This is a delta from the driver patch series just for reviewing purposes.
commit e6053f2aee764b21e28cbb19f52995cb413cf733
Author: Steve Wise <[email protected]> Date: Tue Jan 9 13:06:13 2007 -0600
Chelsio-specific solution for copying in the user cq_index.
- at cq_create time, user lib passes in the address of its cq rptr u32.
- kernel saves this address in the iwch_cq struct.
- kernel copies in the rptr value in iwch_req_notify_cq().
drivers/infiniband/hw/cxgb3/iwch_provider.c +14 -6
@@ -143,6 +143,7 @@ static struct ib_cq *iwch_create_cq(strustruct iwch_dev *rhp;struct iwch_cq *chp;struct iwch_create_cq_resp uresp; +struct iwch_create_cq_req ureq;PDBG ("%s ib_dev %p entries %d\n" , __FUNCTION__, ibdev, entries); rhp =to_iwch_dev (ibdev);
@@ -150,6 +151,14 @@ static struct ib_cq *iwch_create_cq(struif (!chp)return ERR_PTR (-ENOMEM ); +if (context) { +if (ib_copy_from_udata (&ureq, udata,sizeof (ureq))) { +kfree (chp); +return ERR_PTR (-EFAULT ); + } + chp->user_rptr_addr = (u32 *)(unsigned long )ureq.user_rptr_addr; + } +if (t3a_device (rhp)) {/*
@@ -269,15 +278,14 @@ static int iwch_resize_cq(struct ib_cq *return ret; } -static int iwch_arm_cq (struct ib_cq *ibcq,enum ib_cq_notify notify, -struct ib_udata *udata) +static int iwch_arm_cq (struct ib_cq *ibcq,enum ib_cq_notify notify) {struct iwch_dev *rhp;struct iwch_cq *chp;enum t3_cq_opcode cq_op;int err;unsigned long flag; -struct iwch_req_notify_cq ucmd; +u32 rptr; chp =to_iwch_cq (ibcq); rhp = chp->rhp;
@@ -285,11 +293,11 @@ static int iwch_arm_cq(struct ib_cq *ibc cq_op =CQ_ARM_SE ; else cq_op =CQ_ARM_AN ; -if (udata &&t3b_device (rhp)) { -if (ib_copy_from_udata (&ucmd, udata,sizeof ucmd)) +if (chp->user_rptr_addr) { +if (get_user (rptr, chp->user_rptr_addr))return -EFAULT ;spin_lock_irqsave (&chp->lock, flag); - chp->cq.rptr = ucmd.rptr; + chp->cq.rptr = rptr; }else spin_lock_irqsave (&chp->lock, flag);PDBG ("%s rptr 0x%x\n" , __FUNCTION__, chp->cq.rptr);
drivers/infiniband/hw/cxgb3/iwch_provider.h +1 -0
@@ -105,6 +105,7 @@ struct iwch_cq {spinlock_t lock;atomic_t refcnt;wait_queue_head_t wait; +u32 *user_rptr_addr; };static inline struct iwch_cq *to_iwch_cq (struct ib_cq *ibcq)
drivers/infiniband/hw/cxgb3/iwch_user.h +3 -4
@@ -42,6 +42,9 @@ #define IWCH_UVERBS_ABI_VERSION 1* In particular do not use pointer types -- pass pointers in __u64 * instead. */ +struct iwch_create_cq_req { +__u64 user_rptr_addr; +};struct iwch_create_cq_resp {__u64 physaddr;
@@ -61,8 +64,4 @@ struct iwch_create_qp_resp {struct iwch_reg_user_mr_resp {__u32 pbl_addr; }; - -struct iwch_req_notify_cq { -__u32 rptr; -};#endif
Quoted 12 lines
-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Michael S. Tsirkin
Sent: Tuesday, January 09, 2007 5:57 AM
To: Steve Wise
Cc: [email protected]; Roland Dreier; Divy Le Ray; [email protected]; openib-general
Subject: Re: [openib-general] [PATCH 1/10] cxgb3 - main header files
Quoted 8 lines
Quoted 1 line
We also need to decide on the
ib_req_notify_cq()issue.Let's clarify - do you oppose doing
copy_from_userfrom a fixed address passed in during setup?If OK with you, this seems the best way as it is the least controversial and least disruptive one.
To clarfiy my understanding of this issue:
A device MAY implement ib_req_notify_cq by updating a location directly from user mode. Any of the techniques that apply to other user allocated objects, such as the Send Queue, can be applied here.
Even those the proposed changes would be about as low impact and benign as possible, the fact that there are valid solutions without an API changes leans heavily towards using those solutions.
Quoted 4 lines
Quoted 2 lines
You can grab the monolithic patch at this URL:
http://service.chelsio.com/kernel.org/cxgb3.patch.bz2this is in my queue, thanks. Sorry I didn't indicate that earlier.
When do you plan to merge it? For 2.6.20 or .21?
I'm trying to understand when the RDMA stuff that depends on the ethernet driver can be merged.
Thanks,
Roland
Quoted 6 lines · Roland Dreier
Quoted 4 lines
Quoted 2 lines
You can grab the monolithic patch at this URL:
http://service.chelsio.com/kernel.org/cxgb3.patch.bz2this is in my queue, thanks. Sorry I didn't indicate that earlier.
When do you plan to merge it? For 2.6.20 or .21?
The time for adding new stuff to 2.6.20 is /long/ past. We stop adding things like new drivers when Linus releases 2.6.X-rc1.
Jeff
Quoted 2 lines
The time for adding new stuff to 2.6.20 is /long/ past. We stop adding things like new drivers when Linus releases 2.6.X-rc1.
Well, in the past I think new drivers have been added after the merge window, given that there's no chance of regressions (old kernel == no support for device X, so even if the new driver is buggy it's no worse than the old kernel). (eg a quick git scan shows commit 0f64478c added a USB driver between 2.6.19-rc2 and 2.6.19-rc3, and I'm sure you can find lots of other examples)
Anyway, you answered my question. I wasn't pushing to include the driver now, I just wanted to know what you were planning to do.
Thanks.
- R.
Jeff Garzik
AppliedQuoted 9 lines · Divy Le Ray
Quoted 8 lines · Jeff Garzik
Quoted 6 lines · Divy Le Ray
From: Divy Le Ray <[email protected]>
This patch implements the main header files of
the Chelsio T3 network driver.Signed-off-by Divy Le Ray <[email protected]>
Quoted 7 lines
Quoted 3 lines
Once you think it's ready, email me a URL to a single patch that adds the driver to the latest linux-2.6.git kernel. Include in the email a description of the driver and signed-off-by line, which will get directly included in the git changelog.
Adding new drivers is a bit special, because we want to merge it as a single changeset, but that would create a patch too large to review on the common kernel mailing lists.
Jeff,
You can grab the monolithic patch at this URL:
http://service.chelsio.com/kernel.org/cxgb3.patch.bz2
applied to netdev-2.6.git#upstream
I'm really counting on Chelsio to actively maintain this driver, unlike the abandonware you guys first submitted.
Jeff