net/bnx2x: fix for PCI FLR after ungraceful exit

[dpdk.git] / drivers / net / qede / qede_ethdev.c

diff --git a/drivers/net/qede/qede_ethdev.c b/drivers/net/qede/qede_ethdev.c
index f25fb91..1202300 100644 (file)
--- a/drivers/net/qede/qede_ethdev.c
+++ b/drivers/net/qede/qede_ethdev.c
@@ -499,6 +499,9 @@ qede_start_vport(struct qede_dev *qdev, uint16_t mtu)
        return 0;
 }
 
+#define QEDE_NPAR_TX_SWITCHING         "npar_tx_switching"
+#define QEDE_VF_TX_SWITCHING           "vf_tx_switching"
+
 /* Activate or deactivate vport via vport-update */
 int qede_activate_vport(struct rte_eth_dev *eth_dev, bool flg)
 {
@@ -516,10 +519,12 @@ int qede_activate_vport(struct rte_eth_dev *eth_dev, bool flg)
        params.vport_active_rx_flg = flg;
        params.vport_active_tx_flg = flg;
        if (!qdev->enable_tx_switching) {
-               if (IS_VF(edev)) {
+               if ((QEDE_NPAR_TX_SWITCHING != NULL) ||
+                   ((QEDE_VF_TX_SWITCHING != NULL) && IS_VF(edev))) {
                        params.update_tx_switching_flg = 1;
                        params.tx_switching_flg = !flg;
-                       DP_INFO(edev, "VF tx-switching is disabled\n");
+                       DP_INFO(edev, "%s tx-switching is disabled\n",
+                               QEDE_NPAR_TX_SWITCHING ? "NPAR" : "VF");
                }
        }
        for_each_hwfn(edev, i) {
@@ -1033,10 +1038,10 @@ qede_mac_addr_remove(struct rte_eth_dev *eth_dev, uint32_t index)
        ether_addr_copy(&eth_dev->data->mac_addrs[index],
                        (struct ether_addr *)&ucast.mac);
 
-       ecore_filter_ucast_cmd(edev, &ucast, ECORE_SPQ_MODE_CB, NULL);
+       qede_mac_int_ops(eth_dev, &ucast, false);
 }
 
-static void
+static int
 qede_mac_addr_set(struct rte_eth_dev *eth_dev, struct ether_addr *mac_addr)
 {
        struct qede_dev *qdev = QEDE_INIT_QDEV(eth_dev);
@@ -1045,12 +1050,11 @@ qede_mac_addr_set(struct rte_eth_dev *eth_dev, struct ether_addr *mac_addr)
        if (IS_VF(edev) && !ecore_vf_check_mac(ECORE_LEADING_HWFN(edev),
                                               mac_addr->addr_bytes)) {
                DP_ERR(edev, "Setting MAC address is not allowed\n");
-               ether_addr_copy(&qdev->primary_mac,
-                               &eth_dev->data->mac_addrs[0]);
-               return;
+               return -EPERM;
        }
 
        qede_mac_addr_add(eth_dev, mac_addr, 0, 0);
+       return 0;
 }
 
 static void qede_config_accept_any_vlan(struct qede_dev *qdev, bool flg)
@@ -1370,13 +1374,15 @@ static void qede_dev_stop(struct rte_eth_dev *eth_dev)
        /* Disable traffic */
        ecore_hw_stop_fastpath(edev); /* TBD - loop */
 
+       if (IS_PF(edev))
+               qede_mac_addr_remove(eth_dev, 0);
+
        DP_INFO(edev, "Device is stopped\n");
 }
 
-#define QEDE_TX_SWITCHING              "vf_txswitch"
-
 const char *valid_args[] = {
-       QEDE_TX_SWITCHING,
+       QEDE_NPAR_TX_SWITCHING,
+       QEDE_VF_TX_SWITCHING,
        NULL,
 };
 
@@ -1395,7 +1401,8 @@ static int qede_args_check(const char *key, const char *val, void *opaque)
                return errno;
        }
 
-       if (strcmp(QEDE_TX_SWITCHING, key) == 0)
+       if ((strcmp(QEDE_NPAR_TX_SWITCHING, key) == 0) ||
+           (strcmp(QEDE_VF_TX_SWITCHING, key) == 0))
                qdev->enable_tx_switching = !!tmp;
 
        return ret;
@@ -1541,7 +1548,6 @@ qede_dev_info_get(struct rte_eth_dev *eth_dev,
 
        PMD_INIT_FUNC_TRACE(edev);
 
-       dev_info->pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
        dev_info->min_rx_bufsize = (uint32_t)QEDE_MIN_RX_BUFF_SIZE;
        dev_info->max_rx_pktlen = (uint32_t)ETH_TX_MAX_NON_LSO_PKT_LEN;
        dev_info->rx_desc_lim = qede_rx_desc_lim;
@@ -2438,6 +2444,9 @@ static int qede_set_mtu(struct rte_eth_dev *dev, uint16_t mtu)
                dev->data->dev_started = 0;
                qede_dev_stop(dev);
                restart = true;
+       } else {
+               if (IS_PF(edev))
+                       qede_mac_addr_remove(dev, 0);
        }
        rte_delay_ms(1000);
        qede_start_vport(qdev, mtu); /* Recreate vport */
@@ -2465,7 +2474,9 @@ static int qede_set_mtu(struct rte_eth_dev *dev, uint16_t mtu)
                dev->data->dev_conf.rxmode.jumbo_frame = 0;
 
        /* Restore config lost due to vport stop */
-       qede_mac_addr_set(dev, &qdev->primary_mac);
+       if (IS_PF(edev))
+               qede_mac_addr_set(dev, &qdev->primary_mac);
+
        if (dev->data->promiscuous)
                qede_promiscuous_enable(dev);
        else