enic: Move the Cisco driver
authorJeff Kirsher <jeffrey.t.kirsher@intel.com>
Sat, 14 May 2011 05:20:35 +0000 (22:20 -0700)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Thu, 11 Aug 2011 09:42:06 +0000 (02:42 -0700)
Move the Cisco driver into drivers/net/ethernet/cisco/ and make the
necessary Kconfig and Makefile changes.

CC: Christian Benvenuti <benve@cisco.com>
CC: Vasanthy Kolluri <vkolluri@cisco.com>
CC: Roopa Prabhu <roprabhu@cisco.com>
CC: David Wang <dwang2@cisco.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
70 files changed:
MAINTAINERS
drivers/net/Kconfig
drivers/net/Makefile
drivers/net/enic/Makefile [deleted file]
drivers/net/enic/cq_desc.h [deleted file]
drivers/net/enic/cq_enet_desc.h [deleted file]
drivers/net/enic/enic.h [deleted file]
drivers/net/enic/enic_dev.c [deleted file]
drivers/net/enic/enic_dev.h [deleted file]
drivers/net/enic/enic_main.c [deleted file]
drivers/net/enic/enic_pp.c [deleted file]
drivers/net/enic/enic_pp.h [deleted file]
drivers/net/enic/enic_res.c [deleted file]
drivers/net/enic/enic_res.h [deleted file]
drivers/net/enic/rq_enet_desc.h [deleted file]
drivers/net/enic/vnic_cq.c [deleted file]
drivers/net/enic/vnic_cq.h [deleted file]
drivers/net/enic/vnic_dev.c [deleted file]
drivers/net/enic/vnic_dev.h [deleted file]
drivers/net/enic/vnic_devcmd.h [deleted file]
drivers/net/enic/vnic_enet.h [deleted file]
drivers/net/enic/vnic_intr.c [deleted file]
drivers/net/enic/vnic_intr.h [deleted file]
drivers/net/enic/vnic_nic.h [deleted file]
drivers/net/enic/vnic_resource.h [deleted file]
drivers/net/enic/vnic_rq.c [deleted file]
drivers/net/enic/vnic_rq.h [deleted file]
drivers/net/enic/vnic_rss.h [deleted file]
drivers/net/enic/vnic_stats.h [deleted file]
drivers/net/enic/vnic_vic.c [deleted file]
drivers/net/enic/vnic_vic.h [deleted file]
drivers/net/enic/vnic_wq.c [deleted file]
drivers/net/enic/vnic_wq.h [deleted file]
drivers/net/enic/wq_enet_desc.h [deleted file]
drivers/net/ethernet/Kconfig
drivers/net/ethernet/Makefile
drivers/net/ethernet/cisco/Kconfig [new file with mode: 0644]
drivers/net/ethernet/cisco/Makefile [new file with mode: 0644]
drivers/net/ethernet/cisco/enic/Kconfig [new file with mode: 0644]
drivers/net/ethernet/cisco/enic/Makefile [new file with mode: 0644]
drivers/net/ethernet/cisco/enic/cq_desc.h [new file with mode: 0644]
drivers/net/ethernet/cisco/enic/cq_enet_desc.h [new file with mode: 0644]
drivers/net/ethernet/cisco/enic/enic.h [new file with mode: 0644]
drivers/net/ethernet/cisco/enic/enic_dev.c [new file with mode: 0644]
drivers/net/ethernet/cisco/enic/enic_dev.h [new file with mode: 0644]
drivers/net/ethernet/cisco/enic/enic_main.c [new file with mode: 0644]
drivers/net/ethernet/cisco/enic/enic_pp.c [new file with mode: 0644]
drivers/net/ethernet/cisco/enic/enic_pp.h [new file with mode: 0644]
drivers/net/ethernet/cisco/enic/enic_res.c [new file with mode: 0644]
drivers/net/ethernet/cisco/enic/enic_res.h [new file with mode: 0644]
drivers/net/ethernet/cisco/enic/rq_enet_desc.h [new file with mode: 0644]
drivers/net/ethernet/cisco/enic/vnic_cq.c [new file with mode: 0644]
drivers/net/ethernet/cisco/enic/vnic_cq.h [new file with mode: 0644]
drivers/net/ethernet/cisco/enic/vnic_dev.c [new file with mode: 0644]
drivers/net/ethernet/cisco/enic/vnic_dev.h [new file with mode: 0644]
drivers/net/ethernet/cisco/enic/vnic_devcmd.h [new file with mode: 0644]
drivers/net/ethernet/cisco/enic/vnic_enet.h [new file with mode: 0644]
drivers/net/ethernet/cisco/enic/vnic_intr.c [new file with mode: 0644]
drivers/net/ethernet/cisco/enic/vnic_intr.h [new file with mode: 0644]
drivers/net/ethernet/cisco/enic/vnic_nic.h [new file with mode: 0644]
drivers/net/ethernet/cisco/enic/vnic_resource.h [new file with mode: 0644]
drivers/net/ethernet/cisco/enic/vnic_rq.c [new file with mode: 0644]
drivers/net/ethernet/cisco/enic/vnic_rq.h [new file with mode: 0644]
drivers/net/ethernet/cisco/enic/vnic_rss.h [new file with mode: 0644]
drivers/net/ethernet/cisco/enic/vnic_stats.h [new file with mode: 0644]
drivers/net/ethernet/cisco/enic/vnic_vic.c [new file with mode: 0644]
drivers/net/ethernet/cisco/enic/vnic_vic.h [new file with mode: 0644]
drivers/net/ethernet/cisco/enic/vnic_wq.c [new file with mode: 0644]
drivers/net/ethernet/cisco/enic/vnic_wq.h [new file with mode: 0644]
drivers/net/ethernet/cisco/enic/wq_enet_desc.h [new file with mode: 0644]

index 2fcfa8b02d901ba80980f12fe9e3dfacfa71705e..c54e736f5894545eb63c32d09c62992b69e5ce0d 100644 (file)
@@ -1761,7 +1761,7 @@ M:        Vasanthy Kolluri <vkolluri@cisco.com>
 M:     Roopa Prabhu <roprabhu@cisco.com>
 M:     David Wang <dwang2@cisco.com>
 S:     Supported
-F:     drivers/net/enic/
+F:     drivers/net/ethernet/cisco/enic/
 
 CIRRUS LOGIC EP93XX ETHERNET DRIVER
 M:     Hartley Sweeten <hsweeten@visionengravers.com>
index 116f7442e70ccb4f747607820281dfd714b58749..08ce280410634a13d0a29de10389a3f9092beeac 100644 (file)
@@ -1457,12 +1457,6 @@ if NETDEV_10000
 config MDIO
        tristate
 
-config ENIC
-       tristate "Cisco VIC Ethernet NIC Support"
-       depends on PCI && INET
-       help
-         This enables the support for the Cisco VIC Ethernet card.
-
 config PASEMI_MAC
        tristate "PA Semi 1/10Gbit MAC"
        depends on PPC_PASEMI && PCI && INET
index 54146ed625b7c98d4079b3a25de1b6e369d26c80..cf1d5a27a4718ac3a3c503345e115cf40e3b463e 100644 (file)
@@ -20,7 +20,6 @@ obj-$(CONFIG_ATL1C) += atl1c/
 obj-$(CONFIG_GIANFAR) += gianfar_driver.o
 obj-$(CONFIG_PTP_1588_CLOCK_GIANFAR) += gianfar_ptp.o
 obj-$(CONFIG_TEHUTI) += tehuti.o
-obj-$(CONFIG_ENIC) += enic/
 obj-$(CONFIG_JME) += jme.o
 obj-$(CONFIG_VMXNET3) += vmxnet3/
 
