aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/enic
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/enic')
-rw-r--r--drivers/net/enic/Makefile5
-rw-r--r--drivers/net/enic/cq_desc.h80
-rw-r--r--drivers/net/enic/cq_enet_desc.h169
-rw-r--r--drivers/net/enic/enic.h115
-rw-r--r--drivers/net/enic/enic_main.c1950
-rw-r--r--drivers/net/enic/enic_res.c367
-rw-r--r--drivers/net/enic/enic_res.h147
-rw-r--r--drivers/net/enic/rq_enet_desc.h60
-rw-r--r--drivers/net/enic/vnic_cq.c89
-rw-r--r--drivers/net/enic/vnic_cq.h113
-rw-r--r--drivers/net/enic/vnic_dev.c717
-rw-r--r--drivers/net/enic/vnic_dev.h122
-rw-r--r--drivers/net/enic/vnic_devcmd.h305
-rw-r--r--drivers/net/enic/vnic_enet.h47
-rw-r--r--drivers/net/enic/vnic_intr.c62
-rw-r--r--drivers/net/enic/vnic_intr.h106
-rw-r--r--drivers/net/enic/vnic_nic.h65
-rw-r--r--drivers/net/enic/vnic_resource.h63
-rw-r--r--drivers/net/enic/vnic_rq.c199
-rw-r--r--drivers/net/enic/vnic_rq.h211
-rw-r--r--drivers/net/enic/vnic_rss.h45
-rw-r--r--drivers/net/enic/vnic_stats.h70
-rw-r--r--drivers/net/enic/vnic_wq.c184
-rw-r--r--drivers/net/enic/vnic_wq.h161
-rw-r--r--drivers/net/enic/wq_enet_desc.h98
25 files changed, 0 insertions, 5550 deletions
diff --git a/drivers/net/enic/Makefile b/drivers/net/enic/Makefile
deleted file mode 100644
index 391c3bce5b7..00000000000
--- a/drivers/net/enic/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-obj-$(CONFIG_ENIC) := enic.o
-
-enic-y := enic_main.o vnic_cq.o vnic_intr.o vnic_wq.o \
- enic_res.o vnic_dev.o vnic_rq.o
-
diff --git a/drivers/net/enic/cq_desc.h b/drivers/net/enic/cq_desc.h
deleted file mode 100644
index 1eb289f773b..00000000000
--- a/drivers/net/enic/cq_desc.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright 2008 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
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-#ifndef _CQ_DESC_H_
-#define _CQ_DESC_H_
-
-/*
- * Completion queue descriptor types
- */
-enum cq_desc_types {
- CQ_DESC_TYPE_WQ_ENET = 0,
- CQ_DESC_TYPE_DESC_COPY = 1,
- CQ_DESC_TYPE_WQ_EXCH = 2,
- CQ_DESC_TYPE_RQ_ENET = 3,
- CQ_DESC_TYPE_RQ_FCP = 4,
-};
-
-/* Completion queue descriptor: 16B
- *
- * All completion queues have this basic layout. The
- * type_specfic area is unique for each completion
- * queue type.
- */
-struct cq_desc {
- __le16 completed_index;
- __le16 q_number;
- u8 type_specfic[11];
- u8 type_color;
-};
-
-#define CQ_DESC_TYPE_BITS 4
-#define CQ_DESC_TYPE_MASK ((1 << CQ_DESC_TYPE_BITS) - 1)
-#define CQ_DESC_COLOR_MASK 1
-#define CQ_DESC_COLOR_SHIFT 7
-#define CQ_DESC_Q_NUM_BITS 10
-#define CQ_DESC_Q_NUM_MASK ((1 << CQ_DESC_Q_NUM_BITS) - 1)
-#define CQ_DESC_COMP_NDX_BITS 12
-#define CQ_DESC_COMP_NDX_MASK ((1 << CQ_DESC_COMP_NDX_BITS) - 1)
-
-static inline void cq_desc_dec(const struct cq_desc *desc_arg,
- u8 *type, u8 *color, u16 *q_number, u16 *completed_index)
-{
- const struct cq_desc *desc = desc_arg;
- const u8 type_color = desc->type_color;
-
- *color = (type_color >> CQ_DESC_COLOR_SHIFT) & CQ_DESC_COLOR_MASK;
-
- /*
- * Make sure color bit is read from desc *before* other fields
- * are read from desc. Hardware guarantees color bit is last
- * bit (byte) written. Adding the rmb() prevents the compiler
- * and/or CPU from reordering the reads which would potentially
- * result in reading stale values.
- */
-
- rmb();
-
- *type = type_color & CQ_DESC_TYPE_MASK;
- *q_number = le16_to_cpu(desc->q_number) & CQ_DESC_Q_NUM_MASK;
- *completed_index = le16_to_cpu(desc->completed_index) &
- CQ_DESC_COMP_NDX_MASK;
-}
-
-#endif /* _CQ_DESC_H_ */
diff --git a/drivers/net/enic/cq_enet_desc.h b/drivers/net/enic/cq_enet_desc.h
deleted file mode 100644
index 03dce9ed612..00000000000
--- a/drivers/net/enic/cq_enet_desc.h
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Copyright 2008 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
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-#ifndef _CQ_ENET_DESC_H_
-#define _CQ_ENET_DESC_H_
-
-#include "cq_desc.h"
-
-/* Ethernet completion queue descriptor: 16B */
-struct cq_enet_wq_desc {
- __le16 completed_index;
- __le16 q_number;
- u8 reserved[11];
- u8 type_color;
-};
-
-static inline void cq_enet_wq_desc_dec(struct cq_enet_wq_desc *desc,
- u8 *type, u8 *color, u16 *q_number, u16 *completed_index)
-{
- cq_desc_dec((struct cq_desc *)desc, type,
- color, q_number, completed_index);
-}
-
-/* Completion queue descriptor: Ethernet receive queue, 16B */
-struct cq_enet_rq_desc {
- __le16 completed_index_flags;
- __le16 q_number_rss_type_flags;
- __le32 rss_hash;
- __le16 bytes_written_flags;
- __le16 vlan;
- __le16 checksum_fcoe;
- u8 flags;
- u8 type_color;
-};
-
-#define CQ_ENET_RQ_DESC_FLAGS_INGRESS_PORT (0x1 << 12)
-#define CQ_ENET_RQ_DESC_FLAGS_FCOE (0x1 << 13)
-#define CQ_ENET_RQ_DESC_FLAGS_EOP (0x1 << 14)
-#define CQ_ENET_RQ_DESC_FLAGS_SOP (0x1 << 15)
-
-#define CQ_ENET_RQ_DESC_RSS_TYPE_BITS 4
-#define CQ_ENET_RQ_DESC_RSS_TYPE_MASK \
- ((1 << CQ_ENET_RQ_DESC_RSS_TYPE_BITS) - 1)
-#define CQ_ENET_RQ_DESC_RSS_TYPE_NONE 0
-#define CQ_ENET_RQ_DESC_RSS_TYPE_IPv4 1
-#define CQ_ENET_RQ_DESC_RSS_TYPE_TCP_IPv4 2
-#define CQ_ENET_RQ_DESC_RSS_TYPE_IPv6 3
-#define CQ_ENET_RQ_DESC_RSS_TYPE_TCP_IPv6 4
-#define CQ_ENET_RQ_DESC_RSS_TYPE_IPv6_EX 5
-#define CQ_ENET_RQ_DESC_RSS_TYPE_TCP_IPv6_EX 6
-
-#define CQ_ENET_RQ_DESC_FLAGS_CSUM_NOT_CALC (0x1 << 14)
-
-#define CQ_ENET_RQ_DESC_BYTES_WRITTEN_BITS 14
-#define CQ_ENET_RQ_DESC_BYTES_WRITTEN_MASK \
- ((1 << CQ_ENET_RQ_DESC_BYTES_WRITTEN_BITS) - 1)
-#define CQ_ENET_RQ_DESC_FLAGS_TRUNCATED (0x1 << 14)
-#define CQ_ENET_RQ_DESC_FLAGS_VLAN_STRIPPED (0x1 << 15)
-
-#define CQ_ENET_RQ_DESC_FCOE_SOF_BITS 4
-#define CQ_ENET_RQ_DESC_FCOE_SOF_MASK \
- ((1 << CQ_ENET_RQ_DESC_FCOE_SOF_BITS) - 1)
-#define CQ_ENET_RQ_DESC_FCOE_EOF_BITS 8
-#define CQ_ENET_RQ_DESC_FCOE_EOF_MASK \
- ((1 << CQ_ENET_RQ_DESC_FCOE_EOF_BITS) - 1)
-#define CQ_ENET_RQ_DESC_FCOE_EOF_SHIFT 8
-
-#define CQ_ENET_RQ_DESC_FLAGS_TCP_UDP_CSUM_OK (0x1 << 0)
-#define CQ_ENET_RQ_DESC_FCOE_FC_CRC_OK (0x1 << 0)
-#define CQ_ENET_RQ_DESC_FLAGS_UDP (0x1 << 1)
-#define CQ_ENET_RQ_DESC_FCOE_ENC_ERROR (0x1 << 1)
-#define CQ_ENET_RQ_DESC_FLAGS_TCP (0x1 << 2)
-#define CQ_ENET_RQ_DESC_FLAGS_IPV4_CSUM_OK (0x1 << 3)
-#define CQ_ENET_RQ_DESC_FLAGS_IPV6 (0x1 << 4)
-#define CQ_ENET_RQ_DESC_FLAGS_IPV4 (0x1 << 5)
-#define CQ_ENET_RQ_DESC_FLAGS_IPV4_FRAGMENT (0x1 << 6)
-#define CQ_ENET_RQ_DESC_FLAGS_FCS_OK (0x1 << 7)
-
-static inline void cq_enet_rq_desc_dec(struct cq_enet_rq_desc *desc,
- u8 *type, u8 *color, u16 *q_number, u16 *completed_index,
- u8 *ingress_port, u8 *fcoe, u8 *eop, u8 *sop, u8 *rss_type,
- u8 *csum_not_calc, u32 *rss_hash, u16 *bytes_written, u8 *packet_error,
- u8 *vlan_stripped, u16 *vlan, u16 *checksum, u8 *fcoe_sof,
- u8 *fcoe_fc_crc_ok, u8 *fcoe_enc_error, u8 *fcoe_eof,
- u8 *tcp_udp_csum_ok, u8 *udp, u8 *tcp, u8 *ipv4_csum_ok,
- u8 *ipv6, u8 *ipv4, u8 *ipv4_fragment, u8 *fcs_ok)
-{
- u16 completed_index_flags = le16_to_cpu(desc->completed_index_flags);
- u16 q_number_rss_type_flags =
- le16_to_cpu(desc->q_number_rss_type_flags);
- u16 bytes_written_flags = le16_to_cpu(desc->bytes_written_flags);
-
- cq_desc_dec((struct cq_desc *)desc, type,
- color, q_number, completed_index);
-
- *ingress_port = (completed_index_flags &
- CQ_ENET_RQ_DESC_FLAGS_INGRESS_PORT) ? 1 : 0;
- *fcoe = (completed_index_flags & CQ_ENET_RQ_DESC_FLAGS_FCOE) ?
- 1 : 0;
- *eop = (completed_index_flags & CQ_ENET_RQ_DESC_FLAGS_EOP) ?
- 1 : 0;
- *sop = (completed_index_flags & CQ_ENET_RQ_DESC_FLAGS_SOP) ?
- 1 : 0;
-
- *rss_type = (u8)((q_number_rss_type_flags >> CQ_DESC_Q_NUM_BITS) &
- CQ_ENET_RQ_DESC_RSS_TYPE_MASK);
- *csum_not_calc = (q_number_rss_type_flags &
- CQ_ENET_RQ_DESC_FLAGS_CSUM_NOT_CALC) ? 1 : 0;
-
- *rss_hash = le32_to_cpu(desc->rss_hash);
-
- *bytes_written = bytes_written_flags &
- CQ_ENET_RQ_DESC_BYTES_WRITTEN_MASK;
- *packet_error = (bytes_written_flags &
- CQ_ENET_RQ_DESC_FLAGS_TRUNCATED) ? 1 : 0;
- *vlan_stripped = (bytes_written_flags &
- CQ_ENET_RQ_DESC_FLAGS_VLAN_STRIPPED) ? 1 : 0;
-
- *vlan = le16_to_cpu(desc->vlan);
-
- if (*fcoe) {
- *fcoe_sof = (u8)(le16_to_cpu(desc->checksum_fcoe) &
- CQ_ENET_RQ_DESC_FCOE_SOF_MASK);
- *fcoe_fc_crc_ok = (desc->flags &
- CQ_ENET_RQ_DESC_FCOE_FC_CRC_OK) ? 1 : 0;
- *fcoe_enc_error = (desc->flags &
- CQ_ENET_RQ_DESC_FCOE_ENC_ERROR) ? 1 : 0;
- *fcoe_eof = (u8)((desc->checksum_fcoe >>
- CQ_ENET_RQ_DESC_FCOE_EOF_SHIFT) &
- CQ_ENET_RQ_DESC_FCOE_EOF_MASK);
- *checksum = 0;
- } else {
- *fcoe_sof = 0;
- *fcoe_fc_crc_ok = 0;
- *fcoe_enc_error = 0;
- *fcoe_eof = 0;
- *checksum = le16_to_cpu(desc->checksum_fcoe);
- }
-
- *tcp_udp_csum_ok =
- (desc->flags & CQ_ENET_RQ_DESC_FLAGS_TCP_UDP_CSUM_OK) ? 1 : 0;
- *udp = (desc->flags & CQ_ENET_RQ_DESC_FLAGS_UDP) ? 1 : 0;
- *tcp = (desc->flags & CQ_ENET_RQ_DESC_FLAGS_TCP) ? 1 : 0;
- *ipv4_csum_ok =
- (desc->flags & CQ_ENET_RQ_DESC_FLAGS_IPV4_CSUM_OK) ? 1 : 0;
- *ipv6 = (desc->flags & CQ_ENET_RQ_DESC_FLAGS_IPV6) ? 1 : 0;
- *ipv4 = (desc->flags & CQ_ENET_RQ_DESC_FLAGS_IPV4) ? 1 : 0;
- *ipv4_fragment =
- (desc->flags & CQ_ENET_RQ_DESC_FLAGS_IPV4_FRAGMENT) ? 1 : 0;
- *fcs_ok = (desc->flags & CQ_ENET_RQ_DESC_FLAGS_FCS_OK) ? 1 : 0;
-}
-
-#endif /* _CQ_ENET_DESC_H_ */
diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h
deleted file mode 100644
index c26cea0b300..00000000000
--- a/drivers/net/enic/enic.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright 2008 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
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-#ifndef _ENIC_H_
-#define _ENIC_H_
-
-#include <linux/inet_lro.h>
-
-#include "vnic_enet.h"
-#include "vnic_dev.h"
-#include "vnic_wq.h"
-#include "vnic_rq.h"
-#include "vnic_cq.h"
-#include "vnic_intr.h"
-#include "vnic_stats.h"
-#include "vnic_rss.h"
-
-#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 PFX DRV_NAME ": "
-
-#define ENIC_LRO_MAX_DESC 8
-#define ENIC_LRO_MAX_AGGR 64
-
-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 {
- ENIC_MSIX_RQ,
- ENIC_MSIX_WQ,
- ENIC_MSIX_ERR,
- ENIC_MSIX_NOTIFY,
- ENIC_MSIX_MAX,
-};
-
-struct enic_msix_entry {
- int requested;
- char devname[IFNAMSIZ];
- irqreturn_t (*isr)(int, void *);
- void *devid;
-};
-
-/* Per-instance private data structure */
-struct enic {
- struct net_device *netdev;
- struct pci_dev *pdev;
- struct vnic_enet_config config;
- struct vnic_dev_bar bar0;
- struct vnic_dev *vdev;
- struct timer_list notify_timer;
- struct work_struct reset;
- struct msix_entry msix_entry[ENIC_MSIX_MAX];
- struct enic_msix_entry msix[ENIC_MSIX_MAX];
- u32 msg_enable;
- spinlock_t devcmd_lock;
- u8 mac_addr[ETH_ALEN];
- u8 mc_addr[ENIC_MULTICAST_PERFECT_FILTERS][ETH_ALEN];
- unsigned int mc_count;
- int csum_rx_enabled;
- u32 port_mtu;
-
- /* work queue cache line section */
- ____cacheline_aligned struct vnic_wq wq[1];
- spinlock_t wq_lock[1];
- unsigned int wq_count;
- struct vlan_group *vlan_group;
-
- /* receive queue cache line section */
- ____cacheline_aligned struct vnic_rq rq[1];
- unsigned int rq_count;
- int (*rq_alloc_buf)(struct vnic_rq *rq);
- u64 rq_bad_fcs;
- struct napi_struct napi;
- struct net_lro_mgr lro_mgr;
- struct net_lro_desc lro_desc[ENIC_LRO_MAX_DESC];
-
- /* interrupt resource cache line section */
- ____cacheline_aligned struct vnic_intr intr[ENIC_MSIX_MAX];
- unsigned int intr_count;
- u32 __iomem *legacy_pba; /* memory-mapped */
-
- /* completion queue cache line section */
- ____cacheline_aligned struct vnic_cq cq[ENIC_CQ_MAX];
- unsigned int cq_count;
-};
-
-#endif /* _ENIC_H_ */
diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c
deleted file mode 100644
index 9080f07da8f..00000000000
--- a/drivers/net/enic/enic_main.c
+++ /dev/null
@@ -1,1950 +0,0 @@
-/*
- * Copyright 2008 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
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/string.h>
-#include <linux/errno.h>
-#include <linux/types.h>
-#include <linux/init.h>
-#include <linux/workqueue.h>
-#include <linux/pci.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/if_ether.h>
-#include <linux/if_vlan.h>
-#include <linux/ethtool.h>
-#include <linux/in.h>
-#include <linux/ip.h>
-#include <linux/ipv6.h>
-#include <linux/tcp.h>
-#include <net/ip6_checksum.h>
-
-#include "cq_enet_desc.h"
-#include "vnic_dev.h"
-#include "vnic_intr.h"
-#include "vnic_stats.h"
-#include "enic_res.h"
-#include "enic.h"
-
-#define ENIC_NOTIFY_TIMER_PERIOD (2 * HZ)
-
-/* Supported devices */
-static struct pci_device_id enic_id_table[] = {
- { PCI_VDEVICE(CISCO, 0x0043) },
- { 0, } /* end of table */
-};
-
-MODULE_DESCRIPTION(DRV_DESCRIPTION);
-MODULE_AUTHOR("Scott Feldman <scofeldm@cisco.com>");
-MODULE_LICENSE("GPL");
-MODULE_VERSION(DRV_VERSION);
-MODULE_DEVICE_TABLE(pci, enic_id_table);
-
-struct enic_stat {
- char name[ETH_GSTRING_LEN];
- unsigned int offset;
-};
-
-#define ENIC_TX_STAT(stat) \
- { .name = #stat, .offset = offsetof(struct vnic_tx_stats, stat) / 8 }
-#define ENIC_RX_STAT(stat) \
- { .name = #stat, .offset = offsetof(struct vnic_rx_stats, stat) / 8 }
-
-static const struct enic_stat enic_tx_stats[] = {
- ENIC_TX_STAT(tx_frames_ok),
- ENIC_TX_STAT(tx_unicast_frames_ok),
- ENIC_TX_STAT(tx_multicast_frames_ok),
- ENIC_TX_STAT(tx_broadcast_frames_ok),
- ENIC_TX_STAT(tx_bytes_ok),
- ENIC_TX_STAT(tx_unicast_bytes_ok),
- ENIC_TX_STAT(tx_multicast_bytes_ok),
- ENIC_TX_STAT(tx_broadcast_bytes_ok),
- ENIC_TX_STAT(tx_drops),
- ENIC_TX_STAT(tx_errors),
- ENIC_TX_STAT(tx_tso),
-};
-
-static const struct enic_stat enic_rx_stats[] = {
- ENIC_RX_STAT(rx_frames_ok),
- ENIC_RX_STAT(rx_frames_total),
- ENIC_RX_STAT(rx_unicast_frames_ok),
- ENIC_RX_STAT(rx_multicast_frames_ok),
- ENIC_RX_STAT(rx_broadcast_frames_ok),
- ENIC_RX_STAT(rx_bytes_ok),
- ENIC_RX_STAT(rx_unicast_bytes_ok),
- ENIC_RX_STAT(rx_multicast_bytes_ok),
- ENIC_RX_STAT(rx_broadcast_bytes_ok),
- ENIC_RX_STAT(rx_drop),
- ENIC_RX_STAT(rx_no_bufs),
- ENIC_RX_STAT(rx_errors),
- ENIC_RX_STAT(rx_rss),
- ENIC_RX_STAT(rx_crc_errors),
- ENIC_RX_STAT(rx_frames_64),
- ENIC_RX_STAT(rx_frames_127),
- ENIC_RX_STAT(rx_frames_255),
- ENIC_RX_STAT(rx_frames_511),
- ENIC_RX_STAT(rx_frames_1023),
- ENIC_RX_STAT(rx_frames_1518),
- ENIC_RX_STAT(rx_frames_to_max),
-};
-
-static const unsigned int enic_n_tx_stats = ARRAY_SIZE(enic_tx_stats);
-static const unsigned int enic_n_rx_stats = ARRAY_SIZE(enic_rx_stats);
-
-static int enic_get_settings(struct net_device *netdev,
- struct ethtool_cmd *ecmd)
-{
- struct enic *enic = netdev_priv(netdev);
-
- ecmd->supported = (SUPPORTED_10000baseT_Full | SUPPORTED_FIBRE);
- ecmd->advertising = (ADVERTISED_10000baseT_Full | ADVERTISED_FIBRE);
- ecmd->port = PORT_FIBRE;
- ecmd->transceiver = XCVR_EXTERNAL;
-
- if (netif_carrier_ok(netdev)) {
- ecmd->speed = vnic_dev_port_speed(enic->vdev);
- ecmd->duplex = DUPLEX_FULL;
- } else {
- ecmd->speed = -1;
- ecmd->duplex = -1;
- }
-
- ecmd->autoneg = AUTONEG_DISABLE;
-
- return 0;
-}
-
-static void enic_get_drvinfo(struct net_device *netdev,
- struct ethtool_drvinfo *drvinfo)
-{
- struct enic *enic = netdev_priv(netdev);
- struct vnic_devcmd_fw_info *fw_info;
-
- spin_lock(&enic->devcmd_lock);
- vnic_dev_fw_info(enic->vdev, &fw_info);
- spin_unlock(&enic->devcmd_lock);
-
- strncpy(drvinfo->driver, DRV_NAME, sizeof(drvinfo->driver));
- strncpy(drvinfo->version, DRV_VERSION, sizeof(drvinfo->version));
- strncpy(drvinfo->fw_version, fw_info->fw_version,
- sizeof(drvinfo->fw_version));
- strncpy(drvinfo->bus_info, pci_name(enic->pdev),
- sizeof(drvinfo->bus_info));
-}
-
-static void enic_get_strings(struct net_device *netdev, u32 stringset, u8 *data)
-{
- unsigned int i;
-
- switch (stringset) {
- case ETH_SS_STATS:
- for (i = 0; i < enic_n_tx_stats; i++) {
- memcpy(data, enic_tx_stats[i].name, ETH_GSTRING_LEN);
- data += ETH_GSTRING_LEN;
- }
- for (i = 0; i < enic_n_rx_stats; i++) {
- memcpy(data, enic_rx_stats[i].name, ETH_GSTRING_LEN);
- data += ETH_GSTRING_LEN;
- }
- break;
- }
-}
-
-static int enic_get_sset_count(struct net_device *netdev, int sset)
-{
- switch (sset) {
- case ETH_SS_STATS:
- return enic_n_tx_stats + enic_n_rx_stats;
- default:
- return -EOPNOTSUPP;
- }
-}
-
-static void enic_get_ethtool_stats(struct net_device *netdev,
- struct ethtool_stats *stats, u64 *data)
-{
- struct enic *enic = netdev_priv(netdev);
- struct vnic_stats *vstats;
- unsigned int i;
-
- spin_lock(&enic->devcmd_lock);
- vnic_dev_stats_dump(enic->vdev, &vstats);
- spin_unlock(&enic->devcmd_lock);
-
- for (i = 0; i < enic_n_tx_stats; i++)
- *(data++) = ((u64 *)&vstats->tx)[enic_tx_stats[i].offset];
- for (i = 0; i < enic_n_rx_stats; i++)
- *(data++) = ((u64 *)&vstats->rx)[enic_rx_stats[i].offset];
-}
-
-static u32 enic_get_rx_csum(struct net_device *netdev)
-{
- struct enic *enic = netdev_priv(netdev);
- return enic->csum_rx_enabled;
-}
-
-static int enic_set_rx_csum(struct net_device *netdev, u32 data)
-{
- struct enic *enic = netdev_priv(netdev);
-
- if (data && !ENIC_SETTING(enic, RXCSUM))
- return -EINVAL;
-
- enic->csum_rx_enabled = !!data;
-
- return 0;
-}
-
-static int enic_set_tx_csum(struct net_device *netdev, u32 data)
-{
- struct enic *enic = netdev_priv(netdev);
-
- if (data && !ENIC_SETTING(enic, TXCSUM))
- return -EINVAL;
-
- if (data)
- netdev->features |= NETIF_F_HW_CSUM;
- else
- netdev->features &= ~NETIF_F_HW_CSUM;
-
- return 0;
-}
-
-static int enic_set_tso(struct net_device *netdev, u32 data)
-{
- struct enic *enic = netdev_priv(netdev);
-
- if (data && !ENIC_SETTING(enic, TSO))
- return -EINVAL;
-
- if (data)
- netdev->features |=
- NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_TSO_ECN;
- else
- netdev->features &=
- ~(NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_TSO_ECN);
-
- return 0;
-}
-
-static u32 enic_get_msglevel(struct net_device *netdev)
-{
- struct enic *enic = netdev_priv(netdev);
- return enic->msg_enable;
-}
-
-static void enic_set_msglevel(struct net_device *netdev, u32 value)
-{
- struct enic *enic = netdev_priv(netdev);
- enic->msg_enable = value;
-}
-
-static struct ethtool_ops enic_ethtool_ops = {
- .get_settings = enic_get_settings,
- .get_drvinfo = enic_get_drvinfo,
- .get_msglevel = enic_get_msglevel,
- .set_msglevel = enic_set_msglevel,
- .get_link = ethtool_op_get_link,
- .get_strings = enic_get_strings,
- .get_sset_count = enic_get_sset_count,
- .get_ethtool_stats = enic_get_ethtool_stats,
- .get_rx_csum = enic_get_rx_csum,
- .set_rx_csum = enic_set_rx_csum,
- .get_tx_csum = ethtool_op_get_tx_csum,
- .set_tx_csum = enic_set_tx_csum,
- .get_sg = ethtool_op_get_sg,
- .set_sg = ethtool_op_set_sg,
- .get_tso = ethtool_op_get_tso,
- .set_tso = enic_set_tso,
- .get_flags = ethtool_op_get_flags,
- .set_flags = ethtool_op_set_flags,
-};
-
-static void enic_free_wq_buf(struct vnic_wq *wq, struct vnic_wq_buf *buf)
-{
- struct enic *enic = vnic_dev_priv(wq->vdev);
-
- if (buf->sop)
- pci_unmap_single(enic->pdev, buf->dma_addr,
- buf->len, PCI_DMA_TODEVICE);
- else
- pci_unmap_page(enic->pdev, buf->dma_addr,
- buf->len, PCI_DMA_TODEVICE);
-
- if (buf->os_buf)
- dev_kfree_skb_any(buf->os_buf);
-}
-
-static void enic_wq_free_buf(struct vnic_wq *wq,
- struct cq_desc *cq_desc, struct vnic_wq_buf *buf, void *opaque)
-{
- enic_free_wq_buf(wq, buf);
-}
-
-static int enic_wq_service(struct vnic_dev *vdev, struct cq_desc *cq_desc,
- u8 type, u16 q_number, u16 completed_index, void *opaque)
-{
- struct enic *enic = vnic_dev_priv(vdev);
-
- spin_lock(&enic->wq_lock[q_number]);
-
- vnic_wq_service(&enic->wq[q_number], cq_desc,
- completed_index, enic_wq_free_buf,
- opaque);
-
- if (netif_queue_stopped(enic->netdev) &&
- vnic_wq_desc_avail(&enic->wq[q_number]) >= MAX_SKB_FRAGS + 1)
- netif_wake_queue(enic->netdev);
-
- spin_unlock(&enic->wq_lock[q_number]);
-
- return 0;
-}
-
-static void enic_log_q_error(struct enic *enic)
-{
- unsigned int i;
- u32 error_status;
-
- for (i = 0; i < enic->wq_count; i++) {
- error_status = vnic_wq_error_status(&enic->wq[i]);
- if (error_status)
- printk(KERN_ERR PFX "%s: WQ[%d] error_status %d\n",
- enic->netdev->name, i, error_status);
- }
-
- for (i = 0; i < enic->rq_count; i++) {
- error_status = vnic_rq_error_status(&enic->rq[i]);
- if (error_status)
- printk(KERN_ERR PFX "%s: RQ[%d] error_status %d\n",
- enic->netdev->name, i, error_status);
- }
-}
-
-static void enic_link_check(struct enic *enic)
-{
- int link_status = vnic_dev_link_status(enic->vdev);
- int carrier_ok = netif_carrier_ok(enic->netdev);
-
- if (link_status && !carrier_ok) {
- printk(KERN_INFO PFX "%s: Link UP\n", enic->netdev->name);
- netif_carrier_on(enic->netdev);
- } else if (!link_status && carrier_ok) {
- printk(KERN_INFO PFX "%s: Link DOWN\n", enic->netdev->name);
- netif_carrier_off(enic->netdev);
- }
-}
-
-static void enic_mtu_check(struct enic *enic)
-{
- u32 mtu = vnic_dev_mtu(enic->vdev);
-
- if (mtu != enic->port_mtu) {
- if (mtu < enic->netdev->mtu)
- printk(KERN_WARNING PFX
- "%s: interface MTU (%d) set higher "
- "than switch port MTU (%d)\n",
- enic->netdev->name, enic->netdev->mtu, mtu);
- enic->port_mtu = mtu;
- }
-}
-
-static void enic_msglvl_check(struct enic *enic)
-{
- u32 msg_enable = vnic_dev_msg_lvl(enic->vdev);
-
- if (msg_enable != enic->msg_enable) {
- printk(KERN_INFO PFX "%s: msg lvl changed from 0x%x to 0x%x\n",
- enic->netdev->name, enic->msg_enable, msg_enable);
- enic->msg_enable = msg_enable;
- }
-}
-
-static void enic_notify_check(struct enic *enic)
-{
- enic_msglvl_check(enic);
- enic_mtu_check(enic);
- enic_link_check(enic);
-}
-
-#define ENIC_TEST_INTR(pba, i) (pba & (1 << i))
-
-static irqreturn_t enic_isr_legacy(int irq, void *data)
-{
- struct net_device *netdev = data;
- struct enic *enic = netdev_priv(netdev);
- u32 pba;
-
- vnic_intr_mask(&enic->intr[ENIC_INTX_WQ_RQ]);
-
- pba = vnic_intr_legacy_pba(enic->legacy_pba);
- if (!pba) {
- vnic_intr_unmask(&enic->intr[ENIC_INTX_WQ_RQ]);
- return IRQ_NONE; /* not our interrupt */
- }
-
- if (ENIC_TEST_INTR(pba, ENIC_INTX_NOTIFY)) {
- vnic_intr_return_all_credits(&enic->intr[ENIC_INTX_NOTIFY]);
- enic_notify_check(enic);
- }
-
- if (ENIC_TEST_INTR(pba, ENIC_INTX_ERR)) {
- vnic_intr_return_all_credits(&enic->intr[ENIC_INTX_ERR]);
- enic_log_q_error(enic);
- /* schedule recovery from WQ/RQ error */
- schedule_work(&enic->reset);
- return IRQ_HANDLED;
- }
-
- if (ENIC_TEST_INTR(pba, ENIC_INTX_WQ_RQ)) {
- if (napi_schedule_prep(&enic->napi))
- __napi_schedule(&enic->napi);
- } else {
- vnic_intr_unmask(&enic->intr[ENIC_INTX_WQ_RQ]);
- }
-
- return IRQ_HANDLED;
-}
-
-static irqreturn_t enic_isr_msi(int irq, void *data)
-{
- struct enic *enic = data;
-
- /* With MSI, there is no sharing of interrupts, so this is
- * our interrupt and there is no need to ack it. The device
- * is not providing per-vector masking, so the OS will not
- * write to PCI config space to mask/unmask the interrupt.
- * We're using mask_on_assertion for MSI, so the device
- * automatically masks the interrupt when the interrupt is
- * generated. Later, when exiting polling, the interrupt
- * will be unmasked (see enic_poll).
- *
- * Also, the device uses the same PCIe Traffic Class (TC)
- * for Memory Write data and MSI, so there are no ordering
- * issues; the MSI will always arrive at the Root Complex
- * _after_ corresponding Memory Writes (i.e. descriptor
- * writes).
- */
-
- napi_schedule(&enic->napi);
-
- return IRQ_HANDLED;
-}
-
-static irqreturn_t enic_isr_msix_rq(int irq, void *data)
-{
- struct enic *enic = data;
-
- /* schedule NAPI polling for RQ cleanup */
- napi_schedule(&enic->napi);
-
- return IRQ_HANDLED;
-}
-
-static irqreturn_t enic_isr_msix_wq(int irq, void *data)
-{
- struct enic *enic = data;
- unsigned int wq_work_to_do = -1; /* no limit */
- unsigned int wq_work_done;
-
- wq_work_done = vnic_cq_service(&enic->cq[ENIC_CQ_WQ],
- wq_work_to_do, enic_wq_service, NULL);
-
- vnic_intr_return_credits(&enic->intr[ENIC_MSIX_WQ],
- wq_work_done,
- 1 /* unmask intr */,
- 1 /* reset intr timer */);
-
- return IRQ_HANDLED;
-}
-
-static irqreturn_t enic_isr_msix_err(int irq, void *data)
-{
- struct enic *enic = data;
-
- vnic_intr_return_all_credits(&enic->intr[ENIC_MSIX_ERR]);
-
- enic_log_q_error(enic);
-
- /* schedule recovery from WQ/RQ error */
- schedule_work(&enic->reset);
-
- return IRQ_HANDLED;
-}
-
-static irqreturn_t enic_isr_msix_notify(int irq, void *data)
-{
- struct enic *enic = data;
-
- vnic_intr_return_all_credits(&enic->intr[ENIC_MSIX_NOTIFY]);
- enic_notify_check(enic);
-
- return IRQ_HANDLED;
-}
-
-static inline void enic_queue_wq_skb_cont(struct enic *enic,
- struct vnic_wq *wq, struct sk_buff *skb,
- unsigned int len_left)
-{
- skb_frag_t *frag;
-
- /* Queue additional data fragments */
- for (frag = skb_shinfo(skb)->frags; len_left; frag++) {
- len_left -= frag->size;
- enic_queue_wq_desc_cont(wq, skb,
- pci_map_page(enic->pdev, frag->page,
- frag->page_offset, frag->size,
- PCI_DMA_TODEVICE),
- frag->size,
- (len_left == 0)); /* EOP? */
- }
-}
-
-static inline void enic_queue_wq_skb_vlan(struct enic *enic,
- struct vnic_wq *wq, struct sk_buff *skb,
- int vlan_tag_insert, unsigned int vlan_tag)
-{
- unsigned int head_len = skb_headlen(skb);
- unsigned int len_left = skb->len - head_len;
- int eop = (len_left == 0);
-
- /* Queue the main skb fragment */
- enic_queue_wq_desc(wq, skb,
- pci_map_single(enic->pdev, skb->data,
- head_len, PCI_DMA_TODEVICE),
- head_len,
- vlan_tag_insert, vlan_tag,
- eop);
-
- if (!eop)
- enic_queue_wq_skb_cont(enic, wq, skb, len_left);
-}
-
-static inline void enic_queue_wq_skb_csum_l4(struct enic *enic,
- struct vnic_wq *wq, struct sk_buff *skb,
- 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 hdr_len = skb_transport_offset(skb);
- unsigned int csum_offset = hdr_len + skb->csum_offset;
- int eop = (len_left == 0);
-
- /* Queue the main skb fragment */
- enic_queue_wq_desc_csum_l4(wq, skb,
- pci_map_single(enic->pdev, skb->data,
- head_len, PCI_DMA_TODEVICE),
- head_len,
- csum_offset,
- hdr_len,
- vlan_tag_insert, vlan_tag,
- eop);
-
- if (!eop)
- enic_queue_wq_skb_cont(enic, wq, skb, len_left);
-}
-
-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 hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);
- int eop = (len_left == 0);
-
- /* Preload TCP csum field with IP pseudo hdr calculated
- * with IP length set to zero. HW will later add in length
- * to each TCP segment resulting from the TSO.
- */
-
- if (skb->protocol == cpu_to_be16(ETH_P_IP)) {
- ip_hdr(skb)->check = 0;
- tcp_hdr(skb)->check = ~csum_tcpudp_magic(ip_hdr(skb)->saddr,
- ip_hdr(skb)->daddr, 0, IPPROTO_TCP, 0);
- } else if (skb->protocol == cpu_to_be16(ETH_P_IPV6)) {
- tcp_hdr(skb)->check = ~csum_ipv6_magic(&ipv6_hdr(skb)->saddr,
- &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);
-
- if (!eop)
- enic_queue_wq_skb_cont(enic, wq, skb, len_left);
-}
-
-static inline void enic_queue_wq_skb(struct enic *enic,
- struct vnic_wq *wq, struct sk_buff *skb)
-{
- unsigned int mss = skb_shinfo(skb)->gso_size;
- unsigned int vlan_tag = 0;
- int vlan_tag_insert = 0;
-
- if (enic->vlan_group && vlan_tx_tag_present(skb)) {
- /* VLAN tag from trunking driver */
- vlan_tag_insert = 1;
- vlan_tag = vlan_tx_tag_get(skb);
- }
-
- if (mss)
- enic_queue_wq_skb_tso(enic, wq, skb, mss,
- vlan_tag_insert, vlan_tag);
- else if (skb->ip_summed == CHECKSUM_PARTIAL)
- enic_queue_wq_skb_csum_l4(enic, wq, skb,
- vlan_tag_insert, vlan_tag);
- else
- enic_queue_wq_skb_vlan(enic, wq, skb,
- vlan_tag_insert, vlan_tag);
-}
-
-/* netif_tx_lock held, process context with BHs disabled, or BH */
-static int enic_hard_start_xmit(struct sk_buff *skb, struct net_device *netdev)
-{
- struct enic *enic = netdev_priv(netdev);
- struct vnic_wq *wq = &enic->wq[0];
- unsigned long flags;
-
- if (skb->len <= 0) {
- dev_kfree_skb(skb);
- return NETDEV_TX_OK;
- }
-
- /* Non-TSO sends must fit within ENIC_NON_TSO_MAX_DESC descs,
- * which is very likely. In the off chance it's going to take
- * more than * ENIC_NON_TSO_MAX_DESC, linearize the skb.
- */
-
- if (skb_shinfo(skb)->gso_size == 0 &&
- skb_shinfo(skb)->nr_frags + 1 > ENIC_NON_TSO_MAX_DESC &&
- skb_linearize(skb)) {
- dev_kfree_skb(skb);
- return NETDEV_TX_OK;
- }
-
- spin_lock_irqsave(&enic->wq_lock[0], flags);
-
- if (vnic_wq_desc_avail(wq) < skb_shinfo(skb)->nr_frags + 1) {
- netif_stop_queue(netdev);
- /* This is a hard error, log it */
- printk(KERN_ERR PFX "%s: BUG! Tx ring full when "
- "queue awake!\n", netdev->name);
- spin_unlock_irqrestore(&enic->wq_lock[0], flags);
- return NETDEV_TX_BUSY;
- }
-
- enic_queue_wq_skb(enic, wq, skb);
-
- if (vnic_wq_desc_avail(wq) < MAX_SKB_FRAGS + 1)
- netif_stop_queue(netdev);
-
- netdev->trans_start = jiffies;
-
- spin_unlock_irqrestore(&enic->wq_lock[0], flags);
-
- return NETDEV_TX_OK;
-}
-
-/* dev_base_lock rwlock held, nominally process context */
-static struct net_device_stats *enic_get_stats(struct net_device *netdev)
-{
- struct enic *enic = netdev_priv(netdev);
- struct net_device_stats *net_stats = &netdev->stats;
- struct vnic_stats *stats;
-
- spin_lock(&enic->devcmd_lock);
- vnic_dev_stats_dump(enic->vdev, &stats);
- spin_unlock(&enic->devcmd_lock);
-
- net_stats->tx_packets = stats->tx.tx_frames_ok;
- net_stats->tx_bytes = stats->tx.tx_bytes_ok;
- net_stats->tx_errors = stats->tx.tx_errors;
- net_stats->tx_dropped = stats->tx.tx_drops;
-
- net_stats->rx_packets = stats->rx.rx_frames_ok;
- 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_crc_errors = enic->rq_bad_fcs;
- net_stats->rx_dropped = stats->rx.rx_no_bufs;
-
- return net_stats;
-}
-
-static void enic_reset_mcaddrs(struct enic *enic)
-{
- enic->mc_count = 0;
-}
-
-static int enic_set_mac_addr(struct net_device *netdev, char *addr)
-{
- if (!is_valid_ether_addr(addr))
- return -EADDRNOTAVAIL;
-
- memcpy(netdev->dev_addr, addr, netdev->addr_len);
-
- return 0;
-}
-
-/* netif_tx_lock held, BHs disabled */
-static void enic_set_multicast_list(struct net_device *netdev)
-{
- struct enic *enic = netdev_priv(netdev);
- struct dev_mc_list *list = netdev->mc_list;
- int directed = 1;
- int multicast = (netdev->flags & IFF_MULTICAST) ? 1 : 0;
- int broadcast = (netdev->flags & IFF_BROADCAST) ? 1 : 0;
- int promisc = (netdev->flags & IFF_PROMISC) ? 1 : 0;
- int allmulti = (netdev->flags & IFF_ALLMULTI) ||
- (netdev->mc_count > ENIC_MULTICAST_PERFECT_FILTERS);
- u8 mc_addr[ENIC_MULTICAST_PERFECT_FILTERS][ETH_ALEN];
- unsigned int mc_count = netdev->mc_count;
- unsigned int i, j;
-
- if (mc_count > ENIC_MULTICAST_PERFECT_FILTERS)
- mc_count = ENIC_MULTICAST_PERFECT_FILTERS;
-
- spin_lock(&enic->devcmd_lock);
-
- vnic_dev_packet_filter(enic->vdev, directed,
- multicast, broadcast, promisc, allmulti);
-
- /* Is there an easier way? Trying to minimize to
- * calls to add/del multicast addrs. We keep the
- * addrs from the last call in enic->mc_addr and
- * look for changes to add/del.
- */
-
- for (i = 0; list && i < mc_count; i++) {
- memcpy(mc_addr[i], list->dmi_addr, ETH_ALEN);
- list = list->next;
- }
-
- for (i = 0; i < enic->mc_count; i++) {
- for (j = 0; j < mc_count; j++)
- if (compare_ether_addr(enic->mc_addr[i],
- mc_addr[j]) == 0)
- break;
- if (j == mc_count)
- enic_del_multicast_addr(enic, enic->mc_addr[i]);
- }
-
- for (i = 0; i < mc_count; i++) {
- for (j = 0; j < enic->mc_count; j++)
- if (compare_ether_addr(mc_addr[i],
- enic->mc_addr[j]) == 0)
- break;
- if (j == enic->mc_count)
- enic_add_multicast_addr(enic, mc_addr[i]);
- }
-
- /* Save the list to compare against next time
- */
-
- for (i = 0; i < mc_count; i++)
- memcpy(enic->mc_addr[i], mc_addr[i], ETH_ALEN);
-
- enic->mc_count = mc_count;
-
- spin_unlock(&enic->devcmd_lock);
-}
-
-/* rtnl lock is held */
-static void enic_vlan_rx_register(struct net_device *netdev,
- struct vlan_group *vlan_group)
-{
- struct enic *enic = netdev_priv(netdev);
- enic->vlan_group = vlan_group;
-}
-
-/* rtnl lock is held */
-static void enic_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
-{
- struct enic *enic = netdev_priv(netdev);
-
- spin_lock(&enic->devcmd_lock);
- enic_add_vlan(enic, vid);
- spin_unlock(&enic->devcmd_lock);
-}
-
-/* rtnl lock is held */
-static void enic_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)
-{
- struct enic *enic = netdev_priv(netdev);
-
- spin_lock(&enic->devcmd_lock);
- enic_del_vlan(enic, vid);
- spin_unlock(&enic->devcmd_lock);
-}
-
-/* netif_tx_lock held, BHs disabled */
-static void enic_tx_timeout(struct net_device *netdev)
-{
- struct enic *enic = netdev_priv(netdev);
- schedule_work(&enic->reset);
-}
-
-static void enic_free_rq_buf(struct vnic_rq *rq, struct vnic_rq_buf *buf)
-{
- struct enic *enic = vnic_dev_priv(rq->vdev);
-
- if (!buf->os_buf)
- return;
-
- pci_unmap_single(enic->pdev, buf->dma_addr,
- buf->len, PCI_DMA_FROMDEVICE);
- dev_kfree_skb_any(buf->os_buf);
-}
-
-static inline struct sk_buff *enic_rq_alloc_skb(unsigned int size)
-{
- struct sk_buff *skb;
-
- skb = dev_alloc_skb(size + NET_IP_ALIGN);
-
- if (skb)
- skb_reserve(skb, NET_IP_ALIGN);
-
- return skb;
-}
-
-static int enic_rq_alloc_buf(struct vnic_rq *rq)
-{
- struct enic *enic = vnic_dev_priv(rq->vdev);
- struct sk_buff *skb;
- unsigned int len = enic->netdev->mtu + ETH_HLEN;
- unsigned int os_buf_index = 0;
- dma_addr_t dma_addr;
-
- skb = enic_rq_alloc_skb(len);
- if (!skb)
- return -ENOMEM;
-
- dma_addr = pci_map_single(enic->pdev, skb->data,
- len, PCI_DMA_FROMDEVICE);
-
- enic_queue_rq_desc(rq, skb, os_buf_index,
- dma_addr, len);
-
- return 0;
-}
-
-static int enic_get_skb_header(struct sk_buff *skb, void **iphdr,
- void **tcph, u64 *hdr_flags, void *priv)
-{
- struct cq_enet_rq_desc *cq_desc = priv;
- unsigned int ip_len;
- struct iphdr *iph;
-
- u8 type, color, eop, sop, ingress_port, vlan_stripped;
- u8 fcoe, fcoe_sof, fcoe_fc_crc_ok, fcoe_enc_error, fcoe_eof;
- u8 tcp_udp_csum_ok, udp, tcp, ipv4_csum_ok;
- u8 ipv6, ipv4, ipv4_fragment, fcs_ok, rss_type, csum_not_calc;
- u8 packet_error;
- u16 q_number, completed_index, bytes_written, vlan, checksum;
- u32 rss_hash;
-
- cq_enet_rq_desc_dec(cq_desc,
- &type, &color, &q_number, &completed_index,
- &ingress_port, &fcoe, &eop, &sop, &rss_type,
- &csum_not_calc, &rss_hash, &bytes_written,
- &packet_error, &vlan_stripped, &vlan, &checksum,
- &fcoe_sof, &fcoe_fc_crc_ok, &fcoe_enc_error,
- &fcoe_eof, &tcp_udp_csum_ok, &udp, &tcp,
- &ipv4_csum_ok, &ipv6, &ipv4, &ipv4_fragment,
- &fcs_ok);
-
- if (!(ipv4 && tcp && !ipv4_fragment))
- return -1;
-
- skb_reset_network_header(skb);
- iph = ip_hdr(skb);
-
- ip_len = ip_hdrlen(skb);
- skb_set_transport_header(skb, ip_len);
-
- /* check if ip header and tcp header are complete */
- if (ntohs(iph->tot_len) < ip_len + tcp_hdrlen(skb))
- return -1;
-
- *hdr_flags = LRO_IPV4 | LRO_TCP;
- *tcph = tcp_hdr(skb);
- *iphdr = iph;
-
- return 0;
-}
-
-static void enic_rq_indicate_buf(struct vnic_rq *rq,
- struct cq_desc *cq_desc, struct vnic_rq_buf *buf,
- int skipped, void *opaque)
-{
- struct enic *enic = vnic_dev_priv(rq->vdev);
- struct net_device *netdev = enic->netdev;
- struct sk_buff *skb;
-
- u8 type, color, eop, sop, ingress_port, vlan_stripped;
- u8 fcoe, fcoe_sof, fcoe_fc_crc_ok, fcoe_enc_error, fcoe_eof;
- u8 tcp_udp_csum_ok, udp, tcp, ipv4_csum_ok;
- u8 ipv6, ipv4, ipv4_fragment, fcs_ok, rss_type, csum_not_calc;
- u8 packet_error;
- u16 q_number, completed_index, bytes_written, vlan, checksum;
- u32 rss_hash;
-
- if (skipped)
- return;
-
- skb = buf->os_buf;
- prefetch(skb->data - NET_IP_ALIGN);
- pci_unmap_single(enic->pdev, buf->dma_addr,
- buf->len, PCI_DMA_FROMDEVICE);
-
- cq_enet_rq_desc_dec((struct cq_enet_rq_desc *)cq_desc,
- &type, &color, &q_number, &completed_index,
- &ingress_port, &fcoe, &eop, &sop, &rss_type,
- &csum_not_calc, &rss_hash, &bytes_written,
- &packet_error, &vlan_stripped, &vlan, &checksum,
- &fcoe_sof, &fcoe_fc_crc_ok, &fcoe_enc_error,
- &fcoe_eof, &tcp_udp_csum_ok, &udp, &tcp,
- &ipv4_csum_ok, &ipv6, &ipv4, &ipv4_fragment,
- &fcs_ok);
-
- if (packet_error) {
-
- if (bytes_written > 0 && !fcs_ok)
- enic->rq_bad_fcs++;
-
- dev_kfree_skb_any(skb);
-
- return;
- }
-
- if (eop && bytes_written > 0) {
-
- /* Good receive
- */
-
- skb_put(skb, bytes_written);
- skb->protocol = eth_type_trans(skb, netdev);
-
- if (enic->csum_rx_enabled && !csum_not_calc) {
- skb->csum = htons(checksum);
- skb->ip_summed = CHECKSUM_COMPLETE;
- }
-
- skb->dev = netdev;
-
- if (enic->vlan_group && vlan_stripped) {
-
- if ((netdev->features & NETIF_F_LRO) && ipv4)
- lro_vlan_hwaccel_receive_skb(&enic->lro_mgr,
- skb, enic->vlan_group,
- vlan, cq_desc);
- else
- vlan_hwaccel_receive_skb(skb,
- enic->vlan_group, vlan);
-
- } else {
-
- if ((netdev->features & NETIF_F_LRO) && ipv4)
- lro_receive_skb(&enic->lro_mgr, skb, cq_desc);
- else
- netif_receive_skb(skb);
-
- }
-
- } else {
-
- /* Buffer overflow
- */
-
- dev_kfree_skb_any(skb);
- }
-}
-
-static int enic_rq_service(struct vnic_dev *vdev, struct cq_desc *cq_desc,
- u8 type, u16 q_number, u16 completed_index, void *opaque)
-{
- struct enic *enic = vnic_dev_priv(vdev);
-
- vnic_rq_service(&enic->rq[q_number], cq_desc,
- completed_index, VNIC_RQ_RETURN_DESC,
- enic_rq_indicate_buf, opaque);
-
- return 0;
-}
-
-static void enic_rq_drop_buf(struct vnic_rq *rq,
- struct cq_desc *cq_desc, struct vnic_rq_buf *buf,
- int skipped, void *opaque)
-{
- struct enic *enic = vnic_dev_priv(rq->vdev);
- struct sk_buff *skb = buf->os_buf;
-
- if (skipped)
- return;
-
- pci_unmap_single(enic->pdev, buf->dma_addr,
- buf->len, PCI_DMA_FROMDEVICE);
-
- dev_kfree_skb_any(skb);
-}
-
-static int enic_rq_service_drop(struct vnic_dev *vdev, struct cq_desc *cq_desc,
- u8 type, u16 q_number, u16 completed_index, void *opaque)
-{
- struct enic *enic = vnic_dev_priv(vdev);
-
- vnic_rq_service(&enic->rq[q_number], cq_desc,
- completed_index, VNIC_RQ_RETURN_DESC,
- enic_rq_drop_buf, opaque);
-
- return 0;
-}
-
-static int enic_poll(struct napi_struct *napi, int budget)
-{
- struct enic *enic = container_of(napi, struct enic, napi);
- struct net_device *netdev = enic->netdev;
- unsigned int rq_work_to_do = budget;
- unsigned int wq_work_to_do = -1; /* no limit */
- unsigned int work_done, rq_work_done, wq_work_done;
-
- /* Service RQ (first) and WQ
- */
-
- rq_work_done = vnic_cq_service(&enic->cq[ENIC_CQ_RQ],
- rq_work_to_do, enic_rq_service, NULL);
-
- wq_work_done = vnic_cq_service(&enic->cq[ENIC_CQ_WQ],
- wq_work_to_do, enic_wq_service, NULL);
-
- /* Accumulate intr event credits for this polling
- * cycle. An intr event is the completion of a
- * a WQ or RQ packet.
- */
-
- work_done = rq_work_done + wq_work_done;
-
- if (work_done > 0)
- vnic_intr_return_credits(&enic->intr[ENIC_INTX_WQ_RQ],
- work_done,
- 0 /* don't unmask intr */,
- 0 /* don't reset intr timer */);
-
- if (rq_work_done > 0) {
-
- /* Replenish RQ
- */
-
- vnic_rq_fill(&enic->rq[0], enic_rq_alloc_buf);
-
- } else {
-
- /* If no work done, flush all LROs and exit polling
- */
-
- if (netdev->features & NETIF_F_LRO)
- lro_flush_all(&enic->lro_mgr);
-
- napi_complete(napi);
- vnic_intr_unmask(&enic->intr[ENIC_INTX_WQ_RQ]);
- }
-
- return rq_work_done;
-}
-
-static int enic_poll_msix(struct napi_struct *napi, int budget)
-{
- struct enic *enic = container_of(napi, struct enic, napi);
- struct net_device *netdev = enic->netdev;
- unsigned int work_to_do = budget;
- unsigned int work_done;
-
- /* Service RQ
- */
-
- work_done = vnic_cq_service(&enic->cq[ENIC_CQ_RQ],
- work_to_do, enic_rq_service, NULL);
-
- if (work_done > 0) {
-
- /* Replenish RQ
- */
-
- 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
- * RQ packet.
- */
-
- vnic_intr_return_credits(&enic->intr[ENIC_MSIX_RQ],
- work_done,
- 0 /* don't unmask intr */,
- 0 /* don't reset intr timer */);
- } else {
-
- /* If no work done, flush all LROs and exit polling
- */
-
- if (netdev->features & NETIF_F_LRO)
- lro_flush_all(&enic->lro_mgr);
-
- napi_complete(napi);
- vnic_intr_unmask(&enic->intr[ENIC_MSIX_RQ]);
- }
-
- return work_done;
-}
-
-static void enic_notify_timer(unsigned long data)
-{
- struct enic *enic = (struct enic *)data;
-
- enic_notify_check(enic);
-
- mod_timer(&enic->notify_timer,
- round_jiffies(jiffies + ENIC_NOTIFY_TIMER_PERIOD));
-}
-
-static void enic_free_intr(struct enic *enic)
-{
- struct net_device *netdev = enic->netdev;
- unsigned int i;
-
- switch (vnic_dev_get_intr_mode(enic->vdev)) {
- case VNIC_DEV_INTR_MODE_INTX:
- free_irq(enic->pdev->irq, netdev);
- break;
- case VNIC_DEV_INTR_MODE_MSI:
- free_irq(enic->pdev->irq, enic);
- break;
- case VNIC_DEV_INTR_MODE_MSIX:
- for (i = 0; i < ARRAY_SIZE(enic->msix); i++)
- if (enic->msix[i].requested)
- free_irq(enic->msix_entry[i].vector,
- enic->msix[i].devid);
- break;
- default:
- break;
- }
-}
-
-static int enic_request_intr(struct enic *enic)
-{
- struct net_device *netdev = enic->netdev;
- unsigned int i;
- int err = 0;
-
- switch (vnic_dev_get_intr_mode(enic->vdev)) {
-
- case VNIC_DEV_INTR_MODE_INTX:
-
- err = request_irq(enic->pdev->irq, enic_isr_legacy,
- IRQF_SHARED, netdev->name, netdev);
- break;
-
- case VNIC_DEV_INTR_MODE_MSI:
-
- err = request_irq(enic->pdev->irq, enic_isr_msi,
- 0, netdev->name, enic);
- break;
-
- case VNIC_DEV_INTR_MODE_MSIX:
-
- sprintf(enic->msix[ENIC_MSIX_RQ].devname,
- "%.11s-rx-0", netdev->name);
- enic->msix[ENIC_MSIX_RQ].isr = enic_isr_msix_rq;
- enic->msix[ENIC_MSIX_RQ].devid = enic;
-
- sprintf(enic->msix[ENIC_MSIX_WQ].devname,
- "%.11s-tx-0", netdev->name);
- enic->msix[ENIC_MSIX_WQ].isr = enic_isr_msix_wq;
- enic->msix[ENIC_MSIX_WQ].devid = enic;
-
- sprintf(enic->msix[ENIC_MSIX_ERR].devname,
- "%.11s-err", netdev->name);
- enic->msix[ENIC_MSIX_ERR].isr = enic_isr_msix_err;
- enic->msix[ENIC_MSIX_ERR].devid = enic;
-
- sprintf(enic->msix[ENIC_MSIX_NOTIFY].devname,
- "%.11s-notify", netdev->name);
- enic->msix[ENIC_MSIX_NOTIFY].isr = enic_isr_msix_notify;
- enic->msix[ENIC_MSIX_NOTIFY].devid = enic;
-
- for (i = 0; i < ARRAY_SIZE(enic->msix); i++) {
- err = request_irq(enic->msix_entry[i].vector,
- enic->msix[i].isr, 0,
- enic->msix[i].devname,
- enic->msix[i].devid);
- if (err) {
- enic_free_intr(enic);
- break;
- }
- enic->msix[i].requested = 1;
- }
-
- break;
-
- default:
- break;
- }
-
- return err;
-}
-
-static int enic_notify_set(struct enic *enic)
-{
- int err;
-
- switch (vnic_dev_get_intr_mode(enic->vdev)) {
- case VNIC_DEV_INTR_MODE_INTX:
- err = vnic_dev_notify_set(enic->vdev, ENIC_INTX_NOTIFY);
- break;
- case VNIC_DEV_INTR_MODE_MSIX:
- err = vnic_dev_notify_set(enic->vdev, ENIC_MSIX_NOTIFY);
- break;
- default:
- err = vnic_dev_notify_set(enic->vdev, -1 /* no intr */);
- break;
- }
-
- return err;
-}
-
-static void enic_notify_timer_start(struct enic *enic)
-{
- switch (vnic_dev_get_intr_mode(enic->vdev)) {
- case VNIC_DEV_INTR_MODE_MSI:
- mod_timer(&enic->notify_timer, jiffies);
- break;
- default:
- /* Using intr for notification for INTx/MSI-X */
- break;
- };
-}
-
-/* rtnl lock is held, process context */
-static int enic_open(struct net_device *netdev)
-{
- struct enic *enic = netdev_priv(netdev);
- unsigned int i;
- int err;
-
- err = enic_request_intr(enic);
- if (err) {
- printk(KERN_ERR PFX "%s: Unable to request irq.\n",
- netdev->name);
- return err;
- }
-
- err = enic_notify_set(enic);
- if (err) {
- printk(KERN_ERR PFX
- "%s: Failed to alloc notify buffer, aborting.\n",
- netdev->name);
- goto err_out_free_intr;
- }
-
- for (i = 0; i < enic->rq_count; i++) {
- err = vnic_rq_fill(&enic->rq[i], enic_rq_alloc_buf);
- if (err) {
- printk(KERN_ERR PFX
- "%s: Unable to alloc receive buffers.\n",
- netdev->name);
- goto err_out_notify_unset;
- }
- }
-
- for (i = 0; i < enic->wq_count; i++)
- vnic_wq_enable(&enic->wq[i]);
- for (i = 0; i < enic->rq_count; i++)
- vnic_rq_enable(&enic->rq[i]);
-
- enic_add_station_addr(enic);
- enic_set_multicast_list(netdev);
-
- netif_wake_queue(netdev);
- napi_enable(&enic->napi);
- vnic_dev_enable(enic->vdev);
-
- for (i = 0; i < enic->intr_count; i++)
- vnic_intr_unmask(&enic->intr[i]);
-
- enic_notify_timer_start(enic);
-
- return 0;
-
-err_out_notify_unset:
- vnic_dev_notify_unset(enic->vdev);
-err_out_free_intr:
- enic_free_intr(enic);
-
- return err;
-}
-
-/* rtnl lock is held, process context */
-static int enic_stop(struct net_device *netdev)
-{
- struct enic *enic = netdev_priv(netdev);
- unsigned int i;
- int err;
-
- del_timer_sync(&enic->notify_timer);
-
- vnic_dev_disable(enic->vdev);
- napi_disable(&enic->napi);
- netif_stop_queue(netdev);
-
- for (i = 0; i < enic->intr_count; i++)
- vnic_intr_mask(&enic->intr[i]);
-
- for (i = 0; i < enic->wq_count; i++) {
- err = vnic_wq_disable(&enic->wq[i]);
- if (err)
- return err;
- }
- for (i = 0; i < enic->rq_count; i++) {
- err = vnic_rq_disable(&enic->rq[i]);
- if (err)
- return err;
- }
-
- vnic_dev_notify_unset(enic->vdev);
- enic_free_intr(enic);
-
- (void)vnic_cq_service(&enic->cq[ENIC_CQ_RQ],
- -1, enic_rq_service_drop, NULL);
- (void)vnic_cq_service(&enic->cq[ENIC_CQ_WQ],
- -1, enic_wq_service, NULL);
-
- for (i = 0; i < enic->wq_count; i++)
- vnic_wq_clean(&enic->wq[i], enic_free_wq_buf);
- for (i = 0; i < enic->rq_count; i++)
- vnic_rq_clean(&enic->rq[i], enic_free_rq_buf);
- for (i = 0; i < enic->cq_count; i++)
- vnic_cq_clean(&enic->cq[i]);
- for (i = 0; i < enic->intr_count; i++)
- vnic_intr_clean(&enic->intr[i]);
-
- return 0;
-}
-
-static int enic_change_mtu(struct net_device *netdev, int new_mtu)
-{
- struct enic *enic = netdev_priv(netdev);
- int running = netif_running(netdev);
-
- if (new_mtu < ENIC_MIN_MTU || new_mtu > ENIC_MAX_MTU)
- return -EINVAL;
-
- if (running)
- enic_stop(netdev);
-
- netdev->mtu = new_mtu;
-
- if (netdev->mtu > enic->port_mtu)
- printk(KERN_WARNING PFX
- "%s: interface MTU (%d) set higher "
- "than port MTU (%d)\n",
- netdev->name, netdev->mtu, enic->port_mtu);
-
- if (running)
- enic_open(netdev);
-
- return 0;
-}
-
-#ifdef CONFIG_NET_POLL_CONTROLLER
-static void enic_poll_controller(struct net_device *netdev)
-{
- struct enic *enic = netdev_priv(netdev);
- struct vnic_dev *vdev = enic->vdev;
-
- switch (vnic_dev_get_intr_mode(vdev)) {
- case VNIC_DEV_INTR_MODE_MSIX:
- enic_isr_msix_rq(enic->pdev->irq, enic);
- enic_isr_msix_wq(enic->pdev->irq, enic);
- break;
- case VNIC_DEV_INTR_MODE_MSI:
- enic_isr_msi(enic->pdev->irq, enic);
- break;
- case VNIC_DEV_INTR_MODE_INTX:
- enic_isr_legacy(enic->pdev->irq, netdev);
- break;
- default:
- break;
- }
-}
-#endif
-
-static int enic_dev_wait(struct vnic_dev *vdev,
- int (*start)(struct vnic_dev *, int),
- int (*finished)(struct vnic_dev *, int *),
- int arg)
-{
- unsigned long time;
- int done;
- int err;
-
- BUG_ON(in_interrupt());
-
- err = start(vdev, arg);
- if (err)
- return err;
-
- /* Wait for func to complete...2 seconds max
- */
-
- time = jiffies + (HZ * 2);
- do {
-
- err = finished(vdev, &done);
- if (err)
- return err;
-
- if (done)
- return 0;
-
- schedule_timeout_uninterruptible(HZ / 10);
-
- } while (time_after(time, jiffies));
-
- return -ETIMEDOUT;
-}
-
-static int enic_dev_open(struct enic *enic)
-{
- int err;
-
- err = enic_dev_wait(enic->vdev, vnic_dev_open,
- vnic_dev_open_done, 0);
- if (err)
- printk(KERN_ERR PFX
- "vNIC device open failed, err %d.\n", err);
-
- return err;
-}
-
-static int enic_dev_soft_reset(struct enic *enic)
-{
- int err;
-
- err = enic_dev_wait(enic->vdev, vnic_dev_soft_reset,
- vnic_dev_soft_reset_done, 0);
- if (err)
- printk(KERN_ERR PFX
- "vNIC soft reset failed, err %d.\n", err);
-
- return err;
-}
-
-static int enic_set_niccfg(struct enic *enic)
-{
- const u8 rss_default_cpu = 0;
- const u8 rss_hash_type = 0;
- const u8 rss_hash_bits = 0;
- const u8 rss_base_cpu = 0;
- const u8 rss_enable = 0;
- const u8 tso_ipid_split_en = 0;
- 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,
- rss_hash_bits, rss_base_cpu,
- rss_enable, tso_ipid_split_en,
- ig_vlan_strip_en);
-}
-
-static void enic_reset(struct work_struct *work)
-{
- struct enic *enic = container_of(work, struct enic, reset);
-
- if (!netif_running(enic->netdev))
- return;
-
- rtnl_lock();
-
- spin_lock(&enic->devcmd_lock);
- vnic_dev_hang_notify(enic->vdev);
- spin_unlock(&enic->devcmd_lock);
-
- enic_stop(enic->netdev);
- enic_dev_soft_reset(enic);
- vnic_dev_init(enic->vdev, 0);
- enic_reset_mcaddrs(enic);
- enic_init_vnic_resources(enic);
- enic_set_niccfg(enic);
- enic_open(enic->netdev);
-
- rtnl_unlock();
-}
-
-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 i;
-
- /* Set interrupt mode (INTx, MSI, MSI-X) depending
- * system capabilities.
- *
- * Try MSI-X first
- *
- * We need n RQs, m WQs, n+m CQs, and n+m+2 INTRs
- * (the second to last INTR is used for WQ/RQ errors)
- * (the last INTR is used for notifications)
- */
-
- BUG_ON(ARRAY_SIZE(enic->msix_entry) < n + m + 2);
- for (i = 0; i < n + m + 2; i++)
- enic->msix_entry[i].entry = i;
-
- if (enic->config.intr_mode < 1 &&
- enic->rq_count >= n &&
- enic->wq_count >= m &&
- enic->cq_count >= n + m &&
- enic->intr_count >= n + m + 2 &&
- !pci_enable_msix(enic->pdev, enic->msix_entry, n + m + 2)) {
-
- enic->rq_count = n;
- enic->wq_count = m;
- enic->cq_count = n + m;
- enic->intr_count = n + m + 2;
-
- vnic_dev_set_intr_mode(enic->vdev, VNIC_DEV_INTR_MODE_MSIX);
-
- return 0;
- }
-
- /* Next try MSI
- *
- * We need 1 RQ, 1 WQ, 2 CQs, and 1 INTR
- */
-
- if (enic->config.intr_mode < 2 &&
- enic->rq_count >= 1 &&
- enic->wq_count >= 1 &&
- enic->cq_count >= 2 &&
- enic->intr_count >= 1 &&
- !pci_enable_msi(enic->pdev)) {
-
- enic->rq_count = 1;
- enic->wq_count = 1;
- enic->cq_count = 2;
- enic->intr_count = 1;
-
- vnic_dev_set_intr_mode(enic->vdev, VNIC_DEV_INTR_MODE_MSI);
-
- return 0;
- }
-
- /* Next try INTx
- *
- * We need 1 RQ, 1 WQ, 2 CQs, and 3 INTRs
- * (the first INTR is used for WQ/RQ)
- * (the second INTR is used for WQ/RQ errors)
- * (the last INTR is used for notifications)
- */
-
- if (enic->config.intr_mode < 3 &&
- enic->rq_count >= 1 &&
- enic->wq_count >= 1 &&
- enic->cq_count >= 2 &&
- enic->intr_count >= 3) {
-
- enic->rq_count = 1;
- enic->wq_count = 1;
- enic->cq_count = 2;
- enic->intr_count = 3;
-
- vnic_dev_set_intr_mode(enic->vdev, VNIC_DEV_INTR_MODE_INTX);
-
- return 0;
- }
-
- vnic_dev_set_intr_mode(enic->vdev, VNIC_DEV_INTR_MODE_UNKNOWN);
-
- return -EINVAL;
-}
-
-static void enic_clear_intr_mode(struct enic *enic)
-{
- switch (vnic_dev_get_intr_mode(enic->vdev)) {
- case VNIC_DEV_INTR_MODE_MSIX:
- pci_disable_msix(enic->pdev);
- break;
- case VNIC_DEV_INTR_MODE_MSI:
- pci_disable_msi(enic->pdev);
- break;
- default:
- break;
- }
-
- vnic_dev_set_intr_mode(enic->vdev, VNIC_DEV_INTR_MODE_UNKNOWN);
-}
-
-static void enic_iounmap(struct enic *enic)
-{
- if (enic->bar0.vaddr)
- iounmap(enic->bar0.vaddr);
-}
-
-static const struct net_device_ops enic_netdev_ops = {
- .ndo_open = enic_open,
- .ndo_stop = enic_stop,
- .ndo_start_xmit = enic_hard_start_xmit,
- .ndo_get_stats = enic_get_stats,
- .ndo_validate_addr = eth_validate_addr,
- .ndo_set_mac_address = eth_mac_addr,
- .ndo_set_multicast_list = enic_set_multicast_list,
- .ndo_change_mtu = enic_change_mtu,
- .ndo_vlan_rx_register = enic_vlan_rx_register,
- .ndo_vlan_rx_add_vid = enic_vlan_rx_add_vid,
- .ndo_vlan_rx_kill_vid = enic_vlan_rx_kill_vid,
- .ndo_tx_timeout = enic_tx_timeout,
-#ifdef CONFIG_NET_POLL_CONTROLLER
- .ndo_poll_controller = enic_poll_controller,
-#endif
-};
-
-static int __devinit enic_probe(struct pci_dev *pdev,
- const struct pci_device_id *ent)
-{
- struct net_device *netdev;
- struct enic *enic;
- int using_dac = 0;
- unsigned int i;
- int err;
-
- /* Allocate net device structure and initialize. Private
- * instance data is initialized to zero.
- */
-
- netdev = alloc_etherdev(sizeof(struct enic));
- if (!netdev) {
- printk(KERN_ERR PFX "Etherdev alloc failed, aborting.\n");
- return -ENOMEM;
- }
-
- pci_set_drvdata(pdev, netdev);
-
- SET_NETDEV_DEV(netdev, &pdev->dev);
-
- enic = netdev_priv(netdev);
- enic->netdev = netdev;
- enic->pdev = pdev;
-
- /* Setup PCI resources
- */
-
- err = pci_enable_device(pdev);
- if (err) {
- printk(KERN_ERR PFX
- "Cannot enable PCI device, aborting.\n");
- goto err_out_free_netdev;
- }
-
- err = pci_request_regions(pdev, DRV_NAME);
- if (err) {
- printk(KERN_ERR PFX
- "Cannot request PCI regions, aborting.\n");
- goto err_out_disable_device;
- }
-
- pci_set_master(pdev);
-
- /* Query PCI controller on system for DMA addressing
- * limitation for the device. Try 40-bit first, and
- * fail to 32-bit.
- */
-
- err = pci_set_dma_mask(pdev, DMA_BIT_MASK(40));
- if (err) {
- err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
- if (err) {
- printk(KERN_ERR PFX
- "No usable DMA configuration, aborting.\n");
- goto err_out_release_regions;
- }
- err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
- if (err) {
- printk(KERN_ERR PFX
- "Unable to obtain 32-bit DMA "
- "for consistent allocations, aborting.\n");
- goto err_out_release_regions;
- }
- } else {
- err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(40));
- if (err) {
- printk(KERN_ERR PFX
- "Unable to obtain 40-bit DMA "
- "for consistent allocations, aborting.\n");
- goto err_out_release_regions;
- }
- using_dac = 1;
- }
-
- /* Map vNIC resources from BAR0
- */
-
- if (!(pci_resource_flags(pdev, 0) & IORESOURCE_MEM)) {
- printk(KERN_ERR PFX
- "BAR0 not memory-map'able, aborting.\n");
- err = -ENODEV;
- goto err_out_release_regions;
- }
-
- enic->bar0.vaddr = pci_iomap(pdev, 0, enic->bar0.len);
- enic->bar0.bus_addr = pci_resource_start(pdev, 0);
- enic->bar0.len = pci_resource_len(pdev, 0);
-
- if (!enic->bar0.vaddr) {
- printk(KERN_ERR PFX
- "Cannot memory-map BAR0 res hdr, aborting.\n");
- err = -ENODEV;
- goto err_out_release_regions;
- }
-
- /* Register vNIC device
- */
-
- enic->vdev = vnic_dev_register(NULL, enic, pdev, &enic->bar0);
- if (!enic->vdev) {
- printk(KERN_ERR PFX
- "vNIC registration failed, aborting.\n");
- err = -ENODEV;
- goto err_out_iounmap;
- }
-
- /* Issue device open to get device in known state
- */
-
- err = enic_dev_open(enic);
- if (err) {
- printk(KERN_ERR PFX
- "vNIC dev open failed, aborting.\n");
- goto err_out_vnic_unregister;
- }
-
- /* Issue device init to initialize the vnic-to-switch link.
- * We'll start with carrier off and wait for link UP
- * notification later to turn on carrier. We don't need
- * to wait here for the vnic-to-switch link initialization
- * to complete; link UP notification is the indication that
- * the process is complete.
- */
-
- netif_carrier_off(netdev);
-
- err = vnic_dev_init(enic->vdev, 0);
- if (err) {
- printk(KERN_ERR PFX
- "vNIC dev init failed, aborting.\n");
- goto err_out_dev_close;
- }
-
- /* Get vNIC configuration
- */
-
- err = enic_get_vnic_config(enic);
- if (err) {
- printk(KERN_ERR PFX
- "Get vNIC configuration 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
- */
-
- init_timer(&enic->notify_timer);
- enic->notify_timer.function = enic_notify_timer;
- enic->notify_timer.data = (unsigned long)enic;
-
- INIT_WORK(&enic->reset, enic_reset);
-
- for (i = 0; i < enic->wq_count; i++)
- spin_lock_init(&enic->wq_lock[i]);
-
- spin_lock_init(&enic->devcmd_lock);
-
- /* Register net device
- */
-
- enic->port_mtu = enic->config.mtu;
- (void)enic_change_mtu(netdev, enic->port_mtu);
-
- err = enic_set_mac_addr(netdev, enic->mac_addr);
- if (err) {
- printk(KERN_ERR PFX
- "Invalid MAC address, aborting.\n");
- goto err_out_free_vnic_resources;
- }
-
- 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;
- if (ENIC_SETTING(enic, TXCSUM))
- netdev->features |= NETIF_F_SG | NETIF_F_HW_CSUM;
- if (ENIC_SETTING(enic, TSO))
- netdev->features |= NETIF_F_TSO |
- NETIF_F_TSO6 | NETIF_F_TSO_ECN;
- if (ENIC_SETTING(enic, LRO))
- netdev->features |= NETIF_F_LRO;
- if (using_dac)
- netdev->features |= NETIF_F_HIGHDMA;
-
- enic->csum_rx_enabled = ENIC_SETTING(enic, RXCSUM);
-
- enic->lro_mgr.max_aggr = ENIC_LRO_MAX_AGGR;
- enic->lro_mgr.max_desc = ENIC_LRO_MAX_DESC;
- enic->lro_mgr.lro_arr = enic->lro_desc;
- enic->lro_mgr.get_skb_header = enic_get_skb_header;
- enic->lro_mgr.features = LRO_F_NAPI | LRO_F_EXTRACT_VLAN_ID;
- enic->lro_mgr.dev = netdev;
- enic->lro_mgr.ip_summed = CHECKSUM_COMPLETE;
- enic->lro_mgr.ip_summed_aggr = CHECKSUM_UNNECESSARY;
-
- err = register_netdev(netdev);
- if (err) {
- printk(KERN_ERR PFX
- "Cannot register net device, aborting.\n");
- goto err_out_free_vnic_resources;
- }
-
- return 0;
-
-err_out_free_vnic_resources:
- enic_free_vnic_resources(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);
-err_out_release_regions:
- pci_release_regions(pdev);
-err_out_disable_device:
- pci_disable_device(pdev);
-err_out_free_netdev:
- pci_set_drvdata(pdev, NULL);
- free_netdev(netdev);
-
- return err;
-}
-
-static void __devexit enic_remove(struct pci_dev *pdev)
-{
- struct net_device *netdev = pci_get_drvdata(pdev);
-
- if (netdev) {
- struct enic *enic = netdev_priv(netdev);
-
- flush_scheduled_work();
- unregister_netdev(netdev);
- enic_free_vnic_resources(enic);
- vnic_dev_close(enic->vdev);
- enic_clear_intr_mode(enic);
- vnic_dev_unregister(enic->vdev);
- enic_iounmap(enic);
- pci_release_regions(pdev);
- pci_disable_device(pdev);
- pci_set_drvdata(pdev, NULL);
- free_netdev(netdev);
- }
-}
-
-static struct pci_driver enic_driver = {
- .name = DRV_NAME,
- .id_table = enic_id_table,
- .probe = enic_probe,
- .remove = __devexit_p(enic_remove),
-};
-
-static int __init enic_init_module(void)
-{
- printk(KERN_INFO PFX "%s, ver %s\n", DRV_DESCRIPTION, DRV_VERSION);
-
- return pci_register_driver(&enic_driver);
-}
-
-static void __exit enic_cleanup_module(void)
-{
- pci_unregister_driver(&enic_driver);
-}
-
-module_init(enic_init_module);
-module_exit(enic_cleanup_module);
diff --git a/drivers/net/enic/enic_res.c b/drivers/net/enic/enic_res.c
deleted file mode 100644
index e5fc9384f8f..00000000000
--- a/drivers/net/enic/enic_res.c
+++ /dev/null
@@ -1,367 +0,0 @@
-/*
- * Copyright 2008 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
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-#include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/types.h>
-#include <linux/pci.h>
-#include <linux/netdevice.h>
-
-#include "wq_enet_desc.h"
-#include "rq_enet_desc.h"
-#include "cq_enet_desc.h"
-#include "vnic_resource.h"
-#include "vnic_enet.h"
-#include "vnic_dev.h"
-#include "vnic_wq.h"
-#include "vnic_rq.h"
-#include "vnic_cq.h"
-#include "vnic_intr.h"
-#include "vnic_stats.h"
-#include "vnic_nic.h"
-#include "vnic_rss.h"
-#include "enic_res.h"
-#include "enic.h"
-
-int enic_get_vnic_config(struct enic *enic)
-{
- struct vnic_enet_config *c = &enic->config;
- int err;
-
- err = vnic_dev_mac_addr(enic->vdev, enic->mac_addr);
- if (err) {
- printk(KERN_ERR PFX "Error getting MAC addr, %d\n", err);
- return err;
- }
-
-#define GET_CONFIG(m) \
- do { \
- err = vnic_dev_spec(enic->vdev, \
- offsetof(struct vnic_enet_config, m), \
- sizeof(c->m), &c->m); \
- if (err) { \
- printk(KERN_ERR PFX \
- "Error getting %s, %d\n", #m, err); \
- return err; \
- } \
- } while (0)
-
- GET_CONFIG(flags);
- GET_CONFIG(wq_desc_count);
- GET_CONFIG(rq_desc_count);
- GET_CONFIG(mtu);
- GET_CONFIG(intr_timer);
- GET_CONFIG(intr_timer_type);
- GET_CONFIG(intr_mode);
-
- c->wq_desc_count =
- min_t(u32, ENIC_MAX_WQ_DESCS,
- max_t(u32, ENIC_MIN_WQ_DESCS,
- c->wq_desc_count));
- c->wq_desc_count &= 0xfffffff0; /* must be aligned to groups of 16 */
-
- c->rq_desc_count =
- min_t(u32, ENIC_MAX_RQ_DESCS,
- max_t(u32, ENIC_MIN_RQ_DESCS,
- c->rq_desc_count));
- c->rq_desc_count &= 0xfffffff0; /* must be aligned to groups of 16 */
-
- if (c->mtu == 0)
- c->mtu = 1500;
- c->mtu = min_t(u16, ENIC_MAX_MTU,
- max_t(u16, ENIC_MIN_MTU,
- c->mtu));
-
- c->intr_timer = min_t(u16, VNIC_INTR_TIMER_MAX, c->intr_timer);
-
- printk(KERN_INFO PFX "vNIC MAC addr %pM wq/rq %d/%d\n",
- enic->mac_addr, c->wq_desc_count, c->rq_desc_count);
- printk(KERN_INFO PFX "vNIC mtu %d csum tx/rx %d/%d tso/lro %d/%d "
- "intr timer %d\n",
- c->mtu, ENIC_SETTING(enic, TXCSUM),
- ENIC_SETTING(enic, RXCSUM), ENIC_SETTING(enic, TSO),
- ENIC_SETTING(enic, LRO), c->intr_timer);
-
- return 0;
-}
-
-void enic_add_station_addr(struct enic *enic)
-{
- vnic_dev_add_addr(enic->vdev, enic->mac_addr);
-}
-
-void enic_add_multicast_addr(struct enic *enic, u8 *addr)
-{
- vnic_dev_add_addr(enic->vdev, addr);
-}
-
-void enic_del_multicast_addr(struct enic *enic, u8 *addr)
-{
- vnic_dev_del_addr(enic->vdev, addr);
-}
-
-void enic_add_vlan(struct enic *enic, u16 vlanid)
-{
- u64 a0 = vlanid, a1 = 0;
- int wait = 1000;
- int err;
-
- err = vnic_dev_cmd(enic->vdev, CMD_VLAN_ADD, &a0, &a1, wait);
- if (err)
- printk(KERN_ERR PFX "Can't add vlan id, %d\n", err);
-}
-
-void enic_del_vlan(struct enic *enic, u16 vlanid)
-{
- u64 a0 = vlanid, a1 = 0;
- int wait = 1000;
- int err;
-
- err = vnic_dev_cmd(enic->vdev, CMD_VLAN_DEL, &a0, &a1, wait);
- if (err)
- printk(KERN_ERR PFX "Can't delete vlan id, %d\n", err);
-}
-
-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)
-{
- u64 a0, a1;
- u32 nic_cfg;
- int wait = 1000;
-
- vnic_set_nic_cfg(&nic_cfg, rss_default_cpu,
- rss_hash_type, rss_hash_bits, rss_base_cpu,
- rss_enable, tso_ipid_split_en, ig_vlan_strip_en);
-
- a0 = nic_cfg;
- a1 = 0;
-
- return vnic_dev_cmd(enic->vdev, CMD_NIC_CFG, &a0, &a1, wait);
-}
-
-void enic_free_vnic_resources(struct enic *enic)
-{
- unsigned int i;
-
- for (i = 0; i < enic->wq_count; i++)
- vnic_wq_free(&enic->wq[i]);
- for (i = 0; i < enic->rq_count; i++)
- vnic_rq_free(&enic->rq[i]);
- for (i = 0; i < enic->cq_count; i++)
- vnic_cq_free(&enic->cq[i]);
- for (i = 0; i < enic->intr_count; i++)
- vnic_intr_free(&enic->intr[i]);
-}
-
-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);
-
- printk(KERN_INFO PFX "vNIC resources avail: "
- "wq %d rq %d cq %d intr %d\n",
- enic->wq_count, enic->rq_count,
- enic->cq_count, enic->intr_count);
-}
-
-void enic_init_vnic_resources(struct enic *enic)
-{
- enum vnic_dev_intr_mode intr_mode;
- unsigned int mask_on_assertion;
- unsigned int interrupt_offset;
- unsigned int error_interrupt_enable;
- unsigned int error_interrupt_offset;
- unsigned int cq_index;
- unsigned int i;
-
- intr_mode = vnic_dev_get_intr_mode(enic->vdev);
-
- /* Init RQ/WQ resources.
- *
- * RQ[0 - n-1] point to CQ[0 - n-1]
- * WQ[0 - m-1] point to CQ[n - n+m-1]
- *
- * Error interrupt is not enabled for MSI.
- */
-
- switch (intr_mode) {
- case VNIC_DEV_INTR_MODE_INTX:
- case VNIC_DEV_INTR_MODE_MSIX:
- error_interrupt_enable = 1;
- error_interrupt_offset = enic->intr_count - 2;
- break;
- default:
- error_interrupt_enable = 0;
- error_interrupt_offset = 0;
- break;
- }
-
- for (i = 0; i < enic->rq_count; i++) {
- cq_index = i;
- vnic_rq_init(&enic->rq[i],
- cq_index,
- error_interrupt_enable,
- error_interrupt_offset);
- }
-
- for (i = 0; i < enic->wq_count; i++) {
- cq_index = enic->rq_count + i;
- vnic_wq_init(&enic->wq[i],
- cq_index,
- error_interrupt_enable,
- error_interrupt_offset);
- }
-
- /* Init CQ resources
- *
- * CQ[0 - n+m-1] point to INTR[0] for INTx, MSI
- * CQ[0 - n+m-1] point to INTR[0 - n+m-1] for MSI-X
- */
-
- for (i = 0; i < enic->cq_count; i++) {
-
- switch (intr_mode) {
- case VNIC_DEV_INTR_MODE_MSIX:
- interrupt_offset = i;
- break;
- default:
- interrupt_offset = 0;
- break;
- }
-
- vnic_cq_init(&enic->cq[i],
- 0 /* flow_control_enable */,
- 1 /* color_enable */,
- 0 /* cq_head */,
- 0 /* cq_tail */,
- 1 /* cq_tail_color */,
- 1 /* interrupt_enable */,
- 1 /* cq_entry_enable */,
- 0 /* cq_message_enable */,
- interrupt_offset,
- 0 /* cq_message_addr */);
- }
-
- /* Init INTR resources
- *
- * mask_on_assertion is not used for INTx due to the level-
- * triggered nature of INTx
- */
-
- switch (intr_mode) {
- case VNIC_DEV_INTR_MODE_MSI:
- case VNIC_DEV_INTR_MODE_MSIX:
- mask_on_assertion = 1;
- break;
- default:
- mask_on_assertion = 0;
- break;
- }
-
- for (i = 0; i < enic->intr_count; i++) {
- vnic_intr_init(&enic->intr[i],
- enic->config.intr_timer,
- enic->config.intr_timer_type,
- mask_on_assertion);
- }
-
- /* Clear LIF stats
- */
-
- vnic_dev_stats_clear(enic->vdev);
-}
-
-int enic_alloc_vnic_resources(struct enic *enic)
-{
- enum vnic_dev_intr_mode intr_mode;
- unsigned int i;
- int err;
-
- intr_mode = vnic_dev_get_intr_mode(enic->vdev);
-
- printk(KERN_INFO PFX "vNIC resources used: "
- "wq %d rq %d cq %d intr %d intr mode %s\n",
- enic->wq_count, enic->rq_count,
- enic->cq_count, enic->intr_count,
- intr_mode == VNIC_DEV_INTR_MODE_INTX ? "legacy PCI INTx" :
- intr_mode == VNIC_DEV_INTR_MODE_MSI ? "MSI" :
- intr_mode == VNIC_DEV_INTR_MODE_MSIX ? "MSI-X" :
- "unknown"
- );
-
- /* Allocate queue resources
- */
-
- for (i = 0; i < enic->wq_count; i++) {
- err = vnic_wq_alloc(enic->vdev, &enic->wq[i], i,
- enic->config.wq_desc_count,
- sizeof(struct wq_enet_desc));
- if (err)
- goto err_out_cleanup;
- }
-
- for (i = 0; i < enic->rq_count; i++) {
- err = vnic_rq_alloc(enic->vdev, &enic->rq[i], i,
- enic->config.rq_desc_count,
- sizeof(struct rq_enet_desc));
- if (err)
- goto err_out_cleanup;
- }
-
- for (i = 0; i < enic->cq_count; i++) {
- if (i < enic->rq_count)
- err = vnic_cq_alloc(enic->vdev, &enic->cq[i], i,
- enic->config.rq_desc_count,
- sizeof(struct cq_enet_rq_desc));
- else
- err = vnic_cq_alloc(enic->vdev, &enic->cq[i], i,
- enic->config.wq_desc_count,
- sizeof(struct cq_enet_wq_desc));
- if (err)
- goto err_out_cleanup;
- }
-
- for (i = 0; i < enic->intr_count; i++) {
- err = vnic_intr_alloc(enic->vdev, &enic->intr[i], i);
- if (err)
- goto err_out_cleanup;
- }
-
- /* Hook remaining resource
- */
-
- enic->legacy_pba = vnic_dev_get_res(enic->vdev,
- RES_TYPE_INTR_PBA_LEGACY, 0);
- if (!enic->legacy_pba && intr_mode == VNIC_DEV_INTR_MODE_INTX) {
- printk(KERN_ERR PFX "Failed to hook legacy pba resource\n");
- err = -ENODEV;
- goto err_out_cleanup;
- }
-
- return 0;
-
-err_out_cleanup:
- enic_free_vnic_resources(enic);
-
- return err;
-}
diff --git a/drivers/net/enic/enic_res.h b/drivers/net/enic/enic_res.h
deleted file mode 100644
index 7bf272fa859..00000000000
--- a/drivers/net/enic/enic_res.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright 2008 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
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-#ifndef _ENIC_RES_H_
-#define _ENIC_RES_H_
-
-#include "wq_enet_desc.h"
-#include "rq_enet_desc.h"
-#include "vnic_wq.h"
-#include "vnic_rq.h"
-
-#define ENIC_MIN_WQ_DESCS 64
-#define ENIC_MAX_WQ_DESCS 4096
-#define ENIC_MIN_RQ_DESCS 64
-#define ENIC_MAX_RQ_DESCS 4096
-
-#define ENIC_MIN_MTU 576 /* minimum for IPv4 */
-#define ENIC_MAX_MTU 9000
-
-#define ENIC_MULTICAST_PERFECT_FILTERS 32
-
-#define ENIC_NON_TSO_MAX_DESC 16
-
-#define ENIC_SETTING(enic, f) ((enic->config.flags & VENETF_##f) ? 1 : 0)
-
-static inline void enic_queue_wq_desc_ex(struct vnic_wq *wq,
- void *os_buf, dma_addr_t dma_addr, unsigned int len,
- unsigned int mss_or_csum_offset, unsigned int hdr_len,
- int vlan_tag_insert, unsigned int vlan_tag,
- int offload_mode, int cq_entry, int sop, int eop)
-{
- struct wq_enet_desc *desc = vnic_wq_next_desc(wq);
-
- wq_enet_desc_enc(desc,
- (u64)dma_addr | VNIC_PADDR_TARGET,
- (u16)len,
- (u16)mss_or_csum_offset,
- (u16)hdr_len, (u8)offload_mode,
- (u8)eop, (u8)cq_entry,
- 0, /* fcoe_encap */
- (u8)vlan_tag_insert,
- (u16)vlan_tag,
- 0 /* loopback */);
-
- vnic_wq_post(wq, os_buf, dma_addr, len, sop, eop);
-}
-
-static inline void enic_queue_wq_desc_cont(struct vnic_wq *wq,
- void *os_buf, dma_addr_t dma_addr, unsigned int len, int eop)
-{
- enic_queue_wq_desc_ex(wq, os_buf, dma_addr, len,
- 0, 0, 0, 0, 0,
- eop, 0 /* !SOP */, eop);
-}
-
-static inline void enic_queue_wq_desc(struct vnic_wq *wq, void *os_buf,
- dma_addr_t dma_addr, unsigned int len, int vlan_tag_insert,
- unsigned int vlan_tag, int eop)
-{
- enic_queue_wq_desc_ex(wq, os_buf, dma_addr, len,
- 0, 0, vlan_tag_insert, vlan_tag,
- WQ_ENET_OFFLOAD_MODE_CSUM,
- eop, 1 /* SOP */, eop);
-}
-
-static inline void enic_queue_wq_desc_csum(struct vnic_wq *wq,
- void *os_buf, dma_addr_t dma_addr, unsigned int len,
- int ip_csum, int tcpudp_csum, int vlan_tag_insert,
- unsigned int vlan_tag, int eop)
-{
- enic_queue_wq_desc_ex(wq, os_buf, dma_addr, len,
- (ip_csum ? 1 : 0) + (tcpudp_csum ? 2 : 0),
- 0, vlan_tag_insert, vlan_tag,
- WQ_ENET_OFFLOAD_MODE_CSUM,
- eop, 1 /* SOP */, eop);
-}
-
-static inline void enic_queue_wq_desc_csum_l4(struct vnic_wq *wq,
- void *os_buf, dma_addr_t dma_addr, unsigned int len,
- unsigned int csum_offset, unsigned int hdr_len,
- int vlan_tag_insert, unsigned int vlan_tag, int eop)
-{
- enic_queue_wq_desc_ex(wq, os_buf, dma_addr, len,
- csum_offset, hdr_len, vlan_tag_insert, vlan_tag,
- WQ_ENET_OFFLOAD_MODE_CSUM_L4,
- eop, 1 /* SOP */, eop);
-}
-
-static inline void enic_queue_wq_desc_tso(struct vnic_wq *wq,
- void *os_buf, dma_addr_t dma_addr, unsigned int len,
- unsigned int mss, unsigned int hdr_len, int vlan_tag_insert,
- unsigned int vlan_tag, int eop)
-{
- enic_queue_wq_desc_ex(wq, os_buf, dma_addr, len,
- mss, hdr_len, vlan_tag_insert, vlan_tag,
- WQ_ENET_OFFLOAD_MODE_TSO,
- eop, 1 /* SOP */, eop);
-}
-
-static inline void enic_queue_rq_desc(struct vnic_rq *rq,
- void *os_buf, unsigned int os_buf_index,
- dma_addr_t dma_addr, unsigned int len)
-{
- struct rq_enet_desc *desc = vnic_rq_next_desc(rq);
- u8 type = os_buf_index ?
- RQ_ENET_TYPE_NOT_SOP : RQ_ENET_TYPE_ONLY_SOP;
-
- rq_enet_desc_enc(desc,
- (u64)dma_addr | VNIC_PADDR_TARGET,
- type, (u16)len);
-
- vnic_rq_post(rq, os_buf, os_buf_index, dma_addr, len);
-}
-
-struct enic;
-
-int enic_get_vnic_config(struct enic *);
-void enic_add_station_addr(struct enic *enic);
-void enic_add_multicast_addr(struct enic *enic, u8 *addr);
-void enic_del_multicast_addr(struct enic *enic, u8 *addr);
-void enic_add_vlan(struct enic *enic, u16 vlanid);
-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);
-void enic_get_res_counts(struct enic *enic);
-void enic_init_vnic_resources(struct enic *enic);
-int enic_alloc_vnic_resources(struct enic *);
-void enic_free_vnic_resources(struct enic *);
-
-#endif /* _ENIC_RES_H_ */
diff --git a/drivers/net/enic/rq_enet_desc.h b/drivers/net/enic/rq_enet_desc.h
deleted file mode 100644
index a06e649010c..00000000000
--- a/drivers/net/enic/rq_enet_desc.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright 2008 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
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-#ifndef _RQ_ENET_DESC_H_
-#define _RQ_ENET_DESC_H_
-
-/* Ethernet receive queue descriptor: 16B */
-struct rq_enet_desc {
- __le64 address;
- __le16 length_type;
- u8 reserved[6];
-};
-
-enum rq_enet_type_types {
- RQ_ENET_TYPE_ONLY_SOP = 0,
- RQ_ENET_TYPE_NOT_SOP = 1,
- RQ_ENET_TYPE_RESV2 = 2,
- RQ_ENET_TYPE_RESV3 = 3,
-};
-
-#define RQ_ENET_ADDR_BITS 64
-#define RQ_ENET_LEN_BITS 14
-#define RQ_ENET_LEN_MASK ((1 << RQ_ENET_LEN_BITS) - 1)
-#define RQ_ENET_TYPE_BITS 2
-#define RQ_ENET_TYPE_MASK ((1 << RQ_ENET_TYPE_BITS) - 1)
-
-static inline void rq_enet_desc_enc(struct rq_enet_desc *desc,
- u64 address, u8 type, u16 length)
-{
- desc->address = cpu_to_le64(address);
- desc->length_type = cpu_to_le16((length & RQ_ENET_LEN_MASK) |
- ((type & RQ_ENET_TYPE_MASK) << RQ_ENET_LEN_BITS));
-}
-
-static inline void rq_enet_desc_dec(struct rq_enet_desc *desc,
- u64 *address, u8 *type, u16 *length)
-{
- *address = le64_to_cpu(desc->address);
- *length = le16_to_cpu(desc->length_type) & RQ_ENET_LEN_MASK;
- *type = (u8)((le16_to_cpu(desc->length_type) >> RQ_ENET_LEN_BITS) &
- RQ_ENET_TYPE_MASK);
-}
-
-#endif /* _RQ_ENET_DESC_H_ */
diff --git a/drivers/net/enic/vnic_cq.c b/drivers/net/enic/vnic_cq.c
deleted file mode 100644
index 020ae6c3f3d..00000000000
--- a/drivers/net/enic/vnic_cq.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright 2008 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
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-#include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/types.h>
-#include <linux/pci.h>
-
-#include "vnic_dev.h"
-#include "vnic_cq.h"
-
-void vnic_cq_free(struct vnic_cq *cq)
-{
- vnic_dev_free_desc_ring(cq->vdev, &cq->ring);
-
- cq->ctrl = NULL;
-}
-
-int vnic_cq_alloc(struct vnic_dev *vdev, struct vnic_cq *cq, unsigned int index,
- unsigned int desc_count, unsigned int desc_size)
-{
- int err;
-
- cq->index = index;
- cq->vdev = vdev;
-
- cq->ctrl = vnic_dev_get_res(vdev, RES_TYPE_CQ, index);
- if (!cq->ctrl) {
- printk(KERN_ERR "Failed to hook CQ[%d] resource\n", index);
- return -EINVAL;
- }
-
- err = vnic_dev_alloc_desc_ring(vdev, &cq->ring, desc_count, desc_size);
- if (err)
- return err;
-
- return 0;
-}
-
-void vnic_cq_init(struct vnic_cq *cq, unsigned int flow_control_enable,
- unsigned int color_enable, unsigned int cq_head, unsigned int cq_tail,
- unsigned int cq_tail_color, unsigned int interrupt_enable,
- unsigned int cq_entry_enable, unsigned int cq_message_enable,
- unsigned int interrupt_offset, u64 cq_message_addr)
-{
- u64 paddr;
-
- paddr = (u64)cq->ring.base_addr | VNIC_PADDR_TARGET;
- writeq(paddr, &cq->ctrl->ring_base);
- iowrite32(cq->ring.desc_count, &cq->ctrl->ring_size);
- iowrite32(flow_control_enable, &cq->ctrl->flow_control_enable);
- iowrite32(color_enable, &cq->ctrl->color_enable);
- iowrite32(cq_head, &cq->ctrl->cq_head);
- iowrite32(cq_tail, &cq->ctrl->cq_tail);
- iowrite32(cq_tail_color, &cq->ctrl->cq_tail_color);
- iowrite32(interrupt_enable, &cq->ctrl->interrupt_enable);
- iowrite32(cq_entry_enable, &cq->ctrl->cq_entry_enable);
- iowrite32(cq_message_enable, &cq->ctrl->cq_message_enable);
- iowrite32(interrupt_offset, &cq->ctrl->interrupt_offset);
- writeq(cq_message_addr, &cq->ctrl->cq_message_addr);
-}
-
-void vnic_cq_clean(struct vnic_cq *cq)
-{
- cq->to_clean = 0;
- cq->last_color = 0;
-
- iowrite32(0, &cq->ctrl->cq_head);
- iowrite32(0, &cq->ctrl->cq_tail);
- iowrite32(1, &cq->ctrl->cq_tail_color);
-
- vnic_dev_clear_desc_ring(&cq->ring);
-}
diff --git a/drivers/net/enic/vnic_cq.h b/drivers/net/enic/vnic_cq.h
deleted file mode 100644
index 114763cbc2f..00000000000
--- a/drivers/net/enic/vnic_cq.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright 2008 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
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-#ifndef _VNIC_CQ_H_
-#define _VNIC_CQ_H_
-
-#include "cq_desc.h"
-#include "vnic_dev.h"
-
-/* Completion queue control */
-struct vnic_cq_ctrl {
- u64 ring_base; /* 0x00 */
- u32 ring_size; /* 0x08 */
- u32 pad0;
- u32 flow_control_enable; /* 0x10 */
- u32 pad1;
- u32 color_enable; /* 0x18 */
- u32 pad2;
- u32 cq_head; /* 0x20 */
- u32 pad3;
- u32 cq_tail; /* 0x28 */
- u32 pad4;
- u32 cq_tail_color; /* 0x30 */
- u32 pad5;
- u32 interrupt_enable; /* 0x38 */
- u32 pad6;
- u32 cq_entry_enable; /* 0x40 */
- u32 pad7;
- u32 cq_message_enable; /* 0x48 */
- u32 pad8;
- u32 interrupt_offset; /* 0x50 */
- u32 pad9;
- u64 cq_message_addr; /* 0x58 */
- u32 pad10;
-};
-
-struct vnic_cq {
- unsigned int index;
- struct vnic_dev *vdev;
- struct vnic_cq_ctrl __iomem *ctrl; /* memory-mapped */
- struct vnic_dev_ring ring;
- unsigned int to_clean;
- unsigned int last_color;
-};
-
-static inline unsigned int vnic_cq_service(struct vnic_cq *cq,
- unsigned int work_to_do,
- int (*q_service)(struct vnic_dev *vdev, struct cq_desc *cq_desc,
- u8 type, u16 q_number, u16 completed_index, void *opaque),
- void *opaque)
-{
- struct cq_desc *cq_desc;
- unsigned int work_done = 0;
- u16 q_number, completed_index;
- u8 type, color;
-
- cq_desc = (struct cq_desc *)((u8 *)cq->ring.descs +
- cq->ring.desc_size * cq->to_clean);
- cq_desc_dec(cq_desc, &type, &color,
- &q_number, &completed_index);
-
- while (color != cq->last_color) {
-
- if ((*q_service)(cq->vdev, cq_desc, type,
- q_number, completed_index, opaque))
- break;
-
- cq->to_clean++;
- if (cq->to_clean == cq->ring.desc_count) {
- cq->to_clean = 0;
- cq->last_color = cq->last_color ? 0 : 1;
- }
-
- cq_desc = (struct cq_desc *)((u8 *)cq->ring.descs +
- cq->ring.desc_size * cq->to_clean);
- cq_desc_dec(cq_desc, &type, &color,
- &q_number, &completed_index);
-
- work_done++;
- if (work_done >= work_to_do)
- break;
- }
-
- return work_done;
-}
-
-void vnic_cq_free(struct vnic_cq *cq);
-int vnic_cq_alloc(struct vnic_dev *vdev, struct vnic_cq *cq, unsigned int index,
- unsigned int desc_count, unsigned int desc_size);
-void vnic_cq_init(struct vnic_cq *cq, unsigned int flow_control_enable,
- unsigned int color_enable, unsigned int cq_head, unsigned int cq_tail,
- unsigned int cq_tail_color, unsigned int interrupt_enable,
- unsigned int cq_entry_enable, unsigned int message_enable,
- unsigned int interrupt_offset, u64 message_addr);
-void vnic_cq_clean(struct vnic_cq *cq);
-
-#endif /* _VNIC_CQ_H_ */
diff --git a/drivers/net/enic/vnic_dev.c b/drivers/net/enic/vnic_dev.c
deleted file mode 100644
index e21b9d636ae..00000000000
--- a/drivers/net/enic/vnic_dev.c
+++ /dev/null
@@ -1,717 +0,0 @@
-/*
- * Copyright 2008 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
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-#include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/types.h>
-#include <linux/pci.h>
-#include <linux/delay.h>
-#include <linux/if_ether.h>
-
-#include "vnic_resource.h"
-#include "vnic_devcmd.h"
-#include "vnic_dev.h"
-#include "vnic_stats.h"
-
-struct vnic_res {
- void __iomem *vaddr;
- unsigned int count;
-};
-
-#define VNIC_DEV_CAP_INIT 0x0001
-#define VNIC_DEV_CAP_PERBI 0x0002
-
-struct vnic_dev {
- void *priv;
- struct pci_dev *pdev;
- struct vnic_res res[RES_TYPE_MAX];
- enum vnic_dev_intr_mode intr_mode;
- struct vnic_devcmd __iomem *devcmd;
- struct vnic_devcmd_notify *notify;
- struct vnic_devcmd_notify notify_copy;
- dma_addr_t notify_pa;
- u32 notify_sz;
- u32 *linkstatus;
- dma_addr_t linkstatus_pa;
- struct vnic_stats *stats;
- dma_addr_t stats_pa;
- struct vnic_devcmd_fw_info *fw_info;
- dma_addr_t fw_info_pa;
- u32 cap_flags;
-};
-
-#define VNIC_MAX_RES_HDR_SIZE \
- (sizeof(struct vnic_resource_header) + \
- sizeof(struct vnic_resource) * RES_TYPE_MAX)
-#define VNIC_RES_STRIDE 128
-
-void *vnic_dev_priv(struct vnic_dev *vdev)
-{
- return vdev->priv;
-}
-
-static int vnic_dev_discover_res(struct vnic_dev *vdev,
- struct vnic_dev_bar *bar)
-{
- struct vnic_resource_header __iomem *rh;
- struct vnic_resource __iomem *r;
- u8 type;
-
- if (bar->len < VNIC_MAX_RES_HDR_SIZE) {
- printk(KERN_ERR "vNIC BAR0 res hdr length error\n");
- return -EINVAL;
- }
-
- rh = bar->vaddr;
- if (!rh) {
- printk(KERN_ERR "vNIC BAR0 res hdr not mem-mapped\n");
- return -EINVAL;
- }
-
- if (ioread32(&rh->magic) != VNIC_RES_MAGIC ||
- ioread32(&rh->version) != VNIC_RES_VERSION) {
- printk(KERN_ERR "vNIC BAR0 res magic/version error "
- "exp (%lx/%lx) curr (%x/%x)\n",
- VNIC_RES_MAGIC, VNIC_RES_VERSION,
- ioread32(&rh->magic), ioread32(&rh->version));
- return -EINVAL;
- }
-
- r = (struct vnic_resource __iomem *)(rh + 1);
-
- while ((type = ioread8(&r->type)) != RES_TYPE_EOL) {
-
- u8 bar_num = ioread8(&r->bar);
- u32 bar_offset = ioread32(&r->bar_offset);
- u32 count = ioread32(&r->count);
- u32 len;
-
- r++;
-
- if (bar_num != 0) /* only mapping in BAR0 resources */
- continue;
-
- switch (type) {
- case RES_TYPE_WQ:
- case RES_TYPE_RQ:
- case RES_TYPE_CQ:
- case RES_TYPE_INTR_CTRL:
- /* each count is stride bytes long */
- len = count * VNIC_RES_STRIDE;
- if (len + bar_offset > bar->len) {
- printk(KERN_ERR "vNIC BAR0 resource %d "
- "out-of-bounds, offset 0x%x + "
- "size 0x%x > bar len 0x%lx\n",
- type, bar_offset,
- len,
- bar->len);
- return -EINVAL;
- }
- break;
- case RES_TYPE_INTR_PBA_LEGACY:
- case RES_TYPE_DEVCMD:
- len = count;
- break;
- default:
- continue;
- }
-
- vdev->res[type].count = count;
- vdev->res[type].vaddr = (char __iomem *)bar->vaddr + bar_offset;
- }
-
- return 0;
-}
-
-unsigned int vnic_dev_get_res_count(struct vnic_dev *vdev,
- enum vnic_res_type type)
-{
- return vdev->res[type].count;
-}
-
-void __iomem *vnic_dev_get_res(struct vnic_dev *vdev, enum vnic_res_type type,
- unsigned int index)
-{
- if (!vdev->res[type].vaddr)
- return NULL;
-
- switch (type) {
- case RES_TYPE_WQ:
- case RES_TYPE_RQ:
- case RES_TYPE_CQ:
- case RES_TYPE_INTR_CTRL:
- return (char __iomem *)vdev->res[type].vaddr +
- index * VNIC_RES_STRIDE;
- default:
- return (char __iomem *)vdev->res[type].vaddr;
- }
-}
-
-unsigned int vnic_dev_desc_ring_size(struct vnic_dev_ring *ring,
- unsigned int desc_count, unsigned int desc_size)
-{
- /* The base address of the desc rings must be 512 byte aligned.
- * Descriptor count is aligned to groups of 32 descriptors. A
- * count of 0 means the maximum 4096 descriptors. Descriptor
- * size is aligned to 16 bytes.
- */
-
- unsigned int count_align = 32;
- unsigned int desc_align = 16;
-
- ring->base_align = 512;
-
- if (desc_count == 0)
- desc_count = 4096;
-
- ring->desc_count = ALIGN(desc_count, count_align);
-
- ring->desc_size = ALIGN(desc_size, desc_align);
-
- ring->size = ring->desc_count * ring->desc_size;
- ring->size_unaligned = ring->size + ring->base_align;
-
- return ring->size_unaligned;
-}
-
-void vnic_dev_clear_desc_ring(struct vnic_dev_ring *ring)
-{
- memset(ring->descs, 0, ring->size);
-}
-
-int vnic_dev_alloc_desc_ring(struct vnic_dev *vdev, struct vnic_dev_ring *ring,
- unsigned int desc_count, unsigned int desc_size)
-{
- vnic_dev_desc_ring_size(ring, desc_count, desc_size);
-
- ring->descs_unaligned = pci_alloc_consistent(vdev->pdev,
- ring->size_unaligned,
- &ring->base_addr_unaligned);
-
- if (!ring->descs_unaligned) {
- printk(KERN_ERR
- "Failed to allocate ring (size=%d), aborting\n",
- (int)ring->size);
- return -ENOMEM;
- }
-
- ring->base_addr = ALIGN(ring->base_addr_unaligned,
- ring->base_align);
- ring->descs = (u8 *)ring->descs_unaligned +
- (ring->base_addr - ring->base_addr_unaligned);
-
- vnic_dev_clear_desc_ring(ring);
-
- ring->desc_avail = ring->desc_count - 1;
-
- return 0;
-}
-
-void vnic_dev_free_desc_ring(struct vnic_dev *vdev, struct vnic_dev_ring *ring)
-{
- if (ring->descs) {
- pci_free_consistent(vdev->pdev,
- ring->size_unaligned,
- ring->descs_unaligned,
- ring->base_addr_unaligned);
- ring->descs = NULL;
- }
-}
-
-int vnic_dev_cmd(struct vnic_dev *vdev, enum vnic_devcmd_cmd cmd,
- u64 *a0, u64 *a1, int wait)
-{
- struct vnic_devcmd __iomem *devcmd = vdev->devcmd;
- int delay;
- u32 status;
- int err;
-
- status = ioread32(&devcmd->status);
- if (status & STAT_BUSY) {
- printk(KERN_ERR "Busy devcmd %d\n", _CMD_N(cmd));
- return -EBUSY;
- }
-
- if (_CMD_DIR(cmd) & _CMD_DIR_WRITE) {
- writeq(*a0, &devcmd->args[0]);
- writeq(*a1, &devcmd->args[1]);
- wmb();
- }
-
- iowrite32(cmd, &devcmd->cmd);
-
- if ((_CMD_FLAGS(cmd) & _CMD_FLAGS_NOWAIT))
- return 0;
-
- for (delay = 0; delay < wait; delay++) {
-
- udelay(100);
-
- status = ioread32(&devcmd->status);
- if (!(status & STAT_BUSY)) {
-
- if (status & STAT_ERROR) {
- err = (int)readq(&devcmd->args[0]);
- if (err != ERR_ECMDUNKNOWN ||
- cmd != CMD_CAPABILITY)
- printk(KERN_ERR "Error %d devcmd %d\n",
- err, _CMD_N(cmd));
- return err;
- }
-
- if (_CMD_DIR(cmd) & _CMD_DIR_READ) {
- rmb();
- *a0 = readq(&devcmd->args[0]);
- *a1 = readq(&devcmd->args[1]);
- }
-
- return 0;
- }
- }
-
- printk(KERN_ERR "Timedout devcmd %d\n", _CMD_N(cmd));
- return -ETIMEDOUT;
-}
-
-static int vnic_dev_capable(struct vnic_dev *vdev, enum vnic_devcmd_cmd cmd)
-{
- u64 a0 = (u32)cmd, a1 = 0;
- int wait = 1000;
- int err;
-
- err = vnic_dev_cmd(vdev, CMD_CAPABILITY, &a0, &a1, wait);
-
- return !(err || a0);
-}
-
-int vnic_dev_fw_info(struct vnic_dev *vdev,
- struct vnic_devcmd_fw_info **fw_info)
-{
- u64 a0, a1 = 0;
- int wait = 1000;
- int err = 0;
-
- if (!vdev->fw_info) {
- vdev->fw_info = pci_alloc_consistent(vdev->pdev,
- sizeof(struct vnic_devcmd_fw_info),
- &vdev->fw_info_pa);
- if (!vdev->fw_info)
- return -ENOMEM;
-
- a0 = vdev->fw_info_pa;
-
- /* only get fw_info once and cache it */
- err = vnic_dev_cmd(vdev, CMD_MCPU_FW_INFO, &a0, &a1, wait);
- }
-
- *fw_info = vdev->fw_info;
-
- return err;
-}
-
-int vnic_dev_spec(struct vnic_dev *vdev, unsigned int offset, unsigned int size,
- void *value)
-{
- u64 a0, a1;
- int wait = 1000;
- int err;
-
- a0 = offset;
- a1 = size;
-
- err = vnic_dev_cmd(vdev, CMD_DEV_SPEC, &a0, &a1, wait);
-
- switch (size) {
- case 1: *(u8 *)value = (u8)a0; break;
- case 2: *(u16 *)value = (u16)a0; break;
- case 4: *(u32 *)value = (u32)a0; break;
- case 8: *(u64 *)value = a0; break;
- default: BUG(); break;
- }
-
- return err;
-}
-
-int vnic_dev_stats_clear(struct vnic_dev *vdev)
-{
- u64 a0 = 0, a1 = 0;
- int wait = 1000;
- return vnic_dev_cmd(vdev, CMD_STATS_CLEAR, &a0, &a1, wait);
-}
-
-int vnic_dev_stats_dump(struct vnic_dev *vdev, struct vnic_stats **stats)
-{
- u64 a0, a1;
- int wait = 1000;
-
- if (!vdev->stats) {
- vdev->stats = pci_alloc_consistent(vdev->pdev,
- sizeof(struct vnic_stats), &vdev->stats_pa);
- if (!vdev->stats)
- return -ENOMEM;
- }
-
- *stats = vdev->stats;
- a0 = vdev->stats_pa;
- a1 = sizeof(struct vnic_stats);
-
- return vnic_dev_cmd(vdev, CMD_STATS_DUMP, &a0, &a1, wait);
-}
-
-int vnic_dev_close(struct vnic_dev *vdev)
-{
- u64 a0 = 0, a1 = 0;
- int wait = 1000;
- return vnic_dev_cmd(vdev, CMD_CLOSE, &a0, &a1, wait);
-}
-
-int vnic_dev_enable(struct vnic_dev *vdev)
-{
- u64 a0 = 0, a1 = 0;
- int wait = 1000;
- return vnic_dev_cmd(vdev, CMD_ENABLE, &a0, &a1, wait);
-}
-
-int vnic_dev_disable(struct vnic_dev *vdev)
-{
- u64 a0 = 0, a1 = 0;
- int wait = 1000;
- return vnic_dev_cmd(vdev, CMD_DISABLE, &a0, &a1, wait);
-}
-
-int vnic_dev_open(struct vnic_dev *vdev, int arg)
-{
- u64 a0 = (u32)arg, a1 = 0;
- int wait = 1000;
- return vnic_dev_cmd(vdev, CMD_OPEN, &a0, &a1, wait);
-}
-
-int vnic_dev_open_done(struct vnic_dev *vdev, int *done)
-{
- u64 a0 = 0, a1 = 0;
- int wait = 1000;
- int err;
-
- *done = 0;
-
- err = vnic_dev_cmd(vdev, CMD_OPEN_STATUS, &a0, &a1, wait);
- if (err)
- return err;
-
- *done = (a0 == 0);
-
- return 0;
-}
-
-int vnic_dev_soft_reset(struct vnic_dev *vdev, int arg)
-{
- u64 a0 = (u32)arg, a1 = 0;
- int wait = 1000;
- return vnic_dev_cmd(vdev, CMD_SOFT_RESET, &a0, &a1, wait);
-}
-
-int vnic_dev_soft_reset_done(struct vnic_dev *vdev, int *done)
-{
- u64 a0 = 0, a1 = 0;
- int wait = 1000;
- int err;
-
- *done = 0;
-
- err = vnic_dev_cmd(vdev, CMD_SOFT_RESET_STATUS, &a0, &a1, wait);
- if (err)
- return err;
-
- *done = (a0 == 0);
-
- return 0;
-}
-
-int vnic_dev_hang_notify(struct vnic_dev *vdev)
-{
- u64 a0, a1;
- int wait = 1000;
- return vnic_dev_cmd(vdev, CMD_HANG_NOTIFY, &a0, &a1, wait);
-}
-
-int vnic_dev_mac_addr(struct vnic_dev *vdev, u8 *mac_addr)
-{
- u64 a0, a1;
- int wait = 1000;
- int err, i;
-
- for (i = 0; i < ETH_ALEN; i++)
- mac_addr[i] = 0;
-
- err = vnic_dev_cmd(vdev, CMD_MAC_ADDR, &a0, &a1, wait);
- if (err)
- return err;
-
- for (i = 0; i < ETH_ALEN; i++)
- mac_addr[i] = ((u8 *)&a0)[i];
-
- return 0;
-}
-
-void vnic_dev_packet_filter(struct vnic_dev *vdev, int directed, int multicast,
- int broadcast, int promisc, int allmulti)
-{
- u64 a0, a1 = 0;
- int wait = 1000;
- int err;
-
- a0 = (directed ? CMD_PFILTER_DIRECTED : 0) |
- (multicast ? CMD_PFILTER_MULTICAST : 0) |
- (broadcast ? CMD_PFILTER_BROADCAST : 0) |
- (promisc ? CMD_PFILTER_PROMISCUOUS : 0) |
- (allmulti ? CMD_PFILTER_ALL_MULTICAST : 0);
-
- err = vnic_dev_cmd(vdev, CMD_PACKET_FILTER, &a0, &a1, wait);
- if (err)
- printk(KERN_ERR "Can't set packet filter\n");
-}
-
-void vnic_dev_add_addr(struct vnic_dev *vdev, u8 *addr)
-{
- u64 a0 = 0, a1 = 0;
- int wait = 1000;
- int err;
- int i;
-
- for (i = 0; i < ETH_ALEN; i++)
- ((u8 *)&a0)[i] = addr[i];
-
- err = vnic_dev_cmd(vdev, CMD_ADDR_ADD, &a0, &a1, wait);
- if (err)
- printk(KERN_ERR "Can't add addr [%pM], %d\n", addr, err);
-}
-
-void vnic_dev_del_addr(struct vnic_dev *vdev, u8 *addr)
-{
- u64 a0 = 0, a1 = 0;
- int wait = 1000;
- int err;
- int i;
-
- for (i = 0; i < ETH_ALEN; i++)
- ((u8 *)&a0)[i] = addr[i];
-
- err = vnic_dev_cmd(vdev, CMD_ADDR_DEL, &a0, &a1, wait);
- if (err)
- printk(KERN_ERR "Can't del addr [%pM], %d\n", addr, err);
-}
-
-int vnic_dev_notify_set(struct vnic_dev *vdev, u16 intr)
-{
- u64 a0, a1;
- int wait = 1000;
- int r;
-
- if (!vdev->notify) {
- vdev->notify = pci_alloc_consistent(vdev->pdev,
- sizeof(struct vnic_devcmd_notify),
- &vdev->notify_pa);
- if (!vdev->notify)
- return -ENOMEM;
- memset(vdev->notify, 0, sizeof(struct vnic_devcmd_notify));
- }
-
- a0 = vdev->notify_pa;
- a1 = ((u64)intr << 32) & 0x0000ffff00000000ULL;
- a1 += sizeof(struct vnic_devcmd_notify);
-
- r = vnic_dev_cmd(vdev, CMD_NOTIFY, &a0, &a1, wait);
- vdev->notify_sz = (r == 0) ? (u32)a1 : 0;
- return r;
-}
-
-void vnic_dev_notify_unset(struct vnic_dev *vdev)
-{
- u64 a0, a1;
- int wait = 1000;
-
- a0 = 0; /* paddr = 0 to unset notify buffer */
- a1 = 0x0000ffff00000000ULL; /* intr num = -1 to unreg for intr */
- a1 += sizeof(struct vnic_devcmd_notify);
-
- vnic_dev_cmd(vdev, CMD_NOTIFY, &a0, &a1, wait);
- vdev->notify_sz = 0;
-}
-
-static int vnic_dev_notify_ready(struct vnic_dev *vdev)
-{
- u32 *words;
- unsigned int nwords = vdev->notify_sz / 4;
- unsigned int i;
- u32 csum;
-
- if (!vdev->notify || !vdev->notify_sz)
- return 0;
-
- do {
- csum = 0;
- memcpy(&vdev->notify_copy, vdev->notify, vdev->notify_sz);
- words = (u32 *)&vdev->notify_copy;
- for (i = 1; i < nwords; i++)
- csum += words[i];
- } while (csum != words[0]);
-
- return 1;
-}
-
-int vnic_dev_init(struct vnic_dev *vdev, int arg)
-{
- u64 a0 = (u32)arg, a1 = 0;
- int wait = 1000;
- int r = 0;
-
- if (vdev->cap_flags & VNIC_DEV_CAP_INIT)
- r = vnic_dev_cmd(vdev, CMD_INIT, &a0, &a1, wait);
- else {
- vnic_dev_cmd(vdev, CMD_INIT_v1, &a0, &a1, wait);
- if (a0 & CMD_INITF_DEFAULT_MAC) {
- // Emulate these for old CMD_INIT_v1 which
- // didn't pass a0 so no CMD_INITF_*.
- vnic_dev_cmd(vdev, CMD_MAC_ADDR, &a0, &a1, wait);
- vnic_dev_cmd(vdev, CMD_ADDR_ADD, &a0, &a1, wait);
- }
- }
- return r;
-}
-
-int vnic_dev_link_status(struct vnic_dev *vdev)
-{
- if (vdev->linkstatus)
- return *vdev->linkstatus;
-
- if (!vnic_dev_notify_ready(vdev))
- return 0;
-
- return vdev->notify_copy.link_state;
-}
-
-u32 vnic_dev_port_speed(struct vnic_dev *vdev)
-{
- if (!vnic_dev_notify_ready(vdev))
- return 0;
-
- return vdev->notify_copy.port_speed;
-}
-
-u32 vnic_dev_msg_lvl(struct vnic_dev *vdev)
-{
- if (!vnic_dev_notify_ready(vdev))
- return 0;
-
- return vdev->notify_copy.msglvl;
-}
-
-u32 vnic_dev_mtu(struct vnic_dev *vdev)
-{
- if (!vnic_dev_notify_ready(vdev))
- return 0;
-
- return vdev->notify_copy.mtu;
-}
-
-u32 vnic_dev_link_down_cnt(struct vnic_dev *vdev)
-{
- if (!vnic_dev_notify_ready(vdev))
- return 0;
-
- return vdev->notify_copy.link_down_cnt;
-}
-
-u32 vnic_dev_notify_status(struct vnic_dev *vdev)
-{
- if (!vnic_dev_notify_ready(vdev))
- return 0;
-
- return vdev->notify_copy.status;
-}
-
-void vnic_dev_set_intr_mode(struct vnic_dev *vdev,
- enum vnic_dev_intr_mode intr_mode)
-{
- vdev->intr_mode = intr_mode;
-}
-
-enum vnic_dev_intr_mode vnic_dev_get_intr_mode(
- struct vnic_dev *vdev)
-{
- return vdev->intr_mode;
-}
-
-void vnic_dev_unregister(struct vnic_dev *vdev)
-{
- if (vdev) {
- if (vdev->notify)
- pci_free_consistent(vdev->pdev,
- sizeof(struct vnic_devcmd_notify),
- vdev->notify,
- vdev->notify_pa);
- if (vdev->linkstatus)
- pci_free_consistent(vdev->pdev,
- sizeof(u32),
- vdev->linkstatus,
- vdev->linkstatus_pa);
- if (vdev->stats)
- pci_free_consistent(vdev->pdev,
- sizeof(struct vnic_dev),
- vdev->stats, vdev->stats_pa);
- if (vdev->fw_info)
- pci_free_consistent(vdev->pdev,
- sizeof(struct vnic_devcmd_fw_info),
- vdev->fw_info, vdev->fw_info_pa);
- kfree(vdev);
- }
-}
-
-struct vnic_dev *vnic_dev_register(struct vnic_dev *vdev,
- void *priv, struct pci_dev *pdev, struct vnic_dev_bar *bar)
-{
- if (!vdev) {
- vdev = kzalloc(sizeof(struct vnic_dev), GFP_ATOMIC);
- if (!vdev)
- return NULL;
- }
-
- vdev->priv = priv;
- vdev->pdev = pdev;
-
- if (vnic_dev_discover_res(vdev, bar))
- goto err_out;
-
- vdev->devcmd = vnic_dev_get_res(vdev, RES_TYPE_DEVCMD, 0);
- if (!vdev->devcmd)
- goto err_out;
-
- vdev->cap_flags = 0;
-
- if (vnic_dev_capable(vdev, CMD_INIT))
- vdev->cap_flags |= VNIC_DEV_CAP_INIT;
-
- return vdev;
-
-err_out:
- vnic_dev_unregister(vdev);
- return NULL;
-}
-
-
diff --git a/drivers/net/enic/vnic_dev.h b/drivers/net/enic/vnic_dev.h
deleted file mode 100644
index 8aa8db2fd03..00000000000
--- a/drivers/net/enic/vnic_dev.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright 2008 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
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-#ifndef _VNIC_DEV_H_
-#define _VNIC_DEV_H_
-
-#include "vnic_resource.h"
-#include "vnic_devcmd.h"
-
-#ifndef VNIC_PADDR_TARGET
-#define VNIC_PADDR_TARGET 0x0000000000000000ULL
-#endif
-
-#ifndef readq
-static inline u64 readq(void __iomem *reg)
-{
- return (((u64)readl(reg + 0x4UL) << 32) |
- (u64)readl(reg));
-}
-
-static inline void writeq(u64 val, void __iomem *reg)
-{
- writel(val & 0xffffffff, reg);
- writel(val >> 32, reg + 0x4UL);
-}
-#endif
-
-enum vnic_dev_intr_mode {
- VNIC_DEV_INTR_MODE_UNKNOWN,
- VNIC_DEV_INTR_MODE_INTX,
- VNIC_DEV_INTR_MODE_MSI,
- VNIC_DEV_INTR_MODE_MSIX,
-};
-
-struct vnic_dev_bar {
- void __iomem *vaddr;
- dma_addr_t bus_addr;
- unsigned long len;
-};
-
-struct vnic_dev_ring {
- void *descs;
- size_t size;
- dma_addr_t base_addr;
- size_t base_align;
- void *descs_unaligned;
- size_t size_unaligned;
- dma_addr_t base_addr_unaligned;
- unsigned int desc_size;
- unsigned int desc_count;
- unsigned int desc_avail;
-};
-
-struct vnic_dev;
-struct vnic_stats;
-
-void *vnic_dev_priv(struct vnic_dev *vdev);
-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);
-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);
-int vnic_dev_alloc_desc_ring(struct vnic_dev *vdev, struct vnic_dev_ring *ring,
- unsigned int desc_count, unsigned int desc_size);
-void vnic_dev_free_desc_ring(struct vnic_dev *vdev,
- struct vnic_dev_ring *ring);
-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_spec(struct vnic_dev *vdev, unsigned int offset, unsigned int size,
- void *value);
-int vnic_dev_stats_clear(struct vnic_dev *vdev);
-int vnic_dev_stats_dump(struct vnic_dev *vdev, struct vnic_stats **stats);
-int vnic_dev_hang_notify(struct vnic_dev *vdev);
-void vnic_dev_packet_filter(struct vnic_dev *vdev, int directed, int multicast,
- int broadcast, int promisc, int allmulti);
-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_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);
-u32 vnic_dev_port_speed(struct vnic_dev *vdev);
-u32 vnic_dev_msg_lvl(struct vnic_dev *vdev);
-u32 vnic_dev_mtu(struct vnic_dev *vdev);
-u32 vnic_dev_link_down_cnt(struct vnic_dev *vdev);
-u32 vnic_dev_notify_status(struct vnic_dev *vdev);
-int vnic_dev_close(struct vnic_dev *vdev);
-int vnic_dev_enable(struct vnic_dev *vdev);
-int vnic_dev_disable(struct vnic_dev *vdev);
-int vnic_dev_open(struct vnic_dev *vdev, int arg);
-int vnic_dev_open_done(struct vnic_dev *vdev, int *done);
-int vnic_dev_init(struct vnic_dev *vdev, int arg);
-int vnic_dev_soft_reset(struct vnic_dev *vdev, int arg);
-int vnic_dev_soft_reset_done(struct vnic_dev *vdev, int *done);
-void vnic_dev_set_intr_mode(struct vnic_dev *vdev,
- enum vnic_dev_intr_mode intr_mode);
-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);
-
-#endif /* _VNIC_DEV_H_ */
diff --git a/drivers/net/enic/vnic_devcmd.h b/drivers/net/enic/vnic_devcmd.h
deleted file mode 100644
index 2587f34fbfb..00000000000
--- a/drivers/net/enic/vnic_devcmd.h
+++ /dev/null
@@ -1,305 +0,0 @@
-/*
- * Copyright 2008 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
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-#ifndef _VNIC_DEVCMD_H_
-#define _VNIC_DEVCMD_H_
-
-#define _CMD_NBITS 14
-#define _CMD_VTYPEBITS 10
-#define _CMD_FLAGSBITS 6
-#define _CMD_DIRBITS 2
-
-#define _CMD_NMASK ((1 << _CMD_NBITS)-1)
-#define _CMD_VTYPEMASK ((1 << _CMD_VTYPEBITS)-1)
-#define _CMD_FLAGSMASK ((1 << _CMD_FLAGSBITS)-1)
-#define _CMD_DIRMASK ((1 << _CMD_DIRBITS)-1)
-
-#define _CMD_NSHIFT 0
-#define _CMD_VTYPESHIFT (_CMD_NSHIFT+_CMD_NBITS)
-#define _CMD_FLAGSSHIFT (_CMD_VTYPESHIFT+_CMD_VTYPEBITS)
-#define _CMD_DIRSHIFT (_CMD_FLAGSSHIFT+_CMD_FLAGSBITS)
-
-/*
- * Direction bits (from host perspective).
- */
-#define _CMD_DIR_NONE 0U
-#define _CMD_DIR_WRITE 1U
-#define _CMD_DIR_READ 2U
-#define _CMD_DIR_RW (_CMD_DIR_WRITE | _CMD_DIR_READ)
-
-/*
- * Flag bits.
- */
-#define _CMD_FLAGS_NONE 0U
-#define _CMD_FLAGS_NOWAIT 1U
-
-/*
- * vNIC type bits.
- */
-#define _CMD_VTYPE_NONE 0U
-#define _CMD_VTYPE_ENET 1U
-#define _CMD_VTYPE_FC 2U
-#define _CMD_VTYPE_SCSI 4U
-#define _CMD_VTYPE_ALL (_CMD_VTYPE_ENET | _CMD_VTYPE_FC | _CMD_VTYPE_SCSI)
-
-/*
- * Used to create cmds..
-*/
-#define _CMDCF(dir, flags, vtype, nr) \
- (((dir) << _CMD_DIRSHIFT) | \
- ((flags) << _CMD_FLAGSSHIFT) | \
- ((vtype) << _CMD_VTYPESHIFT) | \
- ((nr) << _CMD_NSHIFT))
-#define _CMDC(dir, vtype, nr) _CMDCF(dir, 0, vtype, nr)
-#define _CMDCNW(dir, vtype, nr) _CMDCF(dir, _CMD_FLAGS_NOWAIT, vtype, nr)
-
-/*
- * Used to decode cmds..
-*/
-#define _CMD_DIR(cmd) (((cmd) >> _CMD_DIRSHIFT) & _CMD_DIRMASK)
-#define _CMD_FLAGS(cmd) (((cmd) >> _CMD_FLAGSSHIFT) & _CMD_FLAGSMASK)
-#define _CMD_VTYPE(cmd) (((cmd) >> _CMD_VTYPESHIFT) & _CMD_VTYPEMASK)
-#define _CMD_N(cmd) (((cmd) >> _CMD_NSHIFT) & _CMD_NMASK)
-
-enum vnic_devcmd_cmd {
- CMD_NONE = _CMDC(_CMD_DIR_NONE, _CMD_VTYPE_NONE, 0),
-
- /* mcpu fw info in mem: (u64)a0=paddr to struct vnic_devcmd_fw_info */
- CMD_MCPU_FW_INFO = _CMDC(_CMD_DIR_WRITE, _CMD_VTYPE_ALL, 1),
-
- /* dev-specific block member:
- * in: (u16)a0=offset,(u8)a1=size
- * out: a0=value */
- CMD_DEV_SPEC = _CMDC(_CMD_DIR_RW, _CMD_VTYPE_ALL, 2),
-
- /* stats clear */
- CMD_STATS_CLEAR = _CMDCNW(_CMD_DIR_NONE, _CMD_VTYPE_ALL, 3),
-
- /* stats dump in mem: (u64)a0=paddr to stats area,
- * (u16)a1=sizeof stats area */
- CMD_STATS_DUMP = _CMDC(_CMD_DIR_WRITE, _CMD_VTYPE_ALL, 4),
-
- /* set Rx packet filter: (u32)a0=filters (see CMD_PFILTER_*) */
- CMD_PACKET_FILTER = _CMDCNW(_CMD_DIR_WRITE, _CMD_VTYPE_ENET, 7),
-
- /* hang detection notification */
- CMD_HANG_NOTIFY = _CMDC(_CMD_DIR_NONE, _CMD_VTYPE_ALL, 8),
-
- /* MAC address in (u48)a0 */
- 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),
-
- /* del addr from (u48)a0 */
- CMD_ADDR_DEL = _CMDCNW(_CMD_DIR_WRITE,
- _CMD_VTYPE_ENET | _CMD_VTYPE_FC, 13),
-
- /* add VLAN id in (u16)a0 */
- CMD_VLAN_ADD = _CMDCNW(_CMD_DIR_WRITE, _CMD_VTYPE_ENET, 14),
-
- /* del VLAN id in (u16)a0 */
- CMD_VLAN_DEL = _CMDCNW(_CMD_DIR_WRITE, _CMD_VTYPE_ENET, 15),
-
- /* nic_cfg in (u32)a0 */
- CMD_NIC_CFG = _CMDCNW(_CMD_DIR_WRITE, _CMD_VTYPE_ALL, 16),
-
- /* union vnic_rss_key in mem: (u64)a0=paddr, (u16)a1=len */
- CMD_RSS_KEY = _CMDC(_CMD_DIR_WRITE, _CMD_VTYPE_ENET, 17),
-
- /* union vnic_rss_cpu in mem: (u64)a0=paddr, (u16)a1=len */
- CMD_RSS_CPU = _CMDC(_CMD_DIR_WRITE, _CMD_VTYPE_ENET, 18),
-
- /* initiate softreset */
- CMD_SOFT_RESET = _CMDCNW(_CMD_DIR_NONE, _CMD_VTYPE_ALL, 19),
-
- /* softreset status:
- * out: a0=0 reset complete, a0=1 reset in progress */
- CMD_SOFT_RESET_STATUS = _CMDC(_CMD_DIR_READ, _CMD_VTYPE_ALL, 20),
-
- /* set struct vnic_devcmd_notify buffer in mem:
- * in:
- * (u64)a0=paddr to notify (set paddr=0 to unset)
- * (u32)a1 & 0x00000000ffffffff=sizeof(struct vnic_devcmd_notify)
- * (u16)a1 & 0x0000ffff00000000=intr num (-1 for no intr)
- * out:
- * (u32)a1 = effective size
- */
- CMD_NOTIFY = _CMDC(_CMD_DIR_RW, _CMD_VTYPE_ALL, 21),
-
- /* UNDI API: (u64)a0=paddr to s_PXENV_UNDI_ struct,
- * (u8)a1=PXENV_UNDI_xxx */
- CMD_UNDI = _CMDC(_CMD_DIR_WRITE, _CMD_VTYPE_ENET, 22),
-
- /* initiate open sequence (u32)a0=flags (see CMD_OPENF_*) */
- CMD_OPEN = _CMDCNW(_CMD_DIR_WRITE, _CMD_VTYPE_ALL, 23),
-
- /* open status:
- * out: a0=0 open complete, a0=1 open in progress */
- CMD_OPEN_STATUS = _CMDC(_CMD_DIR_READ, _CMD_VTYPE_ALL, 24),
-
- /* close vnic */
- CMD_CLOSE = _CMDC(_CMD_DIR_NONE, _CMD_VTYPE_ALL, 25),
-
- /* initialize virtual link: (u32)a0=flags (see CMD_INITF_*) */
-/***** Replaced by CMD_INIT *****/
- CMD_INIT_v1 = _CMDCNW(_CMD_DIR_READ, _CMD_VTYPE_ALL, 26),
-
- /* variant of CMD_INIT, with provisioning info
- * (u64)a0=paddr of vnic_devcmd_provinfo
- * (u32)a1=sizeof provision info */
- CMD_INIT_PROV_INFO = _CMDC(_CMD_DIR_WRITE, _CMD_VTYPE_ENET, 27),
-
- /* enable virtual link */
- CMD_ENABLE = _CMDCNW(_CMD_DIR_WRITE, _CMD_VTYPE_ALL, 28),
-
- /* 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 */
- CMD_STATS_DUMP_ALL = _CMDC(_CMD_DIR_WRITE, _CMD_VTYPE_ALL, 30),
-
- /* init status:
- * out: a0=0 init complete, a0=1 init in progress
- * if a0=0, a1=errno */
- CMD_INIT_STATUS = _CMDC(_CMD_DIR_READ, _CMD_VTYPE_ALL, 31),
-
- /* INT13 API: (u64)a0=paddr to vnic_int13_params struct
- * (u32)a1=INT13_CMD_xxx */
- CMD_INT13 = _CMDC(_CMD_DIR_WRITE, _CMD_VTYPE_FC, 32),
-
- /* logical uplink enable/disable: (u64)a0: 0/1=disable/enable */
- CMD_LOGICAL_UPLINK = _CMDCNW(_CMD_DIR_WRITE, _CMD_VTYPE_ENET, 33),
-
- /* undo initialize of virtual link */
- CMD_DEINIT = _CMDCNW(_CMD_DIR_NONE, _CMD_VTYPE_ALL, 34),
-
- /* initialize virtual link: (u32)a0=flags (see CMD_INITF_*) */
- CMD_INIT = _CMDCNW(_CMD_DIR_WRITE, _CMD_VTYPE_ALL, 35),
-
- /* check fw capability of a cmd:
- * in: (u32)a0=cmd
- * out: (u32)a0=errno, 0:valid cmd, a1=supported VNIC_STF_* bits */
- CMD_CAPABILITY = _CMDC(_CMD_DIR_RW, _CMD_VTYPE_ALL, 36),
-
- /* persistent binding info
- * in: (u64)a0=paddr of arg
- * (u32)a1=CMD_PERBI_XXX */
- CMD_PERBI = _CMDC(_CMD_DIR_RW, _CMD_VTYPE_FC, 37),
-};
-
-/* flags for CMD_OPEN */
-#define CMD_OPENF_OPROM 0x1 /* open coming from option rom */
-
-/* flags for CMD_INIT */
-#define CMD_INITF_DEFAULT_MAC 0x1 /* init with default mac addr */
-
-/* flags for CMD_PACKET_FILTER */
-#define CMD_PFILTER_DIRECTED 0x01
-#define CMD_PFILTER_MULTICAST 0x02
-#define CMD_PFILTER_BROADCAST 0x04
-#define CMD_PFILTER_PROMISCUOUS 0x08
-#define CMD_PFILTER_ALL_MULTICAST 0x10
-
-enum vnic_devcmd_status {
- STAT_NONE = 0,
- STAT_BUSY = 1 << 0, /* cmd in progress */
- STAT_ERROR = 1 << 1, /* last cmd caused error (code in a0) */
-};
-
-enum vnic_devcmd_error {
- ERR_SUCCESS = 0,
- ERR_EINVAL = 1,
- ERR_EFAULT = 2,
- ERR_EPERM = 3,
- ERR_EBUSY = 4,
- ERR_ECMDUNKNOWN = 5,
- ERR_EBADSTATE = 6,
- ERR_ENOMEM = 7,
- ERR_ETIMEDOUT = 8,
- ERR_ELINKDOWN = 9,
-};
-
-struct vnic_devcmd_fw_info {
- char fw_version[32];
- char fw_build[32];
- char hw_version[32];
- char hw_serial_number[32];
-};
-
-struct vnic_devcmd_notify {
- u32 csum; /* checksum over following words */
-
- u32 link_state; /* link up == 1 */
- u32 port_speed; /* effective port speed (rate limit) */
- u32 mtu; /* MTU */
- u32 msglvl; /* requested driver msg lvl */
- u32 uif; /* uplink interface */
- u32 status; /* status bits (see VNIC_STF_*) */
- u32 error; /* error code (see ERR_*) for first ERR */
- u32 link_down_cnt; /* running count of link down transitions */
- u32 perbi_rebuild_cnt; /* running count of perbi rebuilds */
-};
-#define VNIC_STF_FATAL_ERR 0x0001 /* fatal fw error */
-#define VNIC_STF_STD_PAUSE 0x0002 /* standard link-level pause on */
-#define VNIC_STF_PFC_PAUSE 0x0004 /* priority flow control pause on */
-/* all supported status flags */
-#define VNIC_STF_ALL (VNIC_STF_FATAL_ERR |\
- VNIC_STF_STD_PAUSE |\
- VNIC_STF_PFC_PAUSE |\
- 0)
-
-struct vnic_devcmd_provinfo {
- u8 oui[3];
- u8 type;
- u8 data[0];
-};
-
-/*
- * Writing cmd register causes STAT_BUSY to get set in status register.
- * When cmd completes, STAT_BUSY will be cleared.
- *
- * If cmd completed successfully STAT_ERROR will be clear
- * and args registers contain cmd-specific results.
- *
- * If cmd error, STAT_ERROR will be set and args[0] contains error code.
- *
- * status register is read-only. While STAT_BUSY is set,
- * all other register contents are read-only.
- */
-
-/* Make sizeof(vnic_devcmd) a power-of-2 for I/O BAR. */
-#define VNIC_DEVCMD_NARGS 15
-struct vnic_devcmd {
- u32 status; /* RO */
- u32 cmd; /* RW */
- u64 args[VNIC_DEVCMD_NARGS]; /* RW cmd args (little-endian) */
-};
-
-#endif /* _VNIC_DEVCMD_H_ */
diff --git a/drivers/net/enic/vnic_enet.h b/drivers/net/enic/vnic_enet.h
deleted file mode 100644
index 6332ac9391b..00000000000
--- a/drivers/net/enic/vnic_enet.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2008 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
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-#ifndef _VNIC_ENIC_H_
-#define _VNIC_ENIC_H_
-
-/* Device-specific region: enet configuration */
-struct vnic_enet_config {
- u32 flags;
- u32 wq_desc_count;
- u32 rq_desc_count;
- u16 mtu;
- u16 intr_timer;
- u8 intr_timer_type;
- u8 intr_mode;
- char devname[16];
-};
-
-#define VENETF_TSO 0x1 /* TSO enabled */
-#define VENETF_LRO 0x2 /* LRO enabled */
-#define VENETF_RXCSUM 0x4 /* RX csum enabled */
-#define VENETF_TXCSUM 0x8 /* TX csum enabled */
-#define VENETF_RSS 0x10 /* RSS enabled */
-#define VENETF_RSSHASH_IPV4 0x20 /* Hash on IPv4 fields */
-#define VENETF_RSSHASH_TCPIPV4 0x40 /* Hash on TCP + IPv4 fields */
-#define VENETF_RSSHASH_IPV6 0x80 /* Hash on IPv6 fields */
-#define VENETF_RSSHASH_TCPIPV6 0x100 /* Hash on TCP + IPv6 fields */
-#define VENETF_RSSHASH_IPV6_EX 0x200 /* Hash on IPv6 extended fields */
-#define VENETF_RSSHASH_TCPIPV6_EX 0x400 /* Hash on TCP + IPv6 ext. fields */
-
-#endif /* _VNIC_ENIC_H_ */
diff --git a/drivers/net/enic/vnic_intr.c b/drivers/net/enic/vnic_intr.c
deleted file mode 100644
index ddc38f8f465..00000000000
--- a/drivers/net/enic/vnic_intr.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2008 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
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-#include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/types.h>
-#include <linux/pci.h>
-#include <linux/delay.h>
-
-#include "vnic_dev.h"
-#include "vnic_intr.h"
-
-void vnic_intr_free(struct vnic_intr *intr)
-{
- intr->ctrl = NULL;
-}
-
-int vnic_intr_alloc(struct vnic_dev *vdev, struct vnic_intr *intr,
- unsigned int index)
-{
- intr->index = index;
- intr->vdev = vdev;
-
- intr->ctrl = vnic_dev_get_res(vdev, RES_TYPE_INTR_CTRL, index);
- if (!intr->ctrl) {
- printk(KERN_ERR "Failed to hook INTR[%d].ctrl resource\n",
- index);
- return -EINVAL;
- }
-
- return 0;
-}
-
-void vnic_intr_init(struct vnic_intr *intr, unsigned int coalescing_timer,
- unsigned int coalescing_type, unsigned int mask_on_assertion)
-{
- iowrite32(coalescing_timer, &intr->ctrl->coalescing_timer);
- iowrite32(coalescing_type, &intr->ctrl->coalescing_type);
- iowrite32(mask_on_assertion, &intr->ctrl->mask_on_assertion);
- iowrite32(0, &intr->ctrl->int_credits);
-}
-
-void vnic_intr_clean(struct vnic_intr *intr)
-{
- iowrite32(0, &intr->ctrl->int_credits);
-}
diff --git a/drivers/net/enic/vnic_intr.h b/drivers/net/enic/vnic_intr.h
deleted file mode 100644
index 9a53604edce..00000000000
--- a/drivers/net/enic/vnic_intr.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright 2008 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
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-#ifndef _VNIC_INTR_H_
-#define _VNIC_INTR_H_
-
-#include <linux/pci.h>
-
-#include "vnic_dev.h"
-
-#define VNIC_INTR_TIMER_MAX 0xffff
-
-#define VNIC_INTR_TIMER_TYPE_ABS 0
-#define VNIC_INTR_TIMER_TYPE_QUIET 1
-
-/* Interrupt control */
-struct vnic_intr_ctrl {
- u32 coalescing_timer; /* 0x00 */
- u32 pad0;
- u32 coalescing_value; /* 0x08 */
- u32 pad1;
- u32 coalescing_type; /* 0x10 */
- u32 pad2;
- u32 mask_on_assertion; /* 0x18 */
- u32 pad3;
- u32 mask; /* 0x20 */
- u32 pad4;
- u32 int_credits; /* 0x28 */
- u32 pad5;
- u32 int_credit_return; /* 0x30 */
- u32 pad6;
-};
-
-struct vnic_intr {
- unsigned int index;
- struct vnic_dev *vdev;
- struct vnic_intr_ctrl __iomem *ctrl; /* memory-mapped */
-};
-
-static inline void vnic_intr_unmask(struct vnic_intr *intr)
-{
- iowrite32(0, &intr->ctrl->mask);
-}
-
-static inline void vnic_intr_mask(struct vnic_intr *intr)
-{
- iowrite32(1, &intr->ctrl->mask);
-}
-
-static inline void vnic_intr_return_credits(struct vnic_intr *intr,
- unsigned int credits, int unmask, int reset_timer)
-{
-#define VNIC_INTR_UNMASK_SHIFT 16
-#define VNIC_INTR_RESET_TIMER_SHIFT 17
-
- u32 int_credit_return = (credits & 0xffff) |
- (unmask ? (1 << VNIC_INTR_UNMASK_SHIFT) : 0) |
- (reset_timer ? (1 << VNIC_INTR_RESET_TIMER_SHIFT) : 0);
-
- iowrite32(int_credit_return, &intr->ctrl->int_credit_return);
-}
-
-static inline unsigned int vnic_intr_credits(struct vnic_intr *intr)
-{
- return ioread32(&intr->ctrl->int_credits);
-}
-
-static inline void vnic_intr_return_all_credits(struct vnic_intr *intr)
-{
- unsigned int credits = vnic_intr_credits(intr);
- int unmask = 1;
- int reset_timer = 1;
-
- vnic_intr_return_credits(intr, credits, unmask, reset_timer);
-}
-
-static inline u32 vnic_intr_legacy_pba(u32 __iomem *legacy_pba)
-{
- /* read PBA without clearing */
- return ioread32(legacy_pba);
-}
-
-void vnic_intr_free(struct vnic_intr *intr);
-int vnic_intr_alloc(struct vnic_dev *vdev, struct vnic_intr *intr,
- unsigned int index);
-void vnic_intr_init(struct vnic_intr *intr, unsigned int coalescing_timer,
- unsigned int coalescing_type, unsigned int mask_on_assertion);
-void vnic_intr_clean(struct vnic_intr *intr);
-
-#endif /* _VNIC_INTR_H_ */
diff --git a/drivers/net/enic/vnic_nic.h b/drivers/net/enic/vnic_nic.h
deleted file mode 100644
index dadf26fae69..00000000000
--- a/drivers/net/enic/vnic_nic.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright 2008 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
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-#ifndef _VNIC_NIC_H_
-#define _VNIC_NIC_H_
-
-#define NIC_CFG_RSS_DEFAULT_CPU_MASK_FIELD 0xffUL
-#define NIC_CFG_RSS_DEFAULT_CPU_SHIFT 0
-#define NIC_CFG_RSS_HASH_TYPE (0xffUL << 8)
-#define NIC_CFG_RSS_HASH_TYPE_MASK_FIELD 0xffUL
-#define NIC_CFG_RSS_HASH_TYPE_SHIFT 8
-#define NIC_CFG_RSS_HASH_BITS (7UL << 16)
-#define NIC_CFG_RSS_HASH_BITS_MASK_FIELD 7UL
-#define NIC_CFG_RSS_HASH_BITS_SHIFT 16
-#define NIC_CFG_RSS_BASE_CPU (7UL << 19)
-#define NIC_CFG_RSS_BASE_CPU_MASK_FIELD 7UL
-#define NIC_CFG_RSS_BASE_CPU_SHIFT 19
-#define NIC_CFG_RSS_ENABLE (1UL << 22)
-#define NIC_CFG_RSS_ENABLE_MASK_FIELD 1UL
-#define NIC_CFG_RSS_ENABLE_SHIFT 22
-#define NIC_CFG_TSO_IPID_SPLIT_EN (1UL << 23)
-#define NIC_CFG_TSO_IPID_SPLIT_EN_MASK_FIELD 1UL
-#define NIC_CFG_TSO_IPID_SPLIT_EN_SHIFT 23
-#define NIC_CFG_IG_VLAN_STRIP_EN (1UL << 24)
-#define NIC_CFG_IG_VLAN_STRIP_EN_MASK_FIELD 1UL
-#define NIC_CFG_IG_VLAN_STRIP_EN_SHIFT 24
-
-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,
- u8 rss_enable, u8 tso_ipid_split_en,
- u8 ig_vlan_strip_en)
-{
- *nic_cfg = (rss_default_cpu & NIC_CFG_RSS_DEFAULT_CPU_MASK_FIELD) |
- ((rss_hash_type & NIC_CFG_RSS_HASH_TYPE_MASK_FIELD)
- << NIC_CFG_RSS_HASH_TYPE_SHIFT) |
- ((rss_hash_bits & NIC_CFG_RSS_HASH_BITS_MASK_FIELD)
- << NIC_CFG_RSS_HASH_BITS_SHIFT) |
- ((rss_base_cpu & NIC_CFG_RSS_BASE_CPU_MASK_FIELD)
- << NIC_CFG_RSS_BASE_CPU_SHIFT) |
- ((rss_enable & NIC_CFG_RSS_ENABLE_MASK_FIELD)
- << NIC_CFG_RSS_ENABLE_SHIFT) |
- ((tso_ipid_split_en & NIC_CFG_TSO_IPID_SPLIT_EN_MASK_FIELD)
- << NIC_CFG_TSO_IPID_SPLIT_EN_SHIFT) |
- ((ig_vlan_strip_en & NIC_CFG_IG_VLAN_STRIP_EN_MASK_FIELD)
- << NIC_CFG_IG_VLAN_STRIP_EN_SHIFT);
-}
-
-#endif /* _VNIC_NIC_H_ */
diff --git a/drivers/net/enic/vnic_resource.h b/drivers/net/enic/vnic_resource.h
deleted file mode 100644
index b61c22aec41..00000000000
--- a/drivers/net/enic/vnic_resource.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright 2008 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
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-#ifndef _VNIC_RESOURCE_H_
-#define _VNIC_RESOURCE_H_
-
-#define VNIC_RES_MAGIC 0x766E6963L /* 'vnic' */
-#define VNIC_RES_VERSION 0x00000000L
-
-/* vNIC resource types */
-enum vnic_res_type {
- RES_TYPE_EOL, /* End-of-list */
- RES_TYPE_WQ, /* Work queues */
- RES_TYPE_RQ, /* Receive queues */
- RES_TYPE_CQ, /* Completion queues */
- RES_TYPE_RSVD1,
- RES_TYPE_NIC_CFG, /* Enet NIC config registers */
- RES_TYPE_RSVD2,
- RES_TYPE_RSVD3,
- RES_TYPE_RSVD4,
- RES_TYPE_RSVD5,
- RES_TYPE_INTR_CTRL, /* Interrupt ctrl table */
- RES_TYPE_INTR_TABLE, /* MSI/MSI-X Interrupt table */
- RES_TYPE_INTR_PBA, /* MSI/MSI-X PBA table */
- RES_TYPE_INTR_PBA_LEGACY, /* Legacy intr status */
- RES_TYPE_RSVD6,
- RES_TYPE_RSVD7,
- RES_TYPE_DEVCMD, /* Device command region */
- RES_TYPE_PASS_THRU_PAGE, /* Pass-thru page */
-
- RES_TYPE_MAX, /* Count of resource types */
-};
-
-struct vnic_resource_header {
- u32 magic;
- u32 version;
-};
-
-struct vnic_resource {
- u8 type;
- u8 bar;
- u8 pad[2];
- u32 bar_offset;
- u32 count;
-};
-
-#endif /* _VNIC_RESOURCE_H_ */
diff --git a/drivers/net/enic/vnic_rq.c b/drivers/net/enic/vnic_rq.c
deleted file mode 100644
index 9365e63e821..00000000000
--- a/drivers/net/enic/vnic_rq.c
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Copyright 2008 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
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-#include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/types.h>
-#include <linux/pci.h>
-#include <linux/delay.h>
-
-#include "vnic_dev.h"
-#include "vnic_rq.h"
-
-static int vnic_rq_alloc_bufs(struct vnic_rq *rq)
-{
- struct vnic_rq_buf *buf;
- struct vnic_dev *vdev;
- unsigned int i, j, count = rq->ring.desc_count;
- unsigned int blks = VNIC_RQ_BUF_BLKS_NEEDED(count);
-
- vdev = rq->vdev;
-
- for (i = 0; i < blks; i++) {
- rq->bufs[i] = kzalloc(VNIC_RQ_BUF_BLK_SZ, GFP_ATOMIC);
- if (!rq->bufs[i]) {
- printk(KERN_ERR "Failed to alloc rq_bufs\n");
- return -ENOMEM;
- }
- }
-
- for (i = 0; i < blks; i++) {
- buf = rq->bufs[i];
- for (j = 0; j < VNIC_RQ_BUF_BLK_ENTRIES; j++) {
- buf->index = i * VNIC_RQ_BUF_BLK_ENTRIES + j;
- buf->desc = (u8 *)rq->ring.descs +
- rq->ring.desc_size * buf->index;
- if (buf->index + 1 == count) {
- buf->next = rq->bufs[0];
- break;
- } else if (j + 1 == VNIC_RQ_BUF_BLK_ENTRIES) {
- buf->next = rq->bufs[i + 1];
- } else {
- buf->next = buf + 1;
- buf++;
- }
- }
- }
-
- rq->to_use = rq->to_clean = rq->bufs[0];
- rq->buf_index = 0;
-
- return 0;
-}
-
-void vnic_rq_free(struct vnic_rq *rq)
-{
- struct vnic_dev *vdev;
- unsigned int i;
-
- vdev = rq->vdev;
-
- vnic_dev_free_desc_ring(vdev, &rq->ring);
-
- for (i = 0; i < VNIC_RQ_BUF_BLKS_MAX; i++) {
- kfree(rq->bufs[i]);
- rq->bufs[i] = NULL;
- }
-
- rq->ctrl = NULL;
-}
-
-int vnic_rq_alloc(struct vnic_dev *vdev, struct vnic_rq *rq, unsigned int index,
- unsigned int desc_count, unsigned int desc_size)
-{
- int err;
-
- rq->index = index;
- rq->vdev = vdev;
-
- rq->ctrl = vnic_dev_get_res(vdev, RES_TYPE_RQ, index);
- if (!rq->ctrl) {
- printk(KERN_ERR "Failed to hook RQ[%d] resource\n", index);
- return -EINVAL;
- }
-
- vnic_rq_disable(rq);
-
- err = vnic_dev_alloc_desc_ring(vdev, &rq->ring, desc_count, desc_size);
- if (err)
- return err;
-
- err = vnic_rq_alloc_bufs(rq);
- if (err) {
- vnic_rq_free(rq);
- return err;
- }
-
- return 0;
-}
-
-void vnic_rq_init(struct vnic_rq *rq, unsigned int cq_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);
- iowrite32(rq->ring.desc_count, &rq->ctrl->ring_size);
- iowrite32(cq_index, &rq->ctrl->cq_index);
- iowrite32(error_interrupt_enable, &rq->ctrl->error_interrupt_enable);
- iowrite32(error_interrupt_offset, &rq->ctrl->error_interrupt_offset);
- iowrite32(0, &rq->ctrl->dropped_packet_count);
- iowrite32(0, &rq->ctrl->error_status);
-
- /* 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);
-
- rq->buf_index = 0;
-}
-
-unsigned int vnic_rq_error_status(struct vnic_rq *rq)
-{
- return ioread32(&rq->ctrl->error_status);
-}
-
-void vnic_rq_enable(struct vnic_rq *rq)
-{
- iowrite32(1, &rq->ctrl->enable);
-}
-
-int vnic_rq_disable(struct vnic_rq *rq)
-{
- unsigned int wait;
-
- iowrite32(0, &rq->ctrl->enable);
-
- /* Wait for HW to ACK disable request */
- for (wait = 0; wait < 100; wait++) {
- if (!(ioread32(&rq->ctrl->running)))
- return 0;
- udelay(1);
- }
-
- printk(KERN_ERR "Failed to disable RQ[%d]\n", rq->index);
-
- return -ETIMEDOUT;
-}
-
-void vnic_rq_clean(struct vnic_rq *rq,
- void (*buf_clean)(struct vnic_rq *rq, struct vnic_rq_buf *buf))
-{
- struct vnic_rq_buf *buf;
- u32 fetch_index;
-
- BUG_ON(ioread32(&rq->ctrl->enable));
-
- buf = rq->to_clean;
-
- while (vnic_rq_desc_used(rq) > 0) {
-
- (*buf_clean)(rq, buf);
-
- buf = rq->to_clean = buf->next;
- rq->ring.desc_avail++;
- }
-
- /* 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);
-
- rq->buf_index = 0;
-
- vnic_dev_clear_desc_ring(&rq->ring);
-}
-
diff --git a/drivers/net/enic/vnic_rq.h b/drivers/net/enic/vnic_rq.h
deleted file mode 100644
index fd0ef66d2e9..00000000000
--- a/drivers/net/enic/vnic_rq.h
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * Copyright 2008 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
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-#ifndef _VNIC_RQ_H_
-#define _VNIC_RQ_H_
-
-#include <linux/pci.h>
-
-#include "vnic_dev.h"
-#include "vnic_cq.h"
-
-/* Receive queue control */
-struct vnic_rq_ctrl {
- u64 ring_base; /* 0x00 */
- u32 ring_size; /* 0x08 */
- u32 pad0;
- u32 posted_index; /* 0x10 */
- u32 pad1;
- u32 cq_index; /* 0x18 */
- u32 pad2;
- u32 enable; /* 0x20 */
- u32 pad3;
- u32 running; /* 0x28 */
- u32 pad4;
- u32 fetch_index; /* 0x30 */
- u32 pad5;
- u32 error_interrupt_enable; /* 0x38 */
- u32 pad6;
- u32 error_interrupt_offset; /* 0x40 */
- u32 pad7;
- u32 error_status; /* 0x48 */
- u32 pad8;
- u32 dropped_packet_count; /* 0x50 */
- u32 pad9;
- u32 dropped_packet_count_rc; /* 0x58 */
- u32 pad10;
-};
-
-/* Break the vnic_rq_buf allocations into blocks of 64 entries */
-#define VNIC_RQ_BUF_BLK_ENTRIES 64
-#define VNIC_RQ_BUF_BLK_SZ \
- (VNIC_RQ_BUF_BLK_ENTRIES * sizeof(struct vnic_rq_buf))
-#define VNIC_RQ_BUF_BLKS_NEEDED(entries) \
- DIV_ROUND_UP(entries, VNIC_RQ_BUF_BLK_ENTRIES)
-#define VNIC_RQ_BUF_BLKS_MAX VNIC_RQ_BUF_BLKS_NEEDED(4096)
-
-struct vnic_rq_buf {
- struct vnic_rq_buf *next;
- dma_addr_t dma_addr;
- void *os_buf;
- unsigned int os_buf_index;
- unsigned int len;
- unsigned int index;
- void *desc;
-};
-
-struct vnic_rq {
- unsigned int index;
- struct vnic_dev *vdev;
- struct vnic_rq_ctrl __iomem *ctrl; /* memory-mapped */
- struct vnic_dev_ring ring;
- struct vnic_rq_buf *bufs[VNIC_RQ_BUF_BLKS_MAX];
- struct vnic_rq_buf *to_use;
- struct vnic_rq_buf *to_clean;
- void *os_buf_head;
- unsigned int buf_index;
- unsigned int pkts_outstanding;
-};
-
-static inline unsigned int vnic_rq_desc_avail(struct vnic_rq *rq)
-{
- /* how many does SW own? */
- return rq->ring.desc_avail;
-}
-
-static inline unsigned int vnic_rq_desc_used(struct vnic_rq *rq)
-{
- /* how many does HW own? */
- return rq->ring.desc_count - rq->ring.desc_avail - 1;
-}
-
-static inline void *vnic_rq_next_desc(struct vnic_rq *rq)
-{
- return rq->to_use->desc;
-}
-
-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)
-{
- struct vnic_rq_buf *buf = rq->to_use;
-
- buf->os_buf = os_buf;
- buf->os_buf_index = os_buf_index;
- buf->dma_addr = dma_addr;
- buf->len = len;
-
- buf = buf->next;
- rq->to_use = buf;
- rq->ring.desc_avail--;
-
- /* Move the posted_index every nth descriptor
- */
-
-#ifndef VNIC_RQ_RETURN_RATE
-#define VNIC_RQ_RETURN_RATE 0xf /* keep 2^n - 1 */
-#endif
-
- if ((buf->index & VNIC_RQ_RETURN_RATE) == 0) {
- /* Adding write memory barrier prevents compiler and/or CPU
- * reordering, thus avoiding descriptor posting before
- * descriptor is initialized. Otherwise, hardware can read
- * stale descriptor fields.
- */
- wmb();
- iowrite32(buf->index, &rq->ctrl->posted_index);
- }
-}
-
-static inline void vnic_rq_return_descs(struct vnic_rq *rq, unsigned int count)
-{
- rq->ring.desc_avail += count;
-}
-
-enum desc_return_options {
- VNIC_RQ_RETURN_DESC,
- VNIC_RQ_DEFER_RETURN_DESC,
-};
-
-static inline void vnic_rq_service(struct vnic_rq *rq,
- struct cq_desc *cq_desc, u16 completed_index,
- int desc_return, void (*buf_service)(struct vnic_rq *rq,
- struct cq_desc *cq_desc, struct vnic_rq_buf *buf,
- int skipped, void *opaque), void *opaque)
-{
- struct vnic_rq_buf *buf;
- int skipped;
-
- buf = rq->to_clean;
- while (1) {
-
- skipped = (buf->index != completed_index);
-
- (*buf_service)(rq, cq_desc, buf, skipped, opaque);
-
- if (desc_return == VNIC_RQ_RETURN_DESC)
- rq->ring.desc_avail++;
-
- rq->to_clean = buf->next;
-
- if (!skipped)
- break;
-
- buf = rq->to_clean;
- }
-}
-
-static inline int vnic_rq_fill(struct vnic_rq *rq,
- int (*buf_fill)(struct vnic_rq *rq))
-{
- int err;
-
- while (vnic_rq_desc_avail(rq) > 1) {
-
- err = (*buf_fill)(rq);
- if (err)
- return err;
- }
-
- return 0;
-}
-
-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(struct vnic_rq *rq, unsigned int cq_index,
- unsigned int error_interrupt_enable,
- unsigned int error_interrupt_offset);
-unsigned int vnic_rq_error_status(struct vnic_rq *rq);
-void vnic_rq_enable(struct vnic_rq *rq);
-int vnic_rq_disable(struct vnic_rq *rq);
-void vnic_rq_clean(struct vnic_rq *rq,
- void (*buf_clean)(struct vnic_rq *rq, struct vnic_rq_buf *buf));
-
-#endif /* _VNIC_RQ_H_ */
diff --git a/drivers/net/enic/vnic_rss.h b/drivers/net/enic/vnic_rss.h
deleted file mode 100644
index 5fbb3c923bc..00000000000
--- a/drivers/net/enic/vnic_rss.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2008 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
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#ifndef _VNIC_RSS_H_
-#define _VNIC_RSS_H_
-
-/* RSS key array */
-union vnic_rss_key {
- struct {
- u8 b[10];
- u8 b_pad[6];
- } key[4];
- u64 raw[8];
-};
-
-/* RSS cpu array */
-union vnic_rss_cpu {
- struct {
- u8 b[4] ;
- u8 b_pad[4];
- } cpu[32];
- u64 raw[32];
-};
-
-void vnic_set_rss_key(union vnic_rss_key *rss_key, u8 *key);
-void vnic_set_rss_cpu(union vnic_rss_cpu *rss_cpu, u8 *cpu);
-void vnic_get_rss_key(union vnic_rss_key *rss_key, u8 *key);
-void vnic_get_rss_cpu(union vnic_rss_cpu *rss_cpu, u8 *cpu);
-
-#endif /* _VNIC_RSS_H_ */
diff --git a/drivers/net/enic/vnic_stats.h b/drivers/net/enic/vnic_stats.h
deleted file mode 100644
index 9ff9614d89b..00000000000
--- a/drivers/net/enic/vnic_stats.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright 2008 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
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-#ifndef _VNIC_STATS_H_
-#define _VNIC_STATS_H_
-
-/* Tx statistics */
-struct vnic_tx_stats {
- u64 tx_frames_ok;
- u64 tx_unicast_frames_ok;
- u64 tx_multicast_frames_ok;
- u64 tx_broadcast_frames_ok;
- u64 tx_bytes_ok;
- u64 tx_unicast_bytes_ok;
- u64 tx_multicast_bytes_ok;
- u64 tx_broadcast_bytes_ok;
- u64 tx_drops;
- u64 tx_errors;
- u64 tx_tso;
- u64 rsvd[16];
-};
-
-/* Rx statistics */
-struct vnic_rx_stats {
- u64 rx_frames_ok;
- u64 rx_frames_total;
- u64 rx_unicast_frames_ok;
- u64 rx_multicast_frames_ok;
- u64 rx_broadcast_frames_ok;
- u64 rx_bytes_ok;
- u64 rx_unicast_bytes_ok;
- u64 rx_multicast_bytes_ok;
- u64 rx_broadcast_bytes_ok;
- u64 rx_drop;
- u64 rx_no_bufs;
- u64 rx_errors;
- u64 rx_rss;
- u64 rx_crc_errors;
- u64 rx_frames_64;
- u64 rx_frames_127;
- u64 rx_frames_255;
- u64 rx_frames_511;
- u64 rx_frames_1023;
- u64 rx_frames_1518;
- u64 rx_frames_to_max;
- u64 rsvd[16];
-};
-
-struct vnic_stats {
- struct vnic_tx_stats tx;
- struct vnic_rx_stats rx;
-};
-
-#endif /* _VNIC_STATS_H_ */
diff --git a/drivers/net/enic/vnic_wq.c b/drivers/net/enic/vnic_wq.c
deleted file mode 100644
index a576d04708e..00000000000
--- a/drivers/net/enic/vnic_wq.c
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * Copyright 2008 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
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-#include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/types.h>
-#include <linux/pci.h>
-#include <linux/delay.h>
-
-#include "vnic_dev.h"
-#include "vnic_wq.h"
-
-static int vnic_wq_alloc_bufs(struct vnic_wq *wq)
-{
- struct vnic_wq_buf *buf;
- struct vnic_dev *vdev;
- unsigned int i, j, count = wq->ring.desc_count;
- unsigned int blks = VNIC_WQ_BUF_BLKS_NEEDED(count);
-
- vdev = wq->vdev;
-
- for (i = 0; i < blks; i++) {
- wq->bufs[i] = kzalloc(VNIC_WQ_BUF_BLK_SZ, GFP_ATOMIC);
- if (!wq->bufs[i]) {
- printk(KERN_ERR "Failed to alloc wq_bufs\n");
- return -ENOMEM;
- }
- }
-
- for (i = 0; i < blks; i++) {
- buf = wq->bufs[i];
- for (j = 0; j < VNIC_WQ_BUF_BLK_ENTRIES; j++) {
- buf->index = i * VNIC_WQ_BUF_BLK_ENTRIES + j;
- buf->desc = (u8 *)wq->ring.descs +
- wq->ring.desc_size * buf->index;
- if (buf->index + 1 == count) {
- buf->next = wq->bufs[0];
- break;
- } else if (j + 1 == VNIC_WQ_BUF_BLK_ENTRIES) {
- buf->next = wq->bufs[i + 1];
- } else {
- buf->next = buf + 1;
- buf++;
- }
- }
- }
-
- wq->to_use = wq->to_clean = wq->bufs[0];
-
- return 0;
-}
-
-void vnic_wq_free(struct vnic_wq *wq)
-{
- struct vnic_dev *vdev;
- unsigned int i;
-
- vdev = wq->vdev;
-
- vnic_dev_free_desc_ring(vdev, &wq->ring);
-
- for (i = 0; i < VNIC_WQ_BUF_BLKS_MAX; i++) {
- kfree(wq->bufs[i]);
- wq->bufs[i] = NULL;
- }
-
- wq->ctrl = NULL;
-}
-
-int vnic_wq_alloc(struct vnic_dev *vdev, struct vnic_wq *wq, unsigned int index,
- unsigned int desc_count, unsigned int desc_size)
-{
- int err;
-
- wq->index = index;
- wq->vdev = vdev;
-
- wq->ctrl = vnic_dev_get_res(vdev, RES_TYPE_WQ, index);
- if (!wq->ctrl) {
- printk(KERN_ERR "Failed to hook WQ[%d] resource\n", index);
- return -EINVAL;
- }
-
- vnic_wq_disable(wq);
-
- err = vnic_dev_alloc_desc_ring(vdev, &wq->ring, desc_count, desc_size);
- if (err)
- return err;
-
- err = vnic_wq_alloc_bufs(wq);
- if (err) {
- vnic_wq_free(wq);
- return err;
- }
-
- return 0;
-}
-
-void vnic_wq_init(struct vnic_wq *wq, unsigned int cq_index,
- unsigned int error_interrupt_enable,
- unsigned int error_interrupt_offset)
-{
- u64 paddr;
-
- 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(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);
-}
-
-unsigned int vnic_wq_error_status(struct vnic_wq *wq)
-{
- return ioread32(&wq->ctrl->error_status);
-}
-
-void vnic_wq_enable(struct vnic_wq *wq)
-{
- iowrite32(1, &wq->ctrl->enable);
-}
-
-int vnic_wq_disable(struct vnic_wq *wq)
-{
- unsigned int wait;
-
- iowrite32(0, &wq->ctrl->enable);
-
- /* Wait for HW to ACK disable request */
- for (wait = 0; wait < 100; wait++) {
- if (!(ioread32(&wq->ctrl->running)))
- return 0;
- udelay(1);
- }
-
- printk(KERN_ERR "Failed to disable WQ[%d]\n", wq->index);
-
- return -ETIMEDOUT;
-}
-
-void vnic_wq_clean(struct vnic_wq *wq,
- void (*buf_clean)(struct vnic_wq *wq, struct vnic_wq_buf *buf))
-{
- struct vnic_wq_buf *buf;
-
- BUG_ON(ioread32(&wq->ctrl->enable));
-
- buf = wq->to_clean;
-
- while (vnic_wq_desc_used(wq) > 0) {
-
- (*buf_clean)(wq, buf);
-
- buf = wq->to_clean = buf->next;
- wq->ring.desc_avail++;
- }
-
- wq->to_use = wq->to_clean = wq->bufs[0];
-
- iowrite32(0, &wq->ctrl->fetch_index);
- iowrite32(0, &wq->ctrl->posted_index);
- iowrite32(0, &wq->ctrl->error_status);
-
- vnic_dev_clear_desc_ring(&wq->ring);
-}
diff --git a/drivers/net/enic/vnic_wq.h b/drivers/net/enic/vnic_wq.h
deleted file mode 100644
index c826137dc65..00000000000
--- a/drivers/net/enic/vnic_wq.h
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Copyright 2008 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
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-#ifndef _VNIC_WQ_H_
-#define _VNIC_WQ_H_
-
-#include <linux/pci.h>
-
-#include "vnic_dev.h"
-#include "vnic_cq.h"
-
-/* Work queue control */
-struct vnic_wq_ctrl {
- u64 ring_base; /* 0x00 */
- u32 ring_size; /* 0x08 */
- u32 pad0;
- u32 posted_index; /* 0x10 */
- u32 pad1;
- u32 cq_index; /* 0x18 */
- u32 pad2;
- u32 enable; /* 0x20 */
- u32 pad3;
- u32 running; /* 0x28 */
- u32 pad4;
- u32 fetch_index; /* 0x30 */
- u32 pad5;
- u32 dca_value; /* 0x38 */
- u32 pad6;
- u32 error_interrupt_enable; /* 0x40 */
- u32 pad7;
- u32 error_interrupt_offset; /* 0x48 */
- u32 pad8;
- u32 error_status; /* 0x50 */
- u32 pad9;
-};
-
-struct vnic_wq_buf {
- struct vnic_wq_buf *next;
- dma_addr_t dma_addr;
- void *os_buf;
- unsigned int len;
- unsigned int index;
- int sop;
- void *desc;
-};
-
-/* Break the vnic_wq_buf allocations into blocks of 64 entries */
-#define VNIC_WQ_BUF_BLK_ENTRIES 64
-#define VNIC_WQ_BUF_BLK_SZ \
- (VNIC_WQ_BUF_BLK_ENTRIES * sizeof(struct vnic_wq_buf))
-#define VNIC_WQ_BUF_BLKS_NEEDED(entries) \
- DIV_ROUND_UP(entries, VNIC_WQ_BUF_BLK_ENTRIES)
-#define VNIC_WQ_BUF_BLKS_MAX VNIC_WQ_BUF_BLKS_NEEDED(4096)
-
-struct vnic_wq {
- unsigned int index;
- struct vnic_dev *vdev;
- struct vnic_wq_ctrl __iomem *ctrl; /* memory-mapped */
- struct vnic_dev_ring ring;
- struct vnic_wq_buf *bufs[VNIC_WQ_BUF_BLKS_MAX];
- struct vnic_wq_buf *to_use;
- struct vnic_wq_buf *to_clean;
- unsigned int pkts_outstanding;
-};
-
-static inline unsigned int vnic_wq_desc_avail(struct vnic_wq *wq)
-{
- /* how many does SW own? */
- return wq->ring.desc_avail;
-}
-
-static inline unsigned int vnic_wq_desc_used(struct vnic_wq *wq)
-{
- /* how many does HW own? */
- return wq->ring.desc_count - wq->ring.desc_avail - 1;
-}
-
-static inline void *vnic_wq_next_desc(struct vnic_wq *wq)
-{
- return wq->to_use->desc;
-}
-
-static inline void vnic_wq_post(struct vnic_wq *wq,
- void *os_buf, dma_addr_t dma_addr,
- unsigned int len, int sop, int eop)
-{
- struct vnic_wq_buf *buf = wq->to_use;
-
- buf->sop = sop;
- buf->os_buf = eop ? os_buf : NULL;
- buf->dma_addr = dma_addr;
- buf->len = len;
-
- buf = buf->next;
- if (eop) {
- /* Adding write memory barrier prevents compiler and/or CPU
- * reordering, thus avoiding descriptor posting before
- * descriptor is initialized. Otherwise, hardware can read
- * stale descriptor fields.
- */
- wmb();
- iowrite32(buf->index, &wq->ctrl->posted_index);
- }
- wq->to_use = buf;
-
- wq->ring.desc_avail--;
-}
-
-static inline void vnic_wq_service(struct vnic_wq *wq,
- struct cq_desc *cq_desc, u16 completed_index,
- void (*buf_service)(struct vnic_wq *wq,
- struct cq_desc *cq_desc, struct vnic_wq_buf *buf, void *opaque),
- void *opaque)
-{
- struct vnic_wq_buf *buf;
-
- buf = wq->to_clean;
- while (1) {
-
- (*buf_service)(wq, cq_desc, buf, opaque);
-
- wq->ring.desc_avail++;
-
- wq->to_clean = buf->next;
-
- if (buf->index == completed_index)
- break;
-
- buf = wq->to_clean;
- }
-}
-
-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(struct vnic_wq *wq, unsigned int cq_index,
- unsigned int error_interrupt_enable,
- unsigned int error_interrupt_offset);
-unsigned int vnic_wq_error_status(struct vnic_wq *wq);
-void vnic_wq_enable(struct vnic_wq *wq);
-int vnic_wq_disable(struct vnic_wq *wq);
-void vnic_wq_clean(struct vnic_wq *wq,
- void (*buf_clean)(struct vnic_wq *wq, struct vnic_wq_buf *buf));
-
-#endif /* _VNIC_WQ_H_ */
diff --git a/drivers/net/enic/wq_enet_desc.h b/drivers/net/enic/wq_enet_desc.h
deleted file mode 100644
index 483596c2d8b..00000000000
--- a/drivers/net/enic/wq_enet_desc.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright 2008 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
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-#ifndef _WQ_ENET_DESC_H_
-#define _WQ_ENET_DESC_H_
-
-/* Ethernet work queue descriptor: 16B */
-struct wq_enet_desc {
- __le64 address;
- __le16 length;
- __le16 mss_loopback;
- __le16 header_length_flags;
- __le16 vlan_tag;
-};
-
-#define WQ_ENET_ADDR_BITS 64
-#define WQ_ENET_LEN_BITS 14
-#define WQ_ENET_LEN_MASK ((1 << WQ_ENET_LEN_BITS) - 1)
-#define WQ_ENET_MSS_BITS 14
-#define WQ_ENET_MSS_MASK ((1 << WQ_ENET_MSS_BITS) - 1)
-#define WQ_ENET_MSS_SHIFT 2
-#define WQ_ENET_LOOPBACK_SHIFT 1
-#define WQ_ENET_HDRLEN_BITS 10
-#define WQ_ENET_HDRLEN_MASK ((1 << WQ_ENET_HDRLEN_BITS) - 1)
-#define WQ_ENET_FLAGS_OM_BITS 2
-#define WQ_ENET_FLAGS_OM_MASK ((1 << WQ_ENET_FLAGS_OM_BITS) - 1)
-#define WQ_ENET_FLAGS_EOP_SHIFT 12
-#define WQ_ENET_FLAGS_CQ_ENTRY_SHIFT 13
-#define WQ_ENET_FLAGS_FCOE_ENCAP_SHIFT 14
-#define WQ_ENET_FLAGS_VLAN_TAG_INSERT_SHIFT 15
-
-#define WQ_ENET_OFFLOAD_MODE_CSUM 0
-#define WQ_ENET_OFFLOAD_MODE_RESERVED 1
-#define WQ_ENET_OFFLOAD_MODE_CSUM_L4 2
-#define WQ_ENET_OFFLOAD_MODE_TSO 3
-
-static inline void wq_enet_desc_enc(struct wq_enet_desc *desc,
- u64 address, u16 length, u16 mss, u16 header_length,
- u8 offload_mode, u8 eop, u8 cq_entry, u8 fcoe_encap,
- u8 vlan_tag_insert, u16 vlan_tag, u8 loopback)
-{
- desc->address = cpu_to_le64(address);
- desc->length = cpu_to_le16(length & WQ_ENET_LEN_MASK);
- desc->mss_loopback = cpu_to_le16((mss & WQ_ENET_MSS_MASK) <<
- WQ_ENET_MSS_SHIFT | (loopback & 1) << WQ_ENET_LOOPBACK_SHIFT);
- desc->header_length_flags = cpu_to_le16(
- (header_length & WQ_ENET_HDRLEN_MASK) |
- (offload_mode & WQ_ENET_FLAGS_OM_MASK) << WQ_ENET_HDRLEN_BITS |
- (eop & 1) << WQ_ENET_FLAGS_EOP_SHIFT |
- (cq_entry & 1) << WQ_ENET_FLAGS_CQ_ENTRY_SHIFT |
- (fcoe_encap & 1) << WQ_ENET_FLAGS_FCOE_ENCAP_SHIFT |
- (vlan_tag_insert & 1) << WQ_ENET_FLAGS_VLAN_TAG_INSERT_SHIFT);
- desc->vlan_tag = cpu_to_le16(vlan_tag);
-}
-
-static inline void wq_enet_desc_dec(struct wq_enet_desc *desc,
- u64 *address, u16 *length, u16 *mss, u16 *header_length,
- u8 *offload_mode, u8 *eop, u8 *cq_entry, u8 *fcoe_encap,
- u8 *vlan_tag_insert, u16 *vlan_tag, u8 *loopback)
-{
- *address = le64_to_cpu(desc->address);
- *length = le16_to_cpu(desc->length) & WQ_ENET_LEN_MASK;
- *mss = (le16_to_cpu(desc->mss_loopback) >> WQ_ENET_MSS_SHIFT) &
- WQ_ENET_MSS_MASK;
- *loopback = (u8)((le16_to_cpu(desc->mss_loopback) >>
- WQ_ENET_LOOPBACK_SHIFT) & 1);
- *header_length = le16_to_cpu(desc->header_length_flags) &
- WQ_ENET_HDRLEN_MASK;
- *offload_mode = (u8)((le16_to_cpu(desc->header_length_flags) >>
- WQ_ENET_HDRLEN_BITS) & WQ_ENET_FLAGS_OM_MASK);
- *eop = (u8)((le16_to_cpu(desc->header_length_flags) >>
- WQ_ENET_FLAGS_EOP_SHIFT) & 1);
- *cq_entry = (u8)((le16_to_cpu(desc->header_length_flags) >>
- WQ_ENET_FLAGS_CQ_ENTRY_SHIFT) & 1);
- *fcoe_encap = (u8)((le16_to_cpu(desc->header_length_flags) >>
- WQ_ENET_FLAGS_FCOE_ENCAP_SHIFT) & 1);
- *vlan_tag_insert = (u8)((le16_to_cpu(desc->header_length_flags) >>
- WQ_ENET_FLAGS_VLAN_TAG_INSERT_SHIFT) & 1);
- *vlan_tag = le16_to_cpu(desc->vlan_tag);
-}
-
-#endif /* _WQ_ENET_DESC_H_ */