net/txgbe: support VF multicast MAC filter

Add multicast MAC filter support for VF driver.

Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>

diff --git a/doc/guides/nics/features/txgbe_vf.ini b/doc/guides/nics/features/txgbe_vf.ini
index aeb93f0..ba1812e 100644 (file)
--- a/doc/guides/nics/features/txgbe_vf.ini
+++ b/doc/guides/nics/features/txgbe_vf.ini
@@ -6,6 +6,7 @@
 [Features]
 Link status          = Y
 Unicast MAC filter   = Y
+Multicast MAC filter = Y
 Rx interrupt         = Y
 Jumbo frame          = Y
 Scattered Rx         = Y

diff --git a/drivers/net/txgbe/base/txgbe_hw.c b/drivers/net/txgbe/base/txgbe_hw.c
index c357c86..3cee8b8 100644 (file)
--- a/drivers/net/txgbe/base/txgbe_hw.c
+++ b/drivers/net/txgbe/base/txgbe_hw.c
@@ -2808,6 +2808,7 @@ s32 txgbe_init_ops_pf(struct txgbe_hw *hw)
        mac->acquire_swfw_sync = txgbe_acquire_swfw_sync;
        mac->release_swfw_sync = txgbe_release_swfw_sync;
        mac->reset_hw = txgbe_reset_hw;
+       mac->update_mc_addr_list = txgbe_update_mc_addr_list;
 
        mac->disable_sec_rx_path = txgbe_disable_sec_rx_path;
        mac->enable_sec_rx_path = txgbe_enable_sec_rx_path;

diff --git a/drivers/net/txgbe/base/txgbe_vf.c b/drivers/net/txgbe/base/txgbe_vf.c
index 9105de2..416c896 100644 (file)
--- a/drivers/net/txgbe/base/txgbe_vf.c
+++ b/drivers/net/txgbe/base/txgbe_vf.c
@@ -26,6 +26,7 @@ s32 txgbe_init_ops_vf(struct txgbe_hw *hw)
        mac->get_mac_addr = txgbe_get_mac_addr_vf;
        mac->stop_hw = txgbe_stop_hw_vf;
        mac->negotiate_api_version = txgbevf_negotiate_api_version;
+       mac->update_mc_addr_list = txgbe_update_mc_addr_list_vf;
 
        /* Link */
        mac->check_link = txgbe_check_mac_link_vf;
@@ -213,6 +214,39 @@ s32 txgbe_stop_hw_vf(struct txgbe_hw *hw)
        return 0;
 }
 
