net/ice/base: add some helper macros

[dpdk.git] / drivers / net / ixgbe / ixgbe_pf.c

diff --git a/drivers/net/ixgbe/ixgbe_pf.c b/drivers/net/ixgbe/ixgbe_pf.c
index c381acf..be0c076 100644 (file)
--- a/drivers/net/ixgbe/ixgbe_pf.c
+++ b/drivers/net/ixgbe/ixgbe_pf.c
@@ -128,8 +128,6 @@ void ixgbe_pf_host_uninit(struct rte_eth_dev *eth_dev)
 
        PMD_INIT_FUNC_TRACE();
 
-       vfinfo = IXGBE_DEV_PRIVATE_TO_P_VFDATA(eth_dev->data->dev_private);
-
        RTE_ETH_DEV_SRIOV(eth_dev).active = 0;
        RTE_ETH_DEV_SRIOV(eth_dev).nb_q_per_pool = 0;
        RTE_ETH_DEV_SRIOV(eth_dev).def_vmdq_idx = 0;
@@ -139,6 +137,10 @@ void ixgbe_pf_host_uninit(struct rte_eth_dev *eth_dev)
        if (vf_num == 0)
                return;
 
+       vfinfo = IXGBE_DEV_PRIVATE_TO_P_VFDATA(eth_dev->data->dev_private);
+       if (*vfinfo == NULL)
+               return;
+
        ret = rte_eth_switch_domain_free((*vfinfo)->switch_domain_id);
        if (ret)
                PMD_INIT_LOG(WARNING, "failed to free switch domain: %d", ret);
@@ -349,7 +351,7 @@ ixgbe_vf_reset_event(struct rte_eth_dev *dev, uint16_t vf)
        int rar_entry = hw->mac.num_rar_entries - (vf + 1);
        uint32_t vmolr = IXGBE_READ_REG(hw, IXGBE_VMOLR(vf));
 
-       vmolr |= (IXGBE_VMOLR_ROPE | IXGBE_VMOLR_ROMPE |
+       vmolr |= (IXGBE_VMOLR_ROPE |
                        IXGBE_VMOLR_BAM | IXGBE_VMOLR_AUPE);
        IXGBE_WRITE_REG(hw, IXGBE_VMOLR(vf), vmolr);
 
@@ -501,6 +503,7 @@ ixgbe_vf_set_multicast(struct rte_eth_dev *dev, uint32_t vf, uint32_t *msgbuf)
        const uint32_t IXGBE_MTA_BIT_MASK = (0x1 << IXGBE_MTA_BIT_SHIFT) - 1;
        uint32_t reg_val;
        int i;
+       u32 vmolr = IXGBE_READ_REG(hw, IXGBE_VMOLR(vf));
 
        /* Disable multicast promiscuous first */
        ixgbe_disable_vf_mc_promisc(dev, vf);
@@ -514,6 +517,12 @@ ixgbe_vf_set_multicast(struct rte_eth_dev *dev, uint32_t vf, uint32_t *msgbuf)
                vfinfo->vf_mc_hashes[i] = hash_list[i];
        }
 
+       if (nb_entries == 0) {
+               vmolr &= ~IXGBE_VMOLR_ROMPE;
+               IXGBE_WRITE_REG(hw, IXGBE_VMOLR(vf), vmolr);
+               return 0;
+       }
+
        for (i = 0; i < vfinfo->num_vf_mc_hashes; i++) {
                mta_idx = (vfinfo->vf_mc_hashes[i] >> IXGBE_MTA_BIT_SHIFT)
                                & IXGBE_MTA_INDEX_MASK;
@@ -523,6 +532,9 @@ ixgbe_vf_set_multicast(struct rte_eth_dev *dev, uint32_t vf, uint32_t *msgbuf)
                IXGBE_WRITE_REG(hw, IXGBE_MTA(mta_idx), reg_val);
        }
 
+       vmolr |= IXGBE_VMOLR_ROMPE;
+       IXGBE_WRITE_REG(hw, IXGBE_VMOLR(vf), vmolr);
+
        return 0;
 }