net/ena: align dynamic log names with standard
[dpdk.git] / drivers / net / cxgbe / cxgbe_main.c
index 6f3a6db..28db6c0 100644 (file)
@@ -1,7 +1,7 @@
 /*-
  *   BSD LICENSE
  *
- *   Copyright(c) 2014-2015 Chelsio Communications.
+ *   Copyright(c) 2014-2017 Chelsio Communications.
  *   All rights reserved.
  *
  *   Redistribution and use in source and binary forms, with or without
 #include <rte_atomic.h>
 #include <rte_branch_prediction.h>
 #include <rte_memory.h>
-#include <rte_memzone.h>
 #include <rte_tailq.h>
 #include <rte_eal.h>
 #include <rte_alarm.h>
 #include <rte_ether.h>
-#include <rte_ethdev.h>
-#include <rte_atomic.h>
+#include <rte_ethdev_driver.h>
+#include <rte_ethdev_pci.h>
 #include <rte_malloc.h>
 #include <rte_random.h>
 #include <rte_dev.h>
 #include "t4_msg.h"
 #include "cxgbe.h"
 
+/*
+ * Response queue handler for the FW event queue.
+ */
+static int fwevtq_handler(struct sge_rspq *q, const __be64 *rsp,
+                         __rte_unused const struct pkt_gl *gl)
+{
+       u8 opcode = ((const struct rss_header *)rsp)->opcode;
+
+       rsp++;                                          /* skip RSS header */
+
+       /*
+        * FW can send EGR_UPDATEs encapsulated in a CPL_FW4_MSG.
+        */
+       if (unlikely(opcode == CPL_FW4_MSG &&
+                    ((const struct cpl_fw4_msg *)rsp)->type ==
+                     FW_TYPE_RSSCPL)) {
+               rsp++;
+               opcode = ((const struct rss_header *)rsp)->opcode;
+               rsp++;
+               if (opcode != CPL_SGE_EGR_UPDATE) {
+                       dev_err(q->adapter, "unexpected FW4/CPL %#x on FW event queue\n",
+                               opcode);
+                       goto out;
+               }
+       }
+
+       if (likely(opcode == CPL_SGE_EGR_UPDATE)) {
+               /* do nothing */
+       } else if (opcode == CPL_FW6_MSG || opcode == CPL_FW4_MSG) {
+               const struct cpl_fw6_msg *msg = (const void *)rsp;
+
+               t4_handle_fw_rpl(q->adapter, msg->data);
+       } else {
+               dev_err(adapter, "unexpected CPL %#x on FW event queue\n",
+                       opcode);
+       }
+out:
+       return 0;
+}
+
+int setup_sge_fwevtq(struct adapter *adapter)
+{
+       struct sge *s = &adapter->sge;
+       int err = 0;
+       int msi_idx = 0;
+
+       err = t4_sge_alloc_rxq(adapter, &s->fw_evtq, true, adapter->eth_dev,
+                              msi_idx, NULL, fwevtq_handler, -1, NULL, 0,
+                              rte_socket_id());
+       return err;
+}
+
+static int closest_timer(const struct sge *s, int time)
+{
+       unsigned int i, match = 0;
+       int delta, min_delta = INT_MAX;
+
+       for (i = 0; i < ARRAY_SIZE(s->timer_val); i++) {
+               delta = time - s->timer_val[i];
+               if (delta < 0)
+                       delta = -delta;
+               if (delta < min_delta) {
+                       min_delta = delta;
+                       match = i;
+               }
+       }
+       return match;
+}
+
+static int closest_thres(const struct sge *s, int thres)
+{
+       unsigned int i, match = 0;
+       int delta, min_delta = INT_MAX;
+
+       for (i = 0; i < ARRAY_SIZE(s->counter_val); i++) {
+               delta = thres - s->counter_val[i];
+               if (delta < 0)
+                       delta = -delta;
+               if (delta < min_delta) {
+                       min_delta = delta;
+                       match = i;
+               }
+       }
+       return match;
+}
+
+/**
+ * cxgb4_set_rspq_intr_params - set a queue's interrupt holdoff parameters
+ * @q: the Rx queue
+ * @us: the hold-off time in us, or 0 to disable timer
+ * @cnt: the hold-off packet count, or 0 to disable counter
+ *
+ * Sets an Rx queue's interrupt hold-off time and packet count.  At least
+ * one of the two needs to be enabled for the queue to generate interrupts.
+ */
+int cxgb4_set_rspq_intr_params(struct sge_rspq *q, unsigned int us,
+                              unsigned int cnt)
+{
+       struct adapter *adap = q->adapter;
+       unsigned int timer_val;
+
+       if (cnt) {
+               int err;
+               u32 v, new_idx;
+
+               new_idx = closest_thres(&adap->sge, cnt);
+               if (q->desc && q->pktcnt_idx != new_idx) {
+                       /* the queue has already been created, update it */
+                       v = V_FW_PARAMS_MNEM(FW_PARAMS_MNEM_DMAQ) |
+                           V_FW_PARAMS_PARAM_X(
+                           FW_PARAMS_PARAM_DMAQ_IQ_INTCNTTHRESH) |
+                           V_FW_PARAMS_PARAM_YZ(q->cntxt_id);
+                       err = t4_set_params(adap, adap->mbox, adap->pf, 0, 1,
+                                           &v, &new_idx);
+                       if (err)
+                               return err;
+               }
+               q->pktcnt_idx = new_idx;
+       }
+
+       timer_val = (us == 0) ? X_TIMERREG_RESTART_COUNTER :
+                               closest_timer(&adap->sge, us);
+
+       if ((us | cnt) == 0)
+               q->intr_params = V_QINTR_TIMER_IDX(X_TIMERREG_UPDATE_CIDX);
+       else
+               q->intr_params = V_QINTR_TIMER_IDX(timer_val) |
+                                V_QINTR_CNT_EN(cnt > 0);
+       return 0;
+}
+
+static inline bool is_x_1g_port(const struct link_config *lc)
+{
+       return (lc->supported & FW_PORT_CAP_SPEED_1G) != 0;
+}
+
+static inline bool is_x_10g_port(const struct link_config *lc)
+{
+       unsigned int speeds, high_speeds;
+
+       speeds = V_FW_PORT_CAP_SPEED(G_FW_PORT_CAP_SPEED(lc->supported));
+       high_speeds = speeds & ~(FW_PORT_CAP_SPEED_100M | FW_PORT_CAP_SPEED_1G);
+
+       return high_speeds != 0;
+}
+
+inline void init_rspq(struct adapter *adap, struct sge_rspq *q,
+                     unsigned int us, unsigned int cnt,
+                     unsigned int size, unsigned int iqe_size)
+{
+       q->adapter = adap;
+       cxgb4_set_rspq_intr_params(q, us, cnt);
+       q->iqe_len = iqe_size;
+       q->size = size;
+}
+
+int cfg_queue_count(struct rte_eth_dev *eth_dev)
+{
+       struct port_info *pi = (struct port_info *)(eth_dev->data->dev_private);
+       struct adapter *adap = pi->adapter;
+       struct sge *s = &adap->sge;
+       unsigned int max_queues = s->max_ethqsets / adap->params.nports;
+
+       if ((eth_dev->data->nb_rx_queues < 1) ||
+           (eth_dev->data->nb_tx_queues < 1))
+               return -EINVAL;
+
+       if ((eth_dev->data->nb_rx_queues > max_queues) ||
+           (eth_dev->data->nb_tx_queues > max_queues))
+               return -EINVAL;
+
+       if (eth_dev->data->nb_rx_queues > pi->rss_size)
+               return -EINVAL;
+
+       /* We must configure RSS, since config has changed*/
+       pi->flags &= ~PORT_RSS_DONE;
+
+       pi->n_rx_qsets = eth_dev->data->nb_rx_queues;
+       pi->n_tx_qsets = eth_dev->data->nb_tx_queues;
+
+       return 0;
+}
+
+void cfg_queues(struct rte_eth_dev *eth_dev)
+{
+       struct rte_config *config = rte_eal_get_configuration();
+       struct port_info *pi = (struct port_info *)(eth_dev->data->dev_private);
+       struct adapter *adap = pi->adapter;
+       struct sge *s = &adap->sge;
+       unsigned int i, nb_ports = 0, qidx = 0;
+       unsigned int q_per_port = 0;
+
+       if (!(adap->flags & CFG_QUEUES)) {
+               for_each_port(adap, i) {
+                       struct port_info *tpi = adap2pinfo(adap, i);
+
+                       nb_ports += (is_x_10g_port(&tpi->link_cfg)) ||
+                                    is_x_1g_port(&tpi->link_cfg) ? 1 : 0;
+               }
+
+               /*
+                * We default up to # of cores queues per 1G/10G port.
+                */
+               if (nb_ports)
+                       q_per_port = (MAX_ETH_QSETS -
+                                    (adap->params.nports - nb_ports)) /
+                                    nb_ports;
+
+               if (q_per_port > config->lcore_count)
+                       q_per_port = config->lcore_count;
+
+               for_each_port(adap, i) {
+                       struct port_info *pi = adap2pinfo(adap, i);
+
+                       pi->first_qset = qidx;
+
+                       /* Initially n_rx_qsets == n_tx_qsets */
+                       pi->n_rx_qsets = (is_x_10g_port(&pi->link_cfg) ||
+                                         is_x_1g_port(&pi->link_cfg)) ?
+                                         q_per_port : 1;
+                       pi->n_tx_qsets = pi->n_rx_qsets;
+
+                       if (pi->n_rx_qsets > pi->rss_size)
+                               pi->n_rx_qsets = pi->rss_size;
+
+                       qidx += pi->n_rx_qsets;
+               }
+
+               s->max_ethqsets = qidx;
+
+               for (i = 0; i < ARRAY_SIZE(s->ethrxq); i++) {
+                       struct sge_eth_rxq *r = &s->ethrxq[i];
+
+                       init_rspq(adap, &r->rspq, 5, 32, 1024, 64);
+                       r->usembufs = 1;
+                       r->fl.size = (r->usembufs ? 1024 : 72);
+               }
+
+               for (i = 0; i < ARRAY_SIZE(s->ethtxq); i++)
+                       s->ethtxq[i].q.size = 1024;
+
+               init_rspq(adap, &adap->sge.fw_evtq, 0, 0, 1024, 64);
+               adap->flags |= CFG_QUEUES;
+       }
+}
+
+void cxgbe_stats_get(struct port_info *pi, struct port_stats *stats)
+{
+       t4_get_port_stats_offset(pi->adapter, pi->tx_chan, stats,
+                                &pi->stats_base);
+}
+
+void cxgbe_stats_reset(struct port_info *pi)
+{
+       t4_clr_port_stats(pi->adapter, pi->tx_chan);
+}
+
 static void setup_memwin(struct adapter *adap)
 {
        u32 mem_win0_base;
@@ -89,6 +345,36 @@ static void setup_memwin(struct adapter *adap)
                                        MEMWIN_NIC));
 }
 
