net/enetc: fix Rx lock-up

[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 bd53811..eb637d0 100644 (file)
--- a/drivers/net/enetc/enetc_ethdev.c
+++ b/drivers/net/enetc/enetc_ethdev.c
@@ -1,9 +1,11 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright 2018-2019 NXP
+ * Copyright 2018-2020 NXP
  */
 
 #include <stdbool.h>
 #include <rte_ethdev_pci.h>
+#include <rte_random.h>
+#include <dpaax_iova_table.h>
 
 #include "enetc_logs.h"
 #include "enetc.h"
@@ -123,23 +125,58 @@ enetc_link_update(struct rte_eth_dev *dev, int wait_to_complete __rte_unused)
        return rte_eth_linkstatus_set(dev, &link);
 }
 
+static void
+print_ethaddr(const char *name, const struct rte_ether_addr *eth_addr)
+{
+       char buf[RTE_ETHER_ADDR_FMT_SIZE];
+
+       rte_ether_format_addr(buf, RTE_ETHER_ADDR_FMT_SIZE, eth_addr);
+       ENETC_PMD_NOTICE("%s%s\n", name, buf);
+}
+
 static int
 enetc_hardware_init(struct enetc_eth_hw *hw)
 {
        struct enetc_hw *enetc_hw = &hw->hw;
        uint32_t *mac = (uint32_t *)hw->mac.addr;
+       uint32_t high_mac = 0;
+       uint16_t low_mac = 0;
 
        PMD_INIT_FUNC_TRACE();
        /* Calculating and storing the base HW addresses */
        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);
+
        /* Enabling Station Interface */
        enetc_wr(enetc_hw, ENETC_SIMR, ENETC_SIMR_EN);
 
        *mac = (uint32_t)enetc_port_rd(enetc_hw, ENETC_PSIPMAR0(0));
+       high_mac = (uint32_t)*mac;
        mac++;
        *mac = (uint16_t)enetc_port_rd(enetc_hw, ENETC_PSIPMAR1(0));
+       low_mac = (uint16_t)*mac;
+
+       if ((high_mac | low_mac) == 0) {
+               char *first_byte;
+
+               ENETC_PMD_NOTICE("MAC is not available for this SI, "
+                               "set random MAC\n");
+               mac = (uint32_t *)hw->mac.addr;
+               *mac = (uint32_t)rte_rand();
+               first_byte = (char *)mac;
+               *first_byte &= 0xfe;    /* clear multicast bit */
+               *first_byte |= 0x02;    /* set local assignment bit (IEEE802) */
+
+               enetc_port_wr(enetc_hw, ENETC_PSIPMAR0(0), *mac);
+               mac++;
+               *mac = (uint16_t)rte_rand();
+               enetc_port_wr(enetc_hw, ENETC_PSIPMAR1(0), *mac);
+               print_ethaddr("New address: ",
+                             (const struct rte_ether_addr *)hw->mac.addr);
+       }
 
        return 0;
 }
@@ -178,12 +215,12 @@ enetc_alloc_txbdr(struct enetc_bdr *txr, uint16_t nb_desc)
        int size;
 
        size = nb_desc * sizeof(struct enetc_swbd);
-       txr->q_swbd = rte_malloc(NULL, size, RTE_CACHE_LINE_SIZE);
+       txr->q_swbd = rte_malloc(NULL, size, ENETC_BD_RING_ALIGN);
        if (txr->q_swbd == NULL)
                return -ENOMEM;
 
        size = nb_desc * sizeof(struct enetc_tx_bd);
-       txr->bd_base = rte_malloc(NULL, size, RTE_CACHE_LINE_SIZE);
+       txr->bd_base = rte_malloc(NULL, size, ENETC_BD_RING_ALIGN);
        if (txr->bd_base == NULL) {
                rte_free(txr->q_swbd);
                txr->q_swbd = NULL;
@@ -325,12 +362,12 @@ enetc_alloc_rxbdr(struct enetc_bdr *rxr,
        int size;
 
        size = nb_rx_desc * sizeof(struct enetc_swbd);
-       rxr->q_swbd = rte_malloc(NULL, size, RTE_CACHE_LINE_SIZE);
+       rxr->q_swbd = rte_malloc(NULL, size, ENETC_BD_RING_ALIGN);
        if (rxr->q_swbd == NULL)
                return -ENOMEM;
 
        size = nb_rx_desc * sizeof(union enetc_rx_bd);
-       rxr->bd_base = rte_malloc(NULL, size, RTE_CACHE_LINE_SIZE);
+       rxr->bd_base = rte_malloc(NULL, size, ENETC_BD_RING_ALIGN);
        if (rxr->bd_base == NULL) {
                rte_free(rxr->q_swbd);
                rxr->q_swbd = NULL;
@@ -563,7 +600,7 @@ enetc_promiscuous_disable(struct rte_eth_dev *dev)
        return 0;
 }
 
-static void
+static int
 enetc_allmulticast_enable(struct rte_eth_dev *dev)
 {
        struct enetc_eth_hw *hw =
@@ -577,9 +614,11 @@ enetc_allmulticast_enable(struct rte_eth_dev *dev)
        psipmr |= ENETC_PSIPMR_SET_MP(0);
 
        enetc_port_wr(enetc_hw, ENETC_PSIPMR, psipmr);
+
+       return 0;
 }
 
-static void
+static int
 enetc_allmulticast_disable(struct rte_eth_dev *dev)
 {
        struct enetc_eth_hw *hw =
@@ -588,13 +627,15 @@ enetc_allmulticast_disable(struct rte_eth_dev *dev)
        uint32_t psipmr = 0;
 
        if (dev->data->promiscuous == 1)
-               return; /* must remain in all_multicast mode */
+               return 0; /* must remain in all_multicast mode */
 
        /* Setting to disable all multicast mode for SI0*/
        psipmr = enetc_port_rd(enetc_hw, ENETC_PSIPMR) &
                               ~(ENETC_PSIPMR_SET_MP(0));
 
        enetc_port_wr(enetc_hw, ENETC_PSIPMR, psipmr);
+
+       return 0;
 }
 
 static int
@@ -859,6 +900,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);
@@ -869,6 +913,10 @@ static int
 enetc_dev_uninit(struct rte_eth_dev *eth_dev __rte_unused)
 {
        PMD_INIT_FUNC_TRACE();
+
+       if (rte_eal_iova_mode() == RTE_IOVA_PA)
+               dpaax_iova_table_depopulate();
+
        return 0;
 }