drivers/net: enic: Move ethtool code to a separate file

This patch moves all enic ethtool hooks from enic_main.c to a new file
enic_ethtool.c

Signed-off-by: Neel Patel <neepatel@cisco.com>
Signed-off-by: Christian Benvenuti <benve@cisco.com>
Signed-off-by: Nishank Trivedi <nistrive@cisco.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 1 insertions, 269 deletions

diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c
index 992ec2ee64d9..b12b32bc53a6 100644
--- a/drivers/net/ethernet/cisco/enic/enic_main.c
+++ b/drivers/net/ethernet/cisco/enic/enic_main.c
@@ -31,7 +31,6 @@
 #include <linux/if.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>
@@ -73,57 +72,6 @@ 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);
-
 int enic_is_dynamic(struct enic *enic)
 {
         return enic->pdev->device == PCI_DEVICE_ID_CISCO_VIC_ENET_DYN;
@@ -148,222 +96,6 @@ int enic_is_valid_vf(struct enic *enic, int vf)
 #endif
 }
 
-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);
-
-        strlcpy(drvinfo->driver, DRV_NAME, sizeof(drvinfo->driver));
-        strlcpy(drvinfo->version, DRV_VERSION, sizeof(drvinfo->version));
-        strlcpy(drvinfo->fw_version, fw_info->fw_version,
-                sizeof(drvinfo->fw_version));
-        strlcpy(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);
@@ -2496,7 +2228,7 @@ static int enic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 netdev->netdev_ops = &enic_netdev_ops;
 
         netdev->watchdog_timeo = 2 * HZ;
-        netdev->ethtool_ops = &enic_ethtool_ops;
+        enic_set_ethtool_ops(netdev);
 
         netdev->features |= NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX;
         if (ENIC_SETTING(enic, LOOP)) {