+static int init_rss(struct adapter *adap)
+{
+       unsigned int i;
+       int err;
+
+       err = t4_init_rss_mode(adap, adap->mbox);
+       if (err)
+               return err;
+
+       for_each_port(adap, i) {
+               struct port_info *pi = adap2pinfo(adap, i);
+
+               pi->rss = rte_zmalloc(NULL, pi->rss_size * sizeof(u16), 0);
+               if (!pi->rss)
+                       return -ENOMEM;
+       }
+       return 0;
+}
+
+/**
+ * Dump basic information about the adapter.
+ */
+static void print_adapter_info(struct adapter *adap)
+{
+       /**
+        * Hardware/Firmware/etc. Version/Revision IDs.
+        */
+       t4_dump_version_info(adap);
+}
+
 static void print_port_info(struct adapter *adap)
 {
        int i;
@@ -100,17 +386,22 @@ static void print_port_info(struct adapter *adap)
                char *bufp = buf;
 
                if (pi->link_cfg.supported & FW_PORT_CAP_SPEED_100M)
-                       bufp += sprintf(bufp, "100/");
+                       bufp += sprintf(bufp, "100M/");
                if (pi->link_cfg.supported & FW_PORT_CAP_SPEED_1G)
-                       bufp += sprintf(bufp, "1000/");
+                       bufp += sprintf(bufp, "1G/");
                if (pi->link_cfg.supported & FW_PORT_CAP_SPEED_10G)
                        bufp += sprintf(bufp, "10G/");
+               if (pi->link_cfg.supported & FW_PORT_CAP_SPEED_25G)
+                       bufp += sprintf(bufp, "25G/");
                if (pi->link_cfg.supported & FW_PORT_CAP_SPEED_40G)
                        bufp += sprintf(bufp, "40G/");
+               if (pi->link_cfg.supported & FW_PORT_CAP_SPEED_100G)
+                       bufp += sprintf(bufp, "100G/");
                if (bufp != buf)
                        --bufp;
                sprintf(bufp, "BASE-%s",
-                       t4_get_port_type_description(pi->port_type));
+                       t4_get_port_type_description(
+                                       (enum fw_port_type)pi->port_type));
 
                dev_info(adap,
                         " " PCI_PRI_FMT " Chelsio rev %d %s %s\n",
@@ -121,6 +412,36 @@ static void print_port_info(struct adapter *adap)
        }
 }
 
