net/ice: fix VSI array out of bounds access

[dpdk.git] / drivers / net / enetc / enetc_ethdev.c

diff --git a/drivers/net/enetc/enetc_ethdev.c b/drivers/net/enetc/enetc_ethdev.c
index c609971..b496cd4 100644 (file)
--- a/drivers/net/enetc/enetc_ethdev.c
+++ b/drivers/net/enetc/enetc_ethdev.c
@@ -1,16 +1,15 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright 2018-2019 NXP
+ * Copyright 2018-2020 NXP
  */
 
 #include <stdbool.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_pci.h>
 #include <rte_random.h>
+#include <dpaax_iova_table.h>
 
 #include "enetc_logs.h"
 #include "enetc.h"
 
-int enetc_logtype_pmd;
-
 static int
 enetc_dev_start(struct rte_eth_dev *dev)
 {
@@ -46,7 +45,7 @@ enetc_dev_start(struct rte_eth_dev *dev)
        return 0;
 }
 
-static void
+static int
 enetc_dev_stop(struct rte_eth_dev *dev)
 {
        struct enetc_eth_hw *hw =
@@ -55,6 +54,7 @@ enetc_dev_stop(struct rte_eth_dev *dev)
        uint32_t val;
 
        PMD_INIT_FUNC_TRACE();
+       dev->data->dev_started = 0;
        /* Disable port */
        val = enetc_port_rd(enetc_hw, ENETC_PMR);
        enetc_port_wr(enetc_hw, ENETC_PMR, val & (~ENETC_PMR_EN));
@@ -62,6 +62,8 @@ enetc_dev_stop(struct rte_eth_dev *dev)
        val = enetc_port_rd(enetc_hw, ENETC_PM0_CMD_CFG);
        enetc_port_wr(enetc_hw, ENETC_PM0_CMD_CFG,
                      val & (~(ENETC_PM0_TX_EN | ENETC_PM0_RX_EN)));
+
+       return 0;
 }
 
 static const uint32_t *
@@ -146,6 +148,15 @@ enetc_hardware_init(struct enetc_eth_hw *hw)
        hw->hw.port = (void *)((size_t)hw->hw.reg + ENETC_PORT_BASE);
        hw->hw.global = (void *)((size_t)hw->hw.reg + ENETC_GLOBAL_BASE);
 
+       /* WA for Rx lock-up HW erratum */
+       enetc_port_wr(enetc_hw, ENETC_PM0_RX_FIFO, 1);
+
+       /* set ENETC transaction flags to coherent, don't allocate.
+        * BD writes merge with surrounding cache line data, frame data writes
+        * overwrite cache line.
+        */
+       enetc_wr(enetc_hw, ENETC_SICAR0, ENETC_SICAR0_COHERENT);
+
        /* Enabling Station Interface */
        enetc_wr(enetc_hw, ENETC_SIMR, ENETC_SIMR_EN);
 
@@ -537,13 +548,17 @@ enetc_stats_reset(struct rte_eth_dev *dev)
        return 0;
 }
 
-static void
+static int
 enetc_dev_close(struct rte_eth_dev *dev)
 {
        uint16_t i;
+       int ret;
 
        PMD_INIT_FUNC_TRACE();
-       enetc_dev_stop(dev);
+       if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+               return 0;
+
+       ret = enetc_dev_stop(dev);
 
        for (i = 0; i < dev->data->nb_rx_queues; i++) {
                enetc_rx_queue_release(dev->data->rx_queues[i]);
@@ -556,6 +571,11 @@ enetc_dev_close(struct rte_eth_dev *dev)
                dev->data->tx_queues[i] = NULL;
        }
        dev->data->nb_tx_queues = 0;
+
+       if (rte_eal_iova_mode() == RTE_IOVA_PA)
+               dpaax_iova_table_depopulate();
+
+       return ret;
 }
 
 static int
@@ -657,7 +677,7 @@ enetc_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
                return -EINVAL;
        }
 
-       if (frame_size > RTE_ETHER_MAX_LEN)
+       if (frame_size > ENETC_ETH_MAX_LEN)
                dev->data->dev_conf.rxmode.offloads &=
                                                DEV_RX_OFFLOAD_JUMBO_FRAME;
        else
@@ -865,6 +885,8 @@ enetc_dev_init(struct rte_eth_dev *eth_dev)
        eth_dev->rx_pkt_burst = &enetc_recv_pkts;
        eth_dev->tx_pkt_burst = &enetc_xmit_pkts;
 
+       eth_dev->data->dev_flags |= RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS;
+
        /* Retrieving and storing the HW base address of device */
        hw->hw.reg = (void *)pci_dev->mem_resource[0].addr;
        hw->device_id = pci_dev->id.device_id;
@@ -896,6 +918,9 @@ enetc_dev_init(struct rte_eth_dev *eth_dev)
        eth_dev->data->mtu = RTE_ETHER_MAX_LEN - RTE_ETHER_HDR_LEN -
                RTE_ETHER_CRC_LEN;
 
+       if (rte_eal_iova_mode() == RTE_IOVA_PA)
+               dpaax_iova_table_populate();
+
        ENETC_PMD_DEBUG("port_id %d vendorID=0x%x deviceID=0x%x",
                        eth_dev->data->port_id, pci_dev->id.vendor_id,
                        pci_dev->id.device_id);
@@ -903,10 +928,11 @@ enetc_dev_init(struct rte_eth_dev *eth_dev)
 }
 
 static int
-enetc_dev_uninit(struct rte_eth_dev *eth_dev __rte_unused)
+enetc_dev_uninit(struct rte_eth_dev *eth_dev)
 {
        PMD_INIT_FUNC_TRACE();
-       return 0;
+
+       return enetc_dev_close(eth_dev);
 }
 
 static int
@@ -934,10 +960,4 @@ static struct rte_pci_driver rte_enetc_pmd = {
 RTE_PMD_REGISTER_PCI(net_enetc, rte_enetc_pmd);
 RTE_PMD_REGISTER_PCI_TABLE(net_enetc, pci_id_enetc_map);
 RTE_PMD_REGISTER_KMOD_DEP(net_enetc, "* vfio-pci");
-
-RTE_INIT(enetc_pmd_init_log)
-{
-       enetc_logtype_pmd = rte_log_register("pmd.net.enetc");
-       if (enetc_logtype_pmd >= 0)
-               rte_log_set_level(enetc_logtype_pmd, RTE_LOG_NOTICE);
-}
+RTE_LOG_REGISTER_DEFAULT(enetc_logtype_pmd, NOTICE);