diff --git a/drivers/net/enic/Makefile b/drivers/net/enic/Makefile
deleted file mode 100644 (file)
index 9d4974b..0000000
+++ /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 enic_dev.o enic_pp.o vnic_dev.o vnic_rq.o vnic_vic.o
-
diff --git a/drivers/net/enic/cq_desc.h b/drivers/net/enic/cq_desc.h
deleted file mode 100644 (file)
index d6dd1b4..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright 2008-2010 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 (file)
index c2c0680..0000000
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * Copyright 2008-2010 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_VLAN_TCI_VLAN_BITS          12
-#define CQ_ENET_RQ_DESC_VLAN_TCI_VLAN_MASK \
-       ((1 << CQ_ENET_RQ_DESC_VLAN_TCI_VLAN_BITS) - 1)
-#define CQ_ENET_RQ_DESC_VLAN_TCI_CFI_MASK           (0x1 << 12)
-#define CQ_ENET_RQ_DESC_VLAN_TCI_USER_PRIO_BITS     3
-#define CQ_ENET_RQ_DESC_VLAN_TCI_USER_PRIO_MASK \
-       ((1 << CQ_ENET_RQ_DESC_VLAN_TCI_USER_PRIO_BITS) - 1)
-#define CQ_ENET_RQ_DESC_VLAN_TCI_USER_PRIO_SHIFT    13
-
-#define CQ_ENET_RQ_DESC_FCOE_SOF_BITS               8
-#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_tci, 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;
-       u16 q_number_rss_type_flags;
-       u16 bytes_written_flags;
-
-       cq_desc_dec((struct cq_desc *)desc, type,
-               color, q_number, completed_index);
-
-       completed_index_flags = le16_to_cpu(desc->completed_index_flags);
-       q_number_rss_type_flags =
-               le16_to_cpu(desc->q_number_rss_type_flags);
-       bytes_written_flags = le16_to_cpu(desc->bytes_written_flags);
-
-       *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;
-
-       /*
-        * Tag Control Information(16) = user_priority(3) + cfi(1) + vlan(12)
-        */
-       *vlan_tci = 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 (file)
index ce76d9a..0000000
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright 2008-2010 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 "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"
-
-#define DRV_NAME               "enic"
-#define DRV_DESCRIPTION                "Cisco VIC Ethernet NIC Driver"
-#define DRV_VERSION            "2.1.1.24"
-#define DRV_COPYRIGHT          "Copyright 2008-2011 Cisco Systems, Inc"
-
-#define ENIC_BARS_MAX          6
-
-#define ENIC_WQ_MAX            1
-#define ENIC_RQ_MAX            1
-#define ENIC_CQ_MAX            (ENIC_WQ_MAX + ENIC_RQ_MAX)
-#define ENIC_INTR_MAX          (ENIC_CQ_MAX + 2)
-
-struct enic_msix_entry {
-       int requested;
-       char devname[IFNAMSIZ];
-       irqreturn_t (*isr)(int, void *);
-       void *devid;
-};
-
-#define ENIC_PORT_REQUEST_APPLIED      (1 << 0)
-#define ENIC_SET_REQUEST               (1 << 1)
-#define ENIC_SET_NAME                  (1 << 2)
-#define ENIC_SET_INSTANCE              (1 << 3)
-#define ENIC_SET_HOST                  (1 << 4)
-
-struct enic_port_profile {
-       u32 set;
-       u8 request;
-       char name[PORT_PROFILE_MAX];
-       u8 instance_uuid[PORT_UUID_MAX];
-       u8 host_uuid[PORT_UUID_MAX];
-       u8 vf_mac[ETH_ALEN];
-       u8 mac_addr[ETH_ALEN];
-};
-
-/* Per-instance private data structure */
-struct enic {
-       struct net_device *netdev;
-       struct pci_dev *pdev;
-       struct vnic_enet_config config;
-       struct vnic_dev_bar bar[ENIC_BARS_MAX];
-       struct vnic_dev *vdev;
-       struct timer_list notify_timer;
-       struct work_struct reset;
-       struct work_struct change_mtu_work;
-       struct msix_entry msix_entry[ENIC_INTR_MAX];
-       struct enic_msix_entry msix[ENIC_INTR_MAX];
-       u32 msg_enable;
-       spinlock_t devcmd_lock;
-       u8 mac_addr[ETH_ALEN];
-       u8 mc_addr[ENIC_MULTICAST_PERFECT_FILTERS][ETH_ALEN];
-       u8 uc_addr[ENIC_UNICAST_PERFECT_FILTERS][ETH_ALEN];
-       unsigned int flags;
-       unsigned int mc_count;
-       unsigned int uc_count;
-       u32 port_mtu;
-       u32 rx_coalesce_usecs;
-       u32 tx_coalesce_usecs;
-       struct enic_port_profile pp;
-
-       /* work queue cache line section */
-       ____cacheline_aligned struct vnic_wq wq[ENIC_WQ_MAX];
-       spinlock_t wq_lock[ENIC_WQ_MAX];
-       unsigned int wq_count;
-       u16 loop_enable;
-       u16 loop_tag;
-
-       /* receive queue cache line section */
-       ____cacheline_aligned struct vnic_rq rq[ENIC_RQ_MAX];
-       unsigned int rq_count;
-       u64 rq_truncated_pkts;
-       u64 rq_bad_fcs;
-       struct napi_struct napi[ENIC_RQ_MAX];
-
-       /* interrupt resource cache line section */
-       ____cacheline_aligned struct vnic_intr intr[ENIC_INTR_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;
-};
-
-static inline struct device *enic_get_dev(struct enic *enic)
-{
-       return &(enic->pdev->dev);
-}
-
-void enic_reset_addr_lists(struct enic *enic);
-
-#endif /* _ENIC_H_ */
diff --git a/drivers/net/enic/enic_dev.c b/drivers/net/enic/enic_dev.c
deleted file mode 100644 (file)
index fd6247b..0000000
+++ /dev/null
@@ -1,286 +0,0 @@
-/*
- * Copyright 2011 Cisco 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/pci.h>
-#include <linux/etherdevice.h>
-
-#include "vnic_dev.h"
-#include "vnic_vic.h"
-#include "enic_res.h"
-#include "enic.h"
-#include "enic_dev.h"
-
-int enic_dev_fw_info(struct enic *enic, struct vnic_devcmd_fw_info **fw_info)
-{
-       int err;
-
-       spin_lock(&enic->devcmd_lock);
-       err = vnic_dev_fw_info(enic->vdev, fw_info);
-       spin_unlock(&enic->devcmd_lock);
-
-       return err;
-}
-
-int enic_dev_stats_dump(struct enic *enic, struct vnic_stats **vstats)
-{
-       int err;
-
-       spin_lock(&enic->devcmd_lock);
-       err = vnic_dev_stats_dump(enic->vdev, vstats);
-       spin_unlock(&enic->devcmd_lock);
-
-       return err;
-}
-
-int enic_dev_add_station_addr(struct enic *enic)
-{
-       int err;
-
-       if (!is_valid_ether_addr(enic->netdev->dev_addr))
-               return -EADDRNOTAVAIL;
-
-       spin_lock(&enic->devcmd_lock);
-       err = vnic_dev_add_addr(enic->vdev, enic->netdev->dev_addr);
-       spin_unlock(&enic->devcmd_lock);
-
-       return err;
-}
-
-int enic_dev_del_station_addr(struct enic *enic)
-{
-       int err;
-
-       if (!is_valid_ether_addr(enic->netdev->dev_addr))
-               return -EADDRNOTAVAIL;
-
-       spin_lock(&enic->devcmd_lock);
-       err = vnic_dev_del_addr(enic->vdev, enic->netdev->dev_addr);
-       spin_unlock(&enic->devcmd_lock);
-
-       return err;
-}
-
-int enic_dev_packet_filter(struct enic *enic, int directed, int multicast,
-       int broadcast, int promisc, int allmulti)
-{
-       int err;
-
-       spin_lock(&enic->devcmd_lock);
-       err = vnic_dev_packet_filter(enic->vdev, directed,
-               multicast, broadcast, promisc, allmulti);
-       spin_unlock(&enic->devcmd_lock);
-
-       return err;
-}
-
-int enic_dev_add_addr(struct enic *enic, u8 *addr)
-{
-       int err;
-
-       spin_lock(&enic->devcmd_lock);
-       err = vnic_dev_add_addr(enic->vdev, addr);
-       spin_unlock(&enic->devcmd_lock);
-
-       return err;
-}
-
-int enic_dev_del_addr(struct enic *enic, u8 *addr)
-{
-       int err;
-
-       spin_lock(&enic->devcmd_lock);
-       err = vnic_dev_del_addr(enic->vdev, addr);
-       spin_unlock(&enic->devcmd_lock);
-
-       return err;
-}
-
-int enic_dev_notify_unset(struct enic *enic)
-{
-       int err;
-
-       spin_lock(&enic->devcmd_lock);
-       err = vnic_dev_notify_unset(enic->vdev);
-       spin_unlock(&enic->devcmd_lock);
-
-       return err;
-}
-
-int enic_dev_hang_notify(struct enic *enic)
-{
-       int err;
-
-       spin_lock(&enic->devcmd_lock);
-       err = vnic_dev_hang_notify(enic->vdev);
-       spin_unlock(&enic->devcmd_lock);
-
-       return err;
-}
-
-int enic_dev_set_ig_vlan_rewrite_mode(struct enic *enic)
-{
-       int err;
-
-       spin_lock(&enic->devcmd_lock);
-       err = vnic_dev_set_ig_vlan_rewrite_mode(enic->vdev,
-               IG_VLAN_REWRITE_MODE_PRIORITY_TAG_DEFAULT_VLAN);
-       spin_unlock(&enic->devcmd_lock);
-
-       return err;
-}
-
-int enic_dev_enable(struct enic *enic)
-{
-       int err;
-
-       spin_lock(&enic->devcmd_lock);
-       err = vnic_dev_enable_wait(enic->vdev);
-       spin_unlock(&enic->devcmd_lock);
-
-       return err;
-}
-
-int enic_dev_disable(struct enic *enic)
-{
-       int err;
-
-       spin_lock(&enic->devcmd_lock);
-       err = vnic_dev_disable(enic->vdev);
-       spin_unlock(&enic->devcmd_lock);
-
-       return err;
-}
-
-int enic_dev_intr_coal_timer_info(struct enic *enic)
-{
-       int err;
-
-       spin_lock(&enic->devcmd_lock);
-       err = vnic_dev_intr_coal_timer_info(enic->vdev);
-       spin_unlock(&enic->devcmd_lock);
-
-       return err;
-}
-
-int enic_vnic_dev_deinit(struct enic *enic)
-{
-       int err;
-
-       spin_lock(&enic->devcmd_lock);
-       err = vnic_dev_deinit(enic->vdev);
-       spin_unlock(&enic->devcmd_lock);
-
-       return err;
-}
-
-int enic_dev_init_prov2(struct enic *enic, struct vic_provinfo *vp)
-{
-       int err;
-
-       spin_lock(&enic->devcmd_lock);
-       err = vnic_dev_init_prov2(enic->vdev,
-               (u8 *)vp, vic_provinfo_size(vp));
-       spin_unlock(&enic->devcmd_lock);
-
-       return err;
-}
-
-int enic_dev_deinit_done(struct enic *enic, int *status)
-{
-       int err;
-
-       spin_lock(&enic->devcmd_lock);
-       err = vnic_dev_deinit_done(enic->vdev, status);
-       spin_unlock(&enic->devcmd_lock);
-
-       return err;
-}
-
-/* rtnl lock is held */
-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 */
-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);
-}
-
-int enic_dev_enable2(struct enic *enic, int active)
-{
-       int err;
-
-       spin_lock(&enic->devcmd_lock);
-       err = vnic_dev_enable2(enic->vdev, active);
-       spin_unlock(&enic->devcmd_lock);
-
-       return err;
-}
-
-int enic_dev_enable2_done(struct enic *enic, int *status)
-{
-       int err;
-
-       spin_lock(&enic->devcmd_lock);
-       err = vnic_dev_enable2_done(enic->vdev, status);
-       spin_unlock(&enic->devcmd_lock);
-
-       return err;
-}
-
-int enic_dev_status_to_errno(int devcmd_status)
-{
-       switch (devcmd_status) {
-       case ERR_SUCCESS:
-               return 0;
-       case ERR_EINVAL:
-               return -EINVAL;
-       case ERR_EFAULT:
-               return -EFAULT;
-       case ERR_EPERM:
-               return -EPERM;
-       case ERR_EBUSY:
-               return -EBUSY;
-       case ERR_ECMDUNKNOWN:
-       case ERR_ENOTSUPPORTED:
-               return -EOPNOTSUPP;
-       case ERR_EBADSTATE:
-               return -EINVAL;
-       case ERR_ENOMEM:
-               return -ENOMEM;
-       case ERR_ETIMEDOUT:
-               return -ETIMEDOUT;
-       case ERR_ELINKDOWN:
-               return -ENETDOWN;
-       case ERR_EINPROGRESS:
-               return -EINPROGRESS;
-       case ERR_EMAXRES:
-       default:
-               return (devcmd_status < 0) ? devcmd_status : -1;
-       }
-}
diff --git a/drivers/net/enic/enic_dev.h b/drivers/net/enic/enic_dev.h
deleted file mode 100644 (file)
index ff8e87f..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2011 Cisco 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_DEV_H_
-#define _ENIC_DEV_H_
-
-int enic_dev_fw_info(struct enic *enic, struct vnic_devcmd_fw_info **fw_info);
-int enic_dev_stats_dump(struct enic *enic, struct vnic_stats **vstats);
-int enic_dev_add_station_addr(struct enic *enic);
-int enic_dev_del_station_addr(struct enic *enic);
-int enic_dev_packet_filter(struct enic *enic, int directed, int multicast,
-       int broadcast, int promisc, int allmulti);
-int enic_dev_add_addr(struct enic *enic, u8 *addr);
-int enic_dev_del_addr(struct enic *enic, u8 *addr);
-void enic_vlan_rx_add_vid(struct net_device *netdev, u16 vid);
-void enic_vlan_rx_kill_vid(struct net_device *netdev, u16 vid);
-int enic_dev_notify_unset(struct enic *enic);
-int enic_dev_hang_notify(struct enic *enic);
-int enic_dev_set_ig_vlan_rewrite_mode(struct enic *enic);
-int enic_dev_enable(struct enic *enic);
-int enic_dev_disable(struct enic *enic);
-int enic_dev_intr_coal_timer_info(struct enic *enic);
-int enic_vnic_dev_deinit(struct enic *enic);
-int enic_dev_init_prov2(struct enic *enic, struct vic_provinfo *vp);
-int enic_dev_deinit_done(struct enic *enic, int *status);
-int enic_dev_enable2(struct enic *enic, int arg);
-int enic_dev_enable2_done(struct enic *enic, int *status);
-int enic_dev_status_to_errno(int devcmd_status);
-
-#endif /* _ENIC_DEV_H_ */
diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c
deleted file mode 100644 (file)
index 67a27cd..0000000
+++ /dev/null
@@ -1,2513 +0,0 @@
-/*
- * Copyright 2008-2010 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/interrupt.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 <linux/rtnetlink.h>
-#include <linux/prefetch.h>
-#include <net/ip6_checksum.h>
-
-#include "cq_enet_desc.h"
-#include "vnic_dev.h"
-#include "vnic_intr.h"
-#include "vnic_stats.h"
-#include "vnic_vic.h"
-#include "enic_res.h"
-#include "enic.h"
-#include "enic_dev.h"
-#include "enic_pp.h"
-
-#define ENIC_NOTIFY_TIMER_PERIOD       (2 * HZ)
-#define WQ_ENET_MAX_DESC_LEN           (1 << WQ_ENET_LEN_BITS)
-#define MAX_TSO                                (1 << 16)
-#define ENIC_DESC_MAX_SPLITS           (MAX_TSO / WQ_ENET_MAX_DESC_LEN + 1)
-
-#define PCI_DEVICE_ID_CISCO_VIC_ENET         0x0043  /* ethernet vnic */
-#define PCI_DEVICE_ID_CISCO_VIC_ENET_DYN     0x0044  /* enet dynamic vnic */
-
-/* Supported devices */
-static DEFINE_PCI_DEVICE_TABLE(enic_id_table) = {
-       { PCI_VDEVICE(CISCO, PCI_DEVICE_ID_CISCO_VIC_ENET) },
-       { PCI_VDEVICE(CISCO, PCI_DEVICE_ID_CISCO_VIC_ENET_DYN) },
-       { 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_is_dynamic(struct enic *enic)
-{
-       return enic->pdev->device == PCI_DEVICE_ID_CISCO_VIC_ENET_DYN;
-}
-
-static inline unsigned int enic_cq_rq(struct enic *enic, unsigned int rq)
-{
-       return rq;
-}
-
-static inline unsigned int enic_cq_wq(struct enic *enic, unsigned int wq)
-{
-       return enic->rq_count + wq;
-}
-
-static inline unsigned int enic_legacy_io_intr(void)
-{
-       return 0;
-}
-
-static inline unsigned int enic_legacy_err_intr(void)
-{
-       return 1;
-}
-
-static inline unsigned int enic_legacy_notify_intr(void)
-{
-       return 2;
-}
-
-static inline unsigned int enic_msix_rq_intr(struct enic *enic, unsigned int rq)
-{
-       return enic->cq[enic_cq_rq(enic, rq)].interrupt_offset;
-}
-
-static inline unsigned int enic_msix_wq_intr(struct enic *enic, unsigned int wq)
-{
-       return enic->cq[enic_cq_wq(enic, wq)].interrupt_offset;
-}
-
-static inline unsigned int enic_msix_err_intr(struct enic *enic)
-{
-       return enic->rq_count + enic->wq_count;
-}
-
-static inline unsigned int enic_msix_notify_intr(struct enic *enic)
-{
-       return enic->rq_count + enic->wq_count + 1;
-}
-
-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)) {
-               ethtool_cmd_speed_set(ecmd, vnic_dev_port_speed(enic->vdev));
-               ecmd->duplex = DUPLEX_FULL;
-       } else {
-               ethtool_cmd_speed_set(ecmd, -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;
-
-       enic_dev_fw_info(enic, &fw_info);
-
-       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;
-
-       enic_dev_stats_dump(enic, &vstats);
-
-       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_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 int enic_get_coalesce(struct net_device *netdev,
-       struct ethtool_coalesce *ecmd)
-{
-       struct enic *enic = netdev_priv(netdev);
-
-       ecmd->tx_coalesce_usecs = enic->tx_coalesce_usecs;
-       ecmd->rx_coalesce_usecs = enic->rx_coalesce_usecs;
-
-       return 0;
-}
-
-static int enic_set_coalesce(struct net_device *netdev,
-       struct ethtool_coalesce *ecmd)
-{
-       struct enic *enic = netdev_priv(netdev);
-       u32 tx_coalesce_usecs;
-       u32 rx_coalesce_usecs;
-       unsigned int i, intr;
-
-       tx_coalesce_usecs = min_t(u32, ecmd->tx_coalesce_usecs,
-               vnic_dev_get_intr_coal_timer_max(enic->vdev));
-       rx_coalesce_usecs = min_t(u32, ecmd->rx_coalesce_usecs,
-               vnic_dev_get_intr_coal_timer_max(enic->vdev));
-
-       switch (vnic_dev_get_intr_mode(enic->vdev)) {
-       case VNIC_DEV_INTR_MODE_INTX:
-               if (tx_coalesce_usecs != rx_coalesce_usecs)
-                       return -EINVAL;
-
-               intr = enic_legacy_io_intr();
-               vnic_intr_coalescing_timer_set(&enic->intr[intr],
-                       tx_coalesce_usecs);
-               break;
-       case VNIC_DEV_INTR_MODE_MSI:
-               if (tx_coalesce_usecs != rx_coalesce_usecs)
-                       return -EINVAL;
-
-               vnic_intr_coalescing_timer_set(&enic->intr[0],
-                       tx_coalesce_usecs);
-               break;
-       case VNIC_DEV_INTR_MODE_MSIX:
-               for (i = 0; i < enic->wq_count; i++) {
-                       intr = enic_msix_wq_intr(enic, i);
-                       vnic_intr_coalescing_timer_set(&enic->intr[intr],
-                               tx_coalesce_usecs);
-               }
-
-               for (i = 0; i < enic->rq_count; i++) {
-                       intr = enic_msix_rq_intr(enic, i);
-                       vnic_intr_coalescing_timer_set(&enic->intr[intr],
-                               rx_coalesce_usecs);
-               }
-
-               break;
-       default:
-               break;
-       }
-
-       enic->tx_coalesce_usecs = tx_coalesce_usecs;
-       enic->rx_coalesce_usecs = rx_coalesce_usecs;
-
-       return 0;
-}
-
-static const 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_coalesce = enic_get_coalesce,
-       .set_coalesce = enic_set_coalesce,
-};
-
-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 + ENIC_DESC_MAX_SPLITS))
-               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)
-                       netdev_err(enic->netdev, "WQ[%d] error_status %d\n",
-                               i, error_status);
-       }
-
-       for (i = 0; i < enic->rq_count; i++) {
-               error_status = vnic_rq_error_status(&enic->rq[i]);
-               if (error_status)
-                       netdev_err(enic->netdev, "RQ[%d] error_status %d\n",
-                               i, error_status);
-       }
-}
-
-static void enic_msglvl_check(struct enic *enic)
-{
-       u32 msg_enable = vnic_dev_msg_lvl(enic->vdev);
-
-       if (msg_enable != enic->msg_enable) {
-               netdev_info(enic->netdev, "msg lvl changed from 0x%x to 0x%x\n",
-                       enic->msg_enable, msg_enable);
-               enic->msg_enable = msg_enable;
-       }
-}
-
-static void enic_mtu_check(struct enic *enic)
-{
-       u32 mtu = vnic_dev_mtu(enic->vdev);
-       struct net_device *netdev = enic->netdev;
-
-       if (mtu && mtu != enic->port_mtu) {
-               enic->port_mtu = mtu;
-               if (enic_is_dynamic(enic)) {
-                       mtu = max_t(int, ENIC_MIN_MTU,
-                               min_t(int, ENIC_MAX_MTU, mtu));
-                       if (mtu != netdev->mtu)
-                               schedule_work(&enic->change_mtu_work);
-               } else {
-                       if (mtu < netdev->mtu)
-                               netdev_warn(netdev,
-                                       "interface MTU (%d) set higher "
-                                       "than switch port MTU (%d)\n",
-                                       netdev->mtu, mtu);
-               }
-       }
-}
-
-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) {
-               netdev_info(enic->netdev, "Link UP\n");
-               netif_carrier_on(enic->netdev);
-       } else if (!link_status && carrier_ok) {
-               netdev_info(enic->netdev, "Link DOWN\n");
-               netif_carrier_off(enic->netdev);
-       }
-}
-
-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);
-       unsigned int io_intr = enic_legacy_io_intr();
-       unsigned int err_intr = enic_legacy_err_intr();
-       unsigned int notify_intr = enic_legacy_notify_intr();
-       u32 pba;
-
-       vnic_intr_mask(&enic->intr[io_intr]);
-
-       pba = vnic_intr_legacy_pba(enic->legacy_pba);
-       if (!pba) {
-               vnic_intr_unmask(&enic->intr[io_intr]);
-               return IRQ_NONE;        /* not our interrupt */
-       }
-
-       if (ENIC_TEST_INTR(pba, notify_intr)) {
-               vnic_intr_return_all_credits(&enic->intr[notify_intr]);
-               enic_notify_check(enic);
-       }
-
-       if (ENIC_TEST_INTR(pba, err_intr)) {
-               vnic_intr_return_all_credits(&enic->intr[err_intr]);
-               enic_log_q_error(enic);
-               /* schedule recovery from WQ/RQ error */
-               schedule_work(&enic->reset);
-               return IRQ_HANDLED;
-       }
-
-       if (ENIC_TEST_INTR(pba, io_intr)) {
-               if (napi_schedule_prep(&enic->napi[0]))
-                       __napi_schedule(&enic->napi[0]);
-       } else {
-               vnic_intr_unmask(&enic->intr[io_intr]);
-       }
-
-       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[0]);
-
-       return IRQ_HANDLED;
-}
-
-static irqreturn_t enic_isr_msix_rq(int irq, void *data)
-{
-       struct napi_struct *napi = data;
-
-       /* schedule NAPI polling for RQ cleanup */
-       napi_schedule(napi);
-
-       return IRQ_HANDLED;
-}
-
-static irqreturn_t enic_isr_msix_wq(int irq, void *data)
-{
-       struct enic *enic = data;
-       unsigned int cq = enic_cq_wq(enic, 0);
-       unsigned int intr = enic_msix_wq_intr(enic, 0);
-       unsigned int wq_work_to_do = -1; /* no limit */
-       unsigned int wq_work_done;
-
-       wq_work_done = vnic_cq_service(&enic->cq[cq],
-               wq_work_to_do, enic_wq_service, NULL);
-
-       vnic_intr_return_credits(&enic->intr[intr],
-               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;
-       unsigned int intr = enic_msix_err_intr(enic);
-
-       vnic_intr_return_all_credits(&enic->intr[intr]);
-
-       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;
-       unsigned int intr = enic_msix_notify_intr(enic);
-
-       vnic_intr_return_all_credits(&enic->intr[intr]);
-       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, int loopback)
-{
-       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? */
-                       loopback);
-       }
-}
-
-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, int loopback)
-{
-       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. The fragments are no larger
-        * than max MTU(9000)+ETH_HDR_LEN(14) bytes, which is less
-        * than WQ_ENET_MAX_DESC_LEN length. So only one descriptor
-        * per fragment is queued.
-        */
-       enic_queue_wq_desc(wq, skb,
-               pci_map_single(enic->pdev, skb->data,
-                       head_len, PCI_DMA_TODEVICE),
-               head_len,
-               vlan_tag_insert, vlan_tag,
-               eop, loopback);
-
-       if (!eop)
-               enic_queue_wq_skb_cont(enic, wq, skb, len_left, loopback);
-}
-
-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, int loopback)
-{
-       unsigned int head_len = skb_headlen(skb);
-       unsigned int len_left = skb->len - head_len;
-       unsigned int hdr_len = skb_checksum_start_offset(skb);
-       unsigned int csum_offset = hdr_len + skb->csum_offset;
-       int eop = (len_left == 0);
-
-       /* Queue the main skb fragment. The fragments are no larger
-        * than max MTU(9000)+ETH_HDR_LEN(14) bytes, which is less
-        * than WQ_ENET_MAX_DESC_LEN length. So only one descriptor
-        * per fragment is queued.
-        */
-       enic_queue_wq_desc_csum_l4(wq, skb,
-               pci_map_single(enic->pdev, skb->data,
-                       head_len, PCI_DMA_TODEVICE),
-               head_len,
-               csum_offset,
-               hdr_len,
-               vlan_tag_insert, vlan_tag,
-               eop, loopback);
-
-       if (!eop)
-               enic_queue_wq_skb_cont(enic, wq, skb, len_left, loopback);
-}
-
-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, int loopback)
-{
-       unsigned int frag_len_left = skb_headlen(skb);
-       unsigned int len_left = skb->len - frag_len_left;
-       unsigned int hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);
-       int eop = (len_left == 0);
-       unsigned int len;
-       dma_addr_t dma_addr;
-       unsigned int offset = 0;
-       skb_frag_t *frag;
-
-       /* Preload TCP csum field with IP pseudo hdr calculated
-        * with IP length set to zero.  HW will later add in length
-        * 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 WQ_ENET_MAX_DESC_LEN length descriptors
-        * for the main skb fragment
-        */
-       while (frag_len_left) {
-               len = min(frag_len_left, (unsigned int)WQ_ENET_MAX_DESC_LEN);
-               dma_addr = pci_map_single(enic->pdev, skb->data + offset,
-                               len, PCI_DMA_TODEVICE);
-               enic_queue_wq_desc_tso(wq, skb,
-                       dma_addr,
-                       len,
-                       mss, hdr_len,
-                       vlan_tag_insert, vlan_tag,
-                       eop && (len == frag_len_left), loopback);
-               frag_len_left -= len;
-               offset += len;
-       }
-
-       if (eop)
-               return;
-
-       /* Queue WQ_ENET_MAX_DESC_LEN length descriptors
-        * for additional data fragments
-        */
-       for (frag = skb_shinfo(skb)->frags; len_left; frag++) {
-               len_left -= frag->size;
-               frag_len_left = frag->size;
-               offset = frag->page_offset;
-
-               while (frag_len_left) {
-                       len = min(frag_len_left,
-                               (unsigned int)WQ_ENET_MAX_DESC_LEN);
-                       dma_addr = pci_map_page(enic->pdev, frag->page,
-                               offset, len,
-                               PCI_DMA_TODEVICE);
-                       enic_queue_wq_desc_cont(wq, skb,
-                               dma_addr,
-                               len,
-                               (len_left == 0) &&
-                               (len == frag_len_left),         /* EOP? */
-                               loopback);
-                       frag_len_left -= len;
-                       offset += len;
-               }
-       }
-}
-
-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;
-       int loopback = 0;
-
-       if (vlan_tx_tag_present(skb)) {
-               /* VLAN tag from trunking driver */
-               vlan_tag_insert = 1;
-               vlan_tag = vlan_tx_tag_get(skb);
-       } else if (enic->loop_enable) {
-               vlan_tag = enic->loop_tag;
-               loopback = 1;
-       }
-
-       if (mss)
-               enic_queue_wq_skb_tso(enic, wq, skb, mss,
-                       vlan_tag_insert, vlan_tag, loopback);
-       else if (skb->ip_summed == CHECKSUM_PARTIAL)
-               enic_queue_wq_skb_csum_l4(enic, wq, skb,
-                       vlan_tag_insert, vlan_tag, loopback);
-       else
-               enic_queue_wq_skb_vlan(enic, wq, skb,
-                       vlan_tag_insert, vlan_tag, loopback);
-}
-
-/* netif_tx_lock held, process context with BHs disabled, or BH */
-static netdev_tx_t 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 + ENIC_DESC_MAX_SPLITS) {
-               netif_stop_queue(netdev);
-               /* This is a hard error, log it */
-               netdev_err(netdev, "BUG! Tx ring full when queue awake!\n");
-               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 + ENIC_DESC_MAX_SPLITS)
-               netif_stop_queue(netdev);
-
-       spin_unlock_irqrestore(&enic->wq_lock[0], flags);
-
-       return NETDEV_TX_OK;
-}
-
-/* dev_base_lock rwlock held, nominally process context */
-static struct rtnl_link_stats64 *enic_get_stats(struct net_device *netdev,
-                                               struct rtnl_link_stats64 *net_stats)
-{
-       struct enic *enic = netdev_priv(netdev);
-       struct vnic_stats *stats;
-
-       enic_dev_stats_dump(enic, &stats);
-
-       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_over_errors = enic->rq_truncated_pkts;
-       net_stats->rx_crc_errors = enic->rq_bad_fcs;
-       net_stats->rx_dropped = stats->rx.rx_no_bufs + stats->rx.rx_drop;
-
-       return net_stats;
-}
-
-void enic_reset_addr_lists(struct enic *enic)
-{
-       enic->mc_count = 0;
-       enic->uc_count = 0;
-       enic->flags = 0;
-}
-
-static int enic_set_mac_addr(struct net_device *netdev, char *addr)
-{
-       struct enic *enic = netdev_priv(netdev);
-
-       if (enic_is_dynamic(enic)) {
-               if (!is_valid_ether_addr(addr) && !is_zero_ether_addr(addr))
-                       return -EADDRNOTAVAIL;
-       } else {
-               if (!is_valid_ether_addr(addr))
-                       return -EADDRNOTAVAIL;
-       }
-
-       memcpy(netdev->dev_addr, addr, netdev->addr_len);
-
-       return 0;
-}
-
-static int enic_set_mac_address_dynamic(struct net_device *netdev, void *p)
-{
-       struct enic *enic = netdev_priv(netdev);
-       struct sockaddr *saddr = p;
-       char *addr = saddr->sa_data;
-       int err;
-
-       if (netif_running(enic->netdev)) {
-               err = enic_dev_del_station_addr(enic);
-               if (err)
-                       return err;
-       }
-
-       err = enic_set_mac_addr(netdev, addr);
-       if (err)
-               return err;
-
-       if (netif_running(enic->netdev)) {
-               err = enic_dev_add_station_addr(enic);
-               if (err)
-                       return err;
-       }
-
-       return err;
-}
-
-static int enic_set_mac_address(struct net_device *netdev, void *p)
-{
-       struct sockaddr *saddr = p;
-       char *addr = saddr->sa_data;
-       struct enic *enic = netdev_priv(netdev);
-       int err;
-
-       err = enic_dev_del_station_addr(enic);
-       if (err)
-               return err;
-
-       err = enic_set_mac_addr(netdev, addr);
-       if (err)
-               return err;
-
-       return enic_dev_add_station_addr(enic);
-}
-
-static void enic_update_multicast_addr_list(struct enic *enic)
-{
-       struct net_device *netdev = enic->netdev;
-       struct netdev_hw_addr *ha;
-       unsigned int mc_count = netdev_mc_count(netdev);
-       u8 mc_addr[ENIC_MULTICAST_PERFECT_FILTERS][ETH_ALEN];
-       unsigned int i, j;
-
-       if (mc_count > ENIC_MULTICAST_PERFECT_FILTERS) {
-               netdev_warn(netdev, "Registering only %d out of %d "
-                       "multicast addresses\n",
-                       ENIC_MULTICAST_PERFECT_FILTERS, mc_count);
-               mc_count = ENIC_MULTICAST_PERFECT_FILTERS;
-       }
-
-       /* 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.
-        */
-
-       i = 0;
-       netdev_for_each_mc_addr(ha, netdev) {
-               if (i == mc_count)
-                       break;
-               memcpy(mc_addr[i++], ha->addr, ETH_ALEN);
-       }
-
-       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_dev_del_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_dev_add_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;
-}
-
-static void enic_update_unicast_addr_list(struct enic *enic)
-{
-       struct net_device *netdev = enic->netdev;
-       struct netdev_hw_addr *ha;
-       unsigned int uc_count = netdev_uc_count(netdev);
-       u8 uc_addr[ENIC_UNICAST_PERFECT_FILTERS][ETH_ALEN];
-       unsigned int i, j;
-
-       if (uc_count > ENIC_UNICAST_PERFECT_FILTERS) {
-               netdev_warn(netdev, "Registering only %d out of %d "
-                       "unicast addresses\n",
-                       ENIC_UNICAST_PERFECT_FILTERS, uc_count);
-               uc_count = ENIC_UNICAST_PERFECT_FILTERS;
-       }
-
-       /* Is there an easier way?  Trying to minimize to
-        * calls to add/del unicast addrs.  We keep the
-        * addrs from the last call in enic->uc_addr and
-        * look for changes to add/del.
-        */
-
-       i = 0;
-       netdev_for_each_uc_addr(ha, netdev) {
-               if (i == uc_count)
-                       break;
-               memcpy(uc_addr[i++], ha->addr, ETH_ALEN);
-       }
-
-       for (i = 0; i < enic->uc_count; i++) {
-               for (j = 0; j < uc_count; j++)
-                       if (compare_ether_addr(enic->uc_addr[i],
-                               uc_addr[j]) == 0)
-                               break;
-               if (j == uc_count)
-                       enic_dev_del_addr(enic, enic->uc_addr[i]);
-       }
-
-       for (i = 0; i < uc_count; i++) {
-               for (j = 0; j < enic->uc_count; j++)
-                       if (compare_ether_addr(uc_addr[i],
-                               enic->uc_addr[j]) == 0)
-                               break;
-               if (j == enic->uc_count)
-                       enic_dev_add_addr(enic, uc_addr[i]);
-       }
-
-       /* Save the list to compare against next time
-        */
-
-       for (i = 0; i < uc_count; i++)
-               memcpy(enic->uc_addr[i], uc_addr[i], ETH_ALEN);
-
-       enic->uc_count = uc_count;
-}
-
-/* netif_tx_lock held, BHs disabled */
-static void enic_set_rx_mode(struct net_device *netdev)
-{
-       struct enic *enic = netdev_priv(netdev);
-       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) ||
-               netdev_uc_count(netdev) > ENIC_UNICAST_PERFECT_FILTERS;
-       int allmulti = (netdev->flags & IFF_ALLMULTI) ||
-               netdev_mc_count(netdev) > ENIC_MULTICAST_PERFECT_FILTERS;
-       unsigned int flags = netdev->flags |
-               (allmulti ? IFF_ALLMULTI : 0) |
-               (promisc ? IFF_PROMISC : 0);
-
-       if (enic->flags != flags) {
-               enic->flags = flags;
-               enic_dev_packet_filter(enic, directed,
-                       multicast, broadcast, promisc, allmulti);
-       }
-
-       if (!promisc) {
-               enic_update_unicast_addr_list(enic);
-               if (!allmulti)
-                       enic_update_multicast_addr_list(enic);
-       }
-}
-
-/* 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 int enic_set_vf_mac(struct net_device *netdev, int vf, u8 *mac)
-{
-       struct enic *enic = netdev_priv(netdev);
-
-       if (vf != PORT_SELF_VF)
-               return -EOPNOTSUPP;
-
-       /* Ignore the vf argument for now. We can assume the request
-        * is coming on a vf.
-        */
-       if (is_valid_ether_addr(mac)) {
-               memcpy(enic->pp.vf_mac, mac, ETH_ALEN);
-               return 0;
-       } else
-               return -EINVAL;
-}
-
-static int enic_set_vf_port(struct net_device *netdev, int vf,
-       struct nlattr *port[])
-{
-       struct enic *enic = netdev_priv(netdev);
-       struct enic_port_profile prev_pp;
-       int err = 0, restore_pp = 1;
-
-       /* don't support VFs, yet */
-       if (vf != PORT_SELF_VF)
-               return -EOPNOTSUPP;
-
-       if (!port[IFLA_PORT_REQUEST])
-               return -EOPNOTSUPP;
-
-       memcpy(&prev_pp, &enic->pp, sizeof(enic->pp));
-       memset(&enic->pp, 0, sizeof(enic->pp));
-
-       enic->pp.set |= ENIC_SET_REQUEST;
-       enic->pp.request = nla_get_u8(port[IFLA_PORT_REQUEST]);
-
-       if (port[IFLA_PORT_PROFILE]) {
-               enic->pp.set |= ENIC_SET_NAME;
-               memcpy(enic->pp.name, nla_data(port[IFLA_PORT_PROFILE]),
-                       PORT_PROFILE_MAX);
-       }
-
-       if (port[IFLA_PORT_INSTANCE_UUID]) {
-               enic->pp.set |= ENIC_SET_INSTANCE;
-               memcpy(enic->pp.instance_uuid,
-                       nla_data(port[IFLA_PORT_INSTANCE_UUID]), PORT_UUID_MAX);
-       }
-
-       if (port[IFLA_PORT_HOST_UUID]) {
-               enic->pp.set |= ENIC_SET_HOST;
-               memcpy(enic->pp.host_uuid,
-                       nla_data(port[IFLA_PORT_HOST_UUID]), PORT_UUID_MAX);
-       }
-
-       /* Special case handling: mac came from IFLA_VF_MAC */
-       if (!is_zero_ether_addr(prev_pp.vf_mac))
-               memcpy(enic->pp.mac_addr, prev_pp.vf_mac, ETH_ALEN);
-
-               if (is_zero_ether_addr(netdev->dev_addr))
-                       random_ether_addr(netdev->dev_addr);
-
-       err = enic_process_set_pp_request(enic, &prev_pp, &restore_pp);
-       if (err) {
-               if (restore_pp) {
-                       /* Things are still the way they were: Implicit
-                        * DISASSOCIATE failed
-                        */
-                       memcpy(&enic->pp, &prev_pp, sizeof(enic->pp));
-               } else {
-                       memset(&enic->pp, 0, sizeof(enic->pp));
-                       memset(netdev->dev_addr, 0, ETH_ALEN);
-               }
-       } else {
-               /* Set flag to indicate that the port assoc/disassoc
-                * request has been sent out to fw
-                */
-               enic->pp.set |= ENIC_PORT_REQUEST_APPLIED;
-
-               /* If DISASSOCIATE, clean up all assigned/saved macaddresses */
-               if (enic->pp.request == PORT_REQUEST_DISASSOCIATE) {
-                       memset(enic->pp.mac_addr, 0, ETH_ALEN);
-                       memset(netdev->dev_addr, 0, ETH_ALEN);
-               }
-       }
-
-       memset(enic->pp.vf_mac, 0, ETH_ALEN);
-
-       return err;
-}
-
-static int enic_get_vf_port(struct net_device *netdev, int vf,
-       struct sk_buff *skb)
-{
-       struct enic *enic = netdev_priv(netdev);
-       u16 response = PORT_PROFILE_RESPONSE_SUCCESS;
-       int err;
-
-       if (!(enic->pp.set & ENIC_PORT_REQUEST_APPLIED))
-               return -ENODATA;
-
-       err = enic_process_get_pp_request(enic, enic->pp.request, &response);
-       if (err)
-               return err;
-
-       NLA_PUT_U16(skb, IFLA_PORT_REQUEST, enic->pp.request);
-       NLA_PUT_U16(skb, IFLA_PORT_RESPONSE, response);
-       if (enic->pp.set & ENIC_SET_NAME)
-               NLA_PUT(skb, IFLA_PORT_PROFILE, PORT_PROFILE_MAX,
-                       enic->pp.name);
-       if (enic->pp.set & ENIC_SET_INSTANCE)
-               NLA_PUT(skb, IFLA_PORT_INSTANCE_UUID, PORT_UUID_MAX,
-                       enic->pp.instance_uuid);
-       if (enic->pp.set & ENIC_SET_HOST)
-               NLA_PUT(skb, IFLA_PORT_HOST_UUID, PORT_UUID_MAX,
-                       enic->pp.host_uuid);
-
-       return 0;
-
-nla_put_failure:
-       return -EMSGSIZE;
-}
-
-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 int enic_rq_alloc_buf(struct vnic_rq *rq)
-{
-       struct enic *enic = vnic_dev_priv(rq->vdev);
-       struct net_device *netdev = enic->netdev;
-       struct sk_buff *skb;
-       unsigned int len = netdev->mtu + VLAN_ETH_HLEN;
-       unsigned int os_buf_index = 0;
-       dma_addr_t dma_addr;
-
-       skb = netdev_alloc_skb_ip_align(netdev, 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 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_tci, 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_tci, &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 (!fcs_ok) {
-                       if (bytes_written > 0)
-                               enic->rq_bad_fcs++;
-                       else if (bytes_written == 0)
-                               enic->rq_truncated_pkts++;
-               }
-
-               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 ((netdev->features & NETIF_F_RXCSUM) && !csum_not_calc) {
-                       skb->csum = htons(checksum);
-                       skb->ip_summed = CHECKSUM_COMPLETE;
-               }
-
-               skb->dev = netdev;
-
-               if (vlan_stripped)
-                       __vlan_hwaccel_put_tag(skb, vlan_tci);
-
-               if (netdev->features & NETIF_F_GRO)
-                       napi_gro_receive(&enic->napi[q_number], skb);
-               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 int enic_poll(struct napi_struct *napi, int budget)
-{
-       struct net_device *netdev = napi->dev;
-       struct enic *enic = netdev_priv(netdev);
-       unsigned int cq_rq = enic_cq_rq(enic, 0);
-       unsigned int cq_wq = enic_cq_wq(enic, 0);
-       unsigned int intr = enic_legacy_io_intr();
-       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;
-       int err;
-
-       /* Service RQ (first) and WQ
-        */
-
-       rq_work_done = vnic_cq_service(&enic->cq[cq_rq],
-               rq_work_to_do, enic_rq_service, NULL);
-
-       wq_work_done = vnic_cq_service(&enic->cq[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[intr],
-                       work_done,
-                       0 /* don't unmask intr */,
-                       0 /* don't reset intr timer */);
-
-       err = vnic_rq_fill(&enic->rq[0], enic_rq_alloc_buf);
-
-       /* Buffer allocation failed. Stay in polling
-        * mode so we can try to fill the ring again.
-        */
-
-       if (err)
-               rq_work_done = rq_work_to_do;
-
-       if (rq_work_done < rq_work_to_do) {
-
-               /* Some work done, but not enough to stay in polling,
-                * exit polling
-                */
-
-               napi_complete(napi);
-               vnic_intr_unmask(&enic->intr[intr]);
-       }
-
-       return rq_work_done;
-}
-
-static int enic_poll_msix(struct napi_struct *napi, int budget)
-{
-       struct net_device *netdev = napi->dev;
-       struct enic *enic = netdev_priv(netdev);
-       unsigned int rq = (napi - &enic->napi[0]);
-       unsigned int cq = enic_cq_rq(enic, rq);
-       unsigned int intr = enic_msix_rq_intr(enic, rq);
-       unsigned int work_to_do = budget;
-       unsigned int work_done;
-       int err;
-
-       /* Service RQ
-        */
-
-       work_done = vnic_cq_service(&enic->cq[cq],
-               work_to_do, enic_rq_service, NULL);
-
-       /* Return intr event credits for this polling
-        * cycle.  An intr event is the completion of a
-        * RQ packet.
-        */
-
-       if (work_done > 0)
-               vnic_intr_return_credits(&enic->intr[intr],
-                       work_done,
-                       0 /* don't unmask intr */,
-                       0 /* don't reset intr timer */);
-
-       err = vnic_rq_fill(&enic->rq[rq], enic_rq_alloc_buf);
-
-       /* Buffer allocation failed. Stay in polling mode
-        * so we can try to fill the ring again.
-        */
-
-       if (err)
-               work_done = work_to_do;
-
-       if (work_done < work_to_do) {
-
-               /* Some work done, but not enough to stay in polling,
-                * exit polling
-                */
-
-               napi_complete(napi);
-               vnic_intr_unmask(&enic->intr[intr]);
-       }
-
-       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, intr;
-       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:
-
-               for (i = 0; i < enic->rq_count; i++) {
-                       intr = enic_msix_rq_intr(enic, i);
-                       sprintf(enic->msix[intr].devname,
-                               "%.11s-rx-%d", netdev->name, i);
-                       enic->msix[intr].isr = enic_isr_msix_rq;
-                       enic->msix[intr].devid = &enic->napi[i];
-               }
-
-               for (i = 0; i < enic->wq_count; i++) {
-                       intr = enic_msix_wq_intr(enic, i);
-                       sprintf(enic->msix[intr].devname,
-                               "%.11s-tx-%d", netdev->name, i);
-                       enic->msix[intr].isr = enic_isr_msix_wq;
-                       enic->msix[intr].devid = enic;
-               }
-
-               intr = enic_msix_err_intr(enic);
-               sprintf(enic->msix[intr].devname,
-                       "%.11s-err", netdev->name);
-               enic->msix[intr].isr = enic_isr_msix_err;
-               enic->msix[intr].devid = enic;
-
-               intr = enic_msix_notify_intr(enic);
-               sprintf(enic->msix[intr].devname,
-                       "%.11s-notify", netdev->name);
-               enic->msix[intr].isr = enic_isr_msix_notify;
-               enic->msix[intr].devid = enic;
-
-               for (i = 0; i < ARRAY_SIZE(enic->msix); i++)
-                       enic->msix[i].requested = 0;
-
-               for (i = 0; i < enic->intr_count; 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 void enic_synchronize_irqs(struct enic *enic)
-{
-       unsigned int i;
-
-       switch (vnic_dev_get_intr_mode(enic->vdev)) {
-       case VNIC_DEV_INTR_MODE_INTX:
-       case VNIC_DEV_INTR_MODE_MSI:
-               synchronize_irq(enic->pdev->irq);
-               break;
-       case VNIC_DEV_INTR_MODE_MSIX:
-               for (i = 0; i < enic->intr_count; i++)
-                       synchronize_irq(enic->msix_entry[i].vector);
-               break;
-       default:
-               break;
-       }
-}
-
-static int enic_dev_notify_set(struct enic *enic)
-{
-       int err;
-
-       spin_lock(&enic->devcmd_lock);
-       switch (vnic_dev_get_intr_mode(enic->vdev)) {
-       case VNIC_DEV_INTR_MODE_INTX:
-               err = vnic_dev_notify_set(enic->vdev,
-                       enic_legacy_notify_intr());
-               break;
-       case VNIC_DEV_INTR_MODE_MSIX:
-               err = vnic_dev_notify_set(enic->vdev,
-                       enic_msix_notify_intr(enic));
-               break;
-       default:
-               err = vnic_dev_notify_set(enic->vdev, -1 /* no intr */);
-               break;
-       }
-       spin_unlock(&enic->devcmd_lock);
-
-       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) {
-               netdev_err(netdev, "Unable to request irq.\n");
-               return err;
-       }
-
-       err = enic_dev_notify_set(enic);
-       if (err) {
-               netdev_err(netdev,
-                       "Failed to alloc notify buffer, aborting.\n");
-               goto err_out_free_intr;
-       }
-
-       for (i = 0; i < enic->rq_count; i++) {
-               vnic_rq_fill(&enic->rq[i], enic_rq_alloc_buf);
-               /* Need at least one buffer on ring to get going */
-               if (vnic_rq_desc_used(&enic->rq[i]) == 0) {
-                       netdev_err(netdev, "Unable to alloc receive buffers\n");
-                       err = -ENOMEM;
-                       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]);
-
-       if (enic_is_dynamic(enic) && !is_zero_ether_addr(enic->pp.mac_addr))
-               enic_dev_add_addr(enic, enic->pp.mac_addr);
-       else
-               enic_dev_add_station_addr(enic);
-       enic_set_rx_mode(netdev);
-
-       netif_wake_queue(netdev);
-
-       for (i = 0; i < enic->rq_count; i++)
-               napi_enable(&enic->napi[i]);
-
-       enic_dev_enable(enic);
-
-       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:
-       enic_dev_notify_unset(enic);
-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;
-
-       for (i = 0; i < enic->intr_count; i++) {
-               vnic_intr_mask(&enic->intr[i]);
-               (void)vnic_intr_masked(&enic->intr[i]); /* flush write */
-       }
-
-       enic_synchronize_irqs(enic);
-
-       del_timer_sync(&enic->notify_timer);
-
-       enic_dev_disable(enic);
-
-       for (i = 0; i < enic->rq_count; i++)
-               napi_disable(&enic->napi[i]);
-
-       netif_carrier_off(netdev);
-       netif_tx_disable(netdev);
-       if (enic_is_dynamic(enic) && !is_zero_ether_addr(enic->pp.mac_addr))
-               enic_dev_del_addr(enic, enic->pp.mac_addr);
-       else
-               enic_dev_del_station_addr(enic);
-
-       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;
-       }
-
-       enic_dev_notify_unset(enic);
-       enic_free_intr(enic);
-
-       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 (enic_is_dynamic(enic))
-               return -EOPNOTSUPP;
-
-       if (running)
-               enic_stop(netdev);
-
-       netdev->mtu = new_mtu;
-
-       if (netdev->mtu > enic->port_mtu)
-               netdev_warn(netdev,
-                       "interface MTU (%d) set higher than port MTU (%d)\n",
-                       netdev->mtu, enic->port_mtu);
-
-       if (running)
-               enic_open(netdev);
-
-       return 0;
-}
-
-static void enic_change_mtu_work(struct work_struct *work)
-{
-       struct enic *enic = container_of(work, struct enic, change_mtu_work);
-       struct net_device *netdev = enic->netdev;
-       int new_mtu = vnic_dev_mtu(enic->vdev);
-       int err;
-       unsigned int i;
-
-       new_mtu = max_t(int, ENIC_MIN_MTU, min_t(int, ENIC_MAX_MTU, new_mtu));
-
-       rtnl_lock();
-
-       /* Stop RQ */
-       del_timer_sync(&enic->notify_timer);
-
-       for (i = 0; i < enic->rq_count; i++)
-               napi_disable(&enic->napi[i]);
-
-       vnic_intr_mask(&enic->intr[0]);
-       enic_synchronize_irqs(enic);
-       err = vnic_rq_disable(&enic->rq[0]);
-       if (err) {
-               netdev_err(netdev, "Unable to disable RQ.\n");
-               return;
-       }
-       vnic_rq_clean(&enic->rq[0], enic_free_rq_buf);
-       vnic_cq_clean(&enic->cq[0]);
-       vnic_intr_clean(&enic->intr[0]);
-
-       /* Fill RQ with new_mtu-sized buffers */
-       netdev->mtu = new_mtu;
-       vnic_rq_fill(&enic->rq[0], enic_rq_alloc_buf);
-       /* Need at least one buffer on ring to get going */
-       if (vnic_rq_desc_used(&enic->rq[0]) == 0) {
-               netdev_err(netdev, "Unable to alloc receive buffers.\n");
-               return;
-       }
-
-       /* Start RQ */
-       vnic_rq_enable(&enic->rq[0]);
-       napi_enable(&enic->napi[0]);
-       vnic_intr_unmask(&enic->intr[0]);
-       enic_notify_timer_start(enic);
-
-       rtnl_unlock();
-
-       netdev_info(netdev, "interface MTU set as %d\n", netdev->mtu);
-}
-
-#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;
-       unsigned int i, intr;
-
-       switch (vnic_dev_get_intr_mode(vdev)) {
-       case VNIC_DEV_INTR_MODE_MSIX:
-               for (i = 0; i < enic->rq_count; i++) {
-                       intr = enic_msix_rq_intr(enic, i);
-                       enic_isr_msix_rq(enic->msix_entry[intr].vector,
-                               &enic->napi[i]);
-               }
-
-               for (i = 0; i < enic->wq_count; i++) {
-                       intr = enic_msix_wq_intr(enic, i);
-                       enic_isr_msix_wq(enic->msix_entry[intr].vector, 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)
-               dev_err(enic_get_dev(enic), "vNIC device open failed, err %d\n",
-                       err);
-
-       return err;
-}
-
-static int enic_dev_hang_reset(struct enic *enic)
-{
-       int err;
-
-       err = enic_dev_wait(enic->vdev, vnic_dev_hang_reset,
-               vnic_dev_hang_reset_done, 0);
-       if (err)
-               netdev_err(enic->netdev, "vNIC hang reset failed, err %d\n",
-                       err);
-
-       return err;
-}
-
-static int enic_set_rsskey(struct enic *enic)
-{
-       dma_addr_t rss_key_buf_pa;
-       union vnic_rss_key *rss_key_buf_va = NULL;
-       union vnic_rss_key rss_key = {
-               .key[0].b = {85, 67, 83, 97, 119, 101, 115, 111, 109, 101},
-               .key[1].b = {80, 65, 76, 79, 117, 110, 105, 113, 117, 101},
-               .key[2].b = {76, 73, 78, 85, 88, 114, 111, 99, 107, 115},
-               .key[3].b = {69, 78, 73, 67, 105, 115, 99, 111, 111, 108},
-       };
-       int err;
-
-       rss_key_buf_va = pci_alloc_consistent(enic->pdev,
-               sizeof(union vnic_rss_key), &rss_key_buf_pa);
-       if (!rss_key_buf_va)
-               return -ENOMEM;
-
-       memcpy(rss_key_buf_va, &rss_key, sizeof(union vnic_rss_key));
-
-       spin_lock(&enic->devcmd_lock);
-       err = enic_set_rss_key(enic,
-               rss_key_buf_pa,
-               sizeof(union vnic_rss_key));
-       spin_unlock(&enic->devcmd_lock);
-
-       pci_free_consistent(enic->pdev, sizeof(union vnic_rss_key),
-               rss_key_buf_va, rss_key_buf_pa);
-
-       return err;
-}
-
-static int enic_set_rsscpu(struct enic *enic, u8 rss_hash_bits)
-{
-       dma_addr_t rss_cpu_buf_pa;
-       union vnic_rss_cpu *rss_cpu_buf_va = NULL;
-       unsigned int i;
-       int err;
-
-       rss_cpu_buf_va = pci_alloc_consistent(enic->pdev,
-               sizeof(union vnic_rss_cpu), &rss_cpu_buf_pa);
-       if (!rss_cpu_buf_va)
-               return -ENOMEM;
-
-       for (i = 0; i < (1 << rss_hash_bits); i++)
-               (*rss_cpu_buf_va).cpu[i/4].b[i%4] = i % enic->rq_count;
-
-       spin_lock(&enic->devcmd_lock);
-       err = enic_set_rss_cpu(enic,
-               rss_cpu_buf_pa,
-               sizeof(union vnic_rss_cpu));
-       spin_unlock(&enic->devcmd_lock);
-
-       pci_free_consistent(enic->pdev, sizeof(union vnic_rss_cpu),
-               rss_cpu_buf_va, rss_cpu_buf_pa);
-
-       return err;
-}
-
-static int enic_set_niccfg(struct enic *enic, u8 rss_default_cpu,
-       u8 rss_hash_type, u8 rss_hash_bits, u8 rss_base_cpu, u8 rss_enable)
-{
-       const u8 tso_ipid_split_en = 0;
-       const u8 ig_vlan_strip_en = 1;
-       int err;
-
-       /* Enable VLAN tag stripping.
-       */
-
-       spin_lock(&enic->devcmd_lock);
-       err = 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);
-       spin_unlock(&enic->devcmd_lock);
-
-       return err;
-}
-
-static int enic_set_rss_nic_cfg(struct enic *enic)
-{
-       struct device *dev = enic_get_dev(enic);
-       const u8 rss_default_cpu = 0;
-       const u8 rss_hash_type = NIC_CFG_RSS_HASH_TYPE_IPV4 |
-               NIC_CFG_RSS_HASH_TYPE_TCP_IPV4 |
-               NIC_CFG_RSS_HASH_TYPE_IPV6 |
-               NIC_CFG_RSS_HASH_TYPE_TCP_IPV6;
-       const u8 rss_hash_bits = 7;
-       const u8 rss_base_cpu = 0;
-       u8 rss_enable = ENIC_SETTING(enic, RSS) && (enic->rq_count > 1);
-
-       if (rss_enable) {
-               if (!enic_set_rsskey(enic)) {
-                       if (enic_set_rsscpu(enic, rss_hash_bits)) {
-                               rss_enable = 0;
-                               dev_warn(dev, "RSS disabled, "
-                                       "Failed to set RSS cpu indirection table.");
-                       }
-               } else {
-                       rss_enable = 0;
-                       dev_warn(dev, "RSS disabled, Failed to set RSS key.\n");
-               }
-       }
-
-       return enic_set_niccfg(enic, rss_default_cpu, rss_hash_type,
-               rss_hash_bits, rss_base_cpu, rss_enable);
-}
-
-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();
-
-       enic_dev_hang_notify(enic);
-       enic_stop(enic->netdev);
-       enic_dev_hang_reset(enic);
-       enic_reset_addr_lists(enic);
-       enic_init_vnic_resources(enic);
-       enic_set_rss_nic_cfg(enic);
-       enic_dev_set_ig_vlan_rewrite_mode(enic);
-       enic_open(enic->netdev);
-
-       rtnl_unlock();
-}
-
-static int enic_set_intr_mode(struct enic *enic)
-{
-       unsigned int n = min_t(unsigned int, enic->rq_count, ENIC_RQ_MAX);
-       unsigned int m = min_t(unsigned int, enic->wq_count, ENIC_WQ_MAX);
-       unsigned int i;
-
-       /* Set interrupt mode (INTx, MSI, MSI-X) depending
-        * on 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;
-
-       /* Use multiple RQs if RSS is enabled
-        */
-
-       if (ENIC_SETTING(enic, RSS) &&
-           enic->config.intr_mode < 1 &&
-           enic->rq_count >= n &&
-           enic->wq_count >= m &&
-           enic->cq_count >= n + m &&
-           enic->intr_count >= n + m + 2) {
-
-               if (!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;
-               }
-       }
-
-       if (enic->config.intr_mode < 1 &&
-           enic->rq_count >= 1 &&
-           enic->wq_count >= m &&
-           enic->cq_count >= 1 + m &&
-           enic->intr_count >= 1 + m + 2) {
-               if (!pci_enable_msix(enic->pdev, enic->msix_entry, 1 + m + 2)) {
-
-                       enic->rq_count = 1;
-                       enic->wq_count = m;
-                       enic->cq_count = 1 + m;
-                       enic->intr_count = 1 + 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 const struct net_device_ops enic_netdev_dynamic_ops = {
-       .ndo_open               = enic_open,
-       .ndo_stop               = enic_stop,
-       .ndo_start_xmit         = enic_hard_start_xmit,
-       .ndo_get_stats64        = enic_get_stats,
-       .ndo_validate_addr      = eth_validate_addr,
-       .ndo_set_rx_mode        = enic_set_rx_mode,
-       .ndo_set_multicast_list = enic_set_rx_mode,
-       .ndo_set_mac_address    = enic_set_mac_address_dynamic,
-       .ndo_change_mtu         = enic_change_mtu,
-       .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,
-       .ndo_set_vf_port        = enic_set_vf_port,
-       .ndo_get_vf_port        = enic_get_vf_port,
-       .ndo_set_vf_mac         = enic_set_vf_mac,
-#ifdef CONFIG_NET_POLL_CONTROLLER
-       .ndo_poll_controller    = enic_poll_controller,
-#endif
-};
-
-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_stats64        = enic_get_stats,
-       .ndo_validate_addr      = eth_validate_addr,
-       .ndo_set_mac_address    = enic_set_mac_address,
-       .ndo_set_rx_mode        = enic_set_rx_mode,
-       .ndo_set_multicast_list = enic_set_rx_mode,
-       .ndo_change_mtu         = enic_change_mtu,
-       .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 void enic_dev_deinit(struct enic *enic)
-{
-       unsigned int i;
-
-       for (i = 0; i < enic->rq_count; i++)
-               netif_napi_del(&enic->napi[i]);
-
-       enic_free_vnic_resources(enic);
-       enic_clear_intr_mode(enic);
-}
-
-static int enic_dev_init(struct enic *enic)
-{
-       struct device *dev = enic_get_dev(enic);
-       struct net_device *netdev = enic->netdev;
-       unsigned int i;
-       int err;
-
-       /* Get interrupt coalesce timer info */
-       err = enic_dev_intr_coal_timer_info(enic);
-       if (err) {
-               dev_warn(dev, "Using default conversion factor for "
-                       "interrupt coalesce timer\n");
-               vnic_dev_intr_coal_timer_info_default(enic->vdev);
-       }
-
-       /* Get vNIC configuration
-        */
-
-       err = enic_get_vnic_config(enic);
-       if (err) {
-               dev_err(dev, "Get vNIC configuration failed, aborting\n");
-               return err;
-       }
-
-       /* Get available resource counts
-        */
-
-       enic_get_res_counts(enic);
-
-       /* Set interrupt mode based on resource counts and system
-        * capabilities
-        */
-
-       err = enic_set_intr_mode(enic);
-       if (err) {
-               dev_err(dev, "Failed to set intr mode based on resource "
-                       "counts and system capabilities, aborting\n");
-               return err;
-       }
-
-       /* Allocate and configure vNIC resources
-        */
-
-       err = enic_alloc_vnic_resources(enic);
-       if (err) {
-               dev_err(dev, "Failed to alloc vNIC resources, aborting\n");
-               goto err_out_free_vnic_resources;
-       }
-
-       enic_init_vnic_resources(enic);
-
-       err = enic_set_rss_nic_cfg(enic);
-       if (err) {
-               dev_err(dev, "Failed to config nic, aborting\n");
-               goto err_out_free_vnic_resources;
-       }
-
-       switch (vnic_dev_get_intr_mode(enic->vdev)) {
-       default:
-               netif_napi_add(netdev, &enic->napi[0], enic_poll, 64);
-               break;
-       case VNIC_DEV_INTR_MODE_MSIX:
-               for (i = 0; i < enic->rq_count; i++)
-                       netif_napi_add(netdev, &enic->napi[i],
-                               enic_poll_msix, 64);
-               break;
-       }
-
-       return 0;
-
-err_out_free_vnic_resources:
-       enic_clear_intr_mode(enic);
-       enic_free_vnic_resources(enic);
-
-       return err;
-}
-
-static void enic_iounmap(struct enic *enic)
-{
-       unsigned int i;
-
-       for (i = 0; i < ARRAY_SIZE(enic->bar); i++)
-               if (enic->bar[i].vaddr)
-                       iounmap(enic->bar[i].vaddr);
-}
-
-static int __devinit enic_probe(struct pci_dev *pdev,
-       const struct pci_device_id *ent)
-{
-       struct device *dev = &pdev->dev;
-       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) {
-               pr_err("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_mem(pdev);
-       if (err) {
-               dev_err(dev, "Cannot enable PCI device, aborting\n");
-               goto err_out_free_netdev;
-       }
-
-       err = pci_request_regions(pdev, DRV_NAME);
-       if (err) {
-               dev_err(dev, "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) {
-                       dev_err(dev, "No usable DMA configuration, aborting\n");
-                       goto err_out_release_regions;
-               }
-               err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
-               if (err) {
-                       dev_err(dev, "Unable to obtain %u-bit DMA "
-                               "for consistent allocations, aborting\n", 32);
-                       goto err_out_release_regions;
-               }
-       } else {
-               err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(40));
-               if (err) {
-                       dev_err(dev, "Unable to obtain %u-bit DMA "
-                               "for consistent allocations, aborting\n", 40);
-                       goto err_out_release_regions;
-               }
-               using_dac = 1;
-       }
-
-       /* Map vNIC resources from BAR0-5
-        */
-
-       for (i = 0; i < ARRAY_SIZE(enic->bar); i++) {
-               if (!(pci_resource_flags(pdev, i) & IORESOURCE_MEM))
-                       continue;
-               enic->bar[i].len = pci_resource_len(pdev, i);
-               enic->bar[i].vaddr = pci_iomap(pdev, i, enic->bar[i].len);
-               if (!enic->bar[i].vaddr) {
-                       dev_err(dev, "Cannot memory-map BAR %d, aborting\n", i);
-                       err = -ENODEV;
-                       goto err_out_iounmap;
-               }
-               enic->bar[i].bus_addr = pci_resource_start(pdev, i);
-       }
-
-       /* Register vNIC device
-        */
-
-       enic->vdev = vnic_dev_register(NULL, enic, pdev, enic->bar,
-               ARRAY_SIZE(enic->bar));
-       if (!enic->vdev) {
-               dev_err(dev, "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) {
-               dev_err(dev, "vNIC dev open failed, aborting\n");
-               goto err_out_vnic_unregister;
-       }
-
-       /* Setup devcmd lock
-        */
-
-       spin_lock_init(&enic->devcmd_lock);
-
-       /*
-        * Set ingress vlan rewrite mode before vnic initialization
-        */
-
-       err = enic_dev_set_ig_vlan_rewrite_mode(enic);
-       if (err) {
-               dev_err(dev,
-                       "Failed to set ingress vlan rewrite mode, aborting.\n");
-               goto err_out_dev_close;
-       }
-
-       /* 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);
-
-       /* Do not call dev_init for a dynamic vnic.
-        * For a dynamic vnic, init_prov_info will be
-        * called later by an upper layer.
-        */
-
-       if (!enic_is_dynamic(enic)) {
-               err = vnic_dev_init(enic->vdev, 0);
-               if (err) {
-                       dev_err(dev, "vNIC dev init failed, aborting\n");
-                       goto err_out_dev_close;
-               }
-       }
-
-       err = enic_dev_init(enic);
-       if (err) {
-               dev_err(dev, "Device initialization failed, aborting\n");
-               goto err_out_dev_close;
-       }
-
-       /* Setup notification timer, HW reset task, and wq 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);
-       INIT_WORK(&enic->change_mtu_work, enic_change_mtu_work);
-
-       for (i = 0; i < enic->wq_count; i++)
-               spin_lock_init(&enic->wq_lock[i]);
-
-       /* 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) {
-               dev_err(dev, "Invalid MAC address, aborting\n");
-               goto err_out_dev_deinit;
-       }
-
-       enic->tx_coalesce_usecs = enic->config.intr_timer_usec;
-       enic->rx_coalesce_usecs = enic->tx_coalesce_usecs;
-
-       if (enic_is_dynamic(enic))
-               netdev->netdev_ops = &enic_netdev_dynamic_ops;
-       else
-               netdev->netdev_ops = &enic_netdev_ops;
-
-       netdev->watchdog_timeo = 2 * HZ;
-       netdev->ethtool_ops = &enic_ethtool_ops;
-
-       netdev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
-       if (ENIC_SETTING(enic, LOOP)) {
-               netdev->features &= ~NETIF_F_HW_VLAN_TX;
-               enic->loop_enable = 1;
-               enic->loop_tag = enic->config.loop_tag;
-               dev_info(dev, "loopback tag=0x%04x\n", enic->loop_tag);
-       }
-       if (ENIC_SETTING(enic, TXCSUM))
-               netdev->hw_features |= NETIF_F_SG | NETIF_F_HW_CSUM;
-       if (ENIC_SETTING(enic, TSO))
-               netdev->hw_features |= NETIF_F_TSO |
-                       NETIF_F_TSO6 | NETIF_F_TSO_ECN;
-       if (ENIC_SETTING(enic, RXCSUM))
-               netdev->hw_features |= NETIF_F_RXCSUM;
-
-       netdev->features |= netdev->hw_features;
-
-       if (using_dac)
-               netdev->features |= NETIF_F_HIGHDMA;
-
-       err = register_netdev(netdev);
-       if (err) {
-               dev_err(dev, "Cannot register net device, aborting\n");
-               goto err_out_dev_deinit;
-       }
-
-       return 0;
-
-err_out_dev_deinit:
-       enic_dev_deinit(enic);
-err_out_dev_close:
-       vnic_dev_close(enic->vdev);
-err_out_vnic_unregister:
-       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);
-
-               cancel_work_sync(&enic->reset);
-               cancel_work_sync(&enic->change_mtu_work);
-               unregister_netdev(netdev);
-               enic_dev_deinit(enic);
-               vnic_dev_close(enic->vdev);
-               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)
-{
-       pr_info("%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_pp.c b/drivers/net/enic/enic_pp.c
deleted file mode 100644 (file)
index ffaa75d..0000000
+++ /dev/null
@@ -1,264 +0,0 @@
-/*
- * Copyright 2011 Cisco 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/string.h>
-#include <linux/errno.h>
-#include <linux/types.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/rtnetlink.h>
-#include <net/ip.h>
-
-#include "vnic_vic.h"
-#include "enic_res.h"
-#include "enic.h"
-#include "enic_dev.h"
-
-static int enic_set_port_profile(struct enic *enic)
-{
-       struct net_device *netdev = enic->netdev;
-       struct vic_provinfo *vp;
-       const u8 oui[3] = VIC_PROVINFO_CISCO_OUI;
-       const u16 os_type = htons(VIC_GENERIC_PROV_OS_TYPE_LINUX);
-       char uuid_str[38];
-       char client_mac_str[18];
-       u8 *client_mac;
-       int err;
-
-       if (!(enic->pp.set & ENIC_SET_NAME) || !strlen(enic->pp.name))
-               return -EINVAL;
-
-       vp = vic_provinfo_alloc(GFP_KERNEL, oui,
-               VIC_PROVINFO_GENERIC_TYPE);
-       if (!vp)
-               return -ENOMEM;
-
-       VIC_PROVINFO_ADD_TLV(vp,
-               VIC_GENERIC_PROV_TLV_PORT_PROFILE_NAME_STR,
-               strlen(enic->pp.name) + 1, enic->pp.name);
-
-       if (!is_zero_ether_addr(enic->pp.mac_addr))
-               client_mac = enic->pp.mac_addr;
-       else
-               client_mac = netdev->dev_addr;
-
-       VIC_PROVINFO_ADD_TLV(vp,
-               VIC_GENERIC_PROV_TLV_CLIENT_MAC_ADDR,
-               ETH_ALEN, client_mac);
-
-       snprintf(client_mac_str, sizeof(client_mac_str), "%pM", client_mac);
-       VIC_PROVINFO_ADD_TLV(vp,
-               VIC_GENERIC_PROV_TLV_CLUSTER_PORT_UUID_STR,
-               sizeof(client_mac_str), client_mac_str);
-
-       if (enic->pp.set & ENIC_SET_INSTANCE) {
-               sprintf(uuid_str, "%pUB", enic->pp.instance_uuid);
-               VIC_PROVINFO_ADD_TLV(vp,
-                       VIC_GENERIC_PROV_TLV_CLIENT_UUID_STR,
-                       sizeof(uuid_str), uuid_str);
-       }
-
-       if (enic->pp.set & ENIC_SET_HOST) {
-               sprintf(uuid_str, "%pUB", enic->pp.host_uuid);
-               VIC_PROVINFO_ADD_TLV(vp,
-                       VIC_GENERIC_PROV_TLV_HOST_UUID_STR,
-                       sizeof(uuid_str), uuid_str);
-       }
-
-       VIC_PROVINFO_ADD_TLV(vp,
-               VIC_GENERIC_PROV_TLV_OS_TYPE,
-               sizeof(os_type), &os_type);
-
-       err = enic_dev_status_to_errno(enic_dev_init_prov2(enic, vp));
-
-add_tlv_failure:
-       vic_provinfo_free(vp);
-
-       return err;
-}
-
-static int enic_unset_port_profile(struct enic *enic)
-{
-       int err;
-
-       err = enic_vnic_dev_deinit(enic);
-       if (err)
-               return enic_dev_status_to_errno(err);
-
-       enic_reset_addr_lists(enic);
-
-       return 0;
-}
-
-static int enic_are_pp_different(struct enic_port_profile *pp1,
-               struct enic_port_profile *pp2)
-{
-       return strcmp(pp1->name, pp2->name) | !!memcmp(pp1->instance_uuid,
-               pp2->instance_uuid, PORT_UUID_MAX) |
-               !!memcmp(pp1->host_uuid, pp2->host_uuid, PORT_UUID_MAX) |
-               !!memcmp(pp1->mac_addr, pp2->mac_addr, ETH_ALEN);
-}
-
-static int enic_pp_preassociate(struct enic *enic,
-       struct enic_port_profile *prev_pp, int *restore_pp);
-static int enic_pp_disassociate(struct enic *enic,
-       struct enic_port_profile *prev_pp, int *restore_pp);
-static int enic_pp_preassociate_rr(struct enic *enic,
-       struct enic_port_profile *prev_pp, int *restore_pp);
-static int enic_pp_associate(struct enic *enic,
-       struct enic_port_profile *prev_pp, int *restore_pp);
-
-static int (*enic_pp_handlers[])(struct enic *enic,
-               struct enic_port_profile *prev_state, int *restore_pp) = {
-       [PORT_REQUEST_PREASSOCIATE]     = enic_pp_preassociate,
-       [PORT_REQUEST_PREASSOCIATE_RR]  = enic_pp_preassociate_rr,
-       [PORT_REQUEST_ASSOCIATE]        = enic_pp_associate,
-       [PORT_REQUEST_DISASSOCIATE]     = enic_pp_disassociate,
-};
-
-static const int enic_pp_handlers_count =
-                       sizeof(enic_pp_handlers)/sizeof(*enic_pp_handlers);
-
-static int enic_pp_preassociate(struct enic *enic,
-       struct enic_port_profile *prev_pp, int *restore_pp)
-{
-       return -EOPNOTSUPP;
-}
-
-static int enic_pp_disassociate(struct enic *enic,
-       struct enic_port_profile *prev_pp, int *restore_pp)
-{
-       return enic_unset_port_profile(enic);
-}
-
-static int enic_pp_preassociate_rr(struct enic *enic,
-       struct enic_port_profile *prev_pp, int *restore_pp)
-{
-       int err;
-       int active = 0;
-
-       if (enic->pp.request != PORT_REQUEST_ASSOCIATE) {
-               /* If pre-associate is not part of an associate.
-               We always disassociate first */
-               err = enic_pp_handlers[PORT_REQUEST_DISASSOCIATE](enic,
-                       prev_pp, restore_pp);
-               if (err)
-                       return err;
-
-               *restore_pp = 0;
-       }
-
-       *restore_pp = 0;
-
-       err = enic_set_port_profile(enic);
-       if (err)
-               return err;
-
-       /* If pre-associate is not part of an associate. */
-       if (enic->pp.request != PORT_REQUEST_ASSOCIATE)
-               err = enic_dev_status_to_errno(enic_dev_enable2(enic, active));
-
-       return err;
-}
-
-static int enic_pp_associate(struct enic *enic,
-       struct enic_port_profile *prev_pp, int *restore_pp)
-{
-       int err;
-       int active = 1;
-
-       /* Check if a pre-associate was called before */
-       if (prev_pp->request != PORT_REQUEST_PREASSOCIATE_RR ||
-               (prev_pp->request == PORT_REQUEST_PREASSOCIATE_RR &&
-                       enic_are_pp_different(prev_pp, &enic->pp))) {
-               err = enic_pp_handlers[PORT_REQUEST_DISASSOCIATE](
-                       enic, prev_pp, restore_pp);
-               if (err)
-                       return err;
-
-               *restore_pp = 0;
-       }
-
-       err = enic_pp_handlers[PORT_REQUEST_PREASSOCIATE_RR](
-                       enic, prev_pp, restore_pp);
-       if (err)
-               return err;
-
-       *restore_pp = 0;
-
-       return enic_dev_status_to_errno(enic_dev_enable2(enic, active));
-}
-
-int enic_process_set_pp_request(struct enic *enic,
-       struct enic_port_profile *prev_pp, int *restore_pp)
-{
-       if (enic->pp.request < enic_pp_handlers_count
-               && enic_pp_handlers[enic->pp.request])
-               return enic_pp_handlers[enic->pp.request](enic,
-                       prev_pp, restore_pp);
-       else
-               return -EOPNOTSUPP;
-}
-
-int enic_process_get_pp_request(struct enic *enic, int request,
-       u16 *response)
-{
-       int err, status = ERR_SUCCESS;
-
-       switch (request) {
-
-       case PORT_REQUEST_PREASSOCIATE_RR:
-       case PORT_REQUEST_ASSOCIATE:
-               err = enic_dev_enable2_done(enic, &status);
-               break;
-
-       case PORT_REQUEST_DISASSOCIATE:
-               err = enic_dev_deinit_done(enic, &status);
-               break;
-
-       default:
-               return -EINVAL;
-       }
-
-       if (err)
-               status = err;
-
-       switch (status) {
-       case ERR_SUCCESS:
-               *response = PORT_PROFILE_RESPONSE_SUCCESS;
-               break;
-       case ERR_EINVAL:
-               *response = PORT_PROFILE_RESPONSE_INVALID;
-               break;
-       case ERR_EBADSTATE:
-               *response = PORT_PROFILE_RESPONSE_BADSTATE;
-               break;
-       case ERR_ENOMEM:
-               *response = PORT_PROFILE_RESPONSE_INSUFFICIENT_RESOURCES;
-               break;
-       case ERR_EINPROGRESS:
-               *response = PORT_PROFILE_RESPONSE_INPROGRESS;
-               break;
-       default:
-               *response = PORT_PROFILE_RESPONSE_ERROR;
-               break;
-       }
-
-       return 0;
-}
diff --git a/drivers/net/enic/enic_pp.h b/drivers/net/enic/enic_pp.h
deleted file mode 100644 (file)
index 699e365..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 2011 Cisco 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_PP_H_
-#define _ENIC_PP_H_
-
-int enic_process_set_pp_request(struct enic *enic,
-       struct enic_port_profile *prev_pp, int *restore_pp);
-int enic_process_get_pp_request(struct enic *enic, int request,
-       u16 *response);
-
-#endif /* _ENIC_PP_H_ */
diff --git a/drivers/net/enic/enic_res.c b/drivers/net/enic/enic_res.c
deleted file mode 100644 (file)
index 4a35367..0000000
+++ /dev/null
@@ -1,384 +0,0 @@
-/*
- * Copyright 2008-2010 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) {
-               dev_err(enic_get_dev(enic),
-                       "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) { \
-                       dev_err(enic_get_dev(enic), \
-                               "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_type);
-       GET_CONFIG(intr_mode);
-       GET_CONFIG(intr_timer_usec);
-       GET_CONFIG(loop_tag);
-
-       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 &= 0xffffffe0; /* must be aligned to groups of 32 */
-
-       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 &= 0xffffffe0; /* must be aligned to groups of 32 */
-
-       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_usec = min_t(u32, c->intr_timer_usec,
-               vnic_dev_get_intr_coal_timer_max(enic->vdev));
-
-       dev_info(enic_get_dev(enic),
-               "vNIC MAC addr %pM wq/rq %d/%d mtu %d\n",
-               enic->mac_addr, c->wq_desc_count, c->rq_desc_count, c->mtu);
-
-       dev_info(enic_get_dev(enic), "vNIC csum tx/rx %s/%s "
-               "tso/lro %s/%s rss %s intr mode %s type %s timer %d usec "
-               "loopback tag 0x%04x\n",
-               ENIC_SETTING(enic, TXCSUM) ? "yes" : "no",
-               ENIC_SETTING(enic, RXCSUM) ? "yes" : "no",
-               ENIC_SETTING(enic, TSO) ? "yes" : "no",
-               ENIC_SETTING(enic, LRO) ? "yes" : "no",
-               ENIC_SETTING(enic, RSS) ? "yes" : "no",
-               c->intr_mode == VENET_INTR_MODE_INTX ? "INTx" :
-               c->intr_mode == VENET_INTR_MODE_MSI ? "MSI" :
-               c->intr_mode == VENET_INTR_MODE_ANY ? "any" :
-               "unknown",
-               c->intr_timer_type == VENET_INTR_TYPE_MIN ? "min" :
-               c->intr_timer_type == VENET_INTR_TYPE_IDLE ? "idle" :
-               "unknown",
-               c->intr_timer_usec,
-               c->loop_tag);
-
-       return 0;
-}
-
-int 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)
-               dev_err(enic_get_dev(enic), "Can't add vlan id, %d\n", err);
-
-       return err;
-}
-
-int 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)
-               dev_err(enic_get_dev(enic), "Can't delete vlan id, %d\n", err);
-
-       return 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);
-}
-
-int enic_set_rss_key(struct enic *enic, dma_addr_t key_pa, u64 len)
-{
-       u64 a0 = (u64)key_pa, a1 = len;
-       int wait = 1000;
-
-       return vnic_dev_cmd(enic->vdev, CMD_RSS_KEY, &a0, &a1, wait);
-}
-
-int enic_set_rss_cpu(struct enic *enic, dma_addr_t cpu_pa, u64 len)
-{
-       u64 a0 = (u64)cpu_pa, a1 = len;
-       int wait = 1000;
-
-       return vnic_dev_cmd(enic->vdev, CMD_RSS_CPU, &a0, &a1, wait);
-}
-
-void enic_free_vnic_resources(struct enic *enic)
-{
-       unsigned int i;
-
-       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);
-
-       dev_info(enic_get_dev(enic),
-               "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_usec,
-                       enic->config.intr_timer_type,
-                       mask_on_assertion);
-       }
-}
-
-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);
-
-       dev_info(enic_get_dev(enic), "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) {
-               dev_err(enic_get_dev(enic),
-                       "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 (file)
index 25be273..0000000
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright 2008-2010 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                   68
-#define ENIC_MAX_MTU                   9000
-
-#define ENIC_MULTICAST_PERFECT_FILTERS 32
-#define ENIC_UNICAST_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, int loopback)
-{
-       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,
-               (u8)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, int loopback)
-{
-       enic_queue_wq_desc_ex(wq, os_buf, dma_addr, len,
-               0, 0, 0, 0, 0,
-               eop, 0 /* !SOP */, eop, loopback);
-}
-
-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, int loopback)
-{
-       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, loopback);
-}
-
-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, int loopback)
-{
-       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, loopback);
-}
-
-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, int loopback)
-{
-       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, loopback);
-}
-
-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, int loopback)
-{
-       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, loopback);
-}
-
-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 *);
-int enic_add_vlan(struct enic *enic, u16 vlanid);
-int enic_del_vlan(struct enic *enic, u16 vlanid);
-int enic_set_nic_cfg(struct enic *enic, u8 rss_default_cpu, u8 rss_hash_type,
-       u8 rss_hash_bits, u8 rss_base_cpu, u8 rss_enable, u8 tso_ipid_split_en,
-       u8 ig_vlan_strip_en);
-int enic_set_rss_key(struct enic *enic, dma_addr_t key_pa, u64 len);
-int enic_set_rss_cpu(struct enic *enic, dma_addr_t cpu_pa, u64 len);
-void enic_get_res_counts(struct enic *enic);
-void enic_init_vnic_resources(struct enic *enic);
-int enic_alloc_vnic_resources(struct enic *);
-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 (file)
index e6dd309..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright 2008-2010 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 (file)
index 0daa1c7..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright 2008-2010 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) {
-               pr_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);
-
-       cq->interrupt_offset = interrupt_offset;
-}
-
-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 (file)
index 579315c..0000000
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright 2008-2010 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;
-       unsigned int interrupt_offset;
-};
-
-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 (file)
index 8c4c8cf..0000000
+++ /dev/null
@@ -1,1003 +0,0 @@
-/*
- * Copyright 2008-2010 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"
-
-enum vnic_proxy_type {
-       PROXY_NONE,
-       PROXY_BY_BDF,
-};
-
-struct vnic_res {
-       void __iomem *vaddr;
-       dma_addr_t bus_addr;
-       unsigned int count;
-};
-
-struct vnic_intr_coal_timer_info {
-       u32 mul;
-       u32 div;
-       u32 max_usec;
-};
-
-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;
-       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;
-       enum vnic_proxy_type proxy;
-       u32 proxy_index;
-       u64 args[VNIC_DEVCMD_NARGS];
-       struct vnic_intr_coal_timer_info intr_coal_timer_info;
-};
-
-#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, unsigned int num_bars)
-{
-       struct vnic_resource_header __iomem *rh;
-       struct mgmt_barmap_hdr __iomem *mrh;
-       struct vnic_resource __iomem *r;
-       u8 type;
-
-       if (num_bars == 0)
-               return -EINVAL;
-
-       if (bar->len < VNIC_MAX_RES_HDR_SIZE) {
-               pr_err("vNIC BAR0 res hdr length error\n");
-               return -EINVAL;
-       }
-
-       rh  = bar->vaddr;
-       mrh = bar->vaddr;
-       if (!rh) {
-               pr_err("vNIC BAR0 res hdr not mem-mapped\n");
-               return -EINVAL;
-       }
-
-       /* Check for mgmt vnic in addition to normal vnic */
-       if ((ioread32(&rh->magic) != VNIC_RES_MAGIC) ||
-               (ioread32(&rh->version) != VNIC_RES_VERSION)) {
-               if ((ioread32(&mrh->magic) != MGMTVNIC_MAGIC) ||
-                       (ioread32(&mrh->version) != MGMTVNIC_VERSION)) {
-                       pr_err("vNIC BAR0 res magic/version error "
-                       "exp (%lx/%lx) or (%lx/%lx), curr (%x/%x)\n",
-                       VNIC_RES_MAGIC, VNIC_RES_VERSION,
-                       MGMTVNIC_MAGIC, MGMTVNIC_VERSION,
-                       ioread32(&rh->magic), ioread32(&rh->version));
-                       return -EINVAL;
-               }
-       }
-
-       if (ioread32(&mrh->magic) == MGMTVNIC_MAGIC)
-               r = (struct vnic_resource __iomem *)(mrh + 1);
-       else
-               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 >= num_bars)
-                       continue;
-
-               if (!bar[bar_num].len || !bar[bar_num].vaddr)
-                       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[bar_num].len) {
-                               pr_err("vNIC BAR0 resource %d "
-                                       "out-of-bounds, offset 0x%x + "
-                                       "size 0x%x > bar len 0x%lx\n",
-                                       type, bar_offset,
-                                       len,
-                                       bar[bar_num].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[bar_num].vaddr +
-                       bar_offset;
-               vdev->res[type].bus_addr = bar[bar_num].bus_addr + 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;
-       }
-}
-
-static 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) {
-               pr_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;
-       }
-}
-
-static int _vnic_dev_cmd(struct vnic_dev *vdev, enum vnic_devcmd_cmd cmd,
-       int wait)
-{
-       struct vnic_devcmd __iomem *devcmd = vdev->devcmd;
-       unsigned int i;
-       int delay;
-       u32 status;
-       int err;
-
-       status = ioread32(&devcmd->status);
-       if (status == 0xFFFFFFFF) {
-               /* PCI-e target device is gone */
-               return -ENODEV;
-       }
-       if (status & STAT_BUSY) {
-               pr_err("Busy devcmd %d\n", _CMD_N(cmd));
-               return -EBUSY;
-       }
-
-       if (_CMD_DIR(cmd) & _CMD_DIR_WRITE) {
-               for (i = 0; i < VNIC_DEVCMD_NARGS; i++)
-                       writeq(vdev->args[i], &devcmd->args[i]);
-               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 == 0xFFFFFFFF) {
-                       /* PCI-e target device is gone */
-                       return -ENODEV;
-               }
-
-               if (!(status & STAT_BUSY)) {
-
-                       if (status & STAT_ERROR) {
-                               err = (int)readq(&devcmd->args[0]);
-                               if (err != ERR_ECMDUNKNOWN ||
-                                   cmd != CMD_CAPABILITY)
-                                       pr_err("Error %d devcmd %d\n",
-                                               err, _CMD_N(cmd));
-                               return err;
-                       }
-
-                       if (_CMD_DIR(cmd) & _CMD_DIR_READ) {
-                               rmb();
-                               for (i = 0; i < VNIC_DEVCMD_NARGS; i++)
-                                       vdev->args[i] = readq(&devcmd->args[i]);
-                       }
-
-                       return 0;
-               }
-       }
-
-       pr_err("Timedout devcmd %d\n", _CMD_N(cmd));
-       return -ETIMEDOUT;
-}
-
-static int vnic_dev_cmd_proxy_by_bdf(struct vnic_dev *vdev,
-       enum vnic_devcmd_cmd cmd, u64 *a0, u64 *a1, int wait)
-{
-       u32 status;
-       int err;
-
-       memset(vdev->args, 0, sizeof(vdev->args));
-
-       vdev->args[0] = vdev->proxy_index; /* bdf */
-       vdev->args[1] = cmd;
-       vdev->args[2] = *a0;
-       vdev->args[3] = *a1;
-
-       err = _vnic_dev_cmd(vdev, CMD_PROXY_BY_BDF, wait);
-       if (err)
-               return err;
-
-       status = (u32)vdev->args[0];
-       if (status & STAT_ERROR) {
-               err = (int)vdev->args[1];
-               if (err != ERR_ECMDUNKNOWN ||
-                   cmd != CMD_CAPABILITY)
-                       pr_err("Error %d proxy devcmd %d\n", err, _CMD_N(cmd));
-               return err;
-       }
-
-       *a0 = vdev->args[1];
-       *a1 = vdev->args[2];
-
-       return 0;
-}
-
-static int vnic_dev_cmd_no_proxy(struct vnic_dev *vdev,
-       enum vnic_devcmd_cmd cmd, u64 *a0, u64 *a1, int wait)
-{
-       int err;
-
-       vdev->args[0] = *a0;
-       vdev->args[1] = *a1;
-
-       err = _vnic_dev_cmd(vdev, cmd, wait);
-
-       *a0 = vdev->args[0];
-       *a1 = vdev->args[1];
-
-       return err;
-}
-
-int vnic_dev_cmd(struct vnic_dev *vdev, enum vnic_devcmd_cmd cmd,
-       u64 *a0, u64 *a1, int wait)
-{
-       memset(vdev->args, 0, sizeof(vdev->args));
-
-       switch (vdev->proxy) {
-       case PROXY_BY_BDF:
-               return vnic_dev_cmd_proxy_by_bdf(vdev, cmd, a0, a1, wait);
-       case PROXY_NONE:
-       default:
-               return vnic_dev_cmd_no_proxy(vdev, cmd, a0, a1, wait);
-       }
-}
-
-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;
-
-               memset(vdev->fw_info, 0, sizeof(struct vnic_devcmd_fw_info));
-
-               a0 = vdev->fw_info_pa;
-               a1 = sizeof(struct vnic_devcmd_fw_info);
-
-               /* only get fw_info once and cache it */
-               err = vnic_dev_cmd(vdev, CMD_MCPU_FW_INFO, &a0, &a1, wait);
-               if (err == ERR_ECMDUNKNOWN) {
-                       err = vnic_dev_cmd(vdev, CMD_MCPU_FW_INFO_OLD,
-                               &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_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_wait(struct vnic_dev *vdev)
-{
-       u64 a0 = 0, a1 = 0;
-       int wait = 1000;
-       int err;
-
-       err = vnic_dev_cmd(vdev, CMD_ENABLE_WAIT, &a0, &a1, wait);
-       if (err == ERR_ECMDUNKNOWN)
-               return vnic_dev_cmd(vdev, CMD_ENABLE, &a0, &a1, wait);
-
-       return err;
-}
-
-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;
-}
-
-static 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);
-}
-
-static 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_reset(struct vnic_dev *vdev, int arg)
-{
-       u64 a0 = (u32)arg, a1 = 0;
-       int wait = 1000;
-       int err;
-
-       err = vnic_dev_cmd(vdev, CMD_HANG_RESET, &a0, &a1, wait);
-       if (err == ERR_ECMDUNKNOWN) {
-               err = vnic_dev_soft_reset(vdev, arg);
-               if (err)
-                       return err;
-
-               return vnic_dev_init(vdev, 0);
-       }
-
-       return err;
-}
-
-int vnic_dev_hang_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_HANG_RESET_STATUS, &a0, &a1, wait);
-       if (err) {
-               if (err == ERR_ECMDUNKNOWN)
-                       return vnic_dev_soft_reset_done(vdev, done);
-               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;
-}
-
-int 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)
-               pr_err("Can't set packet filter\n");
-
-       return err;
-}
-
-int 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)
-               pr_err("Can't add addr [%pM], %d\n", addr, err);
-
-       return err;
-}
-
-int 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)
-               pr_err("Can't del addr [%pM], %d\n", addr, err);
-
-       return err;
-}
-
-int vnic_dev_set_ig_vlan_rewrite_mode(struct vnic_dev *vdev,
-       u8 ig_vlan_rewrite_mode)
-{
-       u64 a0 = ig_vlan_rewrite_mode, a1 = 0;
-       int wait = 1000;
-       int err;
-
-       err = vnic_dev_cmd(vdev, CMD_IG_VLAN_REWRITE_MODE, &a0, &a1, wait);
-       if (err == ERR_ECMDUNKNOWN)
-               return 0;
-
-       return err;
-}
-
-static int vnic_dev_notify_setcmd(struct vnic_dev *vdev,
-       void *notify_addr, dma_addr_t notify_pa, u16 intr)
-{
-       u64 a0, a1;
-       int wait = 1000;
-       int r;
-
-       memset(notify_addr, 0, sizeof(struct vnic_devcmd_notify));
-       vdev->notify = notify_addr;
-       vdev->notify_pa = notify_pa;
-
-       a0 = (u64)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;
-}
-
-int vnic_dev_notify_set(struct vnic_dev *vdev, u16 intr)
-{
-       void *notify_addr;
-       dma_addr_t notify_pa;
-
-       if (vdev->notify || vdev->notify_pa) {
-               pr_err("notify block %p still allocated", vdev->notify);
-               return -EINVAL;
-       }
-
-       notify_addr = pci_alloc_consistent(vdev->pdev,
-                       sizeof(struct vnic_devcmd_notify),
-                       &notify_pa);
-       if (!notify_addr)
-               return -ENOMEM;
-
-       return vnic_dev_notify_setcmd(vdev, notify_addr, notify_pa, intr);
-}
-
-static int vnic_dev_notify_unsetcmd(struct vnic_dev *vdev)
-{
-       u64 a0, a1;
-       int wait = 1000;
-       int err;
-
-       a0 = 0;  /* paddr = 0 to unset notify buffer */
-       a1 = 0x0000ffff00000000ULL; /* intr num = -1 to unreg for intr */
-       a1 += sizeof(struct vnic_devcmd_notify);
-
-       err = vnic_dev_cmd(vdev, CMD_NOTIFY, &a0, &a1, wait);
-       vdev->notify = NULL;
-       vdev->notify_pa = 0;
-       vdev->notify_sz = 0;
-
-       return err;
-}
-
-int vnic_dev_notify_unset(struct vnic_dev *vdev)
-{
-       if (vdev->notify) {
-               pci_free_consistent(vdev->pdev,
-                       sizeof(struct vnic_devcmd_notify),
-                       vdev->notify,
-                       vdev->notify_pa);
-       }
-
-       return vnic_dev_notify_unsetcmd(vdev);
-}
-
-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 (vnic_dev_capable(vdev, CMD_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_deinit(struct vnic_dev *vdev)
-{
-       u64 a0 = 0, a1 = 0;
-       int wait = 1000;
-
-       return vnic_dev_cmd(vdev, CMD_DEINIT, &a0, &a1, wait);
-}
-
-void vnic_dev_intr_coal_timer_info_default(struct vnic_dev *vdev)
-{
-       /* Default: hardware intr coal timer is in units of 1.5 usecs */
-       vdev->intr_coal_timer_info.mul = 2;
-       vdev->intr_coal_timer_info.div = 3;
-       vdev->intr_coal_timer_info.max_usec =
-               vnic_dev_intr_coal_timer_hw_to_usec(vdev, 0xffff);
-}
-
-int vnic_dev_intr_coal_timer_info(struct vnic_dev *vdev)
-{
-       int wait = 1000;
-       int err;
-
-       memset(vdev->args, 0, sizeof(vdev->args));
-
-       err = _vnic_dev_cmd(vdev, CMD_INTR_COAL_CONVERT, wait);
-
-       /* Use defaults when firmware doesn't support the devcmd at all or
-        * supports it for only specific hardware
-        */
-       if ((err == ERR_ECMDUNKNOWN) ||
-               (!err && !(vdev->args[0] && vdev->args[1] && vdev->args[2]))) {
-               pr_warning("Using default conversion factor for "
-                       "interrupt coalesce timer\n");
-               vnic_dev_intr_coal_timer_info_default(vdev);
-               return 0;
-       }
-
-       vdev->intr_coal_timer_info.mul = (u32) vdev->args[0];
-       vdev->intr_coal_timer_info.div = (u32) vdev->args[1];
-       vdev->intr_coal_timer_info.max_usec = (u32) vdev->args[2];
-
-       return err;
-}
-
-int vnic_dev_link_status(struct vnic_dev *vdev)
-{
-       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;
-}
-
-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;
-}
-
-u32 vnic_dev_intr_coal_timer_usec_to_hw(struct vnic_dev *vdev, u32 usec)
-{
-       return (usec * vdev->intr_coal_timer_info.mul) /
-               vdev->intr_coal_timer_info.div;
-}
-
-u32 vnic_dev_intr_coal_timer_hw_to_usec(struct vnic_dev *vdev, u32 hw_cycles)
-{
-       return (hw_cycles * vdev->intr_coal_timer_info.div) /
-               vdev->intr_coal_timer_info.mul;
-}
-
-u32 vnic_dev_get_intr_coal_timer_max(struct vnic_dev *vdev)
-{
-       return vdev->intr_coal_timer_info.max_usec;
-}
-
-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->stats)
-                       pci_free_consistent(vdev->pdev,
-                               sizeof(struct vnic_stats),
-                               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,
-       unsigned int num_bars)
-{
-       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, num_bars))
-               goto err_out;
-
-       vdev->devcmd = vnic_dev_get_res(vdev, RES_TYPE_DEVCMD, 0);
-       if (!vdev->devcmd)
-               goto err_out;
-
-       return vdev;
-
-err_out:
-       vnic_dev_unregister(vdev);
-       return NULL;
-}
-
-int vnic_dev_init_prov2(struct vnic_dev *vdev, u8 *buf, u32 len)
-{
-       u64 a0, a1 = len;
-       int wait = 1000;
-       dma_addr_t prov_pa;
-       void *prov_buf;
-       int ret;
-
-       prov_buf = pci_alloc_consistent(vdev->pdev, len, &prov_pa);
-       if (!prov_buf)
-               return -ENOMEM;
-
-       memcpy(prov_buf, buf, len);
-
-       a0 = prov_pa;
-
-       ret = vnic_dev_cmd(vdev, CMD_INIT_PROV_INFO2, &a0, &a1, wait);
-
-       pci_free_consistent(vdev->pdev, len, prov_buf, prov_pa);
-
-       return ret;
-}
-
-int vnic_dev_enable2(struct vnic_dev *vdev, int active)
-{
-       u64 a0, a1 = 0;
-       int wait = 1000;
-
-       a0 = (active ? CMD_ENABLE2_ACTIVE : 0);
-
-       return vnic_dev_cmd(vdev, CMD_ENABLE2, &a0, &a1, wait);
-}
-
-static int vnic_dev_cmd_status(struct vnic_dev *vdev, enum vnic_devcmd_cmd cmd,
-       int *status)
-{
-       u64 a0 = cmd, a1 = 0;
-       int wait = 1000;
-       int ret;
-
-       ret = vnic_dev_cmd(vdev, CMD_STATUS, &a0, &a1, wait);
-       if (!ret)
-               *status = (int)a0;
-
-       return ret;
-}
-
-int vnic_dev_enable2_done(struct vnic_dev *vdev, int *status)
-{
-       return vnic_dev_cmd_status(vdev, CMD_ENABLE2, status);
-}
-
-int vnic_dev_deinit_done(struct vnic_dev *vdev, int *status)
-{
-       return vnic_dev_cmd_status(vdev, CMD_DEINIT, status);
-}
diff --git a/drivers/net/enic/vnic_dev.h b/drivers/net/enic/vnic_dev.h
deleted file mode 100644 (file)
index 852b698..0000000
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright 2008-2010 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
-
-#undef pr_fmt
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-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);
-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_dump(struct vnic_dev *vdev, struct vnic_stats **stats);
-int vnic_dev_hang_notify(struct vnic_dev *vdev);
-int vnic_dev_packet_filter(struct vnic_dev *vdev, int directed, int multicast,
-       int broadcast, int promisc, int allmulti);
-int vnic_dev_add_addr(struct vnic_dev *vdev, u8 *addr);
-int 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);
-int 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);
-int vnic_dev_close(struct vnic_dev *vdev);
-int vnic_dev_enable_wait(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_deinit(struct vnic_dev *vdev);
-void vnic_dev_intr_coal_timer_info_default(struct vnic_dev *vdev);
-int vnic_dev_intr_coal_timer_info(struct vnic_dev *vdev);
-int vnic_dev_hang_reset(struct vnic_dev *vdev, int arg);
-int vnic_dev_hang_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);
-u32 vnic_dev_intr_coal_timer_usec_to_hw(struct vnic_dev *vdev, u32 usec);
-u32 vnic_dev_intr_coal_timer_hw_to_usec(struct vnic_dev *vdev, u32 hw_cycles);
-u32 vnic_dev_get_intr_coal_timer_max(struct vnic_dev *vdev);
-void vnic_dev_unregister(struct vnic_dev *vdev);
-int vnic_dev_set_ig_vlan_rewrite_mode(struct vnic_dev *vdev,
-       u8 ig_vlan_rewrite_mode);
-struct vnic_dev *vnic_dev_register(struct vnic_dev *vdev,
-       void *priv, struct pci_dev *pdev, struct vnic_dev_bar *bar,
-       unsigned int num_bars);
-int vnic_dev_init_prov2(struct vnic_dev *vdev, u8 *buf, u32 len);
-int vnic_dev_enable2(struct vnic_dev *vdev, int active);
-int vnic_dev_enable2_done(struct vnic_dev *vdev, int *status);
-int vnic_dev_deinit_done(struct vnic_dev *vdev, int *status);
-
-#endif /* _VNIC_DEV_H_ */
diff --git a/drivers/net/enic/vnic_devcmd.h b/drivers/net/enic/vnic_devcmd.h
deleted file mode 100644 (file)
index 8025e88..0000000
+++ /dev/null
@@ -1,450 +0,0 @@
-/*
- * Copyright 2008-2010 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:
-        * in:
-        *   (u64)a0=paddr to struct vnic_devcmd_fw_info
-        * action:
-        *   Fills in struct vnic_devcmd_fw_info (128 bytes)
-        * note:
-        *   An old definition of CMD_MCPU_FW_INFO
-        */
-       CMD_MCPU_FW_INFO_OLD    = _CMDC(_CMD_DIR_WRITE, _CMD_VTYPE_ALL, 1),
-
-       /*
-        * mcpu fw info in mem:
-        * in:
-        *   (u64)a0=paddr to struct vnic_devcmd_fw_info
-        *   (u16)a1=size of the structure
-        * out:
-        *       (u16)a1=0                          for in:a1 = 0,
-        *               data size actually written for other values.
-        * action:
-        *   Fills in first 128 bytes of vnic_devcmd_fw_info for in:a1 = 0,
-        *            first in:a1 bytes               for 0 < in:a1 <= 132,
-        *            132 bytes                       for other values of in:a1.
-        * note:
-        *   CMD_MCPU_FW_INFO and CMD_MCPU_FW_INFO_OLD have the same enum 1
-        *   for source compatibility.
-        */
-       CMD_MCPU_FW_INFO        = _CMDC(_CMD_DIR_RW, _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),
-
-       /* set Rx packet filter for all: (u32)a0=filters (see CMD_PFILTER_*) */
-       CMD_PACKET_FILTER_ALL   = _CMDCNW(_CMD_DIR_WRITE, _CMD_VTYPE_ALL, 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),
-
-       /* 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),
-
-       /* enable virtual link, waiting variant. */
-       CMD_ENABLE_WAIT         = _CMDC(_CMD_DIR_WRITE, _CMD_VTYPE_ALL, 28),
-
-       /* disable virtual link */
-       CMD_DISABLE             = _CMDC(_CMD_DIR_NONE, _CMD_VTYPE_ALL, 29),
-
-       /* stats dump sum of all vnic stats on same uplink in mem:
-        *     (u64)a0=paddr
-        *     (u16)a1=sizeof stats area */
-       CMD_STATS_DUMP_ALL      = _CMDC(_CMD_DIR_WRITE, _CMD_VTYPE_ALL, 30),
-
-       /* init status:
-        *    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),
-
-       /* Interrupt Assert Register functionality
-        * in: (u16)a0=interrupt number to assert
-        */
-       CMD_IAR                 = _CMDCNW(_CMD_DIR_WRITE, _CMD_VTYPE_ALL, 38),
-
-       /* initiate hangreset, like softreset after hang detected */
-       CMD_HANG_RESET          = _CMDC(_CMD_DIR_NONE, _CMD_VTYPE_ALL, 39),
-
-       /* hangreset status:
-        *    out: a0=0 reset complete, a0=1 reset in progress */
-       CMD_HANG_RESET_STATUS   = _CMDC(_CMD_DIR_READ, _CMD_VTYPE_ALL, 40),
-
-       /*
-        * Set hw ingress packet vlan rewrite mode:
-        * in:  (u32)a0=new vlan rewrite mode
-        * out: (u32)a0=old vlan rewrite mode */
-       CMD_IG_VLAN_REWRITE_MODE = _CMDC(_CMD_DIR_RW, _CMD_VTYPE_ENET, 41),
-
-       /*
-        * in:  (u16)a0=bdf of target vnic
-        *      (u32)a1=cmd to proxy
-        *      a2-a15=args to cmd in a1
-        * out: (u32)a0=status of proxied cmd
-        *      a1-a15=out args of proxied cmd */
-       CMD_PROXY_BY_BDF =      _CMDC(_CMD_DIR_RW, _CMD_VTYPE_ALL, 42),
-
-       /*
-        * As for BY_BDF except a0 is index of hvnlink subordinate vnic
-        * or SR-IOV virtual vnic
-        */
-       CMD_PROXY_BY_INDEX =    _CMDC(_CMD_DIR_RW, _CMD_VTYPE_ALL, 43),
-
-       /*
-        * For HPP toggle:
-        * adapter-info-get
-        * in:  (u64)a0=phsical address of buffer passed in from caller.
-        *      (u16)a1=size of buffer specified in a0.
-        * out: (u64)a0=phsical address of buffer passed in from caller.
-        *      (u16)a1=actual bytes from VIF-CONFIG-INFO TLV, or
-        *              0 if no VIF-CONFIG-INFO TLV was ever received. */
-       CMD_CONFIG_INFO_GET     = _CMDC(_CMD_DIR_RW, _CMD_VTYPE_ALL, 44),
-
-       /* init_prov_info2:
-        * Variant of CMD_INIT_PROV_INFO, where it will not try to enable
-        * the vnic until CMD_ENABLE2 is issued.
-        *     (u64)a0=paddr of vnic_devcmd_provinfo
-        *     (u32)a1=sizeof provision info */
-       CMD_INIT_PROV_INFO2  = _CMDC(_CMD_DIR_WRITE, _CMD_VTYPE_ENET, 47),
-
-       /* enable2:
-        *      (u32)a0=0                  ==> standby
-        *             =CMD_ENABLE2_ACTIVE ==> active
-        */
-       CMD_ENABLE2 = _CMDC(_CMD_DIR_WRITE, _CMD_VTYPE_ENET, 48),
-
-       /*
-        * cmd_status:
-        *     Returns the status of the specified command
-        * Input:
-        *     a0 = command for which status is being queried.
-        *          Possible values are:
-        *              CMD_SOFT_RESET
-        *              CMD_HANG_RESET
-        *              CMD_OPEN
-        *              CMD_INIT
-        *              CMD_INIT_PROV_INFO
-        *              CMD_DEINIT
-        *              CMD_INIT_PROV_INFO2
-        *              CMD_ENABLE2
-        * Output:
-        *     if status == STAT_ERROR
-        *        a0 = ERR_ENOTSUPPORTED - status for command in a0 is
-        *                                 not supported
-        *     if status == STAT_NONE
-        *        a0 = status of the devcmd specified in a0 as follows.
-        *             ERR_SUCCESS   - command in a0 completed successfully
-        *             ERR_EINPROGRESS - command in a0 is still in progress
-        */
-       CMD_STATUS = _CMDC(_CMD_DIR_RW, _CMD_VTYPE_ALL, 49),
-
-       /*
-        * Returns interrupt coalescing timer conversion factors.
-        * After calling this devcmd, ENIC driver can convert
-        * interrupt coalescing timer in usec into CPU cycles as follows:
-        *
-        *   intr_timer_cycles = intr_timer_usec * multiplier / divisor
-        *
-        * Interrupt coalescing timer in usecs can be obtained from
-        * CPU cycles as follows:
-        *
-        *   intr_timer_usec = intr_timer_cycles * divisor / multiplier
-        *
-        * in: none
-        * out: (u32)a0 = multiplier
-        *      (u32)a1 = divisor
-        *      (u32)a2 = maximum timer value in usec
-        */
-       CMD_INTR_COAL_CONVERT = _CMDC(_CMD_DIR_READ, _CMD_VTYPE_ALL, 50),
-};
-
-/* CMD_ENABLE2 flags */
-#define CMD_ENABLE2_ACTIVE  0x1
-
-/* 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
-
-/* rewrite modes for CMD_IG_VLAN_REWRITE_MODE */
-#define IG_VLAN_REWRITE_MODE_DEFAULT_TRUNK              0
-#define IG_VLAN_REWRITE_MODE_UNTAG_DEFAULT_VLAN         1
-#define IG_VLAN_REWRITE_MODE_PRIORITY_TAG_DEFAULT_VLAN  2
-#define IG_VLAN_REWRITE_MODE_PASS_THRU                  3
-
-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,
-       ERR_EMAXRES = 10,
-       ERR_ENOTSUPPORTED = 11,
-       ERR_EINPROGRESS = 12,
-};
-
-/*
- * note: hw_version and asic_rev refer to the same thing,
- *       but have different formats. hw_version is
- *       a 32-byte string (e.g. "A2") and asic_rev is
- *       a 16-bit integer (e.g. 0xA2).
- */
-struct vnic_devcmd_fw_info {
-       char fw_version[32];
-       char fw_build[32];
-       char hw_version[32];
-       char hw_serial_number[32];
-       u16 asic_type;
-       u16 asic_rev;
-};
-
-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 (file)
index 6095428..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2008-2010 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_deprecated;
-       u8 intr_timer_type;
-       u8 intr_mode;
-       char devname[16];
-       u32 intr_timer_usec;
-       u16 loop_tag;
-};
-
-#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 */
-#define VENETF_LOOP            0x800   /* Loopback enabled */
-
-#define VENET_INTR_TYPE_MIN    0       /* Timer specs min interrupt spacing */
-#define VENET_INTR_TYPE_IDLE   1       /* Timer specs idle time before irq */
-
-#define VENET_INTR_MODE_ANY    0       /* Try MSI-X, then MSI, then INTx */
-#define VENET_INTR_MODE_MSI    1       /* Try MSI then INTx */
-#define VENET_INTR_MODE_INTX   2       /* Try INTx only */
-
-#endif /* _VNIC_ENIC_H_ */
diff --git a/drivers/net/enic/vnic_intr.c b/drivers/net/enic/vnic_intr.c
deleted file mode 100644 (file)
index 0ca107f..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright 2008-2010 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) {
-               pr_err("Failed to hook INTR[%d].ctrl resource\n", index);
-               return -EINVAL;
-       }
-
-       return 0;
-}
-
-void vnic_intr_init(struct vnic_intr *intr, u32 coalescing_timer,
-       unsigned int coalescing_type, unsigned int mask_on_assertion)
-{
-       vnic_intr_coalescing_timer_set(intr, 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_coalescing_timer_set(struct vnic_intr *intr,
-       u32 coalescing_timer)
-{
-       iowrite32(vnic_dev_intr_coal_timer_usec_to_hw(intr->vdev,
-               coalescing_timer), &intr->ctrl->coalescing_timer);
-}
-
-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 (file)
index 2b16363..0000000
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright 2008-2010 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_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 int vnic_intr_masked(struct vnic_intr *intr)
-{
-       return ioread32(&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, u32 coalescing_timer,
-       unsigned int coalescing_type, unsigned int mask_on_assertion);
-void vnic_intr_coalescing_timer_set(struct vnic_intr *intr,
-       u32 coalescing_timer);
-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 (file)
index 995a50d..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright 2008-2010 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
-
-#define NIC_CFG_RSS_HASH_TYPE_IPV4             (1 << 1)
-#define NIC_CFG_RSS_HASH_TYPE_TCP_IPV4         (1 << 2)
-#define NIC_CFG_RSS_HASH_TYPE_IPV6             (1 << 3)
-#define NIC_CFG_RSS_HASH_TYPE_TCP_IPV6         (1 << 4)
-#define NIC_CFG_RSS_HASH_TYPE_IPV6_EX          (1 << 5)
-#define NIC_CFG_RSS_HASH_TYPE_TCP_IPV6_EX      (1 << 6)
-
-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 (file)
index e0a73f1..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright 2008-2010 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
-#define MGMTVNIC_MAGIC         0x544d474dL     /* 'MGMT' */
-#define MGMTVNIC_VERSION       0x00000000L
-
-/* The MAC address assigned to the CFG vNIC is fixed. */
-#define MGMTVNIC_MAC           { 0x02, 0x00, 0x54, 0x4d, 0x47, 0x4d }
-
-/* 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 mgmt_barmap_hdr {
-       u32 magic;                      /* magic number */
-       u32 version;                    /* header format version */
-       u16 lif;                        /* loopback lif for mgmt frames */
-       u16 pci_slot;                   /* installed pci slot */
-       char serial[16];                /* card serial number */
-};
-
-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 (file)
index 34105e0..0000000
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * Copyright 2008-2010 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/slab.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(count), GFP_ATOMIC);
-               if (!rq->bufs[i]) {
-                       pr_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(count); j++) {
-                       buf->index = i * VNIC_RQ_BUF_BLK_ENTRIES(count) + 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(count)) {
-                               buf->next = rq->bufs[i + 1];
-                       } else {
-                               buf->next = buf + 1;
-                               buf++;
-                       }
-               }
-       }
-
-       rq->to_use = rq->to_clean = rq->bufs[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++) {
-               if (rq->bufs[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) {
-               pr_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;
-}
-
-static void vnic_rq_init_start(struct vnic_rq *rq, unsigned int cq_index,
-       unsigned int fetch_index, unsigned int posted_index,
-       unsigned int error_interrupt_enable,
-       unsigned int error_interrupt_offset)
-{
-       u64 paddr;
-       unsigned int count = rq->ring.desc_count;
-
-       paddr = (u64)rq->ring.base_addr | VNIC_PADDR_TARGET;
-       writeq(paddr, &rq->ctrl->ring_base);
-       iowrite32(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);
-       iowrite32(fetch_index, &rq->ctrl->fetch_index);
-       iowrite32(posted_index, &rq->ctrl->posted_index);
-
-       rq->to_use = rq->to_clean =
-               &rq->bufs[fetch_index / VNIC_RQ_BUF_BLK_ENTRIES(count)]
-                       [fetch_index % VNIC_RQ_BUF_BLK_ENTRIES(count)];
-}
-
-void vnic_rq_init(struct vnic_rq *rq, unsigned int cq_index,
-       unsigned int error_interrupt_enable,
-       unsigned int error_interrupt_offset)
-{
-       u32 fetch_index;
-
-       /* Use current fetch_index as the ring starting point */
-       fetch_index = ioread32(&rq->ctrl->fetch_index);
-
-       if (fetch_index == 0xFFFFFFFF) { /* check for hardware gone  */
-               /* Hardware surprise removal: reset fetch_index */
-               fetch_index = 0;
-       }
-
-       vnic_rq_init_start(rq, cq_index,
-               fetch_index, fetch_index,
-               error_interrupt_enable,
-               error_interrupt_offset);
-}
-
-unsigned int vnic_rq_error_status(struct vnic_rq *rq)
-{
-       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 < 1000; wait++) {
-               if (!(ioread32(&rq->ctrl->running)))
-                       return 0;
-               udelay(10);
-       }
-
-       pr_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;
-       unsigned int count = rq->ring.desc_count;
-
-       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);
-
-       if (fetch_index == 0xFFFFFFFF) { /* check for hardware gone  */
-               /* Hardware surprise removal: reset fetch_index */
-               fetch_index = 0;
-       }
-       rq->to_use = rq->to_clean =
-               &rq->bufs[fetch_index / VNIC_RQ_BUF_BLK_ENTRIES(count)]
-                       [fetch_index % VNIC_RQ_BUF_BLK_ENTRIES(count)];
-       iowrite32(fetch_index, &rq->ctrl->posted_index);
-
-       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 (file)
index 2056586..0000000
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * Copyright 2008-2010 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 32/64 entries */
-#define VNIC_RQ_BUF_MIN_BLK_ENTRIES 32
-#define VNIC_RQ_BUF_DFLT_BLK_ENTRIES 64
-#define VNIC_RQ_BUF_BLK_ENTRIES(entries) \
-       ((unsigned int)((entries < VNIC_RQ_BUF_DFLT_BLK_ENTRIES) ? \
-       VNIC_RQ_BUF_MIN_BLK_ENTRIES : VNIC_RQ_BUF_DFLT_BLK_ENTRIES))
-#define VNIC_RQ_BUF_BLK_SZ(entries) \
-       (VNIC_RQ_BUF_BLK_ENTRIES(entries) * sizeof(struct vnic_rq_buf))
-#define VNIC_RQ_BUF_BLKS_NEEDED(entries) \
-       DIV_ROUND_UP(entries, VNIC_RQ_BUF_BLK_ENTRIES(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 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 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) > 0) {
-
-               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 (file)
index fa421ba..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2008-2010 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];
-};
-
-#endif /* _VNIC_RSS_H_ */
diff --git a/drivers/net/enic/vnic_stats.h b/drivers/net/enic/vnic_stats.h
deleted file mode 100644 (file)
index 77750ec..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright 2008-2010 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_vic.c b/drivers/net/enic/vnic_vic.c
deleted file mode 100644 (file)
index 24ef8cd..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright 2010 Cisco 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/slab.h>
-
-#include "vnic_vic.h"
-
-struct vic_provinfo *vic_provinfo_alloc(gfp_t flags, const u8 *oui,
-       const u8 type)
-{
-       struct vic_provinfo *vp;
-
-       if (!oui)
-               return NULL;
-
-       vp = kzalloc(VIC_PROVINFO_MAX_DATA, flags);
-       if (!vp)
-               return NULL;
-
-       memcpy(vp->oui, oui, sizeof(vp->oui));
-       vp->type = type;
-       vp->length = htonl(sizeof(vp->num_tlvs));
-
-       return vp;
-}
-
-void vic_provinfo_free(struct vic_provinfo *vp)
-{
-       kfree(vp);
-}
-
-int vic_provinfo_add_tlv(struct vic_provinfo *vp, u16 type, u16 length,
-       const void *value)
-{
-       struct vic_provinfo_tlv *tlv;
-
-       if (!vp || !value)
-               return -EINVAL;
-
-       if (ntohl(vp->length) + offsetof(struct vic_provinfo_tlv, value) +
-               length > VIC_PROVINFO_MAX_TLV_DATA)
-               return -ENOMEM;
-
-       tlv = (struct vic_provinfo_tlv *)((u8 *)vp->tlv +
-               ntohl(vp->length) - sizeof(vp->num_tlvs));
-
-       tlv->type = htons(type);
-       tlv->length = htons(length);
-       memcpy(tlv->value, value, length);
-
-       vp->num_tlvs = htonl(ntohl(vp->num_tlvs) + 1);
-       vp->length = htonl(ntohl(vp->length) +
-               offsetof(struct vic_provinfo_tlv, value) + length);
-
-       return 0;
-}
-
-size_t vic_provinfo_size(struct vic_provinfo *vp)
-{
-       return vp ?  ntohl(vp->length) + sizeof(*vp) - sizeof(vp->num_tlvs) : 0;
-}
diff --git a/drivers/net/enic/vnic_vic.h b/drivers/net/enic/vnic_vic.h
deleted file mode 100644 (file)
index 9ef81f1..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright 2010 Cisco 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_VIC_H_
-#define _VNIC_VIC_H_
-
-/* Note: All integer fields in NETWORK byte order */
-
-/* Note: String field lengths include null char */
-
-#define VIC_PROVINFO_CISCO_OUI         { 0x00, 0x00, 0x0c }
-#define VIC_PROVINFO_GENERIC_TYPE              0x4
-
-enum vic_generic_prov_tlv_type {
-       VIC_GENERIC_PROV_TLV_PORT_PROFILE_NAME_STR = 0,
-       VIC_GENERIC_PROV_TLV_CLIENT_MAC_ADDR = 1,
-       VIC_GENERIC_PROV_TLV_CLIENT_NAME_STR = 2,
-       VIC_GENERIC_PROV_TLV_CLUSTER_PORT_NAME_STR = 3,
-       VIC_GENERIC_PROV_TLV_CLUSTER_PORT_UUID_STR = 4,
-       VIC_GENERIC_PROV_TLV_CLUSTER_UUID_STR = 5,
-       VIC_GENERIC_PROV_TLV_CLUSTER_NAME_STR = 7,
-       VIC_GENERIC_PROV_TLV_HOST_UUID_STR = 8,
-       VIC_GENERIC_PROV_TLV_CLIENT_UUID_STR = 9,
-       VIC_GENERIC_PROV_TLV_INCARNATION_NUMBER = 10,
-       VIC_GENERIC_PROV_TLV_OS_TYPE = 11,
-       VIC_GENERIC_PROV_TLV_OS_VENDOR = 12,
-       VIC_GENERIC_PROV_TLV_CLIENT_TYPE = 15,
-};
-
-enum vic_generic_prov_os_type {
-       VIC_GENERIC_PROV_OS_TYPE_UNKNOWN = 0,
-       VIC_GENERIC_PROV_OS_TYPE_ESX = 1,
-       VIC_GENERIC_PROV_OS_TYPE_LINUX = 2,
-       VIC_GENERIC_PROV_OS_TYPE_WINDOWS = 3,
-       VIC_GENERIC_PROV_OS_TYPE_SOLARIS = 4,
-};
-
-struct vic_provinfo {
-       u8 oui[3];              /* OUI of data provider */
-       u8 type;                /* provider-specific type */
-       u32 length;             /* length of data below */
-       u32 num_tlvs;           /* number of tlvs */
-       struct vic_provinfo_tlv {
-               u16 type;
-               u16 length;
-               u8 value[0];
-       } tlv[0];
-} __packed;
-
-#define VIC_PROVINFO_ADD_TLV(vp, tlvtype, tlvlen, data) \
-       do { \
-               err = vic_provinfo_add_tlv(vp, tlvtype, tlvlen, data); \
-               if (err) \
-                       goto add_tlv_failure; \
-       } while (0)
-
-#define VIC_PROVINFO_MAX_DATA          1385
-#define VIC_PROVINFO_MAX_TLV_DATA (VIC_PROVINFO_MAX_DATA - \
-       sizeof(struct vic_provinfo))
-
-struct vic_provinfo *vic_provinfo_alloc(gfp_t flags, const u8 *oui,
-       const u8 type);
-void vic_provinfo_free(struct vic_provinfo *vp);
-int vic_provinfo_add_tlv(struct vic_provinfo *vp, u16 type, u16 length,
-       const void *value);
-size_t vic_provinfo_size(struct vic_provinfo *vp);
-
-#endif /* _VNIC_VIC_H_ */
diff --git a/drivers/net/enic/vnic_wq.c b/drivers/net/enic/vnic_wq.c
deleted file mode 100644 (file)
index df61bd9..0000000
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * Copyright 2008-2010 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/slab.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(count), GFP_ATOMIC);
-               if (!wq->bufs[i]) {
-                       pr_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(count); j++) {
-                       buf->index = i * VNIC_WQ_BUF_BLK_ENTRIES(count) + 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(count)) {
-                               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++) {
-               if (wq->bufs[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) {
-               pr_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;
-}
-
-static void vnic_wq_init_start(struct vnic_wq *wq, unsigned int cq_index,
-       unsigned int fetch_index, unsigned int posted_index,
-       unsigned int error_interrupt_enable,
-       unsigned int error_interrupt_offset)
-{
-       u64 paddr;
-       unsigned int count = wq->ring.desc_count;
-
-       paddr = (u64)wq->ring.base_addr | VNIC_PADDR_TARGET;
-       writeq(paddr, &wq->ctrl->ring_base);
-       iowrite32(count, &wq->ctrl->ring_size);
-       iowrite32(fetch_index, &wq->ctrl->fetch_index);
-       iowrite32(posted_index, &wq->ctrl->posted_index);
-       iowrite32(cq_index, &wq->ctrl->cq_index);
-       iowrite32(error_interrupt_enable, &wq->ctrl->error_interrupt_enable);
-       iowrite32(error_interrupt_offset, &wq->ctrl->error_interrupt_offset);
-       iowrite32(0, &wq->ctrl->error_status);
-
-       wq->to_use = wq->to_clean =
-               &wq->bufs[fetch_index / VNIC_WQ_BUF_BLK_ENTRIES(count)]
-                       [fetch_index % VNIC_WQ_BUF_BLK_ENTRIES(count)];
-}
-
-void vnic_wq_init(struct vnic_wq *wq, unsigned int cq_index,
-       unsigned int error_interrupt_enable,
-       unsigned int error_interrupt_offset)
-{
-       vnic_wq_init_start(wq, cq_index, 0, 0,
-               error_interrupt_enable,
-               error_interrupt_offset);
-}
-
-unsigned int vnic_wq_error_status(struct vnic_wq *wq)
-{
-       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 < 1000; wait++) {
-               if (!(ioread32(&wq->ctrl->running)))
-                       return 0;
-               udelay(10);
-       }
-
-       pr_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;
-
-       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 (file)
index 7dd937a..0000000
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Copyright 2008-2010 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 32/64 entries */
-#define VNIC_WQ_BUF_MIN_BLK_ENTRIES 32
-#define VNIC_WQ_BUF_DFLT_BLK_ENTRIES 64
-#define VNIC_WQ_BUF_BLK_ENTRIES(entries) \
-       ((unsigned int)((entries < VNIC_WQ_BUF_DFLT_BLK_ENTRIES) ? \
-       VNIC_WQ_BUF_MIN_BLK_ENTRIES : VNIC_WQ_BUF_DFLT_BLK_ENTRIES))
-#define VNIC_WQ_BUF_BLK_SZ(entries) \
-       (VNIC_WQ_BUF_BLK_ENTRIES(entries) * sizeof(struct vnic_wq_buf))
-#define VNIC_WQ_BUF_BLKS_NEEDED(entries) \
-       DIV_ROUND_UP(entries, VNIC_WQ_BUF_BLK_ENTRIES(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 (file)
index c7021e3..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright 2008-2010 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_ */
index f23f1b26b64e9ebe4f6c1df19b60d3273fe700fc..18b634e2750840d81c8eed83e66e95dd69909b0e 100644 (file)
@@ -17,6 +17,7 @@ source "drivers/net/ethernet/amd/Kconfig"
 source "drivers/net/ethernet/broadcom/Kconfig"
 source "drivers/net/ethernet/brocade/Kconfig"
 source "drivers/net/ethernet/chelsio/Kconfig"
+source "drivers/net/ethernet/cisco/Kconfig"
 source "drivers/net/ethernet/emulex/Kconfig"
 source "drivers/net/ethernet/neterion/Kconfig"
 source "drivers/net/ethernet/ibm/Kconfig"
index 27e4da658136d0756e1ff86f75b04fc8a66aa0b8..288179b3d0c6033e12b49d5269e8e8d0330cd5c4 100644 (file)
@@ -8,6 +8,7 @@ obj-$(CONFIG_NET_VENDOR_AMD) += amd/
 obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/
 obj-$(CONFIG_NET_VENDOR_BROCADE) += brocade/
 obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/
+obj-$(CONFIG_NET_VENDOR_CISCO) += cisco/
 obj-$(CONFIG_NET_VENDOR_EMULEX) += emulex/
 obj-$(CONFIG_NET_VENDOR_EXAR) += neterion/
 obj-$(CONFIG_NET_VENDOR_IBM) += ibm/
diff --git a/drivers/net/ethernet/cisco/Kconfig b/drivers/net/ethernet/cisco/Kconfig
new file mode 100644 (file)
index 0000000..bbd5348
--- /dev/null
@@ -0,0 +1,22 @@
+#
+# Cisco device configuration
+#
+
+config NET_VENDOR_CISCO
+       bool "Cisco devices"
+       depends on PCI && INET
+       ---help---
+         If you have a network (Ethernet) card belonging to this class, say Y
+         and read the Ethernet-HOWTO, available from
+         <http://www.tldp.org/docs.html#howto>.
+
+         Note that the answer to this question doesn't directly affect the
+         kernel: saying N will just cause the configurator to skip all
+         the questions about Cisco cards. If you say Y, you will be asked for
+         your specific card in the following questions.
+
+if NET_VENDOR_CISCO
+
+source "drivers/net/ethernet/cisco/enic/Kconfig"
+
+endif # NET_VENDOR_CISCO
diff --git a/drivers/net/ethernet/cisco/Makefile b/drivers/net/ethernet/cisco/Makefile
new file mode 100644 (file)
index 0000000..6c7437b
--- /dev/null
@@ -0,0 +1,5 @@
+#
+# Makefile for the Cisco device drivers.
+#
+
+obj-$(CONFIG_ENIC) += enic/
diff --git a/drivers/net/ethernet/cisco/enic/Kconfig b/drivers/net/ethernet/cisco/enic/Kconfig
new file mode 100644 (file)
index 0000000..9cc706a
--- /dev/null
@@ -0,0 +1,9 @@
+#
+# Cisco device configuration
+#
+
+config ENIC
+       tristate "Cisco VIC Ethernet NIC Support"
+       depends on PCI && INET
+       ---help---
+         This enables the support for the Cisco VIC Ethernet card.
diff --git a/drivers/net/ethernet/cisco/enic/Makefile b/drivers/net/ethernet/cisco/enic/Makefile
new file mode 100644 (file)
index 0000000..9d4974b
--- /dev/null
@@ -0,0 +1,5 @@
+obj-$(CONFIG_ENIC) := enic.o
+
+enic-y := enic_main.o vnic_cq.o vnic_intr.o vnic_wq.o \
+       enic_res.o enic_dev.o enic_pp.o vnic_dev.o vnic_rq.o vnic_vic.o
+
diff --git a/drivers/net/ethernet/cisco/enic/cq_desc.h b/drivers/net/ethernet/cisco/enic/cq_desc.h
new file mode 100644 (file)
index 0000000..d6dd1b4
--- /dev/null
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2008-2010 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/ethernet/cisco/enic/cq_enet_desc.h b/drivers/net/ethernet/cisco/enic/cq_enet_desc.h
new file mode 100644 (file)
index 0000000..c2c0680
--- /dev/null
@@ -0,0 +1,185 @@
+/*
+ * Copyright 2008-2010 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_VLAN_TCI_VLAN_BITS          12
+#define CQ_ENET_RQ_DESC_VLAN_TCI_VLAN_MASK \
+       ((1 << CQ_ENET_RQ_DESC_VLAN_TCI_VLAN_BITS) - 1)
+#define CQ_ENET_RQ_DESC_VLAN_TCI_CFI_MASK           (0x1 << 12)
+#define CQ_ENET_RQ_DESC_VLAN_TCI_USER_PRIO_BITS     3
+#define CQ_ENET_RQ_DESC_VLAN_TCI_USER_PRIO_MASK \
+       ((1 << CQ_ENET_RQ_DESC_VLAN_TCI_USER_PRIO_BITS) - 1)
+#define CQ_ENET_RQ_DESC_VLAN_TCI_USER_PRIO_SHIFT    13
+
+#define CQ_ENET_RQ_DESC_FCOE_SOF_BITS               8
+#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_tci, 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;
+       u16 q_number_rss_type_flags;
+       u16 bytes_written_flags;
+
+       cq_desc_dec((struct cq_desc *)desc, type,
+               color, q_number, completed_index);
+
+       completed_index_flags = le16_to_cpu(desc->completed_index_flags);
+       q_number_rss_type_flags =
+               le16_to_cpu(desc->q_number_rss_type_flags);
+       bytes_written_flags = le16_to_cpu(desc->bytes_written_flags);
+
+       *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;
+
+       /*
+        * Tag Control Information(16) = user_priority(3) + cfi(1) + vlan(12)
+        */
+       *vlan_tci = 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/ethernet/cisco/enic/enic.h b/drivers/net/ethernet/cisco/enic/enic.h
new file mode 100644 (file)
index 0000000..ce76d9a
--- /dev/null
@@ -0,0 +1,124 @@
+/*
+ * Copyright 2008-2010 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 "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"
+
+#define DRV_NAME               "enic"
+#define DRV_DESCRIPTION                "Cisco VIC Ethernet NIC Driver"
+#define DRV_VERSION            "2.1.1.24"
+#define DRV_COPYRIGHT          "Copyright 2008-2011 Cisco Systems, Inc"
+
+#define ENIC_BARS_MAX          6
+
+#define ENIC_WQ_MAX            1
+#define ENIC_RQ_MAX            1
+#define ENIC_CQ_MAX            (ENIC_WQ_MAX + ENIC_RQ_MAX)
+#define ENIC_INTR_MAX          (ENIC_CQ_MAX + 2)
+
+struct enic_msix_entry {
+       int requested;
+       char devname[IFNAMSIZ];
+       irqreturn_t (*isr)(int, void *);
+       void *devid;
+};
+
+#define ENIC_PORT_REQUEST_APPLIED      (1 << 0)
+#define ENIC_SET_REQUEST               (1 << 1)
+#define ENIC_SET_NAME                  (1 << 2)
+#define ENIC_SET_INSTANCE              (1 << 3)
+#define ENIC_SET_HOST                  (1 << 4)
+
+struct enic_port_profile {
+       u32 set;
+       u8 request;
+       char name[PORT_PROFILE_MAX];
+       u8 instance_uuid[PORT_UUID_MAX];
+       u8 host_uuid[PORT_UUID_MAX];
+       u8 vf_mac[ETH_ALEN];
+       u8 mac_addr[ETH_ALEN];
+};
+
+/* Per-instance private data structure */
+struct enic {
+       struct net_device *netdev;
+       struct pci_dev *pdev;
+       struct vnic_enet_config config;
+       struct vnic_dev_bar bar[ENIC_BARS_MAX];
+       struct vnic_dev *vdev;
+       struct timer_list notify_timer;
+       struct work_struct reset;
+       struct work_struct change_mtu_work;
+       struct msix_entry msix_entry[ENIC_INTR_MAX];
+       struct enic_msix_entry msix[ENIC_INTR_MAX];
+       u32 msg_enable;
+       spinlock_t devcmd_lock;
+       u8 mac_addr[ETH_ALEN];
+       u8 mc_addr[ENIC_MULTICAST_PERFECT_FILTERS][ETH_ALEN];
+       u8 uc_addr[ENIC_UNICAST_PERFECT_FILTERS][ETH_ALEN];
+       unsigned int flags;
+       unsigned int mc_count;
+       unsigned int uc_count;
+       u32 port_mtu;
+       u32 rx_coalesce_usecs;
+       u32 tx_coalesce_usecs;
+       struct enic_port_profile pp;
+
+       /* work queue cache line section */
+       ____cacheline_aligned struct vnic_wq wq[ENIC_WQ_MAX];
+       spinlock_t wq_lock[ENIC_WQ_MAX];
+       unsigned int wq_count;
+       u16 loop_enable;
+       u16 loop_tag;
+
+       /* receive queue cache line section */
+       ____cacheline_aligned struct vnic_rq rq[ENIC_RQ_MAX];
+       unsigned int rq_count;
+       u64 rq_truncated_pkts;
+       u64 rq_bad_fcs;
+       struct napi_struct napi[ENIC_RQ_MAX];
+
+       /* interrupt resource cache line section */
+       ____cacheline_aligned struct vnic_intr intr[ENIC_INTR_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;
+};
+
+static inline struct device *enic_get_dev(struct enic *enic)
+{
+       return &(enic->pdev->dev);
+}
+
+void enic_reset_addr_lists(struct enic *enic);
+
+#endif /* _ENIC_H_ */
diff --git a/drivers/net/ethernet/cisco/enic/enic_dev.c b/drivers/net/ethernet/cisco/enic/enic_dev.c
new file mode 100644 (file)
index 0000000..fd6247b
--- /dev/null
@@ -0,0 +1,286 @@
+/*
+ * Copyright 2011 Cisco 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/pci.h>
+#include <linux/etherdevice.h>
+
+#include "vnic_dev.h"
+#include "vnic_vic.h"
+#include "enic_res.h"
+#include "enic.h"
+#include "enic_dev.h"
+
+int enic_dev_fw_info(struct enic *enic, struct vnic_devcmd_fw_info **fw_info)
+{
+       int err;
+
+       spin_lock(&enic->devcmd_lock);
+       err = vnic_dev_fw_info(enic->vdev, fw_info);
+       spin_unlock(&enic->devcmd_lock);
+
+       return err;
+}
+
+int enic_dev_stats_dump(struct enic *enic, struct vnic_stats **vstats)
+{
+       int err;
+
+       spin_lock(&enic->devcmd_lock);
+       err = vnic_dev_stats_dump(enic->vdev, vstats);
+       spin_unlock(&enic->devcmd_lock);
+
+       return err;
+}
+
+int enic_dev_add_station_addr(struct enic *enic)
+{
+       int err;
+
+       if (!is_valid_ether_addr(enic->netdev->dev_addr))
+               return -EADDRNOTAVAIL;
+
+       spin_lock(&enic->devcmd_lock);
+       err = vnic_dev_add_addr(enic->vdev, enic->netdev->dev_addr);
+       spin_unlock(&enic->devcmd_lock);
+
+       return err;
+}
+
+int enic_dev_del_station_addr(struct enic *enic)
+{
+       int err;
+
+       if (!is_valid_ether_addr(enic->netdev->dev_addr))
+               return -EADDRNOTAVAIL;
+
+       spin_lock(&enic->devcmd_lock);
+       err = vnic_dev_del_addr(enic->vdev, enic->netdev->dev_addr);
+       spin_unlock(&enic->devcmd_lock);
+
+       return err;
+}
+
+int enic_dev_packet_filter(struct enic *enic, int directed, int multicast,
+       int broadcast, int promisc, int allmulti)
+{
+       int err;
+
+       spin_lock(&enic->devcmd_lock);
+       err = vnic_dev_packet_filter(enic->vdev, directed,
+               multicast, broadcast, promisc, allmulti);
+       spin_unlock(&enic->devcmd_lock);
+
+       return err;
+}
+
+int enic_dev_add_addr(struct enic *enic, u8 *addr)
+{
+       int err;
+
+       spin_lock(&enic->devcmd_lock);
+       err = vnic_dev_add_addr(enic->vdev, addr);
+       spin_unlock(&enic->devcmd_lock);
+
+       return err;
+}
+
+int enic_dev_del_addr(struct enic *enic, u8 *addr)
+{
+       int err;
+
+       spin_lock(&enic->devcmd_lock);
+       err = vnic_dev_del_addr(enic->vdev, addr);
+       spin_unlock(&enic->devcmd_lock);
+
+       return err;
+}
+
+int enic_dev_notify_unset(struct enic *enic)
+{
+       int err;
+
+       spin_lock(&enic->devcmd_lock);
+       err = vnic_dev_notify_unset(enic->vdev);
+       spin_unlock(&enic->devcmd_lock);
+
+       return err;
+}
+
+int enic_dev_hang_notify(struct enic *enic)
+{
+       int err;
+
+       spin_lock(&enic->devcmd_lock);
+       err = vnic_dev_hang_notify(enic->vdev);
+       spin_unlock(&enic->devcmd_lock);
+
+       return err;
+}
+
+int enic_dev_set_ig_vlan_rewrite_mode(struct enic *enic)
+{
+       int err;
+
+       spin_lock(&enic->devcmd_lock);
+       err = vnic_dev_set_ig_vlan_rewrite_mode(enic->vdev,
+               IG_VLAN_REWRITE_MODE_PRIORITY_TAG_DEFAULT_VLAN);
+       spin_unlock(&enic->devcmd_lock);
+
+       return err;
+}
+
+int enic_dev_enable(struct enic *enic)
+{
+       int err;
+
+       spin_lock(&enic->devcmd_lock);
+       err = vnic_dev_enable_wait(enic->vdev);
+       spin_unlock(&enic->devcmd_lock);
+
+       return err;
+}
+
+int enic_dev_disable(struct enic *enic)
+{
+       int err;
+
+       spin_lock(&enic->devcmd_lock);
+       err = vnic_dev_disable(enic->vdev);
+       spin_unlock(&enic->devcmd_lock);
+
+       return err;
+}
+
+int enic_dev_intr_coal_timer_info(struct enic *enic)
+{
+       int err;
+
+       spin_lock(&enic->devcmd_lock);
+       err = vnic_dev_intr_coal_timer_info(enic->vdev);
+       spin_unlock(&enic->devcmd_lock);
+
+       return err;
+}
+
+int enic_vnic_dev_deinit(struct enic *enic)
+{
+       int err;
+
+       spin_lock(&enic->devcmd_lock);
+       err = vnic_dev_deinit(enic->vdev);
+       spin_unlock(&enic->devcmd_lock);
+
+       return err;
+}
+
+int enic_dev_init_prov2(struct enic *enic, struct vic_provinfo *vp)
+{
+       int err;
+
+       spin_lock(&enic->devcmd_lock);
+       err = vnic_dev_init_prov2(enic->vdev,
+               (u8 *)vp, vic_provinfo_size(vp));
+       spin_unlock(&enic->devcmd_lock);
+
+       return err;
+}
+
+int enic_dev_deinit_done(struct enic *enic, int *status)
+{
+       int err;
+
+       spin_lock(&enic->devcmd_lock);
+       err = vnic_dev_deinit_done(enic->vdev, status);
+       spin_unlock(&enic->devcmd_lock);
+
+       return err;
+}
+
+/* rtnl lock is held */
+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 */
+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);
+}
+
+int enic_dev_enable2(struct enic *enic, int active)
+{
+       int err;
+
+       spin_lock(&enic->devcmd_lock);
+       err = vnic_dev_enable2(enic->vdev, active);
+       spin_unlock(&enic->devcmd_lock);
+
+       return err;
+}
+
+int enic_dev_enable2_done(struct enic *enic, int *status)
+{
+       int err;
+
+       spin_lock(&enic->devcmd_lock);
+       err = vnic_dev_enable2_done(enic->vdev, status);
+       spin_unlock(&enic->devcmd_lock);
+
+       return err;
+}
+
+int enic_dev_status_to_errno(int devcmd_status)
+{
+       switch (devcmd_status) {
+       case ERR_SUCCESS:
+               return 0;
+       case ERR_EINVAL:
+               return -EINVAL;
+       case ERR_EFAULT:
+               return -EFAULT;
+       case ERR_EPERM:
+               return -EPERM;
+       case ERR_EBUSY:
+               return -EBUSY;
+       case ERR_ECMDUNKNOWN:
+       case ERR_ENOTSUPPORTED:
+               return -EOPNOTSUPP;
+       case ERR_EBADSTATE:
+               return -EINVAL;
+       case ERR_ENOMEM:
+               return -ENOMEM;
+       case ERR_ETIMEDOUT:
+               return -ETIMEDOUT;
+       case ERR_ELINKDOWN:
+               return -ENETDOWN;
+       case ERR_EINPROGRESS:
+               return -EINPROGRESS;
+       case ERR_EMAXRES:
+       default:
+               return (devcmd_status < 0) ? devcmd_status : -1;
+       }
+}
diff --git a/drivers/net/ethernet/cisco/enic/enic_dev.h b/drivers/net/ethernet/cisco/enic/enic_dev.h
new file mode 100644 (file)
index 0000000..ff8e87f
--- /dev/null
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2011 Cisco 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_DEV_H_
+#define _ENIC_DEV_H_
+
+int enic_dev_fw_info(struct enic *enic, struct vnic_devcmd_fw_info **fw_info);
+int enic_dev_stats_dump(struct enic *enic, struct vnic_stats **vstats);
+int enic_dev_add_station_addr(struct enic *enic);
+int enic_dev_del_station_addr(struct enic *enic);
+int enic_dev_packet_filter(struct enic *enic, int directed, int multicast,
+       int broadcast, int promisc, int allmulti);
+int enic_dev_add_addr(struct enic *enic, u8 *addr);
+int enic_dev_del_addr(struct enic *enic, u8 *addr);
+void enic_vlan_rx_add_vid(struct net_device *netdev, u16 vid);
+void enic_vlan_rx_kill_vid(struct net_device *netdev, u16 vid);
+int enic_dev_notify_unset(struct enic *enic);
+int enic_dev_hang_notify(struct enic *enic);
+int enic_dev_set_ig_vlan_rewrite_mode(struct enic *enic);
+int enic_dev_enable(struct enic *enic);
+int enic_dev_disable(struct enic *enic);
+int enic_dev_intr_coal_timer_info(struct enic *enic);
+int enic_vnic_dev_deinit(struct enic *enic);
+int enic_dev_init_prov2(struct enic *enic, struct vic_provinfo *vp);
+int enic_dev_deinit_done(struct enic *enic, int *status);
+int enic_dev_enable2(struct enic *enic, int arg);
+int enic_dev_enable2_done(struct enic *enic, int *status);
+int enic_dev_status_to_errno(int devcmd_status);
+
+#endif /* _ENIC_DEV_H_ */
diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c
new file mode 100644 (file)
index 0000000..67a27cd
--- /dev/null
@@ -0,0 +1,2513 @@
+/*
+ * Copyright 2008-2010 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/interrupt.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 <linux/rtnetlink.h>
+#include <linux/prefetch.h>
+#include <net/ip6_checksum.h>
+
+#include "cq_enet_desc.h"
+#include "vnic_dev.h"
+#include "vnic_intr.h"
+#include "vnic_stats.h"
+#include "vnic_vic.h"
+#include "enic_res.h"
+#include "enic.h"
+#include "enic_dev.h"
+#include "enic_pp.h"
+
+#define ENIC_NOTIFY_TIMER_PERIOD       (2 * HZ)
+#define WQ_ENET_MAX_DESC_LEN           (1 << WQ_ENET_LEN_BITS)
+#define MAX_TSO                                (1 << 16)
+#define ENIC_DESC_MAX_SPLITS           (MAX_TSO / WQ_ENET_MAX_DESC_LEN + 1)
+
+#define PCI_DEVICE_ID_CISCO_VIC_ENET         0x0043  /* ethernet vnic */
+#define PCI_DEVICE_ID_CISCO_VIC_ENET_DYN     0x0044  /* enet dynamic vnic */
+
+/* Supported devices */
+static DEFINE_PCI_DEVICE_TABLE(enic_id_table) = {
+       { PCI_VDEVICE(CISCO, PCI_DEVICE_ID_CISCO_VIC_ENET) },
+       { PCI_VDEVICE(CISCO, PCI_DEVICE_ID_CISCO_VIC_ENET_DYN) },
+       { 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_is_dynamic(struct enic *enic)
+{
+       return enic->pdev->device == PCI_DEVICE_ID_CISCO_VIC_ENET_DYN;
+}
+
+static inline unsigned int enic_cq_rq(struct enic *enic, unsigned int rq)
+{
+       return rq;
+}
+
+static inline unsigned int enic_cq_wq(struct enic *enic, unsigned int wq)
+{
+       return enic->rq_count + wq;
+}
+
+static inline unsigned int enic_legacy_io_intr(void)
+{
+       return 0;
+}
+
+static inline unsigned int enic_legacy_err_intr(void)
+{
+       return 1;
+}
+
+static inline unsigned int enic_legacy_notify_intr(void)
+{
+       return 2;
+}
+
+static inline unsigned int enic_msix_rq_intr(struct enic *enic, unsigned int rq)
+{
+       return enic->cq[enic_cq_rq(enic, rq)].interrupt_offset;
+}
+
+static inline unsigned int enic_msix_wq_intr(struct enic *enic, unsigned int wq)
+{
+       return enic->cq[enic_cq_wq(enic, wq)].interrupt_offset;
+}
+
+static inline unsigned int enic_msix_err_intr(struct enic *enic)
+{
+       return enic->rq_count + enic->wq_count;
+}
+
+static inline unsigned int enic_msix_notify_intr(struct enic *enic)
+{
+       return enic->rq_count + enic->wq_count + 1;
+}
+
+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)) {
+               ethtool_cmd_speed_set(ecmd, vnic_dev_port_speed(enic->vdev));
+               ecmd->duplex = DUPLEX_FULL;
+       } else {
+               ethtool_cmd_speed_set(ecmd, -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;
+
+       enic_dev_fw_info(enic, &fw_info);
+
+       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;
+
+       enic_dev_stats_dump(enic, &vstats);
+
+       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_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 int enic_get_coalesce(struct net_device *netdev,
+       struct ethtool_coalesce *ecmd)
+{
+       struct enic *enic = netdev_priv(netdev);
+
+       ecmd->tx_coalesce_usecs = enic->tx_coalesce_usecs;
+       ecmd->rx_coalesce_usecs = enic->rx_coalesce_usecs;
+
+       return 0;
+}
+
+static int enic_set_coalesce(struct net_device *netdev,
+       struct ethtool_coalesce *ecmd)
+{
+       struct enic *enic = netdev_priv(netdev);
+       u32 tx_coalesce_usecs;
+       u32 rx_coalesce_usecs;
+       unsigned int i, intr;
+
+       tx_coalesce_usecs = min_t(u32, ecmd->tx_coalesce_usecs,
+               vnic_dev_get_intr_coal_timer_max(enic->vdev));
+       rx_coalesce_usecs = min_t(u32, ecmd->rx_coalesce_usecs,
+               vnic_dev_get_intr_coal_timer_max(enic->vdev));
+
+       switch (vnic_dev_get_intr_mode(enic->vdev)) {
+       case VNIC_DEV_INTR_MODE_INTX:
+               if (tx_coalesce_usecs != rx_coalesce_usecs)
+                       return -EINVAL;
+
+               intr = enic_legacy_io_intr();
+               vnic_intr_coalescing_timer_set(&enic->intr[intr],
+                       tx_coalesce_usecs);
+               break;
+       case VNIC_DEV_INTR_MODE_MSI:
+               if (tx_coalesce_usecs != rx_coalesce_usecs)
+                       return -EINVAL;
+
+               vnic_intr_coalescing_timer_set(&enic->intr[0],
+                       tx_coalesce_usecs);
+               break;
+       case VNIC_DEV_INTR_MODE_MSIX:
+               for (i = 0; i < enic->wq_count; i++) {
+                       intr = enic_msix_wq_intr(enic, i);
+                       vnic_intr_coalescing_timer_set(&enic->intr[intr],
+                               tx_coalesce_usecs);
+               }
+
+               for (i = 0; i < enic->rq_count; i++) {
+                       intr = enic_msix_rq_intr(enic, i);
+                       vnic_intr_coalescing_timer_set(&enic->intr[intr],
+                               rx_coalesce_usecs);
+               }
+
+               break;
+       default:
+               break;
+       }
+
+       enic->tx_coalesce_usecs = tx_coalesce_usecs;
+       enic->rx_coalesce_usecs = rx_coalesce_usecs;
+
+       return 0;
+}
+
+static const 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_coalesce = enic_get_coalesce,
+       .set_coalesce = enic_set_coalesce,
+};
+
+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 + ENIC_DESC_MAX_SPLITS))
+               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)
+                       netdev_err(enic->netdev, "WQ[%d] error_status %d\n",
+                               i, error_status);
+       }
+
+       for (i = 0; i < enic->rq_count; i++) {
+               error_status = vnic_rq_error_status(&enic->rq[i]);
+               if (error_status)
+                       netdev_err(enic->netdev, "RQ[%d] error_status %d\n",
+                               i, error_status);
+       }
+}
+
+static void enic_msglvl_check(struct enic *enic)
+{
+       u32 msg_enable = vnic_dev_msg_lvl(enic->vdev);
+
+       if (msg_enable != enic->msg_enable) {
+               netdev_info(enic->netdev, "msg lvl changed from 0x%x to 0x%x\n",
+                       enic->msg_enable, msg_enable);
+               enic->msg_enable = msg_enable;
+       }
+}
+
+static void enic_mtu_check(struct enic *enic)
+{
+       u32 mtu = vnic_dev_mtu(enic->vdev);
+       struct net_device *netdev = enic->netdev;
+
+       if (mtu && mtu != enic->port_mtu) {
+               enic->port_mtu = mtu;
+               if (enic_is_dynamic(enic)) {
+                       mtu = max_t(int, ENIC_MIN_MTU,
+                               min_t(int, ENIC_MAX_MTU, mtu));
+                       if (mtu != netdev->mtu)
+                               schedule_work(&enic->change_mtu_work);
+               } else {
+                       if (mtu < netdev->mtu)
+                               netdev_warn(netdev,
+                                       "interface MTU (%d) set higher "
+                                       "than switch port MTU (%d)\n",
+                                       netdev->mtu, mtu);
+               }
+       }
+}
+
+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) {
+               netdev_info(enic->netdev, "Link UP\n");
+               netif_carrier_on(enic->netdev);
+       } else if (!link_status && carrier_ok) {
+               netdev_info(enic->netdev, "Link DOWN\n");
+               netif_carrier_off(enic->netdev);
+       }
+}
+
+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);
+       unsigned int io_intr = enic_legacy_io_intr();
+       unsigned int err_intr = enic_legacy_err_intr();
+       unsigned int notify_intr = enic_legacy_notify_intr();
+       u32 pba;
+
+       vnic_intr_mask(&enic->intr[io_intr]);
+
+       pba = vnic_intr_legacy_pba(enic->legacy_pba);
+       if (!pba) {
+               vnic_intr_unmask(&enic->intr[io_intr]);
+               return IRQ_NONE;        /* not our interrupt */
+       }
+
+       if (ENIC_TEST_INTR(pba, notify_intr)) {
+               vnic_intr_return_all_credits(&enic->intr[notify_intr]);
+               enic_notify_check(enic);
+       }
+
+       if (ENIC_TEST_INTR(pba, err_intr)) {
+               vnic_intr_return_all_credits(&enic->intr[err_intr]);
+               enic_log_q_error(enic);
+               /* schedule recovery from WQ/RQ error */
+               schedule_work(&enic->reset);
+               return IRQ_HANDLED;
+       }
+
+       if (ENIC_TEST_INTR(pba, io_intr)) {
+               if (napi_schedule_prep(&enic->napi[0]))
+                       __napi_schedule(&enic->napi[0]);
+       } else {
+               vnic_intr_unmask(&enic->intr[io_intr]);
+       }
+
+       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[0]);
+
+       return IRQ_HANDLED;
+}
+
+static irqreturn_t enic_isr_msix_rq(int irq, void *data)
+{
+       struct napi_struct *napi = data;
+
+       /* schedule NAPI polling for RQ cleanup */
+       napi_schedule(napi);
+
+       return IRQ_HANDLED;
+}
+
+static irqreturn_t enic_isr_msix_wq(int irq, void *data)
+{
+       struct enic *enic = data;
+       unsigned int cq = enic_cq_wq(enic, 0);
+       unsigned int intr = enic_msix_wq_intr(enic, 0);
+       unsigned int wq_work_to_do = -1; /* no limit */
+       unsigned int wq_work_done;
+
+       wq_work_done = vnic_cq_service(&enic->cq[cq],
+               wq_work_to_do, enic_wq_service, NULL);
+
+       vnic_intr_return_credits(&enic->intr[intr],
+               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;
+       unsigned int intr = enic_msix_err_intr(enic);
+
+       vnic_intr_return_all_credits(&enic->intr[intr]);
+
+       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;
+       unsigned int intr = enic_msix_notify_intr(enic);
+
+       vnic_intr_return_all_credits(&enic->intr[intr]);
+       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, int loopback)
+{
+       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? */
+                       loopback);
+       }
+}
+
+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, int loopback)
+{
+       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. The fragments are no larger
+        * than max MTU(9000)+ETH_HDR_LEN(14) bytes, which is less
+        * than WQ_ENET_MAX_DESC_LEN length. So only one descriptor
+        * per fragment is queued.
+        */
+       enic_queue_wq_desc(wq, skb,
+               pci_map_single(enic->pdev, skb->data,
+                       head_len, PCI_DMA_TODEVICE),
+               head_len,
+               vlan_tag_insert, vlan_tag,
+               eop, loopback);
+
+       if (!eop)
+               enic_queue_wq_skb_cont(enic, wq, skb, len_left, loopback);
+}
+
+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, int loopback)
+{
+       unsigned int head_len = skb_headlen(skb);
+       unsigned int len_left = skb->len - head_len;
+       unsigned int hdr_len = skb_checksum_start_offset(skb);
+       unsigned int csum_offset = hdr_len + skb->csum_offset;
+       int eop = (len_left == 0);
+
+       /* Queue the main skb fragment. The fragments are no larger
+        * than max MTU(9000)+ETH_HDR_LEN(14) bytes, which is less
+        * than WQ_ENET_MAX_DESC_LEN length. So only one descriptor
+        * per fragment is queued.
+        */
+       enic_queue_wq_desc_csum_l4(wq, skb,
+               pci_map_single(enic->pdev, skb->data,
+                       head_len, PCI_DMA_TODEVICE),
+               head_len,
+               csum_offset,
+               hdr_len,
+               vlan_tag_insert, vlan_tag,
+               eop, loopback);
+
+       if (!eop)
+               enic_queue_wq_skb_cont(enic, wq, skb, len_left, loopback);
+}
+
+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, int loopback)
+{
+       unsigned int frag_len_left = skb_headlen(skb);
+       unsigned int len_left = skb->len - frag_len_left;
+       unsigned int hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);
+       int eop = (len_left == 0);
+       unsigned int len;
+       dma_addr_t dma_addr;
+       unsigned int offset = 0;
+       skb_frag_t *frag;
+
+       /* Preload TCP csum field with IP pseudo hdr calculated
+        * with IP length set to zero.  HW will later add in length
+        * 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 WQ_ENET_MAX_DESC_LEN length descriptors
+        * for the main skb fragment
+        */
+       while (frag_len_left) {
+               len = min(frag_len_left, (unsigned int)WQ_ENET_MAX_DESC_LEN);
+               dma_addr = pci_map_single(enic->pdev, skb->data + offset,
+                               len, PCI_DMA_TODEVICE);
+               enic_queue_wq_desc_tso(wq, skb,
+                       dma_addr,
+                       len,
+                       mss, hdr_len,
+                       vlan_tag_insert, vlan_tag,
+                       eop && (len == frag_len_left), loopback);
+               frag_len_left -= len;
+               offset += len;
+       }
+
+       if (eop)
+               return;
+
+       /* Queue WQ_ENET_MAX_DESC_LEN length descriptors
+        * for additional data fragments
+        */
+       for (frag = skb_shinfo(skb)->frags; len_left; frag++) {
+               len_left -= frag->size;
+               frag_len_left = frag->size;
+               offset = frag->page_offset;
+
+               while (frag_len_left) {
+                       len = min(frag_len_left,
+                               (unsigned int)WQ_ENET_MAX_DESC_LEN);
+                       dma_addr = pci_map_page(enic->pdev, frag->page,
+                               offset, len,
+                               PCI_DMA_TODEVICE);
+                       enic_queue_wq_desc_cont(wq, skb,
+                               dma_addr,
+                               len,
+                               (len_left == 0) &&
+                               (len == frag_len_left),         /* EOP? */
+                               loopback);
+                       frag_len_left -= len;
+                       offset += len;
+               }
+       }
+}
+
+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;
+       int loopback = 0;
+
+       if (vlan_tx_tag_present(skb)) {
+               /* VLAN tag from trunking driver */
+               vlan_tag_insert = 1;
+               vlan_tag = vlan_tx_tag_get(skb);
+       } else if (enic->loop_enable) {
+               vlan_tag = enic->loop_tag;
+               loopback = 1;
+       }
+
+       if (mss)
+               enic_queue_wq_skb_tso(enic, wq, skb, mss,
+                       vlan_tag_insert, vlan_tag, loopback);
+       else if (skb->ip_summed == CHECKSUM_PARTIAL)
+               enic_queue_wq_skb_csum_l4(enic, wq, skb,
+                       vlan_tag_insert, vlan_tag, loopback);
+       else
+               enic_queue_wq_skb_vlan(enic, wq, skb,
+                       vlan_tag_insert, vlan_tag, loopback);
+}
+
+/* netif_tx_lock held, process context with BHs disabled, or BH */
+static netdev_tx_t 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 + ENIC_DESC_MAX_SPLITS) {
+               netif_stop_queue(netdev);
+               /* This is a hard error, log it */
+               netdev_err(netdev, "BUG! Tx ring full when queue awake!\n");
+               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 + ENIC_DESC_MAX_SPLITS)
+               netif_stop_queue(netdev);
+
+       spin_unlock_irqrestore(&enic->wq_lock[0], flags);
+
+       return NETDEV_TX_OK;
+}
+
+/* dev_base_lock rwlock held, nominally process context */
+static struct rtnl_link_stats64 *enic_get_stats(struct net_device *netdev,
+                                               struct rtnl_link_stats64 *net_stats)
+{
+       struct enic *enic = netdev_priv(netdev);
+       struct vnic_stats *stats;
+
+       enic_dev_stats_dump(enic, &stats);
+
+       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_over_errors = enic->rq_truncated_pkts;
+       net_stats->rx_crc_errors = enic->rq_bad_fcs;
+       net_stats->rx_dropped = stats->rx.rx_no_bufs + stats->rx.rx_drop;
+
+       return net_stats;
+}
+
+void enic_reset_addr_lists(struct enic *enic)
+{
+       enic->mc_count = 0;
+       enic->uc_count = 0;
+       enic->flags = 0;
+}
+
+static int enic_set_mac_addr(struct net_device *netdev, char *addr)
+{
+       struct enic *enic = netdev_priv(netdev);
+
+       if (enic_is_dynamic(enic)) {
+               if (!is_valid_ether_addr(addr) && !is_zero_ether_addr(addr))
+                       return -EADDRNOTAVAIL;
+       } else {
+               if (!is_valid_ether_addr(addr))
+                       return -EADDRNOTAVAIL;
+       }
+
+       memcpy(netdev->dev_addr, addr, netdev->addr_len);
+
+       return 0;
+}
+
+static int enic_set_mac_address_dynamic(struct net_device *netdev, void *p)
+{
+       struct enic *enic = netdev_priv(netdev);
+       struct sockaddr *saddr = p;
+       char *addr = saddr->sa_data;
+       int err;
+
+       if (netif_running(enic->netdev)) {
+               err = enic_dev_del_station_addr(enic);
+               if (err)
+                       return err;
+       }
+
+       err = enic_set_mac_addr(netdev, addr);
+       if (err)
+               return err;
+
+       if (netif_running(enic->netdev)) {
+               err = enic_dev_add_station_addr(enic);
+               if (err)
+                       return err;
+       }
+
+       return err;
+}
+
+static int enic_set_mac_address(struct net_device *netdev, void *p)
+{
+       struct sockaddr *saddr = p;
+       char *addr = saddr->sa_data;
+       struct enic *enic = netdev_priv(netdev);
+       int err;
+
+       err = enic_dev_del_station_addr(enic);
+       if (err)
+               return err;
+
+       err = enic_set_mac_addr(netdev, addr);
+       if (err)
+               return err;
+
+       return enic_dev_add_station_addr(enic);
+}
+
+static void enic_update_multicast_addr_list(struct enic *enic)
+{
+       struct net_device *netdev = enic->netdev;
+       struct netdev_hw_addr *ha;
+       unsigned int mc_count = netdev_mc_count(netdev);
+       u8 mc_addr[ENIC_MULTICAST_PERFECT_FILTERS][ETH_ALEN];
+       unsigned int i, j;
+
+       if (mc_count > ENIC_MULTICAST_PERFECT_FILTERS) {
+               netdev_warn(netdev, "Registering only %d out of %d "
+                       "multicast addresses\n",
+                       ENIC_MULTICAST_PERFECT_FILTERS, mc_count);
+               mc_count = ENIC_MULTICAST_PERFECT_FILTERS;
+       }
+
+       /* 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.
+        */
+
+       i = 0;
+       netdev_for_each_mc_addr(ha, netdev) {
+               if (i == mc_count)
+                       break;
+               memcpy(mc_addr[i++], ha->addr, ETH_ALEN);
+       }
+
+       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_dev_del_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_dev_add_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;
+}
+
+static void enic_update_unicast_addr_list(struct enic *enic)
+{
+       struct net_device *netdev = enic->netdev;
+       struct netdev_hw_addr *ha;
+       unsigned int uc_count = netdev_uc_count(netdev);
+       u8 uc_addr[ENIC_UNICAST_PERFECT_FILTERS][ETH_ALEN];
+       unsigned int i, j;
+
+       if (uc_count > ENIC_UNICAST_PERFECT_FILTERS) {
+               netdev_warn(netdev, "Registering only %d out of %d "
+                       "unicast addresses\n",
+                       ENIC_UNICAST_PERFECT_FILTERS, uc_count);
+               uc_count = ENIC_UNICAST_PERFECT_FILTERS;
+       }
+
+       /* Is there an easier way?  Trying to minimize to
+        * calls to add/del unicast addrs.  We keep the
+        * addrs from the last call in enic->uc_addr and
+        * look for changes to add/del.
+        */
+
+       i = 0;
+       netdev_for_each_uc_addr(ha, netdev) {
+               if (i == uc_count)
+                       break;
+               memcpy(uc_addr[i++], ha->addr, ETH_ALEN);
+       }
+
+       for (i = 0; i < enic->uc_count; i++) {
+               for (j = 0; j < uc_count; j++)
+                       if (compare_ether_addr(enic->uc_addr[i],
+                               uc_addr[j]) == 0)
+                               break;
+               if (j == uc_count)
+                       enic_dev_del_addr(enic, enic->uc_addr[i]);
+       }
+
+       for (i = 0; i < uc_count; i++) {
+               for (j = 0; j < enic->uc_count; j++)
+                       if (compare_ether_addr(uc_addr[i],
+                               enic->uc_addr[j]) == 0)
+                               break;
+               if (j == enic->uc_count)
+                       enic_dev_add_addr(enic, uc_addr[i]);
+       }
+
+       /* Save the list to compare against next time
+        */
+
+       for (i = 0; i < uc_count; i++)
+               memcpy(enic->uc_addr[i], uc_addr[i], ETH_ALEN);
+
+       enic->uc_count = uc_count;
+}
+
+/* netif_tx_lock held, BHs disabled */
+static void enic_set_rx_mode(struct net_device *netdev)
+{
+       struct enic *enic = netdev_priv(netdev);
+       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) ||
+               netdev_uc_count(netdev) > ENIC_UNICAST_PERFECT_FILTERS;
+       int allmulti = (netdev->flags & IFF_ALLMULTI) ||
+               netdev_mc_count(netdev) > ENIC_MULTICAST_PERFECT_FILTERS;
+       unsigned int flags = netdev->flags |
+               (allmulti ? IFF_ALLMULTI : 0) |
+               (promisc ? IFF_PROMISC : 0);
+
+       if (enic->flags != flags) {
+               enic->flags = flags;
+               enic_dev_packet_filter(enic, directed,
+                       multicast, broadcast, promisc, allmulti);
+       }
+
+       if (!promisc) {
+               enic_update_unicast_addr_list(enic);
+               if (!allmulti)
+                       enic_update_multicast_addr_list(enic);
+       }
+}
+
+/* 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 int enic_set_vf_mac(struct net_device *netdev, int vf, u8 *mac)
+{
+       struct enic *enic = netdev_priv(netdev);
+
+       if (vf != PORT_SELF_VF)
+               return -EOPNOTSUPP;
+
+       /* Ignore the vf argument for now. We can assume the request
+        * is coming on a vf.
+        */
+       if (is_valid_ether_addr(mac)) {
+               memcpy(enic->pp.vf_mac, mac, ETH_ALEN);
+               return 0;
+       } else
+               return -EINVAL;
+}
+
+static int enic_set_vf_port(struct net_device *netdev, int vf,
+       struct nlattr *port[])
+{
+       struct enic *enic = netdev_priv(netdev);
+       struct enic_port_profile prev_pp;
+       int err = 0, restore_pp = 1;
+
+       /* don't support VFs, yet */
+       if (vf != PORT_SELF_VF)
+               return -EOPNOTSUPP;
+
+       if (!port[IFLA_PORT_REQUEST])
+               return -EOPNOTSUPP;
+
+       memcpy(&prev_pp, &enic->pp, sizeof(enic->pp));
+       memset(&enic->pp, 0, sizeof(enic->pp));
+
+       enic->pp.set |= ENIC_SET_REQUEST;
+       enic->pp.request = nla_get_u8(port[IFLA_PORT_REQUEST]);
+
+       if (port[IFLA_PORT_PROFILE]) {
+               enic->pp.set |= ENIC_SET_NAME;
+               memcpy(enic->pp.name, nla_data(port[IFLA_PORT_PROFILE]),
+                       PORT_PROFILE_MAX);
+       }
+
+       if (port[IFLA_PORT_INSTANCE_UUID]) {
+               enic->pp.set |= ENIC_SET_INSTANCE;
+               memcpy(enic->pp.instance_uuid,
+                       nla_data(port[IFLA_PORT_INSTANCE_UUID]), PORT_UUID_MAX);
+       }
+
+       if (port[IFLA_PORT_HOST_UUID]) {
+               enic->pp.set |= ENIC_SET_HOST;
+               memcpy(enic->pp.host_uuid,
+                       nla_data(port[IFLA_PORT_HOST_UUID]), PORT_UUID_MAX);
+       }
+
+       /* Special case handling: mac came from IFLA_VF_MAC */
+       if (!is_zero_ether_addr(prev_pp.vf_mac))
+               memcpy(enic->pp.mac_addr, prev_pp.vf_mac, ETH_ALEN);
+
+               if (is_zero_ether_addr(netdev->dev_addr))
+                       random_ether_addr(netdev->dev_addr);
+
+       err = enic_process_set_pp_request(enic, &prev_pp, &restore_pp);
+       if (err) {
+               if (restore_pp) {
+                       /* Things are still the way they were: Implicit
+                        * DISASSOCIATE failed
+                        */
+                       memcpy(&enic->pp, &prev_pp, sizeof(enic->pp));
+               } else {
+                       memset(&enic->pp, 0, sizeof(enic->pp));
+                       memset(netdev->dev_addr, 0, ETH_ALEN);
+               }
+       } else {
+               /* Set flag to indicate that the port assoc/disassoc
+                * request has been sent out to fw
+                */
+               enic->pp.set |= ENIC_PORT_REQUEST_APPLIED;
+
+               /* If DISASSOCIATE, clean up all assigned/saved macaddresses */
+               if (enic->pp.request == PORT_REQUEST_DISASSOCIATE) {
+                       memset(enic->pp.mac_addr, 0, ETH_ALEN);
+                       memset(netdev->dev_addr, 0, ETH_ALEN);
+               }
+       }
+
+       memset(enic->pp.vf_mac, 0, ETH_ALEN);
+
+       return err;
+}
+
+static int enic_get_vf_port(struct net_device *netdev, int vf,
+       struct sk_buff *skb)
+{
+       struct enic *enic = netdev_priv(netdev);
+       u16 response = PORT_PROFILE_RESPONSE_SUCCESS;
+       int err;
+
+       if (!(enic->pp.set & ENIC_PORT_REQUEST_APPLIED))
+               return -ENODATA;
+
+       err = enic_process_get_pp_request(enic, enic->pp.request, &response);
+       if (err)
+               return err;
+
+       NLA_PUT_U16(skb, IFLA_PORT_REQUEST, enic->pp.request);
+       NLA_PUT_U16(skb, IFLA_PORT_RESPONSE, response);
+       if (enic->pp.set & ENIC_SET_NAME)
+               NLA_PUT(skb, IFLA_PORT_PROFILE, PORT_PROFILE_MAX,
+                       enic->pp.name);
+       if (enic->pp.set & ENIC_SET_INSTANCE)
+               NLA_PUT(skb, IFLA_PORT_INSTANCE_UUID, PORT_UUID_MAX,
+                       enic->pp.instance_uuid);
+       if (enic->pp.set & ENIC_SET_HOST)
+               NLA_PUT(skb, IFLA_PORT_HOST_UUID, PORT_UUID_MAX,
+                       enic->pp.host_uuid);
+
+       return 0;
+
+nla_put_failure:
+       return -EMSGSIZE;
+}
+
+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 int enic_rq_alloc_buf(struct vnic_rq *rq)
+{
+       struct enic *enic = vnic_dev_priv(rq->vdev);
+       struct net_device *netdev = enic->netdev;
+       struct sk_buff *skb;
+       unsigned int len = netdev->mtu + VLAN_ETH_HLEN;
+       unsigned int os_buf_index = 0;
+       dma_addr_t dma_addr;
+
+       skb = netdev_alloc_skb_ip_align(netdev, 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 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_tci, 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_tci, &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 (!fcs_ok) {
+                       if (bytes_written > 0)
+                               enic->rq_bad_fcs++;
+                       else if (bytes_written == 0)
+                               enic->rq_truncated_pkts++;
+               }
+
+               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 ((netdev->features & NETIF_F_RXCSUM) && !csum_not_calc) {
+                       skb->csum = htons(checksum);
+                       skb->ip_summed = CHECKSUM_COMPLETE;
+               }
+
+               skb->dev = netdev;
+
+               if (vlan_stripped)
+                       __vlan_hwaccel_put_tag(skb, vlan_tci);
+
+               if (netdev->features & NETIF_F_GRO)
+                       napi_gro_receive(&enic->napi[q_number], skb);
+               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 int enic_poll(struct napi_struct *napi, int budget)
+{
+       struct net_device *netdev = napi->dev;
+       struct enic *enic = netdev_priv(netdev);
+       unsigned int cq_rq = enic_cq_rq(enic, 0);
+       unsigned int cq_wq = enic_cq_wq(enic, 0);
+       unsigned int intr = enic_legacy_io_intr();
+       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;
+       int err;
+
+       /* Service RQ (first) and WQ
+        */
+
+       rq_work_done = vnic_cq_service(&enic->cq[cq_rq],
+               rq_work_to_do, enic_rq_service, NULL);
+
+       wq_work_done = vnic_cq_service(&enic->cq[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[intr],
+                       work_done,
+                       0 /* don't unmask intr */,
+                       0 /* don't reset intr timer */);
+
+       err = vnic_rq_fill(&enic->rq[0], enic_rq_alloc_buf);
+
+       /* Buffer allocation failed. Stay in polling
+        * mode so we can try to fill the ring again.
+        */
+
+       if (err)
+               rq_work_done = rq_work_to_do;
+
+       if (rq_work_done < rq_work_to_do) {
+
+               /* Some work done, but not enough to stay in polling,
+                * exit polling
+                */
+
+               napi_complete(napi);
+               vnic_intr_unmask(&enic->intr[intr]);
+       }
+
+       return rq_work_done;
+}
+
+static int enic_poll_msix(struct napi_struct *napi, int budget)
+{
+       struct net_device *netdev = napi->dev;
+       struct enic *enic = netdev_priv(netdev);
+       unsigned int rq = (napi - &enic->napi[0]);
+       unsigned int cq = enic_cq_rq(enic, rq);
+       unsigned int intr = enic_msix_rq_intr(enic, rq);
+       unsigned int work_to_do = budget;
+       unsigned int work_done;
+       int err;
+
+       /* Service RQ
+        */
+
+       work_done = vnic_cq_service(&enic->cq[cq],
+               work_to_do, enic_rq_service, NULL);
+
+       /* Return intr event credits for this polling
+        * cycle.  An intr event is the completion of a
+        * RQ packet.
+        */
+
+       if (work_done > 0)
+               vnic_intr_return_credits(&enic->intr[intr],
+                       work_done,
+                       0 /* don't unmask intr */,
+                       0 /* don't reset intr timer */);
+
+       err = vnic_rq_fill(&enic->rq[rq], enic_rq_alloc_buf);
+
+       /* Buffer allocation failed. Stay in polling mode
+        * so we can try to fill the ring again.
+        */
+
+       if (err)
+               work_done = work_to_do;
+
+       if (work_done < work_to_do) {
+
+               /* Some work done, but not enough to stay in polling,
+                * exit polling
+                */
+
+               napi_complete(napi);
+               vnic_intr_unmask(&enic->intr[intr]);
+       }
+
+       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, intr;
+       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:
+
+               for (i = 0; i < enic->rq_count; i++) {
+                       intr = enic_msix_rq_intr(enic, i);
+                       sprintf(enic->msix[intr].devname,
+                               "%.11s-rx-%d", netdev->name, i);
+                       enic->msix[intr].isr = enic_isr_msix_rq;
+                       enic->msix[intr].devid = &enic->napi[i];
+               }
+
+               for (i = 0; i < enic->wq_count; i++) {
+                       intr = enic_msix_wq_intr(enic, i);
+                       sprintf(enic->msix[intr].devname,
+                               "%.11s-tx-%d", netdev->name, i);
+                       enic->msix[intr].isr = enic_isr_msix_wq;
+                       enic->msix[intr].devid = enic;
+               }
+
+               intr = enic_msix_err_intr(enic);
+               sprintf(enic->msix[intr].devname,
+                       "%.11s-err", netdev->name);
+               enic->msix[intr].isr = enic_isr_msix_err;
+               enic->msix[intr].devid = enic;
+
+               intr = enic_msix_notify_intr(enic);
+               sprintf(enic->msix[intr].devname,
+                       "%.11s-notify", netdev->name);
+               enic->msix[intr].isr = enic_isr_msix_notify;
+               enic->msix[intr].devid = enic;
+
+               for (i = 0; i < ARRAY_SIZE(enic->msix); i++)
+                       enic->msix[i].requested = 0;
+
+               for (i = 0; i < enic->intr_count; 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 void enic_synchronize_irqs(struct enic *enic)
+{
+       unsigned int i;
+
+       switch (vnic_dev_get_intr_mode(enic->vdev)) {
+       case VNIC_DEV_INTR_MODE_INTX:
+       case VNIC_DEV_INTR_MODE_MSI:
+               synchronize_irq(enic->pdev->irq);
+               break;
+       case VNIC_DEV_INTR_MODE_MSIX:
+               for (i = 0; i < enic->intr_count; i++)
+                       synchronize_irq(enic->msix_entry[i].vector);
+               break;
+       default:
+               break;
+       }
+}
+
+static int enic_dev_notify_set(struct enic *enic)
+{
+       int err;
+
+       spin_lock(&enic->devcmd_lock);
+       switch (vnic_dev_get_intr_mode(enic->vdev)) {
+       case VNIC_DEV_INTR_MODE_INTX:
+               err = vnic_dev_notify_set(enic->vdev,
+                       enic_legacy_notify_intr());
+               break;
+       case VNIC_DEV_INTR_MODE_MSIX:
+               err = vnic_dev_notify_set(enic->vdev,
+                       enic_msix_notify_intr(enic));
+               break;
+       default:
+               err = vnic_dev_notify_set(enic->vdev, -1 /* no intr */);
+               break;
+       }
+       spin_unlock(&enic->devcmd_lock);
+
+       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) {
+               netdev_err(netdev, "Unable to request irq.\n");
+               return err;
+       }
+
+       err = enic_dev_notify_set(enic);
+       if (err) {
+               netdev_err(netdev,
+                       "Failed to alloc notify buffer, aborting.\n");
+               goto err_out_free_intr;
+       }
+
+       for (i = 0; i < enic->rq_count; i++) {
+               vnic_rq_fill(&enic->rq[i], enic_rq_alloc_buf);
+               /* Need at least one buffer on ring to get going */
+               if (vnic_rq_desc_used(&enic->rq[i]) == 0) {
+                       netdev_err(netdev, "Unable to alloc receive buffers\n");
+                       err = -ENOMEM;
+                       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]);
+
+       if (enic_is_dynamic(enic) && !is_zero_ether_addr(enic->pp.mac_addr))
+               enic_dev_add_addr(enic, enic->pp.mac_addr);
+       else
+               enic_dev_add_station_addr(enic);
+       enic_set_rx_mode(netdev);
+
+       netif_wake_queue(netdev);
+
+       for (i = 0; i < enic->rq_count; i++)
+               napi_enable(&enic->napi[i]);
+
+       enic_dev_enable(enic);
+
+       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:
+       enic_dev_notify_unset(enic);
+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;
+
+       for (i = 0; i < enic->intr_count; i++) {
+               vnic_intr_mask(&enic->intr[i]);
+               (void)vnic_intr_masked(&enic->intr[i]); /* flush write */
+       }
+
+       enic_synchronize_irqs(enic);
+
+       del_timer_sync(&enic->notify_timer);
+
+       enic_dev_disable(enic);
+
+       for (i = 0; i < enic->rq_count; i++)
+               napi_disable(&enic->napi[i]);
+
+       netif_carrier_off(netdev);
+       netif_tx_disable(netdev);
+       if (enic_is_dynamic(enic) && !is_zero_ether_addr(enic->pp.mac_addr))
+               enic_dev_del_addr(enic, enic->pp.mac_addr);
+       else
+               enic_dev_del_station_addr(enic);
+
+       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;
+       }
+
+       enic_dev_notify_unset(enic);
+       enic_free_intr(enic);
+
+       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 (enic_is_dynamic(enic))
+               return -EOPNOTSUPP;
+
+       if (running)
+               enic_stop(netdev);
+
+       netdev->mtu = new_mtu;
+
+       if (netdev->mtu > enic->port_mtu)
+               netdev_warn(netdev,
+                       "interface MTU (%d) set higher than port MTU (%d)\n",
+                       netdev->mtu, enic->port_mtu);
+
+       if (running)
+               enic_open(netdev);
+
+       return 0;
+}
+
+static void enic_change_mtu_work(struct work_struct *work)
+{
+       struct enic *enic = container_of(work, struct enic, change_mtu_work);
+       struct net_device *netdev = enic->netdev;
+       int new_mtu = vnic_dev_mtu(enic->vdev);
+       int err;
+       unsigned int i;
+
+       new_mtu = max_t(int, ENIC_MIN_MTU, min_t(int, ENIC_MAX_MTU, new_mtu));
+
+       rtnl_lock();
+
+       /* Stop RQ */
+       del_timer_sync(&enic->notify_timer);
+
+       for (i = 0; i < enic->rq_count; i++)
+               napi_disable(&enic->napi[i]);
+
+       vnic_intr_mask(&enic->intr[0]);
+       enic_synchronize_irqs(enic);
+       err = vnic_rq_disable(&enic->rq[0]);
+       if (err) {
+               netdev_err(netdev, "Unable to disable RQ.\n");
+               return;
+       }
+       vnic_rq_clean(&enic->rq[0], enic_free_rq_buf);
+       vnic_cq_clean(&enic->cq[0]);
+       vnic_intr_clean(&enic->intr[0]);
+
+       /* Fill RQ with new_mtu-sized buffers */
+       netdev->mtu = new_mtu;
+       vnic_rq_fill(&enic->rq[0], enic_rq_alloc_buf);
+       /* Need at least one buffer on ring to get going */
+       if (vnic_rq_desc_used(&enic->rq[0]) == 0) {
+               netdev_err(netdev, "Unable to alloc receive buffers.\n");
+               return;
+       }
+
+       /* Start RQ */
+       vnic_rq_enable(&enic->rq[0]);
+       napi_enable(&enic->napi[0]);
+       vnic_intr_unmask(&enic->intr[0]);
+       enic_notify_timer_start(enic);
+
+       rtnl_unlock();
+
+       netdev_info(netdev, "interface MTU set as %d\n", netdev->mtu);
+}
+
+#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;
+       unsigned int i, intr;
+
+       switch (vnic_dev_get_intr_mode(vdev)) {
+       case VNIC_DEV_INTR_MODE_MSIX:
+               for (i = 0; i < enic->rq_count; i++) {
+                       intr = enic_msix_rq_intr(enic, i);
+                       enic_isr_msix_rq(enic->msix_entry[intr].vector,
+                               &enic->napi[i]);
+               }
+
+               for (i = 0; i < enic->wq_count; i++) {
+                       intr = enic_msix_wq_intr(enic, i);
+                       enic_isr_msix_wq(enic->msix_entry[intr].vector, 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)
+               dev_err(enic_get_dev(enic), "vNIC device open failed, err %d\n",
+                       err);
+
+       return err;
+}
+
+static int enic_dev_hang_reset(struct enic *enic)
+{
+       int err;
+
+       err = enic_dev_wait(enic->vdev, vnic_dev_hang_reset,
+               vnic_dev_hang_reset_done, 0);
+       if (err)
+               netdev_err(enic->netdev, "vNIC hang reset failed, err %d\n",
+                       err);
+
+       return err;
+}
+
+static int enic_set_rsskey(struct enic *enic)
+{
+       dma_addr_t rss_key_buf_pa;
+       union vnic_rss_key *rss_key_buf_va = NULL;
+       union vnic_rss_key rss_key = {
+               .key[0].b = {85, 67, 83, 97, 119, 101, 115, 111, 109, 101},
+               .key[1].b = {80, 65, 76, 79, 117, 110, 105, 113, 117, 101},
+               .key[2].b = {76, 73, 78, 85, 88, 114, 111, 99, 107, 115},
+               .key[3].b = {69, 78, 73, 67, 105, 115, 99, 111, 111, 108},
+       };
+       int err;
+
+       rss_key_buf_va = pci_alloc_consistent(enic->pdev,
+               sizeof(union vnic_rss_key), &rss_key_buf_pa);
+       if (!rss_key_buf_va)
+               return -ENOMEM;
+
+       memcpy(rss_key_buf_va, &rss_key, sizeof(union vnic_rss_key));
+
+       spin_lock(&enic->devcmd_lock);
+       err = enic_set_rss_key(enic,
+               rss_key_buf_pa,
+               sizeof(union vnic_rss_key));
+       spin_unlock(&enic->devcmd_lock);
+
+       pci_free_consistent(enic->pdev, sizeof(union vnic_rss_key),
+               rss_key_buf_va, rss_key_buf_pa);
+
+       return err;
+}
+
+static int enic_set_rsscpu(struct enic *enic, u8 rss_hash_bits)
+{
+       dma_addr_t rss_cpu_buf_pa;
+       union vnic_rss_cpu *rss_cpu_buf_va = NULL;
+       unsigned int i;
+       int err;
+
+       rss_cpu_buf_va = pci_alloc_consistent(enic->pdev,
+               sizeof(union vnic_rss_cpu), &rss_cpu_buf_pa);
+       if (!rss_cpu_buf_va)
+               return -ENOMEM;
+
+       for (i = 0; i < (1 << rss_hash_bits); i++)
+               (*rss_cpu_buf_va).cpu[i/4].b[i%4] = i % enic->rq_count;
+
+       spin_lock(&enic->devcmd_lock);
+       err = enic_set_rss_cpu(enic,
+               rss_cpu_buf_pa,
+               sizeof(union vnic_rss_cpu));
+       spin_unlock(&enic->devcmd_lock);
+
+       pci_free_consistent(enic->pdev, sizeof(union vnic_rss_cpu),
+               rss_cpu_buf_va, rss_cpu_buf_pa);
+
+       return err;
+}
+
+static int enic_set_niccfg(struct enic *enic, u8 rss_default_cpu,
+       u8 rss_hash_type, u8 rss_hash_bits, u8 rss_base_cpu, u8 rss_enable)
+{
+       const u8 tso_ipid_split_en = 0;
+       const u8 ig_vlan_strip_en = 1;
+       int err;
+
+       /* Enable VLAN tag stripping.
+       */
+
+       spin_lock(&enic->devcmd_lock);
+       err = 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);
+       spin_unlock(&enic->devcmd_lock);
+
+       return err;
+}
+
+static int enic_set_rss_nic_cfg(struct enic *enic)
+{
+       struct device *dev = enic_get_dev(enic);
+       const u8 rss_default_cpu = 0;
+       const u8 rss_hash_type = NIC_CFG_RSS_HASH_TYPE_IPV4 |
+               NIC_CFG_RSS_HASH_TYPE_TCP_IPV4 |
+               NIC_CFG_RSS_HASH_TYPE_IPV6 |
+               NIC_CFG_RSS_HASH_TYPE_TCP_IPV6;
+       const u8 rss_hash_bits = 7;
+       const u8 rss_base_cpu = 0;
+       u8 rss_enable = ENIC_SETTING(enic, RSS) && (enic->rq_count > 1);
+
+       if (rss_enable) {
+               if (!enic_set_rsskey(enic)) {
+                       if (enic_set_rsscpu(enic, rss_hash_bits)) {
+                               rss_enable = 0;
+                               dev_warn(dev, "RSS disabled, "
+                                       "Failed to set RSS cpu indirection table.");
+                       }
+               } else {
+                       rss_enable = 0;
+                       dev_warn(dev, "RSS disabled, Failed to set RSS key.\n");
+               }
+       }
+
+       return enic_set_niccfg(enic, rss_default_cpu, rss_hash_type,
+               rss_hash_bits, rss_base_cpu, rss_enable);
+}
+
+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();
+
+       enic_dev_hang_notify(enic);
+       enic_stop(enic->netdev);
+       enic_dev_hang_reset(enic);
+       enic_reset_addr_lists(enic);
+       enic_init_vnic_resources(enic);
+       enic_set_rss_nic_cfg(enic);
+       enic_dev_set_ig_vlan_rewrite_mode(enic);
+       enic_open(enic->netdev);
+
+       rtnl_unlock();
+}
+
+static int enic_set_intr_mode(struct enic *enic)
+{
+       unsigned int n = min_t(unsigned int, enic->rq_count, ENIC_RQ_MAX);
+       unsigned int m = min_t(unsigned int, enic->wq_count, ENIC_WQ_MAX);
+       unsigned int i;
+
+       /* Set interrupt mode (INTx, MSI, MSI-X) depending
+        * on 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;
+
+       /* Use multiple RQs if RSS is enabled
+        */
+
+       if (ENIC_SETTING(enic, RSS) &&
+           enic->config.intr_mode < 1 &&
+           enic->rq_count >= n &&
+           enic->wq_count >= m &&
+           enic->cq_count >= n + m &&
+           enic->intr_count >= n + m + 2) {
+
+               if (!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;
+               }
+       }
+
+       if (enic->config.intr_mode < 1 &&
+           enic->rq_count >= 1 &&
+           enic->wq_count >= m &&
+           enic->cq_count >= 1 + m &&
+           enic->intr_count >= 1 + m + 2) {
+               if (!pci_enable_msix(enic->pdev, enic->msix_entry, 1 + m + 2)) {
+
+                       enic->rq_count = 1;
+                       enic->wq_count = m;
+                       enic->cq_count = 1 + m;
+                       enic->intr_count = 1 + 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 const struct net_device_ops enic_netdev_dynamic_ops = {
+       .ndo_open               = enic_open,
+       .ndo_stop               = enic_stop,
+       .ndo_start_xmit         = enic_hard_start_xmit,
+       .ndo_get_stats64        = enic_get_stats,
+       .ndo_validate_addr      = eth_validate_addr,
+       .ndo_set_rx_mode        = enic_set_rx_mode,
+       .ndo_set_multicast_list = enic_set_rx_mode,
+       .ndo_set_mac_address    = enic_set_mac_address_dynamic,
+       .ndo_change_mtu         = enic_change_mtu,
+       .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,
+       .ndo_set_vf_port        = enic_set_vf_port,
+       .ndo_get_vf_port        = enic_get_vf_port,
+       .ndo_set_vf_mac         = enic_set_vf_mac,
+#ifdef CONFIG_NET_POLL_CONTROLLER
+       .ndo_poll_controller    = enic_poll_controller,
+#endif
+};
+
+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_stats64        = enic_get_stats,
+       .ndo_validate_addr      = eth_validate_addr,
+       .ndo_set_mac_address    = enic_set_mac_address,
+       .ndo_set_rx_mode        = enic_set_rx_mode,
+       .ndo_set_multicast_list = enic_set_rx_mode,
+       .ndo_change_mtu         = enic_change_mtu,
+       .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 void enic_dev_deinit(struct enic *enic)
+{
+       unsigned int i;
+
+       for (i = 0; i < enic->rq_count; i++)
+               netif_napi_del(&enic->napi[i]);
+
+       enic_free_vnic_resources(enic);
+       enic_clear_intr_mode(enic);
+}
+
+static int enic_dev_init(struct enic *enic)
+{
+       struct device *dev = enic_get_dev(enic);
+       struct net_device *netdev = enic->netdev;
+       unsigned int i;
+       int err;
+
+       /* Get interrupt coalesce timer info */
+       err = enic_dev_intr_coal_timer_info(enic);
+       if (err) {
+               dev_warn(dev, "Using default conversion factor for "
+                       "interrupt coalesce timer\n");
+               vnic_dev_intr_coal_timer_info_default(enic->vdev);
+       }
+
+       /* Get vNIC configuration
+        */
+
+       err = enic_get_vnic_config(enic);
+       if (err) {
+               dev_err(dev, "Get vNIC configuration failed, aborting\n");
+               return err;
+       }
+
+       /* Get available resource counts
+        */
+
+       enic_get_res_counts(enic);
+
+       /* Set interrupt mode based on resource counts and system
+        * capabilities
+        */
+
+       err = enic_set_intr_mode(enic);
+       if (err) {
+               dev_err(dev, "Failed to set intr mode based on resource "
+                       "counts and system capabilities, aborting\n");
+               return err;
+       }
+
+       /* Allocate and configure vNIC resources
+        */
+
+       err = enic_alloc_vnic_resources(enic);
+       if (err) {
+               dev_err(dev, "Failed to alloc vNIC resources, aborting\n");
+               goto err_out_free_vnic_resources;
+       }
+
+       enic_init_vnic_resources(enic);
+
+       err = enic_set_rss_nic_cfg(enic);
+       if (err) {
+               dev_err(dev, "Failed to config nic, aborting\n");
+               goto err_out_free_vnic_resources;
+       }
+
+       switch (vnic_dev_get_intr_mode(enic->vdev)) {
+       default:
+               netif_napi_add(netdev, &enic->napi[0], enic_poll, 64);
+               break;
+       case VNIC_DEV_INTR_MODE_MSIX:
+               for (i = 0; i < enic->rq_count; i++)
+                       netif_napi_add(netdev, &enic->napi[i],
+                               enic_poll_msix, 64);
+               break;
+       }
+
+       return 0;
+
+err_out_free_vnic_resources:
+       enic_clear_intr_mode(enic);
+       enic_free_vnic_resources(enic);
+
+       return err;
+}
+
+static void enic_iounmap(struct enic *enic)
+{
+       unsigned int i;
+
+       for (i = 0; i < ARRAY_SIZE(enic->bar); i++)
+               if (enic->bar[i].vaddr)
+                       iounmap(enic->bar[i].vaddr);
+}
+
+static int __devinit enic_probe(struct pci_dev *pdev,
+       const struct pci_device_id *ent)
+{
+       struct device *dev = &pdev->dev;
+       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) {
+               pr_err("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_mem(pdev);
+       if (err) {
+               dev_err(dev, "Cannot enable PCI device, aborting\n");
+               goto err_out_free_netdev;
+       }
+
+       err = pci_request_regions(pdev, DRV_NAME);
+       if (err) {
+               dev_err(dev, "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) {
+                       dev_err(dev, "No usable DMA configuration, aborting\n");
+                       goto err_out_release_regions;
+               }
+               err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
+               if (err) {
+                       dev_err(dev, "Unable to obtain %u-bit DMA "
+                               "for consistent allocations, aborting\n", 32);
+                       goto err_out_release_regions;
+               }
+       } else {
+               err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(40));
+               if (err) {
+                       dev_err(dev, "Unable to obtain %u-bit DMA "
+                               "for consistent allocations, aborting\n", 40);
+                       goto err_out_release_regions;
+               }
+               using_dac = 1;
+       }
+
+       /* Map vNIC resources from BAR0-5
+        */
+
+       for (i = 0; i < ARRAY_SIZE(enic->bar); i++) {
+               if (!(pci_resource_flags(pdev, i) & IORESOURCE_MEM))
+                       continue;
+               enic->bar[i].len = pci_resource_len(pdev, i);
+               enic->bar[i].vaddr = pci_iomap(pdev, i, enic->bar[i].len);
+               if (!enic->bar[i].vaddr) {
+                       dev_err(dev, "Cannot memory-map BAR %d, aborting\n", i);
+                       err = -ENODEV;
+                       goto err_out_iounmap;
+               }
+               enic->bar[i].bus_addr = pci_resource_start(pdev, i);
+       }
+
+       /* Register vNIC device
+        */
+
+       enic->vdev = vnic_dev_register(NULL, enic, pdev, enic->bar,
+               ARRAY_SIZE(enic->bar));
+       if (!enic->vdev) {
+               dev_err(dev, "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) {
+               dev_err(dev, "vNIC dev open failed, aborting\n");
+               goto err_out_vnic_unregister;
+       }
+
+       /* Setup devcmd lock
+        */
+
+       spin_lock_init(&enic->devcmd_lock);
+
+       /*
+        * Set ingress vlan rewrite mode before vnic initialization
+        */
+
+       err = enic_dev_set_ig_vlan_rewrite_mode(enic);
+       if (err) {
+               dev_err(dev,
+                       "Failed to set ingress vlan rewrite mode, aborting.\n");
+               goto err_out_dev_close;
+       }
+
+       /* 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);
+
+       /* Do not call dev_init for a dynamic vnic.
+        * For a dynamic vnic, init_prov_info will be
+        * called later by an upper layer.
+        */
+
+       if (!enic_is_dynamic(enic)) {
+               err = vnic_dev_init(enic->vdev, 0);
+               if (err) {
+                       dev_err(dev, "vNIC dev init failed, aborting\n");
+                       goto err_out_dev_close;
+               }
+       }
+
+       err = enic_dev_init(enic);
+       if (err) {
+               dev_err(dev, "Device initialization failed, aborting\n");
+               goto err_out_dev_close;
+       }
+
+       /* Setup notification timer, HW reset task, and wq 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);
+       INIT_WORK(&enic->change_mtu_work, enic_change_mtu_work);
+
+       for (i = 0; i < enic->wq_count; i++)
+               spin_lock_init(&enic->wq_lock[i]);
+
+       /* 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) {
+               dev_err(dev, "Invalid MAC address, aborting\n");
+               goto err_out_dev_deinit;
+       }
+
+       enic->tx_coalesce_usecs = enic->config.intr_timer_usec;
+       enic->rx_coalesce_usecs = enic->tx_coalesce_usecs;
+
+       if (enic_is_dynamic(enic))
+               netdev->netdev_ops = &enic_netdev_dynamic_ops;
+       else
+               netdev->netdev_ops = &enic_netdev_ops;
+
+       netdev->watchdog_timeo = 2 * HZ;
+       netdev->ethtool_ops = &enic_ethtool_ops;
+
+       netdev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
+       if (ENIC_SETTING(enic, LOOP)) {
+               netdev->features &= ~NETIF_F_HW_VLAN_TX;
+               enic->loop_enable = 1;
+               enic->loop_tag = enic->config.loop_tag;
+               dev_info(dev, "loopback tag=0x%04x\n", enic->loop_tag);
+       }
+       if (ENIC_SETTING(enic, TXCSUM))
+               netdev->hw_features |= NETIF_F_SG | NETIF_F_HW_CSUM;
+       if (ENIC_SETTING(enic, TSO))
+               netdev->hw_features |= NETIF_F_TSO |
+                       NETIF_F_TSO6 | NETIF_F_TSO_ECN;
+       if (ENIC_SETTING(enic, RXCSUM))
+               netdev->hw_features |= NETIF_F_RXCSUM;
+
+       netdev->features |= netdev->hw_features;
+
+       if (using_dac)
+               netdev->features |= NETIF_F_HIGHDMA;
+
+       err = register_netdev(netdev);
+       if (err) {
+               dev_err(dev, "Cannot register net device, aborting\n");
+               goto err_out_dev_deinit;
+       }
+
+       return 0;
+
+err_out_dev_deinit:
+       enic_dev_deinit(enic);
+err_out_dev_close:
+       vnic_dev_close(enic->vdev);
+err_out_vnic_unregister:
+       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);
+
+               cancel_work_sync(&enic->reset);
+               cancel_work_sync(&enic->change_mtu_work);
+               unregister_netdev(netdev);
+               enic_dev_deinit(enic);
+               vnic_dev_close(enic->vdev);
+               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)
+{
+       pr_info("%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/ethernet/cisco/enic/enic_pp.c b/drivers/net/ethernet/cisco/enic/enic_pp.c
new file mode 100644 (file)
index 0000000..ffaa75d
--- /dev/null
@@ -0,0 +1,264 @@
+/*
+ * Copyright 2011 Cisco 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/string.h>
+#include <linux/errno.h>
+#include <linux/types.h>
+#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
+#include <linux/rtnetlink.h>
+#include <net/ip.h>
+
+#include "vnic_vic.h"
+#include "enic_res.h"
+#include "enic.h"
+#include "enic_dev.h"
+
+static int enic_set_port_profile(struct enic *enic)
+{
+       struct net_device *netdev = enic->netdev;
+       struct vic_provinfo *vp;
+       const u8 oui[3] = VIC_PROVINFO_CISCO_OUI;
+       const u16 os_type = htons(VIC_GENERIC_PROV_OS_TYPE_LINUX);
+       char uuid_str[38];
+       char client_mac_str[18];
+       u8 *client_mac;
+       int err;
+
+       if (!(enic->pp.set & ENIC_SET_NAME) || !strlen(enic->pp.name))
+               return -EINVAL;
+
+       vp = vic_provinfo_alloc(GFP_KERNEL, oui,
+               VIC_PROVINFO_GENERIC_TYPE);
+       if (!vp)
+               return -ENOMEM;
+
+       VIC_PROVINFO_ADD_TLV(vp,
+               VIC_GENERIC_PROV_TLV_PORT_PROFILE_NAME_STR,
+               strlen(enic->pp.name) + 1, enic->pp.name);
+
+       if (!is_zero_ether_addr(enic->pp.mac_addr))
+               client_mac = enic->pp.mac_addr;
+       else
+               client_mac = netdev->dev_addr;
+
+       VIC_PROVINFO_ADD_TLV(vp,
+               VIC_GENERIC_PROV_TLV_CLIENT_MAC_ADDR,
+               ETH_ALEN, client_mac);
+
+       snprintf(client_mac_str, sizeof(client_mac_str), "%pM", client_mac);
+       VIC_PROVINFO_ADD_TLV(vp,
+               VIC_GENERIC_PROV_TLV_CLUSTER_PORT_UUID_STR,
+               sizeof(client_mac_str), client_mac_str);
+
+       if (enic->pp.set & ENIC_SET_INSTANCE) {
+               sprintf(uuid_str, "%pUB", enic->pp.instance_uuid);
+               VIC_PROVINFO_ADD_TLV(vp,
+                       VIC_GENERIC_PROV_TLV_CLIENT_UUID_STR,
+                       sizeof(uuid_str), uuid_str);
+       }
+
+       if (enic->pp.set & ENIC_SET_HOST) {
+               sprintf(uuid_str, "%pUB", enic->pp.host_uuid);
+               VIC_PROVINFO_ADD_TLV(vp,
+                       VIC_GENERIC_PROV_TLV_HOST_UUID_STR,
+                       sizeof(uuid_str), uuid_str);
+       }
+
+       VIC_PROVINFO_ADD_TLV(vp,
+               VIC_GENERIC_PROV_TLV_OS_TYPE,
+               sizeof(os_type), &os_type);
+
+       err = enic_dev_status_to_errno(enic_dev_init_prov2(enic, vp));
+
+add_tlv_failure:
+       vic_provinfo_free(vp);
+
+       return err;
+}
+
+static int enic_unset_port_profile(struct enic *enic)
+{
+       int err;
+
+       err = enic_vnic_dev_deinit(enic);
+       if (err)
+               return enic_dev_status_to_errno(err);
+
+       enic_reset_addr_lists(enic);
+
+       return 0;
+}
+
+static int enic_are_pp_different(struct enic_port_profile *pp1,
+               struct enic_port_profile *pp2)
+{
+       return strcmp(pp1->name, pp2->name) | !!memcmp(pp1->instance_uuid,
+               pp2->instance_uuid, PORT_UUID_MAX) |
+               !!memcmp(pp1->host_uuid, pp2->host_uuid, PORT_UUID_MAX) |
+               !!memcmp(pp1->mac_addr, pp2->mac_addr, ETH_ALEN);
+}
+
+static int enic_pp_preassociate(struct enic *enic,
+       struct enic_port_profile *prev_pp, int *restore_pp);
+static int enic_pp_disassociate(struct enic *enic,
+       struct enic_port_profile *prev_pp, int *restore_pp);
+static int enic_pp_preassociate_rr(struct enic *enic,
+       struct enic_port_profile *prev_pp, int *restore_pp);
+static int enic_pp_associate(struct enic *enic,
+       struct enic_port_profile *prev_pp, int *restore_pp);
+
+static int (*enic_pp_handlers[])(struct enic *enic,
+               struct enic_port_profile *prev_state, int *restore_pp) = {
+       [PORT_REQUEST_PREASSOCIATE]     = enic_pp_preassociate,
+       [PORT_REQUEST_PREASSOCIATE_RR]  = enic_pp_preassociate_rr,
+       [PORT_REQUEST_ASSOCIATE]        = enic_pp_associate,
+       [PORT_REQUEST_DISASSOCIATE]     = enic_pp_disassociate,
+};
+
+static const int enic_pp_handlers_count =
+                       sizeof(enic_pp_handlers)/sizeof(*enic_pp_handlers);
+
+static int enic_pp_preassociate(struct enic *enic,
+       struct enic_port_profile *prev_pp, int *restore_pp)
+{
+       return -EOPNOTSUPP;
+}
+
+static int enic_pp_disassociate(struct enic *enic,
+       struct enic_port_profile *prev_pp, int *restore_pp)
+{
+       return enic_unset_port_profile(enic);
+}
+
+static int enic_pp_preassociate_rr(struct enic *enic,
+       struct enic_port_profile *prev_pp, int *restore_pp)
+{
+       int err;
+       int active = 0;
+
+       if (enic->pp.request != PORT_REQUEST_ASSOCIATE) {
+               /* If pre-associate is not part of an associate.
+               We always disassociate first */
+               err = enic_pp_handlers[PORT_REQUEST_DISASSOCIATE](enic,
+                       prev_pp, restore_pp);
+               if (err)
+                       return err;
+
+               *restore_pp = 0;
+       }
+
+       *restore_pp = 0;
+
+       err = enic_set_port_profile(enic);
+       if (err)
+               return err;
+
+       /* If pre-associate is not part of an associate. */
+       if (enic->pp.request != PORT_REQUEST_ASSOCIATE)
+               err = enic_dev_status_to_errno(enic_dev_enable2(enic, active));
+
+       return err;
+}
+
+static int enic_pp_associate(struct enic *enic,
+       struct enic_port_profile *prev_pp, int *restore_pp)
+{
+       int err;
+       int active = 1;
+
+       /* Check if a pre-associate was called before */
+       if (prev_pp->request != PORT_REQUEST_PREASSOCIATE_RR ||
+               (prev_pp->request == PORT_REQUEST_PREASSOCIATE_RR &&
+                       enic_are_pp_different(prev_pp, &enic->pp))) {
+               err = enic_pp_handlers[PORT_REQUEST_DISASSOCIATE](
+                       enic, prev_pp, restore_pp);
+               if (err)
+                       return err;
+
+               *restore_pp = 0;
+       }
+
+       err = enic_pp_handlers[PORT_REQUEST_PREASSOCIATE_RR](
+                       enic, prev_pp, restore_pp);
+       if (err)
+               return err;
+
+       *restore_pp = 0;
+
+       return enic_dev_status_to_errno(enic_dev_enable2(enic, active));
+}
+
+int enic_process_set_pp_request(struct enic *enic,
+       struct enic_port_profile *prev_pp, int *restore_pp)
+{
+       if (enic->pp.request < enic_pp_handlers_count
+               && enic_pp_handlers[enic->pp.request])
+               return enic_pp_handlers[enic->pp.request](enic,
+                       prev_pp, restore_pp);
+       else
+               return -EOPNOTSUPP;
+}
+
+int enic_process_get_pp_request(struct enic *enic, int request,
+       u16 *response)
+{
+       int err, status = ERR_SUCCESS;
+
+       switch (request) {
+
+       case PORT_REQUEST_PREASSOCIATE_RR:
+       case PORT_REQUEST_ASSOCIATE:
+               err = enic_dev_enable2_done(enic, &status);
+               break;
+
+       case PORT_REQUEST_DISASSOCIATE:
+               err = enic_dev_deinit_done(enic, &status);
+               break;
+
+       default:
+               return -EINVAL;
+       }
+
+       if (err)
+               status = err;
+
+       switch (status) {
+       case ERR_SUCCESS:
+               *response = PORT_PROFILE_RESPONSE_SUCCESS;
+               break;
+       case ERR_EINVAL:
+               *response = PORT_PROFILE_RESPONSE_INVALID;
+               break;
+       case ERR_EBADSTATE:
+               *response = PORT_PROFILE_RESPONSE_BADSTATE;
+               break;
+       case ERR_ENOMEM:
+               *response = PORT_PROFILE_RESPONSE_INSUFFICIENT_RESOURCES;
+               break;
+       case ERR_EINPROGRESS:
+               *response = PORT_PROFILE_RESPONSE_INPROGRESS;
+               break;
+       default:
+               *response = PORT_PROFILE_RESPONSE_ERROR;
+               break;
+       }
+
+       return 0;
+}
diff --git a/drivers/net/ethernet/cisco/enic/enic_pp.h b/drivers/net/ethernet/cisco/enic/enic_pp.h
new file mode 100644 (file)
index 0000000..699e365
--- /dev/null
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2011 Cisco 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_PP_H_
+#define _ENIC_PP_H_
+
+int enic_process_set_pp_request(struct enic *enic,
+       struct enic_port_profile *prev_pp, int *restore_pp);
+int enic_process_get_pp_request(struct enic *enic, int request,
+       u16 *response);
+
+#endif /* _ENIC_PP_H_ */
diff --git a/drivers/net/ethernet/cisco/enic/enic_res.c b/drivers/net/ethernet/cisco/enic/enic_res.c
new file mode 100644 (file)
index 0000000..4a35367
--- /dev/null
@@ -0,0 +1,384 @@
+/*
+ * Copyright 2008-2010 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) {
+               dev_err(enic_get_dev(enic),
+                       "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) { \
+                       dev_err(enic_get_dev(enic), \
+                               "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_type);
+       GET_CONFIG(intr_mode);
+       GET_CONFIG(intr_timer_usec);
+       GET_CONFIG(loop_tag);
+
+       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 &= 0xffffffe0; /* must be aligned to groups of 32 */
+
+       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 &= 0xffffffe0; /* must be aligned to groups of 32 */
+
+       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_usec = min_t(u32, c->intr_timer_usec,
+               vnic_dev_get_intr_coal_timer_max(enic->vdev));
+
+       dev_info(enic_get_dev(enic),
+               "vNIC MAC addr %pM wq/rq %d/%d mtu %d\n",
+               enic->mac_addr, c->wq_desc_count, c->rq_desc_count, c->mtu);
+
+       dev_info(enic_get_dev(enic), "vNIC csum tx/rx %s/%s "
+               "tso/lro %s/%s rss %s intr mode %s type %s timer %d usec "
+               "loopback tag 0x%04x\n",
+               ENIC_SETTING(enic, TXCSUM) ? "yes" : "no",
+               ENIC_SETTING(enic, RXCSUM) ? "yes" : "no",
+               ENIC_SETTING(enic, TSO) ? "yes" : "no",
+               ENIC_SETTING(enic, LRO) ? "yes" : "no",
+               ENIC_SETTING(enic, RSS) ? "yes" : "no",
+               c->intr_mode == VENET_INTR_MODE_INTX ? "INTx" :
+               c->intr_mode == VENET_INTR_MODE_MSI ? "MSI" :
+               c->intr_mode == VENET_INTR_MODE_ANY ? "any" :
+               "unknown",
+               c->intr_timer_type == VENET_INTR_TYPE_MIN ? "min" :
+               c->intr_timer_type == VENET_INTR_TYPE_IDLE ? "idle" :
+               "unknown",
+               c->intr_timer_usec,
+               c->loop_tag);
+
+       return 0;
+}
+
+int 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)
+               dev_err(enic_get_dev(enic), "Can't add vlan id, %d\n", err);
+
+       return err;
+}
+
+int 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)
+               dev_err(enic_get_dev(enic), "Can't delete vlan id, %d\n", err);
+
+       return 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);
+}
+
+int enic_set_rss_key(struct enic *enic, dma_addr_t key_pa, u64 len)
+{
+       u64 a0 = (u64)key_pa, a1 = len;
+       int wait = 1000;
+
+       return vnic_dev_cmd(enic->vdev, CMD_RSS_KEY, &a0, &a1, wait);
+}
+
+int enic_set_rss_cpu(struct enic *enic, dma_addr_t cpu_pa, u64 len)
+{
+       u64 a0 = (u64)cpu_pa, a1 = len;
+       int wait = 1000;
+
+       return vnic_dev_cmd(enic->vdev, CMD_RSS_CPU, &a0, &a1, wait);
+}
+
+void enic_free_vnic_resources(struct enic *enic)
+{
+       unsigned int i;
+
+       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);
+
+       dev_info(enic_get_dev(enic),
+               "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_usec,
+                       enic->config.intr_timer_type,
+                       mask_on_assertion);
+       }
+}
+
+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);
+
+       dev_info(enic_get_dev(enic), "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) {
+               dev_err(enic_get_dev(enic),
+                       "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/ethernet/cisco/enic/enic_res.h b/drivers/net/ethernet/cisco/enic/enic_res.h
new file mode 100644 (file)
index 0000000..25be273
--- /dev/null
@@ -0,0 +1,148 @@
+/*
+ * Copyright 2008-2010 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                   68
+#define ENIC_MAX_MTU                   9000
+
+#define ENIC_MULTICAST_PERFECT_FILTERS 32
+#define ENIC_UNICAST_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, int loopback)
+{
+       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,
+               (u8)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, int loopback)
+{
+       enic_queue_wq_desc_ex(wq, os_buf, dma_addr, len,
+               0, 0, 0, 0, 0,
+               eop, 0 /* !SOP */, eop, loopback);
+}
+
+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, int loopback)
+{
+       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, loopback);
+}
+
+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, int loopback)
+{
+       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, loopback);
+}
+
+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, int loopback)
+{
+       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, loopback);
+}
+
+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, int loopback)
+{
+       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, loopback);
+}
+
+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 *);
+int enic_add_vlan(struct enic *enic, u16 vlanid);
+int enic_del_vlan(struct enic *enic, u16 vlanid);
+int enic_set_nic_cfg(struct enic *enic, u8 rss_default_cpu, u8 rss_hash_type,
+       u8 rss_hash_bits, u8 rss_base_cpu, u8 rss_enable, u8 tso_ipid_split_en,
+       u8 ig_vlan_strip_en);
+int enic_set_rss_key(struct enic *enic, dma_addr_t key_pa, u64 len);
+int enic_set_rss_cpu(struct enic *enic, dma_addr_t cpu_pa, u64 len);
+void enic_get_res_counts(struct enic *enic);
+void enic_init_vnic_resources(struct enic *enic);
+int enic_alloc_vnic_resources(struct enic *);
+void enic_free_vnic_resources(struct enic *);
+
+#endif /* _ENIC_RES_H_ */
diff --git a/drivers/net/ethernet/cisco/enic/rq_enet_desc.h b/drivers/net/ethernet/cisco/enic/rq_enet_desc.h
new file mode 100644 (file)
index 0000000..e6dd309
--- /dev/null
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2008-2010 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/ethernet/cisco/enic/vnic_cq.c b/drivers/net/ethernet/cisco/enic/vnic_cq.c
new file mode 100644 (file)
index 0000000..0daa1c7
--- /dev/null
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2008-2010 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) {
+               pr_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);
+
+       cq->interrupt_offset = interrupt_offset;
+}
+
+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/ethernet/cisco/enic/vnic_cq.h b/drivers/net/ethernet/cisco/enic/vnic_cq.h
new file mode 100644 (file)
index 0000000..579315c
--- /dev/null
@@ -0,0 +1,114 @@
+/*
+ * Copyright 2008-2010 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;
+       unsigned int interrupt_offset;
+};
+
+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/ethernet/cisco/enic/vnic_dev.c b/drivers/net/ethernet/cisco/enic/vnic_dev.c
new file mode 100644 (file)
index 0000000..8c4c8cf
--- /dev/null
@@ -0,0 +1,1003 @@
+/*
+ * Copyright 2008-2010 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"
+
+enum vnic_proxy_type {
+       PROXY_NONE,
+       PROXY_BY_BDF,
+};
+
+struct vnic_res {
+       void __iomem *vaddr;
+       dma_addr_t bus_addr;
+       unsigned int count;
+};
+
+struct vnic_intr_coal_timer_info {
+       u32 mul;
+       u32 div;
+       u32 max_usec;
+};
+
+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;
+       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;
+       enum vnic_proxy_type proxy;
+       u32 proxy_index;
+       u64 args[VNIC_DEVCMD_NARGS];
+       struct vnic_intr_coal_timer_info intr_coal_timer_info;
+};
+
+#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, unsigned int num_bars)
+{
+       struct vnic_resource_header __iomem *rh;
+       struct mgmt_barmap_hdr __iomem *mrh;
+       struct vnic_resource __iomem *r;
+       u8 type;
+
+       if (num_bars == 0)
+               return -EINVAL;
+
+       if (bar->len < VNIC_MAX_RES_HDR_SIZE) {
+               pr_err("vNIC BAR0 res hdr length error\n");
+               return -EINVAL;
+       }
+
+       rh  = bar->vaddr;
+       mrh = bar->vaddr;
+       if (!rh) {
+               pr_err("vNIC BAR0 res hdr not mem-mapped\n");
+               return -EINVAL;
+       }
+
+       /* Check for mgmt vnic in addition to normal vnic */
+       if ((ioread32(&rh->magic) != VNIC_RES_MAGIC) ||
+               (ioread32(&rh->version) != VNIC_RES_VERSION)) {
+               if ((ioread32(&mrh->magic) != MGMTVNIC_MAGIC) ||
+                       (ioread32(&mrh->version) != MGMTVNIC_VERSION)) {
+                       pr_err("vNIC BAR0 res magic/version error "
+                       "exp (%lx/%lx) or (%lx/%lx), curr (%x/%x)\n",
+                       VNIC_RES_MAGIC, VNIC_RES_VERSION,
+                       MGMTVNIC_MAGIC, MGMTVNIC_VERSION,
+                       ioread32(&rh->magic), ioread32(&rh->version));
+                       return -EINVAL;
+               }
+       }
+
+       if (ioread32(&mrh->magic) == MGMTVNIC_MAGIC)
+               r = (struct vnic_resource __iomem *)(mrh + 1);
+       else
+               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 >= num_bars)
+                       continue;
+
+               if (!bar[bar_num].len || !bar[bar_num].vaddr)
+                       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[bar_num].len) {
+                               pr_err("vNIC BAR0 resource %d "
+                                       "out-of-bounds, offset 0x%x + "
+                                       "size 0x%x > bar len 0x%lx\n",
+                                       type, bar_offset,
+                                       len,
+                                       bar[bar_num].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[bar_num].vaddr +
+                       bar_offset;
+               vdev->res[type].bus_addr = bar[bar_num].bus_addr + 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;
+       }
+}
+
+static 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) {
+               pr_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;
+       }
+}
+
+static int _vnic_dev_cmd(struct vnic_dev *vdev, enum vnic_devcmd_cmd cmd,
+       int wait)
+{
+       struct vnic_devcmd __iomem *devcmd = vdev->devcmd;
+       unsigned int i;
+       int delay;
+       u32 status;
+       int err;
+
+       status = ioread32(&devcmd->status);
+       if (status == 0xFFFFFFFF) {
+               /* PCI-e target device is gone */
+               return -ENODEV;
+       }
+       if (status & STAT_BUSY) {
+               pr_err("Busy devcmd %d\n", _CMD_N(cmd));
+               return -EBUSY;
+       }
+
+       if (_CMD_DIR(cmd) & _CMD_DIR_WRITE) {
+               for (i = 0; i < VNIC_DEVCMD_NARGS; i++)
+                       writeq(vdev->args[i], &devcmd->args[i]);
+               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 == 0xFFFFFFFF) {
+                       /* PCI-e target device is gone */
+                       return -ENODEV;
+               }
+
+               if (!(status & STAT_BUSY)) {
+
+                       if (status & STAT_ERROR) {
+                               err = (int)readq(&devcmd->args[0]);
+                               if (err != ERR_ECMDUNKNOWN ||
+                                   cmd != CMD_CAPABILITY)
+                                       pr_err("Error %d devcmd %d\n",
+                                               err, _CMD_N(cmd));
+                               return err;
+                       }
+
+                       if (_CMD_DIR(cmd) & _CMD_DIR_READ) {
+                               rmb();
+                               for (i = 0; i < VNIC_DEVCMD_NARGS; i++)
+                                       vdev->args[i] = readq(&devcmd->args[i]);
+                       }
+
+                       return 0;
+               }
+       }
+
+       pr_err("Timedout devcmd %d\n", _CMD_N(cmd));
+       return -ETIMEDOUT;
+}
+
+static int vnic_dev_cmd_proxy_by_bdf(struct vnic_dev *vdev,
+       enum vnic_devcmd_cmd cmd, u64 *a0, u64 *a1, int wait)
+{
+       u32 status;
+       int err;
+
+       memset(vdev->args, 0, sizeof(vdev->args));
+
+       vdev->args[0] = vdev->proxy_index; /* bdf */
+       vdev->args[1] = cmd;
+       vdev->args[2] = *a0;
+       vdev->args[3] = *a1;
+
+       err = _vnic_dev_cmd(vdev, CMD_PROXY_BY_BDF, wait);
+       if (err)
+               return err;
+
+       status = (u32)vdev->args[0];
+       if (status & STAT_ERROR) {
+               err = (int)vdev->args[1];
+               if (err != ERR_ECMDUNKNOWN ||
+                   cmd != CMD_CAPABILITY)
+                       pr_err("Error %d proxy devcmd %d\n", err, _CMD_N(cmd));
+               return err;
+       }
+
+       *a0 = vdev->args[1];
+       *a1 = vdev->args[2];
+
+       return 0;
+}
+
+static int vnic_dev_cmd_no_proxy(struct vnic_dev *vdev,
+       enum vnic_devcmd_cmd cmd, u64 *a0, u64 *a1, int wait)
+{
+       int err;
+
+       vdev->args[0] = *a0;
+       vdev->args[1] = *a1;
+
+       err = _vnic_dev_cmd(vdev, cmd, wait);
+
+       *a0 = vdev->args[0];
+       *a1 = vdev->args[1];
+
+       return err;
+}
+
+int vnic_dev_cmd(struct vnic_dev *vdev, enum vnic_devcmd_cmd cmd,
+       u64 *a0, u64 *a1, int wait)
+{
+       memset(vdev->args, 0, sizeof(vdev->args));
+
+       switch (vdev->proxy) {
+       case PROXY_BY_BDF:
+               return vnic_dev_cmd_proxy_by_bdf(vdev, cmd, a0, a1, wait);
+       case PROXY_NONE:
+       default:
+               return vnic_dev_cmd_no_proxy(vdev, cmd, a0, a1, wait);
+       }
+}
+
+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;
+
+               memset(vdev->fw_info, 0, sizeof(struct vnic_devcmd_fw_info));
+
+               a0 = vdev->fw_info_pa;
+               a1 = sizeof(struct vnic_devcmd_fw_info);
+
+               /* only get fw_info once and cache it */
+               err = vnic_dev_cmd(vdev, CMD_MCPU_FW_INFO, &a0, &a1, wait);
+               if (err == ERR_ECMDUNKNOWN) {
+                       err = vnic_dev_cmd(vdev, CMD_MCPU_FW_INFO_OLD,
+                               &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_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_wait(struct vnic_dev *vdev)
+{
+       u64 a0 = 0, a1 = 0;
+       int wait = 1000;
+       int err;
+
+       err = vnic_dev_cmd(vdev, CMD_ENABLE_WAIT, &a0, &a1, wait);
+       if (err == ERR_ECMDUNKNOWN)
+               return vnic_dev_cmd(vdev, CMD_ENABLE, &a0, &a1, wait);
+
+       return err;
+}
+
+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;
+}
+
+static 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);
+}
+
+static 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_reset(struct vnic_dev *vdev, int arg)
+{
+       u64 a0 = (u32)arg, a1 = 0;
+       int wait = 1000;
+       int err;
+
+       err = vnic_dev_cmd(vdev, CMD_HANG_RESET, &a0, &a1, wait);
+       if (err == ERR_ECMDUNKNOWN) {
+               err = vnic_dev_soft_reset(vdev, arg);
+               if (err)
+                       return err;
+
+               return vnic_dev_init(vdev, 0);
+       }
+
+       return err;
+}
+
+int vnic_dev_hang_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_HANG_RESET_STATUS, &a0, &a1, wait);
+       if (err) {
+               if (err == ERR_ECMDUNKNOWN)
+                       return vnic_dev_soft_reset_done(vdev, done);
+               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;
+}
+
+int 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)
+               pr_err("Can't set packet filter\n");
+
+       return err;
+}
+
+int 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)
+               pr_err("Can't add addr [%pM], %d\n", addr, err);
+
+       return err;
+}
+
+int 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)
+               pr_err("Can't del addr [%pM], %d\n", addr, err);
+
+       return err;
+}
+
+int vnic_dev_set_ig_vlan_rewrite_mode(struct vnic_dev *vdev,
+       u8 ig_vlan_rewrite_mode)
+{
+       u64 a0 = ig_vlan_rewrite_mode, a1 = 0;
+       int wait = 1000;
+       int err;
+
+       err = vnic_dev_cmd(vdev, CMD_IG_VLAN_REWRITE_MODE, &a0, &a1, wait);
+       if (err == ERR_ECMDUNKNOWN)
+               return 0;
+
+       return err;
+}
+
+static int vnic_dev_notify_setcmd(struct vnic_dev *vdev,
+       void *notify_addr, dma_addr_t notify_pa, u16 intr)
+{
+       u64 a0, a1;
+       int wait = 1000;
+       int r;
+
+       memset(notify_addr, 0, sizeof(struct vnic_devcmd_notify));
+       vdev->notify = notify_addr;
+       vdev->notify_pa = notify_pa;
+
+       a0 = (u64)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;
+}
+
+int vnic_dev_notify_set(struct vnic_dev *vdev, u16 intr)
+{
+       void *notify_addr;
+       dma_addr_t notify_pa;
+
+       if (vdev->notify || vdev->notify_pa) {
+               pr_err("notify block %p still allocated", vdev->notify);
+               return -EINVAL;
+       }
+
+       notify_addr = pci_alloc_consistent(vdev->pdev,
+                       sizeof(struct vnic_devcmd_notify),
+                       &notify_pa);
+       if (!notify_addr)
+               return -ENOMEM;
+
+       return vnic_dev_notify_setcmd(vdev, notify_addr, notify_pa, intr);
+}
+
+static int vnic_dev_notify_unsetcmd(struct vnic_dev *vdev)
+{
+       u64 a0, a1;
+       int wait = 1000;
+       int err;
+
+       a0 = 0;  /* paddr = 0 to unset notify buffer */
+       a1 = 0x0000ffff00000000ULL; /* intr num = -1 to unreg for intr */
+       a1 += sizeof(struct vnic_devcmd_notify);
+
+       err = vnic_dev_cmd(vdev, CMD_NOTIFY, &a0, &a1, wait);
+       vdev->notify = NULL;
+       vdev->notify_pa = 0;
+       vdev->notify_sz = 0;
+
+       return err;
+}
+
+int vnic_dev_notify_unset(struct vnic_dev *vdev)
+{
+       if (vdev->notify) {
+               pci_free_consistent(vdev->pdev,
+                       sizeof(struct vnic_devcmd_notify),
+                       vdev->notify,
+                       vdev->notify_pa);
+       }
+
+       return vnic_dev_notify_unsetcmd(vdev);
+}
+
+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 (vnic_dev_capable(vdev, CMD_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_deinit(struct vnic_dev *vdev)
+{
+       u64 a0 = 0, a1 = 0;
+       int wait = 1000;
+
+       return vnic_dev_cmd(vdev, CMD_DEINIT, &a0, &a1, wait);
+}
+
+void vnic_dev_intr_coal_timer_info_default(struct vnic_dev *vdev)
+{
+       /* Default: hardware intr coal timer is in units of 1.5 usecs */
+       vdev->intr_coal_timer_info.mul = 2;
+       vdev->intr_coal_timer_info.div = 3;
+       vdev->intr_coal_timer_info.max_usec =
+               vnic_dev_intr_coal_timer_hw_to_usec(vdev, 0xffff);
+}
+
+int vnic_dev_intr_coal_timer_info(struct vnic_dev *vdev)
+{
+       int wait = 1000;
+       int err;
+
+       memset(vdev->args, 0, sizeof(vdev->args));
+
+       err = _vnic_dev_cmd(vdev, CMD_INTR_COAL_CONVERT, wait);
+
+       /* Use defaults when firmware doesn't support the devcmd at all or
+        * supports it for only specific hardware
+        */
+       if ((err == ERR_ECMDUNKNOWN) ||
+               (!err && !(vdev->args[0] && vdev->args[1] && vdev->args[2]))) {
+               pr_warning("Using default conversion factor for "
+                       "interrupt coalesce timer\n");
+               vnic_dev_intr_coal_timer_info_default(vdev);
+               return 0;
+       }
+
+       vdev->intr_coal_timer_info.mul = (u32) vdev->args[0];
+       vdev->intr_coal_timer_info.div = (u32) vdev->args[1];
+       vdev->intr_coal_timer_info.max_usec = (u32) vdev->args[2];
+
+       return err;
+}
+
+int vnic_dev_link_status(struct vnic_dev *vdev)
+{
+       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;
+}
+
+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;
+}
+
+u32 vnic_dev_intr_coal_timer_usec_to_hw(struct vnic_dev *vdev, u32 usec)
+{
+       return (usec * vdev->intr_coal_timer_info.mul) /
+               vdev->intr_coal_timer_info.div;
+}
+
+u32 vnic_dev_intr_coal_timer_hw_to_usec(struct vnic_dev *vdev, u32 hw_cycles)
+{
+       return (hw_cycles * vdev->intr_coal_timer_info.div) /
+               vdev->intr_coal_timer_info.mul;
+}
+
+u32 vnic_dev_get_intr_coal_timer_max(struct vnic_dev *vdev)
+{
+       return vdev->intr_coal_timer_info.max_usec;
+}
+
+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->stats)
+                       pci_free_consistent(vdev->pdev,
+                               sizeof(struct vnic_stats),
+                               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,
+       unsigned int num_bars)
+{
+       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, num_bars))
+               goto err_out;
+
+       vdev->devcmd = vnic_dev_get_res(vdev, RES_TYPE_DEVCMD, 0);
+       if (!vdev->devcmd)
+               goto err_out;
+
+       return vdev;
+
+err_out:
+       vnic_dev_unregister(vdev);
+       return NULL;
+}
+
+int vnic_dev_init_prov2(struct vnic_dev *vdev, u8 *buf, u32 len)
+{
+       u64 a0, a1 = len;
+       int wait = 1000;
+       dma_addr_t prov_pa;
+       void *prov_buf;
+       int ret;
+
+       prov_buf = pci_alloc_consistent(vdev->pdev, len, &prov_pa);
+       if (!prov_buf)
+               return -ENOMEM;
+
+       memcpy(prov_buf, buf, len);
+
+       a0 = prov_pa;
+
+       ret = vnic_dev_cmd(vdev, CMD_INIT_PROV_INFO2, &a0, &a1, wait);
+
+       pci_free_consistent(vdev->pdev, len, prov_buf, prov_pa);
+
+       return ret;
+}
+
+int vnic_dev_enable2(struct vnic_dev *vdev, int active)
+{
+       u64 a0, a1 = 0;
+       int wait = 1000;
+
+       a0 = (active ? CMD_ENABLE2_ACTIVE : 0);
+
+       return vnic_dev_cmd(vdev, CMD_ENABLE2, &a0, &a1, wait);
+}
+
+static int vnic_dev_cmd_status(struct vnic_dev *vdev, enum vnic_devcmd_cmd cmd,
+       int *status)
+{
+       u64 a0 = cmd, a1 = 0;
+       int wait = 1000;
+       int ret;
+
+       ret = vnic_dev_cmd(vdev, CMD_STATUS, &a0, &a1, wait);
+       if (!ret)
+               *status = (int)a0;
+
+       return ret;
+}
+
+int vnic_dev_enable2_done(struct vnic_dev *vdev, int *status)
+{
+       return vnic_dev_cmd_status(vdev, CMD_ENABLE2, status);
+}
+
+int vnic_dev_deinit_done(struct vnic_dev *vdev, int *status)
+{
+       return vnic_dev_cmd_status(vdev, CMD_DEINIT, status);
+}
diff --git a/drivers/net/ethernet/cisco/enic/vnic_dev.h b/drivers/net/ethernet/cisco/enic/vnic_dev.h
new file mode 100644 (file)
index 0000000..852b698
--- /dev/null
@@ -0,0 +1,133 @@
+/*
+ * Copyright 2008-2010 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
+
+#undef pr_fmt
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+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);
+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_dump(struct vnic_dev *vdev, struct vnic_stats **stats);
+int vnic_dev_hang_notify(struct vnic_dev *vdev);
+int vnic_dev_packet_filter(struct vnic_dev *vdev, int directed, int multicast,
+       int broadcast, int promisc, int allmulti);
+int vnic_dev_add_addr(struct vnic_dev *vdev, u8 *addr);
+int 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);
+int 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);
+int vnic_dev_close(struct vnic_dev *vdev);
+int vnic_dev_enable_wait(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_deinit(struct vnic_dev *vdev);
+void vnic_dev_intr_coal_timer_info_default(struct vnic_dev *vdev);
+int vnic_dev_intr_coal_timer_info(struct vnic_dev *vdev);
+int vnic_dev_hang_reset(struct vnic_dev *vdev, int arg);
+int vnic_dev_hang_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);
+u32 vnic_dev_intr_coal_timer_usec_to_hw(struct vnic_dev *vdev, u32 usec);
+u32 vnic_dev_intr_coal_timer_hw_to_usec(struct vnic_dev *vdev, u32 hw_cycles);
+u32 vnic_dev_get_intr_coal_timer_max(struct vnic_dev *vdev);
+void vnic_dev_unregister(struct vnic_dev *vdev);
+int vnic_dev_set_ig_vlan_rewrite_mode(struct vnic_dev *vdev,
+       u8 ig_vlan_rewrite_mode);
+struct vnic_dev *vnic_dev_register(struct vnic_dev *vdev,
+       void *priv, struct pci_dev *pdev, struct vnic_dev_bar *bar,
+       unsigned int num_bars);
+int vnic_dev_init_prov2(struct vnic_dev *vdev, u8 *buf, u32 len);
+int vnic_dev_enable2(struct vnic_dev *vdev, int active);
+int vnic_dev_enable2_done(struct vnic_dev *vdev, int *status);
+int vnic_dev_deinit_done(struct vnic_dev *vdev, int *status);
+
+#endif /* _VNIC_DEV_H_ */
diff --git a/drivers/net/ethernet/cisco/enic/vnic_devcmd.h b/drivers/net/ethernet/cisco/enic/vnic_devcmd.h
new file mode 100644 (file)
index 0000000..8025e88
--- /dev/null
@@ -0,0 +1,450 @@
+/*
+ * Copyright 2008-2010 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:
+        * in:
+        *   (u64)a0=paddr to struct vnic_devcmd_fw_info
+        * action:
+        *   Fills in struct vnic_devcmd_fw_info (128 bytes)
+        * note:
+        *   An old definition of CMD_MCPU_FW_INFO
+        */
+       CMD_MCPU_FW_INFO_OLD    = _CMDC(_CMD_DIR_WRITE, _CMD_VTYPE_ALL, 1),
+
+       /*
+        * mcpu fw info in mem:
+        * in:
+        *   (u64)a0=paddr to struct vnic_devcmd_fw_info
+        *   (u16)a1=size of the structure
+        * out:
+        *       (u16)a1=0                          for in:a1 = 0,
+        *               data size actually written for other values.
+        * action:
+        *   Fills in first 128 bytes of vnic_devcmd_fw_info for in:a1 = 0,
+        *            first in:a1 bytes               for 0 < in:a1 <= 132,
+        *            132 bytes                       for other values of in:a1.
+        * note:
+        *   CMD_MCPU_FW_INFO and CMD_MCPU_FW_INFO_OLD have the same enum 1
+        *   for source compatibility.
+        */
+       CMD_MCPU_FW_INFO        = _CMDC(_CMD_DIR_RW, _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),
+
+       /* set Rx packet filter for all: (u32)a0=filters (see CMD_PFILTER_*) */
+       CMD_PACKET_FILTER_ALL   = _CMDCNW(_CMD_DIR_WRITE, _CMD_VTYPE_ALL, 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),
+
+       /* 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),
+
+       /* enable virtual link, waiting variant. */
+       CMD_ENABLE_WAIT         = _CMDC(_CMD_DIR_WRITE, _CMD_VTYPE_ALL, 28),
+
+       /* disable virtual link */
+       CMD_DISABLE             = _CMDC(_CMD_DIR_NONE, _CMD_VTYPE_ALL, 29),
+
+       /* stats dump sum of all vnic stats on same uplink in mem:
+        *     (u64)a0=paddr
+        *     (u16)a1=sizeof stats area */
+       CMD_STATS_DUMP_ALL      = _CMDC(_CMD_DIR_WRITE, _CMD_VTYPE_ALL, 30),
+
+       /* init status:
+        *    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),
+
+       /* Interrupt Assert Register functionality
+        * in: (u16)a0=interrupt number to assert
+        */
+       CMD_IAR                 = _CMDCNW(_CMD_DIR_WRITE, _CMD_VTYPE_ALL, 38),
+
+       /* initiate hangreset, like softreset after hang detected */
+       CMD_HANG_RESET          = _CMDC(_CMD_DIR_NONE, _CMD_VTYPE_ALL, 39),
+
+       /* hangreset status:
+        *    out: a0=0 reset complete, a0=1 reset in progress */
+       CMD_HANG_RESET_STATUS   = _CMDC(_CMD_DIR_READ, _CMD_VTYPE_ALL, 40),
+
+       /*
+        * Set hw ingress packet vlan rewrite mode:
+        * in:  (u32)a0=new vlan rewrite mode
+        * out: (u32)a0=old vlan rewrite mode */
+       CMD_IG_VLAN_REWRITE_MODE = _CMDC(_CMD_DIR_RW, _CMD_VTYPE_ENET, 41),
+
+       /*
+        * in:  (u16)a0=bdf of target vnic
+        *      (u32)a1=cmd to proxy
+        *      a2-a15=args to cmd in a1
+        * out: (u32)a0=status of proxied cmd
+        *      a1-a15=out args of proxied cmd */
+       CMD_PROXY_BY_BDF =      _CMDC(_CMD_DIR_RW, _CMD_VTYPE_ALL, 42),
+
+       /*
+        * As for BY_BDF except a0 is index of hvnlink subordinate vnic
+        * or SR-IOV virtual vnic
+        */
+       CMD_PROXY_BY_INDEX =    _CMDC(_CMD_DIR_RW, _CMD_VTYPE_ALL, 43),
+
+       /*
+        * For HPP toggle:
+        * adapter-info-get
+        * in:  (u64)a0=phsical address of buffer passed in from caller.
+        *      (u16)a1=size of buffer specified in a0.
+        * out: (u64)a0=phsical address of buffer passed in from caller.
+        *      (u16)a1=actual bytes from VIF-CONFIG-INFO TLV, or
+        *              0 if no VIF-CONFIG-INFO TLV was ever received. */
+       CMD_CONFIG_INFO_GET     = _CMDC(_CMD_DIR_RW, _CMD_VTYPE_ALL, 44),
+
+       /* init_prov_info2:
+        * Variant of CMD_INIT_PROV_INFO, where it will not try to enable
+        * the vnic until CMD_ENABLE2 is issued.
+        *     (u64)a0=paddr of vnic_devcmd_provinfo
+        *     (u32)a1=sizeof provision info */
+       CMD_INIT_PROV_INFO2  = _CMDC(_CMD_DIR_WRITE, _CMD_VTYPE_ENET, 47),
+
+       /* enable2:
+        *      (u32)a0=0                  ==> standby
+        *             =CMD_ENABLE2_ACTIVE ==> active
+        */
+       CMD_ENABLE2 = _CMDC(_CMD_DIR_WRITE, _CMD_VTYPE_ENET, 48),
+
+       /*
+        * cmd_status:
+        *     Returns the status of the specified command
+        * Input:
+        *     a0 = command for which status is being queried.
+        *          Possible values are:
+        *              CMD_SOFT_RESET
+        *              CMD_HANG_RESET
+        *              CMD_OPEN
+        *              CMD_INIT
+        *              CMD_INIT_PROV_INFO
+        *              CMD_DEINIT
+        *              CMD_INIT_PROV_INFO2
+        *              CMD_ENABLE2
+        * Output:
+        *     if status == STAT_ERROR
+        *        a0 = ERR_ENOTSUPPORTED - status for command in a0 is
+        *                                 not supported
+        *     if status == STAT_NONE
+        *        a0 = status of the devcmd specified in a0 as follows.
+        *             ERR_SUCCESS   - command in a0 completed successfully
+        *             ERR_EINPROGRESS - command in a0 is still in progress
+        */
+       CMD_STATUS = _CMDC(_CMD_DIR_RW, _CMD_VTYPE_ALL, 49),
+
+       /*
+        * Returns interrupt coalescing timer conversion factors.
+        * After calling this devcmd, ENIC driver can convert
+        * interrupt coalescing timer in usec into CPU cycles as follows:
+        *
+        *   intr_timer_cycles = intr_timer_usec * multiplier / divisor
+        *
+        * Interrupt coalescing timer in usecs can be obtained from
+        * CPU cycles as follows:
+        *
+        *   intr_timer_usec = intr_timer_cycles * divisor / multiplier
+        *
+        * in: none
+        * out: (u32)a0 = multiplier
+        *      (u32)a1 = divisor
+        *      (u32)a2 = maximum timer value in usec
+        */
+       CMD_INTR_COAL_CONVERT = _CMDC(_CMD_DIR_READ, _CMD_VTYPE_ALL, 50),
+};
+
+/* CMD_ENABLE2 flags */
+#define CMD_ENABLE2_ACTIVE  0x1
+
+/* 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
+
+/* rewrite modes for CMD_IG_VLAN_REWRITE_MODE */
+#define IG_VLAN_REWRITE_MODE_DEFAULT_TRUNK              0
+#define IG_VLAN_REWRITE_MODE_UNTAG_DEFAULT_VLAN         1
+#define IG_VLAN_REWRITE_MODE_PRIORITY_TAG_DEFAULT_VLAN  2
+#define IG_VLAN_REWRITE_MODE_PASS_THRU                  3
+
+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,
+       ERR_EMAXRES = 10,
+       ERR_ENOTSUPPORTED = 11,
+       ERR_EINPROGRESS = 12,
+};
+
+/*
+ * note: hw_version and asic_rev refer to the same thing,
+ *       but have different formats. hw_version is
+ *       a 32-byte string (e.g. "A2") and asic_rev is
+ *       a 16-bit integer (e.g. 0xA2).
+ */
+struct vnic_devcmd_fw_info {
+       char fw_version[32];
+       char fw_build[32];
+       char hw_version[32];
+       char hw_serial_number[32];
+       u16 asic_type;
+       u16 asic_rev;
+};
+
+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/ethernet/cisco/enic/vnic_enet.h b/drivers/net/ethernet/cisco/enic/vnic_enet.h
new file mode 100644 (file)
index 0000000..6095428
--- /dev/null
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2008-2010 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_deprecated;
+       u8 intr_timer_type;
+       u8 intr_mode;
+       char devname[16];
+       u32 intr_timer_usec;
+       u16 loop_tag;
+};
+
+#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 */
+#define VENETF_LOOP            0x800   /* Loopback enabled */
+
+#define VENET_INTR_TYPE_MIN    0       /* Timer specs min interrupt spacing */
+#define VENET_INTR_TYPE_IDLE   1       /* Timer specs idle time before irq */
+
+#define VENET_INTR_MODE_ANY    0       /* Try MSI-X, then MSI, then INTx */
+#define VENET_INTR_MODE_MSI    1       /* Try MSI then INTx */
+#define VENET_INTR_MODE_INTX   2       /* Try INTx only */
+
+#endif /* _VNIC_ENIC_H_ */
diff --git a/drivers/net/ethernet/cisco/enic/vnic_intr.c b/drivers/net/ethernet/cisco/enic/vnic_intr.c
new file mode 100644 (file)
index 0000000..0ca107f
--- /dev/null
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2008-2010 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) {
+               pr_err("Failed to hook INTR[%d].ctrl resource\n", index);
+               return -EINVAL;
+       }
+
+       return 0;
+}
+
+void vnic_intr_init(struct vnic_intr *intr, u32 coalescing_timer,
+       unsigned int coalescing_type, unsigned int mask_on_assertion)
+{
+       vnic_intr_coalescing_timer_set(intr, 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_coalescing_timer_set(struct vnic_intr *intr,
+       u32 coalescing_timer)
+{
+       iowrite32(vnic_dev_intr_coal_timer_usec_to_hw(intr->vdev,
+               coalescing_timer), &intr->ctrl->coalescing_timer);
+}
+
+void vnic_intr_clean(struct vnic_intr *intr)
+{
+       iowrite32(0, &intr->ctrl->int_credits);
+}
diff --git a/drivers/net/ethernet/cisco/enic/vnic_intr.h b/drivers/net/ethernet/cisco/enic/vnic_intr.h
new file mode 100644 (file)
index 0000000..2b16363
--- /dev/null
@@ -0,0 +1,111 @@
+/*
+ * Copyright 2008-2010 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_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 int vnic_intr_masked(struct vnic_intr *intr)
+{
+       return ioread32(&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, u32 coalescing_timer,
+       unsigned int coalescing_type, unsigned int mask_on_assertion);
+void vnic_intr_coalescing_timer_set(struct vnic_intr *intr,
+       u32 coalescing_timer);
+void vnic_intr_clean(struct vnic_intr *intr);
+
+#endif /* _VNIC_INTR_H_ */
diff --git a/drivers/net/ethernet/cisco/enic/vnic_nic.h b/drivers/net/ethernet/cisco/enic/vnic_nic.h
new file mode 100644 (file)
index 0000000..995a50d
--- /dev/null
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2008-2010 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
+
+#define NIC_CFG_RSS_HASH_TYPE_IPV4             (1 << 1)
+#define NIC_CFG_RSS_HASH_TYPE_TCP_IPV4         (1 << 2)
+#define NIC_CFG_RSS_HASH_TYPE_IPV6             (1 << 3)
+#define NIC_CFG_RSS_HASH_TYPE_TCP_IPV6         (1 << 4)
+#define NIC_CFG_RSS_HASH_TYPE_IPV6_EX          (1 << 5)
+#define NIC_CFG_RSS_HASH_TYPE_TCP_IPV6_EX      (1 << 6)
+
+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/ethernet/cisco/enic/vnic_resource.h b/drivers/net/ethernet/cisco/enic/vnic_resource.h
new file mode 100644 (file)
index 0000000..e0a73f1
--- /dev/null
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2008-2010 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
+#define MGMTVNIC_MAGIC         0x544d474dL     /* 'MGMT' */
+#define MGMTVNIC_VERSION       0x00000000L
+
+/* The MAC address assigned to the CFG vNIC is fixed. */
+#define MGMTVNIC_MAC           { 0x02, 0x00, 0x54, 0x4d, 0x47, 0x4d }
+
+/* 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 mgmt_barmap_hdr {
+       u32 magic;                      /* magic number */
+       u32 version;                    /* header format version */
+       u16 lif;                        /* loopback lif for mgmt frames */
+       u16 pci_slot;                   /* installed pci slot */
+       char serial[16];                /* card serial number */
+};
+
+struct vnic_resource {
+       u8 type;
+       u8 bar;
+       u8 pad[2];
+       u32 bar_offset;
+       u32 count;
+};
+
+#endif /* _VNIC_RESOURCE_H_ */
diff --git a/drivers/net/ethernet/cisco/enic/vnic_rq.c b/drivers/net/ethernet/cisco/enic/vnic_rq.c
new file mode 100644 (file)
index 0000000..34105e0
--- /dev/null
@@ -0,0 +1,221 @@
+/*
+ * Copyright 2008-2010 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/slab.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(count), GFP_ATOMIC);
+               if (!rq->bufs[i]) {
+                       pr_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(count); j++) {
+                       buf->index = i * VNIC_RQ_BUF_BLK_ENTRIES(count) + 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(count)) {
+                               buf->next = rq->bufs[i + 1];
+                       } else {
+                               buf->next = buf + 1;
+                               buf++;
+                       }
+               }
+       }
+
+       rq->to_use = rq->to_clean = rq->bufs[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++) {
+               if (rq->bufs[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) {
+               pr_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;
+}
+
+static void vnic_rq_init_start(struct vnic_rq *rq, unsigned int cq_index,
+       unsigned int fetch_index, unsigned int posted_index,
+       unsigned int error_interrupt_enable,
+       unsigned int error_interrupt_offset)
+{
+       u64 paddr;
+       unsigned int count = rq->ring.desc_count;
+
+       paddr = (u64)rq->ring.base_addr | VNIC_PADDR_TARGET;
+       writeq(paddr, &rq->ctrl->ring_base);
+       iowrite32(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);
+       iowrite32(fetch_index, &rq->ctrl->fetch_index);
+       iowrite32(posted_index, &rq->ctrl->posted_index);
+
+       rq->to_use = rq->to_clean =
+               &rq->bufs[fetch_index / VNIC_RQ_BUF_BLK_ENTRIES(count)]
+                       [fetch_index % VNIC_RQ_BUF_BLK_ENTRIES(count)];
+}
+
+void vnic_rq_init(struct vnic_rq *rq, unsigned int cq_index,
+       unsigned int error_interrupt_enable,
+       unsigned int error_interrupt_offset)
+{
+       u32 fetch_index;
+
+       /* Use current fetch_index as the ring starting point */
+       fetch_index = ioread32(&rq->ctrl->fetch_index);
+
+       if (fetch_index == 0xFFFFFFFF) { /* check for hardware gone  */
+               /* Hardware surprise removal: reset fetch_index */
+               fetch_index = 0;
+       }
+
+       vnic_rq_init_start(rq, cq_index,
+               fetch_index, fetch_index,
+               error_interrupt_enable,
+               error_interrupt_offset);
+}
+
+unsigned int vnic_rq_error_status(struct vnic_rq *rq)
+{
+       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 < 1000; wait++) {
+               if (!(ioread32(&rq->ctrl->running)))
+                       return 0;
+               udelay(10);
+       }
+
+       pr_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;
+       unsigned int count = rq->ring.desc_count;
+
+       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);
+
+       if (fetch_index == 0xFFFFFFFF) { /* check for hardware gone  */
+               /* Hardware surprise removal: reset fetch_index */
+               fetch_index = 0;
+       }
+       rq->to_use = rq->to_clean =
+               &rq->bufs[fetch_index / VNIC_RQ_BUF_BLK_ENTRIES(count)]
+                       [fetch_index % VNIC_RQ_BUF_BLK_ENTRIES(count)];
+       iowrite32(fetch_index, &rq->ctrl->posted_index);
+
+       vnic_dev_clear_desc_ring(&rq->ring);
+}
+
diff --git a/drivers/net/ethernet/cisco/enic/vnic_rq.h b/drivers/net/ethernet/cisco/enic/vnic_rq.h
new file mode 100644 (file)
index 0000000..2056586
--- /dev/null
@@ -0,0 +1,209 @@
+/*
+ * Copyright 2008-2010 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 32/64 entries */
+#define VNIC_RQ_BUF_MIN_BLK_ENTRIES 32
+#define VNIC_RQ_BUF_DFLT_BLK_ENTRIES 64
+#define VNIC_RQ_BUF_BLK_ENTRIES(entries) \
+       ((unsigned int)((entries < VNIC_RQ_BUF_DFLT_BLK_ENTRIES) ? \
+       VNIC_RQ_BUF_MIN_BLK_ENTRIES : VNIC_RQ_BUF_DFLT_BLK_ENTRIES))
+#define VNIC_RQ_BUF_BLK_SZ(entries) \
+       (VNIC_RQ_BUF_BLK_ENTRIES(entries) * sizeof(struct vnic_rq_buf))
+#define VNIC_RQ_BUF_BLKS_NEEDED(entries) \
+       DIV_ROUND_UP(entries, VNIC_RQ_BUF_BLK_ENTRIES(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 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 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) > 0) {
+
+               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/ethernet/cisco/enic/vnic_rss.h b/drivers/net/ethernet/cisco/enic/vnic_rss.h
new file mode 100644 (file)
index 0000000..fa421ba
--- /dev/null
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2008-2010 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];
+};
+
+#endif /* _VNIC_RSS_H_ */
diff --git a/drivers/net/ethernet/cisco/enic/vnic_stats.h b/drivers/net/ethernet/cisco/enic/vnic_stats.h
new file mode 100644 (file)
index 0000000..77750ec
--- /dev/null
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2008-2010 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/ethernet/cisco/enic/vnic_vic.c b/drivers/net/ethernet/cisco/enic/vnic_vic.c
new file mode 100644 (file)
index 0000000..24ef8cd
--- /dev/null
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2010 Cisco 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/slab.h>
+
+#include "vnic_vic.h"
+
+struct vic_provinfo *vic_provinfo_alloc(gfp_t flags, const u8 *oui,
+       const u8 type)
+{
+       struct vic_provinfo *vp;
+
+       if (!oui)
+               return NULL;
+
+       vp = kzalloc(VIC_PROVINFO_MAX_DATA, flags);
+       if (!vp)
+               return NULL;
+
+       memcpy(vp->oui, oui, sizeof(vp->oui));
+       vp->type = type;
+       vp->length = htonl(sizeof(vp->num_tlvs));
+
+       return vp;
+}
+
+void vic_provinfo_free(struct vic_provinfo *vp)
+{
+       kfree(vp);
+}
+
+int vic_provinfo_add_tlv(struct vic_provinfo *vp, u16 type, u16 length,
+       const void *value)
+{
+       struct vic_provinfo_tlv *tlv;
+
+       if (!vp || !value)
+               return -EINVAL;
+
+       if (ntohl(vp->length) + offsetof(struct vic_provinfo_tlv, value) +
+               length > VIC_PROVINFO_MAX_TLV_DATA)
+               return -ENOMEM;
+
+       tlv = (struct vic_provinfo_tlv *)((u8 *)vp->tlv +
+               ntohl(vp->length) - sizeof(vp->num_tlvs));
+
+       tlv->type = htons(type);
+       tlv->length = htons(length);
+       memcpy(tlv->value, value, length);
+
+       vp->num_tlvs = htonl(ntohl(vp->num_tlvs) + 1);
+       vp->length = htonl(ntohl(vp->length) +
+               offsetof(struct vic_provinfo_tlv, value) + length);
+
+       return 0;
+}
+
+size_t vic_provinfo_size(struct vic_provinfo *vp)
+{
+       return vp ?  ntohl(vp->length) + sizeof(*vp) - sizeof(vp->num_tlvs) : 0;
+}
diff --git a/drivers/net/ethernet/cisco/enic/vnic_vic.h b/drivers/net/ethernet/cisco/enic/vnic_vic.h
new file mode 100644 (file)
index 0000000..9ef81f1
--- /dev/null
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2010 Cisco 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_VIC_H_
+#define _VNIC_VIC_H_
+
+/* Note: All integer fields in NETWORK byte order */
+
+/* Note: String field lengths include null char */
+
+#define VIC_PROVINFO_CISCO_OUI         { 0x00, 0x00, 0x0c }
+#define VIC_PROVINFO_GENERIC_TYPE              0x4
+
+enum vic_generic_prov_tlv_type {
+       VIC_GENERIC_PROV_TLV_PORT_PROFILE_NAME_STR = 0,
+       VIC_GENERIC_PROV_TLV_CLIENT_MAC_ADDR = 1,
+       VIC_GENERIC_PROV_TLV_CLIENT_NAME_STR = 2,
+       VIC_GENERIC_PROV_TLV_CLUSTER_PORT_NAME_STR = 3,
+       VIC_GENERIC_PROV_TLV_CLUSTER_PORT_UUID_STR = 4,
+       VIC_GENERIC_PROV_TLV_CLUSTER_UUID_STR = 5,
+       VIC_GENERIC_PROV_TLV_CLUSTER_NAME_STR = 7,
+       VIC_GENERIC_PROV_TLV_HOST_UUID_STR = 8,
+       VIC_GENERIC_PROV_TLV_CLIENT_UUID_STR = 9,
+       VIC_GENERIC_PROV_TLV_INCARNATION_NUMBER = 10,
+       VIC_GENERIC_PROV_TLV_OS_TYPE = 11,
+       VIC_GENERIC_PROV_TLV_OS_VENDOR = 12,
+       VIC_GENERIC_PROV_TLV_CLIENT_TYPE = 15,
+};
+
+enum vic_generic_prov_os_type {
+       VIC_GENERIC_PROV_OS_TYPE_UNKNOWN = 0,
+       VIC_GENERIC_PROV_OS_TYPE_ESX = 1,
+       VIC_GENERIC_PROV_OS_TYPE_LINUX = 2,
+       VIC_GENERIC_PROV_OS_TYPE_WINDOWS = 3,
+       VIC_GENERIC_PROV_OS_TYPE_SOLARIS = 4,
+};
+
+struct vic_provinfo {
+       u8 oui[3];              /* OUI of data provider */
+       u8 type;                /* provider-specific type */
+       u32 length;             /* length of data below */
+       u32 num_tlvs;           /* number of tlvs */
+       struct vic_provinfo_tlv {
+               u16 type;
+               u16 length;
+               u8 value[0];
+       } tlv[0];
+} __packed;
+
+#define VIC_PROVINFO_ADD_TLV(vp, tlvtype, tlvlen, data) \
+       do { \
+               err = vic_provinfo_add_tlv(vp, tlvtype, tlvlen, data); \
+               if (err) \
+                       goto add_tlv_failure; \
+       } while (0)
+
+#define VIC_PROVINFO_MAX_DATA          1385
+#define VIC_PROVINFO_MAX_TLV_DATA (VIC_PROVINFO_MAX_DATA - \
+       sizeof(struct vic_provinfo))
+
+struct vic_provinfo *vic_provinfo_alloc(gfp_t flags, const u8 *oui,
+       const u8 type);
+void vic_provinfo_free(struct vic_provinfo *vp);
+int vic_provinfo_add_tlv(struct vic_provinfo *vp, u16 type, u16 length,
+       const void *value);
+size_t vic_provinfo_size(struct vic_provinfo *vp);
+
+#endif /* _VNIC_VIC_H_ */
diff --git a/drivers/net/ethernet/cisco/enic/vnic_wq.c b/drivers/net/ethernet/cisco/enic/vnic_wq.c
new file mode 100644 (file)
index 0000000..df61bd9
--- /dev/null
@@ -0,0 +1,200 @@
+/*
+ * Copyright 2008-2010 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/slab.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(count), GFP_ATOMIC);
+               if (!wq->bufs[i]) {
+                       pr_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(count); j++) {
+                       buf->index = i * VNIC_WQ_BUF_BLK_ENTRIES(count) + 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(count)) {
+                               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++) {
+               if (wq->bufs[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) {
+               pr_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;
+}
+
+static void vnic_wq_init_start(struct vnic_wq *wq, unsigned int cq_index,
+       unsigned int fetch_index, unsigned int posted_index,
+       unsigned int error_interrupt_enable,
+       unsigned int error_interrupt_offset)
+{
+       u64 paddr;
+       unsigned int count = wq->ring.desc_count;
+
+       paddr = (u64)wq->ring.base_addr | VNIC_PADDR_TARGET;
+       writeq(paddr, &wq->ctrl->ring_base);
+       iowrite32(count, &wq->ctrl->ring_size);
+       iowrite32(fetch_index, &wq->ctrl->fetch_index);
+       iowrite32(posted_index, &wq->ctrl->posted_index);
+       iowrite32(cq_index, &wq->ctrl->cq_index);
+       iowrite32(error_interrupt_enable, &wq->ctrl->error_interrupt_enable);
+       iowrite32(error_interrupt_offset, &wq->ctrl->error_interrupt_offset);
+       iowrite32(0, &wq->ctrl->error_status);
+
+       wq->to_use = wq->to_clean =
+               &wq->bufs[fetch_index / VNIC_WQ_BUF_BLK_ENTRIES(count)]
+                       [fetch_index % VNIC_WQ_BUF_BLK_ENTRIES(count)];
+}
+
+void vnic_wq_init(struct vnic_wq *wq, unsigned int cq_index,
+       unsigned int error_interrupt_enable,
+       unsigned int error_interrupt_offset)
+{
+       vnic_wq_init_start(wq, cq_index, 0, 0,
+               error_interrupt_enable,
+               error_interrupt_offset);
+}
+
+unsigned int vnic_wq_error_status(struct vnic_wq *wq)
+{
+       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 < 1000; wait++) {
+               if (!(ioread32(&wq->ctrl->running)))
+                       return 0;
+               udelay(10);
+       }
+
+       pr_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;
+
+       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/ethernet/cisco/enic/vnic_wq.h b/drivers/net/ethernet/cisco/enic/vnic_wq.h
new file mode 100644 (file)
index 0000000..7dd937a
--- /dev/null
@@ -0,0 +1,165 @@
+/*
+ * Copyright 2008-2010 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 32/64 entries */
+#define VNIC_WQ_BUF_MIN_BLK_ENTRIES 32
+#define VNIC_WQ_BUF_DFLT_BLK_ENTRIES 64
+#define VNIC_WQ_BUF_BLK_ENTRIES(entries) \
+       ((unsigned int)((entries < VNIC_WQ_BUF_DFLT_BLK_ENTRIES) ? \
+       VNIC_WQ_BUF_MIN_BLK_ENTRIES : VNIC_WQ_BUF_DFLT_BLK_ENTRIES))
+#define VNIC_WQ_BUF_BLK_SZ(entries) \
+       (VNIC_WQ_BUF_BLK_ENTRIES(entries) * sizeof(struct vnic_wq_buf))
+#define VNIC_WQ_BUF_BLKS_NEEDED(entries) \
+       DIV_ROUND_UP(entries, VNIC_WQ_BUF_BLK_ENTRIES(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/ethernet/cisco/enic/wq_enet_desc.h b/drivers/net/ethernet/cisco/enic/wq_enet_desc.h
new file mode 100644 (file)
index 0000000..c7021e3
--- /dev/null
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2008-2010 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_ */