+static void configure_pcie_ext_tag(struct adapter *adapter)
+{
+       u16 v;
+       int pos = t4_os_find_pci_capability(adapter, PCI_CAP_ID_EXP);
+
+       if (!pos)
+               return;
+
+       if (pos > 0) {
+               t4_os_pci_read_cfg2(adapter, pos + PCI_EXP_DEVCTL, &v);
+               v |= PCI_EXP_DEVCTL_EXT_TAG;
+               t4_os_pci_write_cfg2(adapter, pos + PCI_EXP_DEVCTL, v);
+               if (is_t6(adapter->params.chip)) {
+                       t4_set_reg_field(adapter, A_PCIE_CFG2,
+                                        V_T6_TOTMAXTAG(M_T6_TOTMAXTAG),
+                                        V_T6_TOTMAXTAG(7));
+                       t4_set_reg_field(adapter, A_PCIE_CMD_CFG,
+                                        V_T6_MINTAG(M_T6_MINTAG),
+                                        V_T6_MINTAG(8));
+               } else {
+                       t4_set_reg_field(adapter, A_PCIE_CFG2,
+                                        V_TOTMAXTAG(M_TOTMAXTAG),
+                                        V_TOTMAXTAG(3));
+                       t4_set_reg_field(adapter, A_PCIE_CMD_CFG,
+                                        V_MINTAG(M_MINTAG),
+                                        V_MINTAG(8));
+               }
+       }
+}
+
 /*
  * Tweak configuration based on system architecture, etc.  Most of these have
  * defaults assigned to them by Firmware Configuration Files (if we're using
@@ -137,7 +458,7 @@ static int adap_init0_tweaks(struct adapter *adapter)
         * Line Size, etc.  The firmware default is for a 4KB Page Size and
         * 64B Cache Line Size ...
         */
