enic: updates
Subsystems (2)
cover enic: updates
The following series implements updates to the enic netdev driver for Cisco's 10G Ethernet NIC:
01 enic: add support for multiple BARs
02 enic: workaround A0 erratum
03 enic: bug fix: split TSO fragments larger than 16K into
multiple descs
04 enic: use netdev_alloc_skb
05 enic: bug fix: protect fw call i/f with spinlock
06 enic: bug fix: included MAC drops in rx_dropped netstat 07 enic: provision for multiple Rx/Tx queues; prepare for RSS support 08 enic: bug fix: enable VLAN filtering
09 enic: changes to driver/firmware interface
10 enic: bug fix: check for zero port MTU before posting warning 11 enic: organize device initialization/deinit into separate functions
Please apply.
PATCH 1/11 enic: add support for multiple BARs
enic: add support for multiple BARs
Nic firmware can place resources (queues, intrs, etc) on multiple BARs, so allow driver to discover/map resources beyond BAR0.
--- drivers/net/enic/enic.h | 8 ++++--- drivers/net/enic/enic_main.c | 48 +++++++++++++++++++++--------------------- drivers/net/enic/vnic_dev.c | 41 +++++++++++++++++++++++++++++------- drivers/net/enic/vnic_dev.h | 5 ++++ 4 files changed, 66 insertions(+), 36 deletions(-)
drivers/net/enic/enic.h +5 -3
@@ -33,13 +33,15 @@#define DRV_NAME "enic"#define DRV_DESCRIPTION "Cisco 10G Ethernet Driver" -#define DRV_VERSION "1.0.0.933" -#define DRV_COPYRIGHT "Copyright 2008 Cisco Systems, Inc" +#define DRV_VERSION "1.1.0.100" +#define DRV_COPYRIGHT "Copyright 2008-2009 Cisco Systems, Inc"#define PFX DRV_NAME ": "#define ENIC_LRO_MAX_DESC 8#define ENIC_LRO_MAX_AGGR 64 +#define ENIC_BARS_MAX 6 +enum enic_cq_index {ENIC_CQ_RQ ,ENIC_CQ_WQ ,
@@ -73,7 +75,7 @@ struct enic {struct net_device *netdev;struct pci_dev *pdev;struct vnic_enet_config config; -struct vnic_dev_bar bar0; +struct vnic_dev_bar bar[ENIC_BARS_MAX ];struct vnic_dev *vdev;struct timer_list notify_timer;struct work_struct reset;
drivers/net/enic/enic_main.c +24 -24
73 lines not on this page · raw message
drivers/net/enic/vnic_dev.c +33 -8
105 lines not on this page · raw message
drivers/net/enic/vnic_dev.h +4 -1
@@ -75,6 +75,8 @@ unsigned int vnic_dev_get_res_count(struct vnic_dev *vdev, enum vnic_res_type type);void __iomem *vnic_dev_get_res (struct vnic_dev *vdev,enum vnic_res_type type,unsigned int index); +dma_addr_t vnic_dev_get_res_bus_addr (struct vnic_dev *vdev, +enum vnic_res_type type,unsigned int index);unsigned int vnic_dev_desc_ring_size (struct vnic_dev_ring *ring,unsigned int desc_count,unsigned int desc_size);void vnic_dev_clear_desc_ring (struct vnic_dev_ring *ring);
@@ -117,6 +119,7 @@ void vnic_dev_set_intr_mode(struct vnic_dev *vdev,enum vnic_dev_intr_mode vnic_dev_get_intr_mode (struct vnic_dev *vdev);void vnic_dev_unregister (struct vnic_dev *vdev);struct vnic_dev *vnic_dev_register (struct vnic_dev *vdev, -void *priv,struct pci_dev *pdev,struct vnic_dev_bar *bar); +void *priv,struct pci_dev *pdev,struct vnic_dev_bar *bar, +unsigned int num_bars);#endif /* _VNIC_DEV_H_ */
PATCH 2/11 enic: workaround A0 erratum
In reply to Scott Feldmanenic: workaround A0 erratum
A0 revision ASIC has an erratum on the RQ desc cache on chip where the cache can become corrupted causing pkt buf writes to wrong locations. The s/w workaround is to post a dummy RQ desc in the ring every 32 descs, causing a flush of the cache. A0 parts are not production, but there are enough of these parts in the wild in test setups to warrant including workaround. A1 revision ASIC parts fix erratum.
--- drivers/net/enic/enic_main.c | 50 +++++++++++++++++++++++++++++++++++++++--- drivers/net/enic/vnic_dev.c | 19 ++++++++++++++++ drivers/net/enic/vnic_dev.h | 8 +++++++ drivers/net/enic/vnic_rq.h | 7 +++++- 4 files changed, 80 insertions(+), 4 deletions(-)
drivers/net/enic/enic_main.c +47 -3
@@ -850,6 +850,50 @@ static int enic_rq_alloc_buf(struct vnic_rq *rq)return 0 ; } +static int enic_rq_alloc_buf_a1 (struct vnic_rq *rq) +{ +struct rq_enet_desc *desc =vnic_rq_next_desc (rq); + +if (vnic_rq_posting_soon (rq)) { + +/* SW workaround for A0 HW erratum: if we're just about +* to write posted_index, insert a dummy desc +* of type resvd +*/ + +rq_enet_desc_enc (desc,0 ,RQ_ENET_TYPE_RESV2 ,0 ); +vnic_rq_post (rq,0 ,0 ,0 ,0 ); + }else { +return enic_rq_alloc_buf (rq); + } + +return 0 ; +} + +static int enic_set_rq_alloc_buf (struct enic *enic) +{ +enum vnic_dev_hw_version hw_ver; +int err; + + err =vnic_dev_hw_version (enic->vdev, &hw_ver); +if (err) +return err; + +switch (hw_ver) { +case VNIC_DEV_HW_VER_A1 : + enic->rq_alloc_buf = enic_rq_alloc_buf_a1; +break ; +case VNIC_DEV_HW_VER_A2 : +case VNIC_DEV_HW_VER_UNKNOWN : + enic->rq_alloc_buf = enic_rq_alloc_buf; +break ; +default : +return -ENODEV ; + } + +return 0 ; +} +static int enic_get_skb_header (struct sk_buff *skb,void **iphdr,void **tcph,u64 *hdr_flags,void *priv) {
@@ -1057,7 +1101,7 @@ static int enic_poll(struct napi_struct *napi, int budget)/* Replenish RQ */ -vnic_rq_fill (&enic->rq[0 ], enic_rq_alloc_buf); +vnic_rq_fill (&enic->rq[0 ], enic->rq_alloc_buf); }else {
@@ -1092,7 +1136,7 @@ static int enic_poll_msix(struct napi_struct *napi, int budget)/* Replenish RQ */ -vnic_rq_fill (&enic->rq[0 ], enic_rq_alloc_buf); +vnic_rq_fill (&enic->rq[0 ], enic->rq_alloc_buf);/* Return intr event credits for this polling * cycle. An intr event is the completion of a
@@ -1268,7 +1312,7 @@ static int enic_open(struct net_device *netdev) }for (i =0 ; i < enic->rq_count; i++) { - err =vnic_rq_fill (&enic->rq[i], enic_rq_alloc_buf); + err =vnic_rq_fill (&enic->rq[i], enic->rq_alloc_buf);if (err) { printk(KERN_ERR PFX "%s: Unable to alloc receive buffers.\n",
drivers/net/enic/vnic_dev.c +19 -0
@@ -349,6 +349,25 @@ int vnic_dev_fw_info(struct vnic_dev *vdev,return err; } +int vnic_dev_hw_version (struct vnic_dev *vdev,enum vnic_dev_hw_version *hw_ver) +{ +struct vnic_devcmd_fw_info *fw_info; +int err; + + err =vnic_dev_fw_info (vdev, &fw_info); +if (err) +return err; + +if (strncmp (fw_info->hw_version,"A1" ,sizeof ("A1" )) ==0 ) + *hw_ver =VNIC_DEV_HW_VER_A1 ; +else if (strncmp (fw_info->hw_version,"A2" ,sizeof ("A2" )) ==0 ) + *hw_ver =VNIC_DEV_HW_VER_A2 ; +else + *hw_ver =VNIC_DEV_HW_VER_UNKNOWN ; + +return 0 ; +} +int vnic_dev_spec (struct vnic_dev *vdev,unsigned int offset,unsigned int size,void *value) {
drivers/net/enic/vnic_dev.h +8 -0
@@ -41,6 +41,12 @@ static inline void writeq(u64 val, void __iomem *reg) }#endif +enum vnic_dev_hw_version { +VNIC_DEV_HW_VER_UNKNOWN , +VNIC_DEV_HW_VER_A1 , +VNIC_DEV_HW_VER_A2 , +}; +enum vnic_dev_intr_mode {VNIC_DEV_INTR_MODE_UNKNOWN ,VNIC_DEV_INTR_MODE_INTX ,
@@ -88,6 +94,8 @@ int vnic_dev_cmd(struct vnic_dev *vdev, enum vnic_devcmd_cmd cmd, u64 *a0, u64 *a1, int wait);int vnic_dev_fw_info (struct vnic_dev *vdev,struct vnic_devcmd_fw_info **fw_info); +int vnic_dev_hw_version (struct vnic_dev *vdev, +enum vnic_dev_hw_version *hw_ver);int vnic_dev_spec (struct vnic_dev *vdev,unsigned int offset,unsigned int size,void *value);int vnic_dev_stats_clear (struct vnic_dev *vdev);
drivers/net/enic/vnic_rq.h +6 -1
@@ -143,6 +143,11 @@ static inline void vnic_rq_post(struct vnic_rq *rq, } } +static inline int vnic_rq_posting_soon (struct vnic_rq *rq) +{ +return ((rq->to_use->index &VNIC_RQ_RETURN_RATE ) ==0 ); +} +static inline void vnic_rq_return_descs (struct vnic_rq *rq,unsigned int count) { rq->ring.desc_avail += count;
@@ -186,7 +191,7 @@ static inline int vnic_rq_fill(struct vnic_rq *rq, {int err; -while (vnic_rq_desc_avail (rq) >1 ) { +while (vnic_rq_desc_avail (rq) >0 ) { err = (*buf_fill)(rq);if (err)
PATCH 3/11 enic: bug fix: split TSO fragments larger than 16K into multiple descs
In reply to Scott Feldmanenic: bug fix: split TSO fragments larger than 16K into multiple descs
enic WQ desc supports a maximum 16K buf size, so split any send fragments larger than 16K into several descs.
--- drivers/net/enic/enic_main.c | 87 +++++++++++++++++++++++++++++++++--------- 1 files changed, 69 insertions(+), 18 deletions(-)
drivers/net/enic/enic_main.c +69 -18
@@ -44,10 +44,15 @@#include "enic.h" #define ENIC_NOTIFY_TIMER_PERIOD (2 * HZ) +#define WQ_ENET_MAX_DESC_LEN (1 << WQ_ENET_LEN_BITS) +#define MAX_TSO (1 << 16) +#define ENIC_DESC_MAX_SPLITS (MAX_TSO / WQ_ENET_MAX_DESC_LEN + 1) + +#define PCI_DEVICE_ID_CISCO_VIC_ENET 0x0043/* ethernet vnic */ /* Supported devices */ static struct pci_device_id enic_id_table[] = { - {PCI_VDEVICE (CISCO ,0x0043 ) }, + {PCI_VDEVICE (CISCO ,PCI_DEVICE_ID_CISCO_VIC_ENET ) }, {0 , }/* end of table */ };
@@ -310,7 +315,8 @@ static int enic_wq_service(struct vnic_dev *vdev, struct cq_desc *cq_desc, opaque);if (netif_queue_stopped (enic->netdev) && -vnic_wq_desc_avail (&enic->wq[q_number]) >=MAX_SKB_FRAGS +1 ) +vnic_wq_desc_avail (&enic->wq[q_number]) >= + (MAX_SKB_FRAGS +ENIC_DESC_MAX_SPLITS ))netif_wake_queue (enic->netdev);spin_unlock (&enic->wq_lock[q_number]);
@@ -525,7 +531,11 @@ static inline void enic_queue_wq_skb_vlan(struct enic *enic,unsigned int len_left = skb->len - head_len;int eop = (len_left ==0 ); -/* Queue the main skb fragment */ +/* Queue the main skb fragment. The fragments are no larger +* than max MTU(9000)+ETH_HDR_LEN(14) bytes, which is less +* than WQ_ENET_MAX_DESC_LEN length. So only one descriptor +* per fragment is queued. +*/ enic_queue_wq_desc(wq, skb, pci_map_single(enic->pdev, skb->data, head_len, PCI_DMA_TODEVICE),
@@ -547,7 +557,11 @@ static inline void enic_queue_wq_skb_csum_l4(struct enic *enic,unsigned int csum_offset = hdr_len + skb->csum_offset;int eop = (len_left ==0 ); -/* Queue the main skb fragment */ +/* Queue the main skb fragment. The fragments are no larger +* than max MTU(9000)+ETH_HDR_LEN(14) bytes, which is less +* than WQ_ENET_MAX_DESC_LEN length. So only one descriptor +* per fragment is queued. +*/ enic_queue_wq_desc_csum_l4(wq, skb, pci_map_single(enic->pdev, skb->data, head_len, PCI_DMA_TODEVICE),
@@ -565,10 +579,14 @@ static inline void enic_queue_wq_skb_tso(struct enic *enic, struct vnic_wq *wq, struct sk_buff *skb, unsigned int mss, int vlan_tag_insert, unsigned int vlan_tag) { - unsigned int head_len = skb_headlen(skb); -unsigned int len_left = skb->len - head_len; + unsigned int frag_len_left = skb_headlen(skb); +unsigned int len_left = skb->len - frag_len_left;unsigned int hdr_len =skb_transport_offset (skb) +tcp_hdrlen (skb);int eop = (len_left ==0 ); +unsigned int len; +dma_addr_t dma_addr; +unsigned int offset =0 ; +skb_frag_t *frag;/* Preload TCP csum field with IP pseudo hdr calculated * with IP length set to zero. HW will later add in length
@@ -584,17 +602,49 @@ static inline void enic_queue_wq_skb_tso(struct enic *enic, &ipv6_hdr(skb)->daddr, 0, IPPROTO_TCP, 0); } -/* Queue the main skb fragment */ -enic_queue_wq_desc_tso (wq, skb, -pci_map_single (enic->pdev, skb->data, - head_len,PCI_DMA_TODEVICE ), - head_len, - mss, hdr_len, - vlan_tag_insert, vlan_tag, - eop); +/* Queue WQ_ENET_MAX_DESC_LEN length descriptors +* for the main skb fragment +*/ +while (frag_len_left) { + len =min (frag_len_left, (unsigned int )WQ_ENET_MAX_DESC_LEN ); + dma_addr =pci_map_single (enic->pdev, skb->data + offset, + len,PCI_DMA_TODEVICE ); +enic_queue_wq_desc_tso (wq, skb, + dma_addr, + len, + mss, hdr_len, + vlan_tag_insert, vlan_tag, + eop && (len == frag_len_left)); + frag_len_left -= len; + offset += len; + } -if (!eop) -enic_queue_wq_skb_cont (enic, wq, skb, len_left); +if (eop) +return ; + +/* Queue WQ_ENET_MAX_DESC_LEN length descriptors +* for additional data fragments +*/ +for (frag =skb_shinfo (skb)->frags; len_left; frag++) { + len_left -= frag->size; + frag_len_left = frag->size; + offset = frag->page_offset; + +while (frag_len_left) { + len =min (frag_len_left, + (unsigned int )WQ_ENET_MAX_DESC_LEN ); + dma_addr =pci_map_page (enic->pdev, frag->page, + offset, len, +PCI_DMA_TODEVICE ); +enic_queue_wq_desc_cont (wq, skb, + dma_addr, + len, + (len_left ==0 ) && + (len == frag_len_left));/* EOP? */ + frag_len_left -= len; + offset += len; + } + } } static inline void enic_queue_wq_skb(struct enic *enic,
@@ -647,7 +697,8 @@ static int enic_hard_start_xmit(struct sk_buff *skb, struct net_device *netdev)spin_lock_irqsave (&enic->wq_lock[0 ], flags); -if (vnic_wq_desc_avail (wq) <skb_shinfo (skb)->nr_frags +1 ) { +if (vnic_wq_desc_avail (wq) < +skb_shinfo (skb)->nr_frags +ENIC_DESC_MAX_SPLITS ) {netif_stop_queue (netdev);/* This is a hard error, log it */ printk(KERN_ERR PFX "%s: BUG! Tx ring full when "
@@ -658,7 +709,7 @@ static int enic_hard_start_xmit(struct sk_buff *skb, struct net_device *netdev)enic_queue_wq_skb (enic, wq, skb); -if (vnic_wq_desc_avail (wq) <MAX_SKB_FRAGS +1 ) +if (vnic_wq_desc_avail (wq) <MAX_SKB_FRAGS +ENIC_DESC_MAX_SPLITS )netif_stop_queue (netdev);spin_unlock_irqrestore (&enic->wq_lock[0 ], flags);
PATCH 4/11 enic: use netdev_alloc_skb
In reply to Scott Feldmanenic: use netdev_alloc_skb
Use netdev_alloc_skb rather than dev_alloc_skb
--- drivers/net/enic/enic_main.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-)
drivers/net/enic/enic_main.c +6 -4
@@ -868,11 +868,12 @@ static void enic_free_rq_buf(struct vnic_rq *rq, struct vnic_rq_buf *buf)dev_kfree_skb_any (buf->os_buf); } -static inline struct sk_buff *enic_rq_alloc_skb (unsigned int size) +static inline struct sk_buff *enic_rq_alloc_skb (struct net_device *netdev, +unsigned int size) {struct sk_buff *skb; - skb =dev_alloc_skb (size +NET_IP_ALIGN ); + skb =netdev_alloc_skb (netdev, size +NET_IP_ALIGN );if (skb)skb_reserve (skb,NET_IP_ALIGN );
@@ -883,12 +884,13 @@ static inline struct sk_buff *enic_rq_alloc_skb(unsigned int size)static int enic_rq_alloc_buf (struct vnic_rq *rq) {struct enic *enic =vnic_dev_priv (rq->vdev); +struct net_device *netdev = enic->netdev;struct sk_buff *skb; -unsigned int len = enic->netdev->mtu +ETH_HLEN ; +unsigned int len = netdev->mtu +ETH_HLEN ;unsigned int os_buf_index =0 ;dma_addr_t dma_addr; - skb =enic_rq_alloc_skb (len); + skb =enic_rq_alloc_skb (netdev, len);if (!skb)return -ENOMEM ;
PATCH 5/11 enic: bug fix: protect fw call i/f with spinlock
In reply to Scott Feldmanenic: bug fix: protect fw call i/f with spinlock
Some driver -> nic firmware calls weren't guarded with a spinlock, exposing the call i/f to a race between two threads
--- drivers/net/enic/enic_main.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-)
drivers/net/enic/enic_main.c +12 -0
@@ -1315,6 +1315,7 @@ static int enic_notify_set(struct enic *enic) {int err; +spin_lock (&enic->devcmd_lock);switch (vnic_dev_get_intr_mode (enic->vdev)) {case VNIC_DEV_INTR_MODE_INTX : err =vnic_dev_notify_set (enic->vdev,ENIC_INTX_NOTIFY );
@@ -1326,6 +1327,7 @@ static int enic_notify_set(struct enic *enic) err =vnic_dev_notify_set (enic->vdev,-1 /* no intr */ );break ; } +spin_unlock (&enic->devcmd_lock);return err; }
@@ -1379,12 +1381,16 @@ static int enic_open(struct net_device *netdev)for (i =0 ; i < enic->rq_count; i++)vnic_rq_enable (&enic->rq[i]); +spin_lock (&enic->devcmd_lock);enic_add_station_addr (enic); +spin_unlock (&enic->devcmd_lock);enic_set_multicast_list (netdev);netif_wake_queue (netdev);napi_enable (&enic->napi); +spin_lock (&enic->devcmd_lock);vnic_dev_enable (enic->vdev); +spin_unlock (&enic->devcmd_lock);for (i =0 ; i < enic->intr_count; i++)vnic_intr_unmask (&enic->intr[i]);
@@ -1394,7 +1400,9 @@ static int enic_open(struct net_device *netdev)return 0 ; err_out_notify_unset: +spin_lock (&enic->devcmd_lock);vnic_dev_notify_unset (enic->vdev); +spin_unlock (&enic->devcmd_lock); err_out_free_intr:enic_free_intr (enic);
@@ -1410,7 +1418,9 @@ static int enic_stop(struct net_device *netdev)del_timer_sync (&enic->notify_timer); +spin_lock (&enic->devcmd_lock);vnic_dev_disable (enic->vdev); +spin_unlock (&enic->devcmd_lock);napi_disable (&enic->napi);netif_stop_queue (netdev);
@@ -1428,7 +1438,9 @@ static int enic_stop(struct net_device *netdev)return err; } +spin_lock (&enic->devcmd_lock);vnic_dev_notify_unset (enic->vdev); +spin_unlock (&enic->devcmd_lock);enic_free_intr (enic); (void)vnic_cq_service(&enic->cq[ENIC_CQ_RQ],
PATCH 6/11 enic: bug fix: included MAC drops in rx_dropped netstat
In reply to Scott Feldmanenic: bug fix: included MAC drops in rx_dropped netstat
Bug fix: included MAC drops in rx_dropped netstat. Also track Rx trunctations stat at the MAC
--- drivers/net/enic/enic.h | 1 + drivers/net/enic/enic_main.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 3 deletions(-)
drivers/net/enic/enic.h +1 -0
@@ -99,6 +99,7 @@ struct enic {____cacheline_aligned struct vnic_rq rq[1 ];unsigned int rq_count;int (*rq_alloc_buf)(struct vnic_rq *rq); +u64 rq_truncated_pkts;u64 rq_bad_fcs;struct napi_struct napi;struct net_lro_mgr lro_mgr;
drivers/net/enic/enic_main.c +8 -3
@@ -737,8 +737,9 @@ static struct net_device_stats *enic_get_stats(struct net_device *netdev) net_stats->rx_bytes = stats->rx.rx_bytes_ok; net_stats->rx_errors = stats->rx.rx_errors; net_stats->multicast = stats->rx.rx_multicast_frames_ok; + net_stats->rx_over_errors = enic->rq_truncated_pkts; net_stats->rx_crc_errors = enic->rq_bad_fcs; - net_stats->rx_dropped = stats->rx.rx_no_bufs; + net_stats->rx_dropped = stats->rx.rx_no_bufs + stats->rx.rx_drop;return net_stats; }
@@ -1028,8 +1029,12 @@ static void enic_rq_indicate_buf(struct vnic_rq *rq,if (packet_error) { -if (bytes_written >0 && !fcs_ok) - enic->rq_bad_fcs++; +if (!fcs_ok) { +if (bytes_written >0 ) + enic->rq_bad_fcs++; +else if (bytes_written ==0 ) + enic->rq_truncated_pkts++; + }dev_kfree_skb_any (skb);
PATCH 7/11 enic: provision for multiple Rx/Tx queues; prepare for RSS support
In reply to Scott Feldmanenic: provision for multiple Rx/Tx queues; prepare for RSS support
Provision for multiple Rx/Tx queues. Max of 8 WQs and 8 RQs. Max for completion queue is 8+8=16 and max for interrupt resources is 8+8+2.
Add driver/firmware interface for setting up RSS secret key and indirection table.
--- drivers/net/enic/enic.h | 16 ++++++++++------ drivers/net/enic/enic_main.c | 6 +++--- drivers/net/enic/enic_res.c | 33 ++++++++++++++++++++++++++++----- drivers/net/enic/enic_res.h | 2 ++ drivers/net/enic/vnic_nic.h | 7 +++++++ 5 files changed, 50 insertions(+), 14 deletions(-)
drivers/net/enic/enic.h +10 -6
@@ -29,6 +29,7 @@#include "vnic_cq.h" #include "vnic_intr.h" #include "vnic_stats.h" +#include "vnic_nic.h" #include "vnic_rss.h" #define DRV_NAME "enic"
@@ -42,17 +43,20 @@#define ENIC_BARS_MAX 6 +#define ENIC_WQ_MAX 8 +#define ENIC_RQ_MAX 8 +#define ENIC_CQ_MAX (ENIC_WQ_MAX + ENIC_RQ_MAX) +#define ENIC_INTR_MAX (ENIC_CQ_MAX + 2) +enum enic_cq_index {ENIC_CQ_RQ ,ENIC_CQ_WQ , -ENIC_CQ_MAX , };enum enic_intx_intr_index {ENIC_INTX_WQ_RQ ,ENIC_INTX_ERR ,ENIC_INTX_NOTIFY , -ENIC_INTX_MAX , };enum enic_msix_intr_index {
@@ -90,13 +94,13 @@ struct enic {u32 port_mtu;/* work queue cache line section */ -____cacheline_aligned struct vnic_wq wq[1 ]; -spinlock_t wq_lock[1 ]; +____cacheline_aligned struct vnic_wq wq[ENIC_WQ_MAX ]; +spinlock_t wq_lock[ENIC_WQ_MAX ];unsigned int wq_count;struct vlan_group *vlan_group;/* receive queue cache line section */ -____cacheline_aligned struct vnic_rq rq[1 ]; +____cacheline_aligned struct vnic_rq rq[ENIC_RQ_MAX ];unsigned int rq_count;int (*rq_alloc_buf)(struct vnic_rq *rq);u64 rq_truncated_pkts;
@@ -106,7 +110,7 @@ struct enic {struct net_lro_desc lro_desc[ENIC_LRO_MAX_DESC ];/* interrupt resource cache line section */ -____cacheline_aligned struct vnic_intr intr[ENIC_MSIX_MAX ]; +____cacheline_aligned struct vnic_intr intr[ENIC_INTR_MAX ];unsigned int intr_count;u32 __iomem *legacy_pba;/* memory-mapped */
drivers/net/enic/enic_main.c +3 -3
@@ -1585,7 +1585,7 @@ static int enic_set_niccfg(struct enic *enic)const u8 ig_vlan_strip_en =1 ;/* Enable VLAN tag stripping. RSS not enabled (yet). -*/ +*/ return enic_set_nic_cfg(enic, rss_default_cpu, rss_hash_type,
@@ -1620,8 +1620,8 @@ static void enic_reset(struct work_struct *work)static int enic_set_intr_mode (struct enic *enic) { -unsigned int n =ARRAY_SIZE (enic->rq); -unsigned int m =ARRAY_SIZE (enic->wq); +unsigned int n =1 ; +unsigned int m =1 ;unsigned int i;/* Set interrupt mode (INTx, MSI, MSI-X) depending
drivers/net/enic/enic_res.c +28 -5
@@ -156,6 +156,22 @@ int enic_set_nic_cfg(struct enic *enic, u8 rss_default_cpu, u8 rss_hash_type,return vnic_dev_cmd (enic->vdev,CMD_NIC_CFG , &a0, &a1, wait); } +int enic_set_rss_key (struct enic *enic,dma_addr_t key_pa,u64 len) +{ +u64 a0 = (u64 )key_pa, a1 = len; +int wait =1000 ; + +return vnic_dev_cmd (enic->vdev,CMD_RSS_KEY , &a0, &a1, wait); +} + +int enic_set_rss_cpu (struct enic *enic,dma_addr_t cpu_pa,u64 len) +{ +u64 a0 = (u64 )cpu_pa, a1 = len; +int wait =1000 ; + +return vnic_dev_cmd (enic->vdev,CMD_RSS_CPU , &a0, &a1, wait); +} +void enic_free_vnic_resources (struct enic *enic) {unsigned int i;
@@ -172,11 +188,18 @@ void enic_free_vnic_resources(struct enic *enic)void enic_get_res_counts (struct enic *enic) { - enic->wq_count =vnic_dev_get_res_count (enic->vdev,RES_TYPE_WQ ); - enic->rq_count =vnic_dev_get_res_count (enic->vdev,RES_TYPE_RQ ); - enic->cq_count =vnic_dev_get_res_count (enic->vdev,RES_TYPE_CQ ); - enic->intr_count =vnic_dev_get_res_count (enic->vdev, -RES_TYPE_INTR_CTRL ); + enic->wq_count =min_t (int, +vnic_dev_get_res_count (enic->vdev,RES_TYPE_WQ ), +ENIC_WQ_MAX ); + enic->rq_count =min_t (int, +vnic_dev_get_res_count (enic->vdev,RES_TYPE_RQ ), +ENIC_RQ_MAX ); + enic->cq_count =min_t (int, +vnic_dev_get_res_count (enic->vdev,RES_TYPE_CQ ), +ENIC_CQ_MAX ); + enic->intr_count =min_t (int, +vnic_dev_get_res_count (enic->vdev,RES_TYPE_INTR_CTRL ), +ENIC_INTR_MAX ); printk(KERN_INFO PFX "vNIC resources avail: " "wq %d rq %d cq %d intr %d\n",
drivers/net/enic/enic_res.h +2 -0
@@ -139,6 +139,8 @@ void enic_del_vlan(struct enic *enic, u16 vlanid);int enic_set_nic_cfg (struct enic *enic,u8 rss_default_cpu,u8 rss_hash_type,u8 rss_hash_bits,u8 rss_base_cpu,u8 rss_enable,u8 tso_ipid_split_en,u8 ig_vlan_strip_en); +int enic_set_rss_key (struct enic *enic,dma_addr_t key_pa,u64 len); +int enic_set_rss_cpu (struct enic *enic,dma_addr_t cpu_pa,u64 len);void enic_get_res_counts (struct enic *enic);void enic_init_vnic_resources (struct enic *enic);int enic_alloc_vnic_resources (struct enic *);
drivers/net/enic/vnic_nic.h +7 -0
@@ -41,6 +41,13 @@#define NIC_CFG_IG_VLAN_STRIP_EN_MASK_FIELD 1UL#define NIC_CFG_IG_VLAN_STRIP_EN_SHIFT 24 +#define NIC_CFG_RSS_HASH_TYPE_IPV4 (1 << 0) +#define NIC_CFG_RSS_HASH_TYPE_TCP_IPV4 (1 << 1) +#define NIC_CFG_RSS_HASH_TYPE_IPV6 (1 << 2) +#define NIC_CFG_RSS_HASH_TYPE_TCP_IPV6 (1 << 3) +#define NIC_CFG_RSS_HASH_TYPE_IPV6_EX (1 << 4) +#define NIC_CFG_RSS_HASH_TYPE_TCP_IPV6_EX (1 << 5) + static inline void vnic_set_nic_cfg(u32 *nic_cfg, u8 rss_default_cpu, u8 rss_hash_type, u8 rss_hash_bits, u8 rss_base_cpu,
PATCH 8/11 enic: bug fix: enable VLAN filtering
In reply to Scott Feldmanenic: bug fix: enable VLAN filtering
Bug fix: enable VLAN filtering
--- drivers/net/enic/enic_main.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
drivers/net/enic/enic_main.c +2 -1
@@ -1967,7 +1967,8 @@ static int __devinit enic_probe(struct pci_dev *pdev,break ; } - netdev->features |=NETIF_F_HW_VLAN_TX |NETIF_F_HW_VLAN_RX ; + netdev->features |=NETIF_F_HW_VLAN_TX | +NETIF_F_HW_VLAN_RX |NETIF_F_HW_VLAN_FILTER ;if (ENIC_SETTING (enic,TXCSUM )) netdev->features |=NETIF_F_SG |NETIF_F_HW_CSUM ;if (ENIC_SETTING (enic,TSO ))
PATCH 9/11 enic: changes to driver/firmware interface
In reply to Scott Feldmanenic: changes to driver/firmware interface
Deprecate some old APIa; change arguments to stats dump all API; add new interrupt assert API
--- drivers/net/enic/vnic_dev.c | 14 ++++++++++++++ drivers/net/enic/vnic_dev.h | 1 + drivers/net/enic/vnic_devcmd.h | 20 ++++++++++---------- drivers/net/enic/vnic_intr.c | 5 +++++ 4 files changed, 30 insertions(+), 10 deletions(-)
drivers/net/enic/vnic_dev.c +14 -0
@@ -560,6 +560,20 @@ void vnic_dev_del_addr(struct vnic_dev *vdev, u8 *addr)printk (KERN_ERR "Can't del addr [%pM], %d\n" , addr, err); } +int vnic_dev_raise_intr (struct vnic_dev *vdev,u16 intr) +{ +u64 a0 = intr, a1 =0 ; +int wait =1000 ; +int err; + + err =vnic_dev_cmd (vdev,CMD_IAR , &a0, &a1, wait); +if (err) +printk (KERN_ERR "Failed to raise INTR[%d], err %d\n" , + intr, err); + +return err; +} +int vnic_dev_notify_set (struct vnic_dev *vdev,u16 intr) {u64 a0, a1;
drivers/net/enic/vnic_dev.h +1 -0
@@ -106,6 +106,7 @@ void vnic_dev_packet_filter(struct vnic_dev *vdev, int directed, int multicast,void vnic_dev_add_addr (struct vnic_dev *vdev,u8 *addr);void vnic_dev_del_addr (struct vnic_dev *vdev,u8 *addr);int vnic_dev_mac_addr (struct vnic_dev *vdev,u8 *mac_addr); +int vnic_dev_raise_intr (struct vnic_dev *vdev,u16 intr);int vnic_dev_notify_set (struct vnic_dev *vdev,u16 intr);void vnic_dev_notify_unset (struct vnic_dev *vdev);int vnic_dev_link_status (struct vnic_dev *vdev);
drivers/net/enic/vnic_devcmd.h +10 -10
@@ -105,14 +105,6 @@ enum vnic_devcmd_cmd {CMD_MAC_ADDR =_CMDC (_CMD_DIR_READ, _CMD_VTYPE_ENET | _CMD_VTYPE_FC,9 ), -/* disable/enable promisc mode: (u8)a0=0/1 */ -/***** XXX DEPRECATED *****/ -CMD_PROMISC_MODE =_CMDCNW (_CMD_DIR_WRITE, _CMD_VTYPE_ENET,10 ), - -/* disable/enable all-multi mode: (u8)a0=0/1 */ -/***** XXX DEPRECATED *****/ -CMD_ALLMULTI_MODE =_CMDCNW (_CMD_DIR_WRITE, _CMD_VTYPE_ENET,11 ), -/* add addr from (u48)a0 */ CMD_ADDR_ADD =_CMDCNW (_CMD_DIR_WRITE, _CMD_VTYPE_ENET | _CMD_VTYPE_FC, 12),
@@ -182,7 +174,9 @@ enum vnic_devcmd_cmd {/* disable virtual link */ CMD_DISABLE =_CMDC (_CMD_DIR_NONE, _CMD_VTYPE_ALL,29 ), -/* stats dump all vnics on uplink in mem: (u64)a0=paddr (u32)a1=uif */ +/* stats dump sum of all vnic stats on same uplink in mem: +* (u64)a0=paddr +* (u16)a1=sizeof stats area */ CMD_STATS_DUMP_ALL = _CMDC(_CMD_DIR_WRITE, _CMD_VTYPE_ALL, 30),/* init status:
@@ -211,7 +205,12 @@ enum vnic_devcmd_cmd {/* persistent binding info * in: (u64)a0=paddr of arg * (u32)a1=CMD_PERBI_XXX */ - CMD_PERBI = _CMDC(_CMD_DIR_RW, _CMD_VTYPE_FC, 37), +CMD_PERBI =_CMDC (_CMD_DIR_RW, _CMD_VTYPE_FC,37 ), + +/* Interrupt Assert Register functionality +* in: (u16)a0=interrupt number to assert +*/ + CMD_IAR = _CMDCNW(_CMD_DIR_WRITE, _CMD_VTYPE_ALL, 38), };/* flags for CMD_OPEN */
@@ -244,6 +243,7 @@ enum vnic_devcmd_error {ERR_ENOMEM =7 ,ERR_ETIMEDOUT =8 ,ERR_ELINKDOWN =9 , + ERR_EMAXRES = 10, }; struct vnic_devcmd_fw_info {
drivers/net/enic/vnic_intr.c +5 -0
@@ -60,3 +60,8 @@ void vnic_intr_clean(struct vnic_intr *intr) {iowrite32 (0 , &intr->ctrl->int_credits); } + +void vnic_intr_raise (struct vnic_intr *intr) +{ +vnic_dev_raise_intr (intr->vdev, (u16 )intr->index); +}
PATCH 10/11 enic: bug fix: check for zero port MTU before posting warning
In reply to Scott Feldmanenic: bug fix: check for zero port MTU before posting warning
Nic firmware can return zero for port MTU, so check for non-zero value before checking for change in port MTU.
--- drivers/net/enic/enic_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/enic/enic_main.c +1 -1
@@ -362,7 +362,7 @@ static void enic_mtu_check(struct enic *enic) {u32 mtu =vnic_dev_mtu (enic->vdev); -if (mtu != enic->port_mtu) { +if (mtu && mtu != enic->port_mtu) {if (mtu < enic->netdev->mtu) printk(KERN_WARNING PFX "%s: interface MTU (%d) set higher "
PATCH 11/11 enic: organize device initialization/deinit into separate functions
In reply to Scott Feldmanenic: organize device initialization/deinit into separate functions
To unclutter probe() a little bit, put all device initialization code in one spot and device deinit code in another spot. Also remove unused rq->buf_index variable/func.
--- drivers/net/enic/enic_main.c | 145 ++++++++++++++++++++++++++---------------- drivers/net/enic/vnic_rq.c | 27 +++++--- drivers/net/enic/vnic_rq.h | 12 +-- drivers/net/enic/vnic_wq.c | 20 +++++- drivers/net/enic/vnic_wq.h | 4 + 5 files changed, 133 insertions(+), 75 deletions(-)
drivers/net/enic/enic_main.c +89 -56
@@ -1740,6 +1740,88 @@ static const struct net_device_ops enic_netdev_ops = {#endif }; +void enic_dev_deinit (struct enic *enic) +{ +netif_napi_del (&enic->napi); +enic_free_vnic_resources (enic); +enic_clear_intr_mode (enic); +} + +int enic_dev_init (struct enic *enic) +{ +struct net_device *netdev = enic->netdev; +int err; + +/* Get vNIC configuration +*/ + + err =enic_get_vnic_config (enic); +if (err) { + printk(KERN_ERR PFX + "Get vNIC configuration failed, aborting.\n"); +return err; + } + +/* Get available resource counts +*/ + +enic_get_res_counts (enic); + +/* Set interrupt mode based on resource counts and system +* capabilities +*/ + + err =enic_set_intr_mode (enic); +if (err) { + printk(KERN_ERR PFX + "Failed to set intr mode, aborting.\n"); +return err; + } + +/* Allocate and configure vNIC resources +*/ + + err =enic_alloc_vnic_resources (enic); +if (err) { + printk(KERN_ERR PFX + "Failed to alloc vNIC resources, aborting.\n"); + goto err_out_free_vnic_resources; + } + +enic_init_vnic_resources (enic); + + err =enic_set_rq_alloc_buf (enic); +if (err) { + printk(KERN_ERR PFX + "Failed to set RQ buffer allocator, aborting.\n"); + goto err_out_free_vnic_resources; + } + + err =enic_set_niccfg (enic); +if (err) { + printk(KERN_ERR PFX + "Failed to config nic, aborting.\n"); + goto err_out_free_vnic_resources; + } + +switch (vnic_dev_get_intr_mode (enic->vdev)) { +default : +netif_napi_add (netdev, &enic->napi, enic_poll,64 ); +break ; +case VNIC_DEV_INTR_MODE_MSIX : +netif_napi_add (netdev, &enic->napi, enic_poll_msix,64 ); +break ; + } + +return 0 ; + +err_out_free_vnic_resources: +enic_clear_intr_mode (enic); +enic_free_vnic_resources (enic); + +return err; +} +static void enic_iounmap (struct enic *enic) {unsigned int i;
@@ -1882,51 +1964,13 @@ static int __devinit enic_probe(struct pci_dev *pdev, goto err_out_dev_close; } -/* Get vNIC configuration -*/ - - err =enic_get_vnic_config (enic); + err =enic_dev_init (enic);if (err) { printk(KERN_ERR PFX - "Get vNIC configuration failed, aborting.\n"); + "Device initialization failed, aborting.\n"); goto err_out_dev_close; } -/* Get available resource counts -*/ - -enic_get_res_counts (enic); - -/* Set interrupt mode based on resource counts and system -* capabilities -*/ - - err =enic_set_intr_mode (enic); -if (err) { - printk(KERN_ERR PFX - "Failed to set intr mode, aborting.\n"); - goto err_out_dev_close; - } - -/* Allocate and configure vNIC resources -*/ - - err =enic_alloc_vnic_resources (enic); -if (err) { - printk(KERN_ERR PFX - "Failed to alloc vNIC resources, aborting.\n"); - goto err_out_free_vnic_resources; - } - -enic_init_vnic_resources (enic); - - err =enic_set_niccfg (enic); -if (err) { - printk(KERN_ERR PFX - "Failed to config nic, aborting.\n"); - goto err_out_free_vnic_resources; - } -/* Setup notification timer, HW reset task, and locks */
@@ -1951,22 +1995,13 @@ static int __devinit enic_probe(struct pci_dev *pdev,if (err) { printk(KERN_ERR PFX "Invalid MAC address, aborting.\n"); - goto err_out_free_vnic_resources; + goto err_out_dev_deinit; } netdev->netdev_ops = &enic_netdev_ops; netdev->watchdog_timeo =2 *HZ ; netdev->ethtool_ops = &enic_ethtool_ops; -switch (vnic_dev_get_intr_mode (enic->vdev)) { -default : -netif_napi_add (netdev, &enic->napi, enic_poll,64 ); -break ; -case VNIC_DEV_INTR_MODE_MSIX : -netif_napi_add (netdev, &enic->napi, enic_poll_msix,64 ); -break ; - } - netdev->features |=NETIF_F_HW_VLAN_TX |NETIF_F_HW_VLAN_RX |NETIF_F_HW_VLAN_FILTER ;if (ENIC_SETTING (enic,TXCSUM ))
@@ -1994,17 +2029,16 @@ static int __devinit enic_probe(struct pci_dev *pdev,if (err) { printk(KERN_ERR PFX "Cannot register net device, aborting.\n"); - goto err_out_free_vnic_resources; + goto err_out_dev_deinit; }return 0 ; -err_out_free_vnic_resources: -enic_free_vnic_resources (enic); +err_out_dev_deinit: +enic_dev_deinit (enic); err_out_dev_close:vnic_dev_close (enic->vdev); err_out_vnic_unregister: -enic_clear_intr_mode (enic);vnic_dev_unregister (enic->vdev); err_out_iounmap:enic_iounmap (enic);
@@ -2028,9 +2062,8 @@ static void __devexit enic_remove(struct pci_dev *pdev)flush_scheduled_work ();unregister_netdev (netdev); -enic_free_vnic_resources (enic); +enic_dev_deinit (enic);vnic_dev_close (enic->vdev); -enic_clear_intr_mode (enic);vnic_dev_unregister (enic->vdev);enic_iounmap (enic);pci_release_regions (pdev);
drivers/net/enic/vnic_rq.c +18 -9
@@ -62,7 +62,6 @@ static int vnic_rq_alloc_bufs(struct vnic_rq *rq) } rq->to_use = rq->to_clean = rq->bufs[0 ]; - rq->buf_index =0 ;return 0 ; }
@@ -113,12 +112,12 @@ int vnic_rq_alloc(struct vnic_dev *vdev, struct vnic_rq *rq, unsigned int index,return 0 ; } -void vnic_rq_init (struct vnic_rq *rq,unsigned int cq_index, +void vnic_rq_init_start (struct vnic_rq *rq,unsigned int cq_index, +unsigned int fetch_index,unsigned int posted_index,unsigned int error_interrupt_enable,unsigned int error_interrupt_offset) {u64 paddr; -u32 fetch_index; paddr = (u64 )rq->ring.base_addr |VNIC_PADDR_TARGET ;writeq (paddr, &rq->ctrl->ring_base);
@@ -128,15 +127,27 @@ void vnic_rq_init(struct vnic_rq *rq, unsigned int cq_index,iowrite32 (error_interrupt_offset, &rq->ctrl->error_interrupt_offset);iowrite32 (0 , &rq->ctrl->dropped_packet_count);iowrite32 (0 , &rq->ctrl->error_status); +iowrite32 (fetch_index, &rq->ctrl->fetch_index); +iowrite32 (posted_index, &rq->ctrl->posted_index); -/* Use current fetch_index as the ring starting point */ - fetch_index =ioread32 (&rq->ctrl->fetch_index); rq->to_use = rq->to_clean = &rq->bufs[fetch_index /VNIC_RQ_BUF_BLK_ENTRIES ] [fetch_index %VNIC_RQ_BUF_BLK_ENTRIES ]; -iowrite32 (fetch_index, &rq->ctrl->posted_index); +} + +void vnic_rq_init (struct vnic_rq *rq,unsigned int cq_index, +unsigned int error_interrupt_enable, +unsigned int error_interrupt_offset) +{ +u32 fetch_index; - rq->buf_index =0 ; +/* Use current fetch_index as the ring starting point */ + fetch_index =ioread32 (&rq->ctrl->fetch_index); + +vnic_rq_init_start (rq, cq_index, + fetch_index, fetch_index, + error_interrupt_enable, + error_interrupt_offset); }unsigned int vnic_rq_error_status (struct vnic_rq *rq)
@@ -192,8 +203,6 @@ void vnic_rq_clean(struct vnic_rq *rq, [fetch_index %VNIC_RQ_BUF_BLK_ENTRIES ];iowrite32 (fetch_index, &rq->ctrl->posted_index); - rq->buf_index =0 ; -vnic_dev_clear_desc_ring (&rq->ring); }
drivers/net/enic/vnic_rq.h +5 -7
@@ -1,5 +1,5 @@/* -* Copyright 2008 Cisco Systems, Inc. All rights reserved. +* Copyright 2008, 2009 Cisco Systems, Inc. All rights reserved. * Copyright 2007 Nuova Systems, Inc. All rights reserved. * * This program is free software; you may redistribute it and/or modify
@@ -79,7 +79,6 @@ struct vnic_rq {struct vnic_rq_buf *to_use;struct vnic_rq_buf *to_clean;void *os_buf_head; -unsigned int buf_index;unsigned int pkts_outstanding; };
@@ -105,11 +104,6 @@ static inline unsigned int vnic_rq_next_index(struct vnic_rq *rq)return rq->to_use->index; } -static inline unsigned int vnic_rq_next_buf_index (struct vnic_rq *rq) -{ -return rq->buf_index++; -} -static inline void vnic_rq_post (struct vnic_rq *rq,void *os_buf,unsigned int os_buf_index,dma_addr_t dma_addr,unsigned int len)
@@ -204,6 +198,10 @@ static inline int vnic_rq_fill(struct vnic_rq *rq,void vnic_rq_free (struct vnic_rq *rq);int vnic_rq_alloc (struct vnic_dev *vdev,struct vnic_rq *rq,unsigned int index,unsigned int desc_count,unsigned int desc_size); +void vnic_rq_init_start (struct vnic_rq *rq,unsigned int cq_index, +unsigned int fetch_index,unsigned int posted_index, +unsigned int error_interrupt_enable, +unsigned int error_interrupt_offset);void vnic_rq_init (struct vnic_rq *rq,unsigned int cq_index,unsigned int error_interrupt_enable,unsigned int error_interrupt_offset);
drivers/net/enic/vnic_wq.c +17 -3
@@ -112,7 +112,8 @@ int vnic_wq_alloc(struct vnic_dev *vdev, struct vnic_wq *wq, unsigned int index,return 0 ; } -void vnic_wq_init (struct vnic_wq *wq,unsigned int cq_index, +void vnic_wq_init_start (struct vnic_wq *wq,unsigned int cq_index, +unsigned int fetch_index,unsigned int posted_index,unsigned int error_interrupt_enable,unsigned int error_interrupt_offset) {
@@ -121,12 +122,25 @@ void vnic_wq_init(struct vnic_wq *wq, unsigned int cq_index, paddr = (u64 )wq->ring.base_addr |VNIC_PADDR_TARGET ;writeq (paddr, &wq->ctrl->ring_base);iowrite32 (wq->ring.desc_count, &wq->ctrl->ring_size); -iowrite32 (0 , &wq->ctrl->fetch_index); -iowrite32 (0 , &wq->ctrl->posted_index); +iowrite32 (fetch_index, &wq->ctrl->fetch_index); +iowrite32 (posted_index, &wq->ctrl->posted_index);iowrite32 (cq_index, &wq->ctrl->cq_index);iowrite32 (error_interrupt_enable, &wq->ctrl->error_interrupt_enable);iowrite32 (error_interrupt_offset, &wq->ctrl->error_interrupt_offset);iowrite32 (0 , &wq->ctrl->error_status); + + wq->to_use = wq->to_clean = + &wq->bufs[fetch_index /VNIC_WQ_BUF_BLK_ENTRIES ] + [fetch_index %VNIC_WQ_BUF_BLK_ENTRIES ]; +} + +void vnic_wq_init (struct vnic_wq *wq,unsigned int cq_index, +unsigned int error_interrupt_enable, +unsigned int error_interrupt_offset) +{ +vnic_wq_init_start (wq, cq_index,0 ,0 , + error_interrupt_enable, + error_interrupt_offset); }unsigned int vnic_wq_error_status (struct vnic_wq *wq)
drivers/net/enic/vnic_wq.h +4 -0
@@ -149,6 +149,10 @@ static inline void vnic_wq_service(struct vnic_wq *wq,void vnic_wq_free (struct vnic_wq *wq);int vnic_wq_alloc (struct vnic_dev *vdev,struct vnic_wq *wq,unsigned int index,unsigned int desc_count,unsigned int desc_size); +void vnic_wq_init_start (struct vnic_wq *wq,unsigned int cq_index, +unsigned int fetch_index,unsigned int posted_index, +unsigned int error_interrupt_enable, +unsigned int error_interrupt_offset);void vnic_wq_init (struct vnic_wq *wq,unsigned int cq_index,unsigned int error_interrupt_enable,unsigned int error_interrupt_offset);
David Miller
maintainerFrom: Scott Feldman <[email protected]>
Date: Thu, 03 Sep 2009 20:01:43 -0700
Quoted 16 lines
The following series implements updates to the enic netdev driver for Cisco's 10G Ethernet NIC:
01 enic: add support for multiple BARs
02 enic: workaround A0 erratum
03 enic: bug fix: split TSO fragments larger than 16K into
multiple descs
04 enic: usenetdev_alloc_skb
05 enic: bug fix: protect fw call i/f with spinlock
06 enic: bug fix: included MAC drops inrx_droppednetstat 07 enic: provision for multiple Rx/Tx queues; prepare for RSS support 08 enic: bug fix: enable VLAN filtering
09 enic: changes to driver/firmware interface
10 enic: bug fix: check for zero port MTU before posting warning 11 enic: organize device initialization/deinit into separate functions
Quoted 3 lines
Please apply.
Signed-off-by Scott Feldman <[email protected]>
Looks good, all aplied, thanks!