net/hinic/base: add message check for command channel

[dpdk.git] / drivers / net / nfp / nfp_net.c

diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c
index 2d20d4c..1608bf5 100644 (file)
--- a/drivers/net/nfp/nfp_net.c
+++ b/drivers/net/nfp/nfp_net.c
@@ -50,7 +50,7 @@
 #include <errno.h>
 
 /* Prototypes */
-static void nfp_net_close(struct rte_eth_dev *dev);
+static int nfp_net_close(struct rte_eth_dev *dev);
 static int nfp_net_configure(struct rte_eth_dev *dev);
 static void nfp_net_dev_interrupt_handler(void *param);
 static void nfp_net_dev_interrupt_delayed_handler(void *param);
@@ -80,7 +80,7 @@ static int nfp_net_start(struct rte_eth_dev *dev);
 static int nfp_net_stats_get(struct rte_eth_dev *dev,
                              struct rte_eth_stats *stats);
 static int nfp_net_stats_reset(struct rte_eth_dev *dev);
-static void nfp_net_stop(struct rte_eth_dev *dev);
+static int nfp_net_stop(struct rte_eth_dev *dev);
 static uint16_t nfp_net_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
                                  uint16_t nb_pkts);
 
@@ -788,7 +788,7 @@ error:
 }
 
 /* Stop device: disable rx and tx functions to allow for reconfiguring. */
-static void
+static int
 nfp_net_stop(struct rte_eth_dev *dev)
 {
        int i;
@@ -819,6 +819,8 @@ nfp_net_stop(struct rte_eth_dev *dev)
                        nfp_eth_set_configured(dev->process_private,
                                               hw->pf_port_idx, 0);
        }
+
+       return 0;
 }
 
 /* Set the link up. */
@@ -864,13 +866,16 @@ nfp_net_set_link_down(struct rte_eth_dev *dev)
 }
 
 /* Reset and stop device. The device can not be restarted. */
-static void
+static int
 nfp_net_close(struct rte_eth_dev *dev)
 {
        struct nfp_net_hw *hw;
        struct rte_pci_device *pci_dev;
        int i;
 
+       if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+               return 0;
+
        PMD_INIT_LOG(DEBUG, "Close");
 
        hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);
@@ -906,6 +911,8 @@ nfp_net_close(struct rte_eth_dev *dev)
         * The ixgbe PMD driver disables the pcie master on the
         * device. The i40e does not...
         */
+
+       return 0;
 }
 
 static int
@@ -1250,6 +1257,20 @@ nfp_net_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
                .tx_rs_thresh = DEFAULT_TX_RSBIT_THRESH,
        };
 
+       dev_info->rx_desc_lim = (struct rte_eth_desc_lim) {
+               .nb_max = NFP_NET_MAX_RX_DESC,
+               .nb_min = NFP_NET_MIN_RX_DESC,
+               .nb_align = NFP_ALIGN_RING_DESC,
+       };
+
+       dev_info->tx_desc_lim = (struct rte_eth_desc_lim) {
+               .nb_max = NFP_NET_MAX_TX_DESC,
+               .nb_min = NFP_NET_MIN_TX_DESC,
+               .nb_align = NFP_ALIGN_RING_DESC,
+               .nb_seg_max = NFP_TX_MAX_SEG,
+               .nb_mtu_seg_max = NFP_TX_MAX_MTU_SEG,
+       };
+
        dev_info->flow_type_rss_offloads = ETH_RSS_IPV4 |
                                           ETH_RSS_NONFRAG_IPV4_TCP |
                                           ETH_RSS_NONFRAG_IPV4_UDP |
@@ -1513,15 +1534,17 @@ nfp_net_rx_queue_setup(struct rte_eth_dev *dev,
        const struct rte_memzone *tz;
        struct nfp_net_rxq *rxq;
        struct nfp_net_hw *hw;
+       uint32_t rx_desc_sz;
 
        hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 
        PMD_INIT_FUNC_TRACE();
 
        /* Validating number of descriptors */
-       if (((nb_desc * sizeof(struct nfp_net_rx_desc)) % 128) != 0 ||
-           (nb_desc > NFP_NET_MAX_RX_DESC) ||
-           (nb_desc < NFP_NET_MIN_RX_DESC)) {
+       rx_desc_sz = nb_desc * sizeof(struct nfp_net_rx_desc);
+       if (rx_desc_sz % NFP_ALIGN_RING_DESC != 0 ||
+           nb_desc > NFP_NET_MAX_RX_DESC ||
+           nb_desc < NFP_NET_MIN_RX_DESC) {
                PMD_DRV_LOG(ERR, "Wrong nb_desc value");
                return -EINVAL;
        }
@@ -1660,15 +1683,17 @@ nfp_net_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
        struct nfp_net_txq *txq;
        uint16_t tx_free_thresh;
        struct nfp_net_hw *hw;
+       uint32_t tx_desc_sz;
 
        hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 
        PMD_INIT_FUNC_TRACE();
 
        /* Validating number of descriptors */
-       if (((nb_desc * sizeof(struct nfp_net_tx_desc)) % 128) != 0 ||
-           (nb_desc > NFP_NET_MAX_TX_DESC) ||
-           (nb_desc < NFP_NET_MIN_TX_DESC)) {
+       tx_desc_sz = nb_desc * sizeof(struct nfp_net_tx_desc);
+       if (tx_desc_sz % NFP_ALIGN_RING_DESC != 0 ||
+           nb_desc > NFP_NET_MAX_TX_DESC ||
+           nb_desc < NFP_NET_MIN_TX_DESC) {
                PMD_DRV_LOG(ERR, "Wrong nb_desc value");
                return -EINVAL;
        }
@@ -2967,6 +2992,8 @@ nfp_net_init(struct rte_eth_dev *eth_dev)
        if (!(hw->cap & NFP_NET_CFG_CTRL_LIVE_ADDR))
                eth_dev->data->dev_flags |= RTE_ETH_DEV_NOLIVE_MAC_ADDR;
 
+       eth_dev->data->dev_flags |= RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS;
+
        PMD_INIT_LOG(INFO, "port %d VendorID=0x%x DeviceID=0x%x "
                     "mac=%02x:%02x:%02x:%02x:%02x:%02x",
                     eth_dev->data->port_id, pci_dev->id.vendor_id,
@@ -3719,6 +3746,8 @@ static int eth_nfp_pci_remove(struct rte_pci_device *pci_dev)
        int port = 0;
 
        eth_dev = rte_eth_dev_allocated(pci_dev->device.name);
+       if (eth_dev == NULL)
+               return 0; /* port already released */
        if ((pci_dev->id.device_id == PCI_DEVICE_ID_NFP4000_PF_NIC) ||
            (pci_dev->id.device_id == PCI_DEVICE_ID_NFP6000_PF_NIC)) {
                port = get_pf_port_number(eth_dev->data->name);