-       t4_fixup_host_params_compat(adapter, PAGE_SIZE, L1_CACHE_BYTES,
+       t4_fixup_host_params_compat(adapter, CXGBE_PAGE_SIZE, L1_CACHE_BYTES,
                                    T5_LAST_REV);
 
        /*
@@ -148,6 +469,16 @@ static int adap_init0_tweaks(struct adapter *adapter)
        t4_set_reg_field(adapter, A_SGE_CONTROL, V_PKTSHIFT(M_PKTSHIFT),
                         V_PKTSHIFT(rx_dma_offset));
 
+       t4_set_reg_field(adapter, A_SGE_FLM_CFG,
+                        V_CREDITCNT(M_CREDITCNT) | M_CREDITCNTPACKING,
+                        V_CREDITCNT(3) | V_CREDITCNTPACKING(1));
+
+       t4_set_reg_field(adapter, A_SGE_INGRESS_RX_THRESHOLD,
+                        V_THRESHOLD_3(M_THRESHOLD_3), V_THRESHOLD_3(32U));
+
+       t4_set_reg_field(adapter, A_SGE_CONTROL2, V_IDMAARBROUNDROBIN(1U),
+                        V_IDMAARBROUNDROBIN(1U));
+
        /*
         * Don't include the "IP Pseudo Header" in CPL_RX_PKT checksums: Linux
         * adds the pseudo header itself.
@@ -293,7 +624,7 @@ static int adap_init0_config(struct adapter *adapter, int reset)
        /*
         * Return successfully and note that we're operating with parameters
         * not supplied by the driver, rather than from hard-wired
-        * initialization constants burried in the driver.
+        * initialization constants buried in the driver.
         */
        dev_info(adapter,
                 "Successfully configured using Firmware Configuration File \"%s\", version %#x, computed checksum %#x\n",
@@ -356,21 +687,10 @@ static int adap_init0(struct adapter *adap)
                        dev_err(adap, "Failed to restart. Exit.\n");
                        goto bye;
                }
-               state &= ~DEV_STATE_INIT;
+               state = (enum dev_state)((unsigned)state & ~DEV_STATE_INIT);
        }
 
-       t4_get_fw_version(adap, &adap->params.fw_vers);
-       t4_get_tp_version(adap, &adap->params.tp_vers);
-
-       dev_info(adap, "fw: %u.%u.%u.%u, TP: %u.%u.%u.%u\n",
-                G_FW_HDR_FW_VER_MAJOR(adap->params.fw_vers),
-                G_FW_HDR_FW_VER_MINOR(adap->params.fw_vers),
-                G_FW_HDR_FW_VER_MICRO(adap->params.fw_vers),
-                G_FW_HDR_FW_VER_BUILD(adap->params.fw_vers),
-                G_FW_HDR_FW_VER_MAJOR(adap->params.tp_vers),
-                G_FW_HDR_FW_VER_MINOR(adap->params.tp_vers),
-                G_FW_HDR_FW_VER_MICRO(adap->params.tp_vers),
-                G_FW_HDR_FW_VER_BUILD(adap->params.tp_vers));
+       t4_get_version_info(adap);
 
        ret = t4_get_core_clock(adap, &adap->params.vpd);
        if (ret < 0) {
@@ -379,26 +699,6 @@ static int adap_init0(struct adapter *adap)
                goto bye;
        }
 