+/**
+ *  txgbe_mta_vector - Determines bit-vector in multicast table to set
+ *  @hw: pointer to hardware structure
+ *  @mc_addr: the multicast address
+ **/
+STATIC s32 txgbe_mta_vector(struct txgbe_hw *hw, u8 *mc_addr)
+{
+       u32 vector = 0;
+
+       switch (hw->mac.mc_filter_type) {
+       case 0:   /* use bits [47:36] of the address */
+               vector = ((mc_addr[4] >> 4) | (((u16)mc_addr[5]) << 4));
+               break;
+       case 1:   /* use bits [46:35] of the address */
+               vector = ((mc_addr[4] >> 3) | (((u16)mc_addr[5]) << 5));
+               break;
+       case 2:   /* use bits [45:34] of the address */
+               vector = ((mc_addr[4] >> 2) | (((u16)mc_addr[5]) << 6));
+               break;
+       case 3:   /* use bits [43:32] of the address */
+               vector = ((mc_addr[4]) | (((u16)mc_addr[5]) << 8));
+               break;
+       default:  /* Invalid mc_filter_type */
+               DEBUGOUT("MC filter type param set incorrectly\n");
+               ASSERT(0);
+               break;
+       }
+
+       /* vector can only be 12-bits or boundary will be exceeded */
+       vector &= 0xFFF;
+       return vector;
+}
+
 STATIC s32 txgbevf_write_msg_read_ack(struct txgbe_hw *hw, u32 *msg,
                                      u32 *retmsg, u16 size)
 {
@@ -258,6 +292,55 @@ s32 txgbe_set_rar_vf(struct txgbe_hw *hw, u32 index, u8 *addr, u32 vmdq,
        return ret_val;
 }
 
+/**
+ *  txgbe_update_mc_addr_list_vf - Update Multicast addresses
+ *  @hw: pointer to the HW structure
+ *  @mc_addr_list: array of multicast addresses to program
+ *  @mc_addr_count: number of multicast addresses to program
+ *  @next: caller supplied function to return next address in list
+ *  @clear: unused
+ *
+ *  Updates the Multicast Table Array.
+ **/
+s32 txgbe_update_mc_addr_list_vf(struct txgbe_hw *hw, u8 *mc_addr_list,
+                                u32 mc_addr_count, txgbe_mc_addr_itr next,
+                                bool clear)
+{
+       struct txgbe_mbx_info *mbx = &hw->mbx;
+       u32 msgbuf[TXGBE_P2VMBX_SIZE];
+       u16 *vector_list = (u16 *)&msgbuf[1];
+       u32 vector;
+       u32 cnt, i;
+       u32 vmdq;
+
+       UNREFERENCED_PARAMETER(clear);
+
+       DEBUGFUNC("txgbe_update_mc_addr_list_vf");
+
+       /* Each entry in the list uses 1 16 bit word.  We have 30
+        * 16 bit words available in our HW msg buffer (minus 1 for the
+        * msg type).  That's 30 hash values if we pack 'em right.  If
+        * there are more than 30 MC addresses to add then punt the
+        * extras for now and then add code to handle more than 30 later.
+        * It would be unusual for a server to request that many multi-cast
+        * addresses except for in large enterprise network environments.
+        */
+
+       DEBUGOUT("MC Addr Count = %d\n", mc_addr_count);
+
+       cnt = (mc_addr_count > 30) ? 30 : mc_addr_count;
+       msgbuf[0] = TXGBE_VF_SET_MULTICAST;
+       msgbuf[0] |= cnt << TXGBE_VT_MSGINFO_SHIFT;
+
+       for (i = 0; i < cnt; i++) {
+               vector = txgbe_mta_vector(hw, next(hw, &mc_addr_list, &vmdq));
+               DEBUGOUT("Hash value = 0x%03X\n", vector);
+               vector_list[i] = (u16)vector;
+       }
+
+       return mbx->write_posted(hw, msgbuf, TXGBE_P2VMBX_SIZE, 0);
+}
+
 /**
  *  txgbevf_update_xcast_mode - Update Multicast mode
  *  @hw: pointer to the HW structure

diff --git a/drivers/net/txgbe/base/txgbe_vf.h b/drivers/net/txgbe/base/txgbe_vf.h
index 710df83..39714d1 100644 (file)
--- a/drivers/net/txgbe/base/txgbe_vf.h
+++ b/drivers/net/txgbe/base/txgbe_vf.h
@@ -47,6 +47,9 @@ s32 txgbe_check_mac_link_vf(struct txgbe_hw *hw, u32 *speed,
 s32 txgbe_set_rar_vf(struct txgbe_hw *hw, u32 index, u8 *addr, u32 vmdq,
                     u32 enable_addr);
 s32 txgbevf_set_uc_addr_vf(struct txgbe_hw *hw, u32 index, u8 *addr);
+s32 txgbe_update_mc_addr_list_vf(struct txgbe_hw *hw, u8 *mc_addr_list,
+                                u32 mc_addr_count, txgbe_mc_addr_itr next,
+                                bool clear);
 s32 txgbevf_update_xcast_mode(struct txgbe_hw *hw, int xcast_mode);
 s32 txgbe_set_vfta_vf(struct txgbe_hw *hw, u32 vlan, u32 vind,
                      bool vlan_on, bool vlvf_bypass);

diff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c
index 247bb04..90137d0 100644 (file)
--- a/drivers/net/txgbe/txgbe_ethdev.c
+++ b/drivers/net/txgbe/txgbe_ethdev.c
@@ -4121,7 +4121,7 @@ txgbe_dev_set_mc_addr_list(struct rte_eth_dev *dev,
 
        hw = TXGBE_DEV_HW(dev);
        mc_addr_list = (u8 *)mc_addr_set;
-       return txgbe_update_mc_addr_list(hw, mc_addr_list, nb_mc_addr,
+       return hw->mac.update_mc_addr_list(hw, mc_addr_list, nb_mc_addr,
                                         txgbe_dev_addr_list_itr, TRUE);
 }
 

diff --git a/drivers/net/txgbe/txgbe_ethdev_vf.c b/drivers/net/txgbe/txgbe_ethdev_vf.c
index 74cdcc6..b9d55de 100644 (file)
--- a/drivers/net/txgbe/txgbe_ethdev_vf.c
+++ b/drivers/net/txgbe/txgbe_ethdev_vf.c
@@ -1080,6 +1080,7 @@ static const struct eth_dev_ops txgbevf_eth_dev_ops = {
        .rx_queue_intr_disable = txgbevf_dev_rx_queue_intr_disable,
        .mac_addr_add         = txgbevf_add_mac_addr,
        .mac_addr_remove      = txgbevf_remove_mac_addr,
+       .set_mc_addr_list     = txgbe_dev_set_mc_addr_list,
        .rxq_info_get         = txgbe_rxq_info_get,
        .txq_info_get         = txgbe_txq_info_get,
        .mac_addr_set         = txgbevf_set_default_mac_addr,