-       /*
-        * Find out what ports are available to us.  Note that we need to do
-        * this before calling adap_init0_no_config() since it needs nports
-        * and portvec ...
-        */
-       v = V_FW_PARAMS_MNEM(FW_PARAMS_MNEM_DEV) |
-           V_FW_PARAMS_PARAM_X(FW_PARAMS_PARAM_DEV_PORTVEC);
-       ret = t4_query_params(adap, adap->mbox, adap->pf, 0, 1, &v, &port_vec);
-       if (ret < 0) {
-               dev_err(adap, "%s: failure in t4_queury_params; error = %d\n",
-                       __func__, ret);
-               goto bye;
-       }
-
-       adap->params.nports = hweight32(port_vec);
-       adap->params.portvec = port_vec;
-
-       dev_debug(adap, "%s: adap->params.nports = %u\n", __func__,
-                 adap->params.nports);
-
        /*
         * If the firmware is initialized already (and we're not forcing a
         * master initialization), note that we're living with existing
@@ -423,6 +723,22 @@ static int adap_init0(struct adapter *adap)
                goto bye;
        }
 
+       /* Find out what ports are available to us. */
+       v = V_FW_PARAMS_MNEM(FW_PARAMS_MNEM_DEV) |
+           V_FW_PARAMS_PARAM_X(FW_PARAMS_PARAM_DEV_PORTVEC);
+       ret = t4_query_params(adap, adap->mbox, adap->pf, 0, 1, &v, &port_vec);
+       if (ret < 0) {
+               dev_err(adap, "%s: failure in t4_query_params; error = %d\n",
+                       __func__, ret);
+               goto bye;
+       }
+
+       adap->params.nports = hweight32(port_vec);
+       adap->params.portvec = port_vec;
+
+       dev_debug(adap, "%s: adap->params.nports = %u\n", __func__,
+                 adap->params.nports);
+
        /*
         * Give the SGE code a chance to pull in anything that it needs ...
         * Note that this must be called after we retrieve our VPD parameters
@@ -511,6 +827,7 @@ static int adap_init0(struct adapter *adap)
        }
        t4_init_sge_params(adap);
        t4_init_tp_params(adap);
+       configure_pcie_ext_tag(adap);
 
        adap->params.drv_memwin = MEMWIN_NIC;
        adap->flags |= FW_OK;
@@ -551,10 +868,10 @@ void t4_os_portmod_changed(const struct adapter *adap, int port_id)
                dev_info(adap, "Port%d: %s port module inserted\n", pi->port_id,
                         mod_str[pi->mod_type]);
        else if (pi->mod_type == FW_PORT_MOD_TYPE_NOTSUPPORTED)
-               dev_info(adap, "Port%d: unsupported optical port module inserted\n",
+               dev_info(adap, "Port%d: unsupported port module inserted\n",
                         pi->port_id);
        else if (pi->mod_type == FW_PORT_MOD_TYPE_UNKNOWN)
-               dev_info(adap, "Port%d: unknown port module inserted, forcing TWINAX\n",
+               dev_info(adap, "Port%d: unknown port module inserted\n",
                         pi->port_id);
        else if (pi->mod_type == FW_PORT_MOD_TYPE_ERROR)
                dev_info(adap, "Port%d: transceiver module error\n",
@@ -564,13 +881,340 @@ void t4_os_portmod_changed(const struct adapter *adap, int port_id)
                         pi->port_id, pi->mod_type);
 }
 
+/**
+ * link_start - enable a port
+ * @dev: the port to enable
+ *
+ * Performs the MAC and PHY actions needed to enable a port.
+ */
+int link_start(struct port_info *pi)
+{
+       struct adapter *adapter = pi->adapter;
+       int ret;
+       unsigned int mtu;
+
+       mtu = pi->eth_dev->data->dev_conf.rxmode.max_rx_pkt_len -
+             (ETHER_HDR_LEN + ETHER_CRC_LEN);
+
+       /*
+        * We do not set address filters and promiscuity here, the stack does
+        * that step explicitly.
+        */
+       ret = t4_set_rxmode(adapter, adapter->mbox, pi->viid, mtu, -1, -1,
+                           -1, 1, true);
+       if (ret == 0) {
+               ret = t4_change_mac(adapter, adapter->mbox, pi->viid,
+                                   pi->xact_addr_filt,
+                                   (u8 *)&pi->eth_dev->data->mac_addrs[0],
+                                   true, true);
+               if (ret >= 0) {
+                       pi->xact_addr_filt = ret;
+                       ret = 0;
+               }
+       }
+       if (ret == 0)
+               ret = t4_link_l1cfg(adapter, adapter->mbox, pi->tx_chan,
+                                   &pi->link_cfg);
+       if (ret == 0) {
+               /*
+                * Enabling a Virtual Interface can result in an interrupt
+                * during the processing of the VI Enable command and, in some
+                * paths, result in an attempt to issue another command in the
+                * interrupt context.  Thus, we disable interrupts during the
+                * course of the VI Enable command ...
+                */
+               ret = t4_enable_vi_params(adapter, adapter->mbox, pi->viid,
+                                         true, true, false);
+       }
+       return ret;
+}
+
+/**
+ * cxgb4_write_rss - write the RSS table for a given port
+ * @pi: the port
+ * @queues: array of queue indices for RSS
+ *
+ * Sets up the portion of the HW RSS table for the port's VI to distribute
+ * packets to the Rx queues in @queues.
+ */
+int cxgb4_write_rss(const struct port_info *pi, const u16 *queues)
+{
+       u16 *rss;
+       int i, err;
+       struct adapter *adapter = pi->adapter;
+       const struct sge_eth_rxq *rxq;
+
+       /*  Should never be called before setting up sge eth rx queues */
+       BUG_ON(!(adapter->flags & FULL_INIT_DONE));
+
+       rxq = &adapter->sge.ethrxq[pi->first_qset];
+       rss = rte_zmalloc(NULL, pi->rss_size * sizeof(u16), 0);
+       if (!rss)
+               return -ENOMEM;
+
+       /* map the queue indices to queue ids */
+       for (i = 0; i < pi->rss_size; i++, queues++)
+               rss[i] = rxq[*queues].rspq.abs_id;
+
+       err = t4_config_rss_range(adapter, adapter->pf, pi->viid, 0,
+                                 pi->rss_size, rss, pi->rss_size);
+       /*
+        * If Tunnel All Lookup isn't specified in the global RSS
+        * Configuration, then we need to specify a default Ingress
+        * Queue for any ingress packets which aren't hashed.  We'll
+        * use our first ingress queue ...
+        */
+       if (!err)
+               err = t4_config_vi_rss(adapter, adapter->mbox, pi->viid,
+                                      F_FW_RSS_VI_CONFIG_CMD_IP6FOURTUPEN |
+                                      F_FW_RSS_VI_CONFIG_CMD_IP6TWOTUPEN |
+                                      F_FW_RSS_VI_CONFIG_CMD_IP4FOURTUPEN |
+                                      F_FW_RSS_VI_CONFIG_CMD_IP4TWOTUPEN |
+                                      F_FW_RSS_VI_CONFIG_CMD_UDPEN,
+                                      rss[0]);
+       rte_free(rss);
+       return err;
+}
+
+/**
+ * setup_rss - configure RSS
+ * @adapter: the adapter
+ *
+ * Sets up RSS to distribute packets to multiple receive queues.  We
+ * configure the RSS CPU lookup table to distribute to the number of HW
+ * receive queues, and the response queue lookup table to narrow that
+ * down to the response queues actually configured for each port.
+ * We always configure the RSS mapping for all ports since the mapping
+ * table has plenty of entries.
+ */
+int setup_rss(struct port_info *pi)
+{
+       int j, err;
+       struct adapter *adapter = pi->adapter;
+
+       dev_debug(adapter, "%s:  pi->rss_size = %u; pi->n_rx_qsets = %u\n",
+                 __func__, pi->rss_size, pi->n_rx_qsets);
+
+       if (!(pi->flags & PORT_RSS_DONE)) {
+               if (adapter->flags & FULL_INIT_DONE) {
+                       /* Fill default values with equal distribution */
+                       for (j = 0; j < pi->rss_size; j++)
+                               pi->rss[j] = j % pi->n_rx_qsets;
+
+                       err = cxgb4_write_rss(pi, pi->rss);
+                       if (err)
+                               return err;
+                       pi->flags |= PORT_RSS_DONE;
+               }
+       }
+       return 0;
+}
+
+/*
+ * Enable NAPI scheduling and interrupt generation for all Rx queues.
+ */
+static void enable_rx(struct adapter *adap, struct sge_rspq *q)
+{
+       /* 0-increment GTS to start the timer and enable interrupts */
+       t4_write_reg(adap, MYPF_REG(A_SGE_PF_GTS),
+                    V_SEINTARM(q->intr_params) |
+                    V_INGRESSQID(q->cntxt_id));
+}
+
+void cxgbe_enable_rx_queues(struct port_info *pi)
+{
+       struct adapter *adap = pi->adapter;
+       struct sge *s = &adap->sge;
+       unsigned int i;
+
+       for (i = 0; i < pi->n_rx_qsets; i++)
+               enable_rx(adap, &s->ethrxq[pi->first_qset + i].rspq);
+}
+
+/**
+ * fw_caps_to_speed_caps - translate Firmware Port Caps to Speed Caps.
+ * @port_type: Firmware Port Type
+ * @fw_caps: Firmware Port Capabilities
+ * @speed_caps: Device Info Speed Capabilities
+ *
+ * Translate a Firmware Port Capabilities specification to Device Info
+ * Speed Capabilities.
+ */
+static void fw_caps_to_speed_caps(enum fw_port_type port_type,
+                                 unsigned int fw_caps,
+                                 u32 *speed_caps)
+{
+#define SET_SPEED(__speed_name) \
+       do { \
+               *speed_caps |= ETH_LINK_ ## __speed_name; \
+       } while (0)
+
+#define FW_CAPS_TO_SPEED(__fw_name) \
+       do { \
+               if (fw_caps & FW_PORT_CAP_ ## __fw_name) \
+                       SET_SPEED(__fw_name); \
+       } while (0)
+
+       switch (port_type) {
+       case FW_PORT_TYPE_BT_SGMII:
+       case FW_PORT_TYPE_BT_XFI:
+       case FW_PORT_TYPE_BT_XAUI:
+               FW_CAPS_TO_SPEED(SPEED_100M);
+               FW_CAPS_TO_SPEED(SPEED_1G);
+               FW_CAPS_TO_SPEED(SPEED_10G);
+               break;
+
+       case FW_PORT_TYPE_KX4:
+       case FW_PORT_TYPE_KX:
+       case FW_PORT_TYPE_FIBER_XFI:
+       case FW_PORT_TYPE_FIBER_XAUI:
+       case FW_PORT_TYPE_SFP:
+       case FW_PORT_TYPE_QSFP_10G:
+       case FW_PORT_TYPE_QSA:
+               FW_CAPS_TO_SPEED(SPEED_1G);
+               FW_CAPS_TO_SPEED(SPEED_10G);
+               break;
+
+       case FW_PORT_TYPE_KR:
+               SET_SPEED(SPEED_10G);
+               break;
+
+       case FW_PORT_TYPE_BP_AP:
+       case FW_PORT_TYPE_BP4_AP:
+               SET_SPEED(SPEED_1G);
+               SET_SPEED(SPEED_10G);
+               break;
+
+       case FW_PORT_TYPE_BP40_BA:
+       case FW_PORT_TYPE_QSFP:
+               SET_SPEED(SPEED_40G);
+               break;
+
+       case FW_PORT_TYPE_CR_QSFP:
+       case FW_PORT_TYPE_SFP28:
+       case FW_PORT_TYPE_KR_SFP28:
+               FW_CAPS_TO_SPEED(SPEED_1G);
+               FW_CAPS_TO_SPEED(SPEED_10G);
+               FW_CAPS_TO_SPEED(SPEED_25G);
+               break;
+
+       case FW_PORT_TYPE_CR2_QSFP:
+               SET_SPEED(SPEED_50G);
+               break;
+
+       case FW_PORT_TYPE_KR4_100G:
+       case FW_PORT_TYPE_CR4_QSFP:
+               FW_CAPS_TO_SPEED(SPEED_25G);
+               FW_CAPS_TO_SPEED(SPEED_40G);
+               FW_CAPS_TO_SPEED(SPEED_100G);
+               break;
+
+       default:
+               break;
+       }
+
+#undef FW_CAPS_TO_SPEED
+#undef SET_SPEED
+}
+
+/**
+ * cxgbe_get_speed_caps - Fetch supported speed capabilities
+ * @pi: Underlying port's info
+ * @speed_caps: Device Info speed capabilities
+ *
+ * Fetch supported speed capabilities of the underlying port.
+ */
+void cxgbe_get_speed_caps(struct port_info *pi, u32 *speed_caps)
+{
+       *speed_caps = 0;
+
+       fw_caps_to_speed_caps(pi->port_type, pi->link_cfg.supported,
+                             speed_caps);
+
+       if (!(pi->link_cfg.supported & FW_PORT_CAP_ANEG))
+               *speed_caps |= ETH_LINK_SPEED_FIXED;
+}
+
+/**
+ * cxgb_up - enable the adapter
+ * @adap: adapter being enabled
+ *
+ * Called when the first port is enabled, this function performs the
+ * actions necessary to make an adapter operational, such as completing
+ * the initialization of HW modules, and enabling interrupts.
+ */
+int cxgbe_up(struct adapter *adap)
+{
+       enable_rx(adap, &adap->sge.fw_evtq);
+       t4_sge_tx_monitor_start(adap);
+       t4_intr_enable(adap);
+       adap->flags |= FULL_INIT_DONE;
+
+       /* TODO: deadman watchdog ?? */
+       return 0;
+}
+
+/*
+ * Close the port
+ */
+int cxgbe_down(struct port_info *pi)
+{
+       struct adapter *adapter = pi->adapter;
+       int err = 0;
+
+       err = t4_enable_vi(adapter, adapter->mbox, pi->viid, false, false);
+       if (err) {
+               dev_err(adapter, "%s: disable_vi failed: %d\n", __func__, err);
+               return err;
+       }
+
+       t4_reset_link_config(adapter, pi->port_id);
+       return 0;
+}
+
+/*
+ * Release resources when all the ports have been stopped.
+ */
+void cxgbe_close(struct adapter *adapter)
+{
+       struct port_info *pi;
+       int i;
+
+       if (adapter->flags & FULL_INIT_DONE) {
+               t4_intr_disable(adapter);
+               t4_sge_tx_monitor_stop(adapter);
+               t4_free_sge_resources(adapter);
+               for_each_port(adapter, i) {
+                       pi = adap2pinfo(adapter, i);
+                       if (pi->viid != 0)
+                               t4_free_vi(adapter, adapter->mbox,
+                                          adapter->pf, 0, pi->viid);
+                       rte_free(pi->eth_dev->data->mac_addrs);
+               }
+               adapter->flags &= ~FULL_INIT_DONE;
+       }
+
+       if (adapter->flags & FW_OK)
+               t4_fw_bye(adapter, adapter->mbox);
+}
+
 int cxgbe_probe(struct adapter *adapter)
 {
        struct port_info *pi;
+       int chip;
        int func, i;
        int err = 0;
+       u32 whoami;
+
+       whoami = t4_read_reg(adapter, A_PL_WHOAMI);
+       chip = t4_get_chip_type(adapter,
+                       CHELSIO_PCI_ID_VER(adapter->pdev->id.device_id));
+       if (chip < 0)
+               return chip;
+
+       func = CHELSIO_CHIP_VERSION(chip) <= CHELSIO_T5 ?
+              G_SOURCEPF(whoami) : G_T6_SOURCEPF(whoami);
 
-       func = G_SOURCEPF(t4_read_reg(adapter, A_PL_WHOAMI));
        adapter->mbox = func;
        adapter->pf = func;
 
@@ -606,7 +1250,7 @@ int cxgbe_probe(struct adapter *adapter)
                qpp = 1 << ((t4_read_reg(adapter,
                                A_SGE_EGRESS_QUEUES_PER_PAGE_PF) >> s_qpp)
                                & M_QUEUESPERPAGEPF0);
-               num_seg = PAGE_SIZE / UDBS_SEG_SIZE;
+               num_seg = CXGBE_PAGE_SIZE / UDBS_SEG_SIZE;
                if (qpp > num_seg)
                        dev_warn(adapter, "Incorrect SGE EGRESS QUEUES_PER_PAGE configuration, continuing in debug mode\n");
 
@@ -645,7 +1289,7 @@ int cxgbe_probe(struct adapter *adapter)
                 */
 
                /* reserve an ethdev entry */
-               pi->eth_dev = rte_eth_dev_allocate(name, RTE_ETH_DEV_PCI);
+               pi->eth_dev = rte_eth_dev_allocate(name);
                if (!pi->eth_dev)
                        goto out_free;
 
@@ -658,11 +1302,13 @@ int cxgbe_probe(struct adapter *adapter)
                pi->eth_dev->data = data;
 
 allocate_mac:
-               pi->eth_dev->pci_dev = adapter->pdev;
+               pi->eth_dev->device = &adapter->pdev->device;
                pi->eth_dev->data->dev_private = pi;
-               pi->eth_dev->driver = adapter->eth_dev->driver;
                pi->eth_dev->dev_ops = adapter->eth_dev->dev_ops;
-               TAILQ_INIT(&pi->eth_dev->link_intr_cbs);
+               pi->eth_dev->tx_pkt_burst = adapter->eth_dev->tx_pkt_burst;
+               pi->eth_dev->rx_pkt_burst = adapter->eth_dev->rx_pkt_burst;
+
+               rte_eth_copy_pci_info(pi->eth_dev, adapter->pdev);
 
                pi->eth_dev->data->mac_addrs = rte_zmalloc(name,
                                                           ETHER_ADDR_LEN, 0);
@@ -683,8 +1329,15 @@ allocate_mac:
                }
        }
 
+       cfg_queues(adapter->eth_dev);
+
+       print_adapter_info(adapter);
        print_port_info(adapter);
 
+       err = init_rss(adapter);
+       if (err)
+               goto out_free;
+
        return 0;
 
 out_free: