@@ -1271,6 +1271,7 @@ s32 ixgbe_init_rx_addrs_generic(struct ixgbe_hw *hw)
{
u32 i;
u32 rar_entries = hw->mac.num_rar_entries;
+ struct ixgbe_adapter *adapter = hw->back;
/*
* If the current mac address is valid, assume it is a software override
@@ -1288,15 +1289,18 @@ s32 ixgbe_init_rx_addrs_generic(struct ixgbe_hw *hw)
hw_dbg(hw, "Overriding MAC Address in RAR[0]\n");
hw_dbg(hw, " New MAC Addr =%pM\n", hw->mac.addr);
- hw->mac.ops.set_rar(hw, 0, hw->mac.addr, 0, IXGBE_RAH_AV);
+ hw->mac.ops.set_rar(hw, 0, hw->mac.addr, adapter->num_vfs,
+ IXGBE_RAH_AV);
}
hw->addr_ctrl.overflow_promisc = 0;
- hw->addr_ctrl.rar_used_count = 1;
+ /* reserve VFs receive address entries if any */
+ hw->addr_ctrl.rar_used_count = adapter->num_vfs + 1;
- /* Zero out the other receive addresses. */
- hw_dbg(hw, "Clearing RAR[1-%d]\n", rar_entries - 1);
- for (i = 1; i < rar_entries; i++) {
+ /* Zero out the other receive addresses except VFs if any */
+ hw_dbg(hw, "Clearing RAR[%d-%d]\n",
+ adapter->num_vfs + 1, rar_entries - 1);
+ for (i = adapter->num_vfs + 1; i < rar_entries; i++) {
IXGBE_WRITE_REG(hw, IXGBE_RAL(i), 0);
IXGBE_WRITE_REG(hw, IXGBE_RAH(i), 0);
}
@@ -1368,18 +1372,20 @@ s32 ixgbe_update_uc_addr_list_generic(struct ixgbe_hw *hw,
u32 uc_addr_in_use;
u32 fctrl;
struct netdev_hw_addr *ha;
+ struct ixgbe_adapter *adapter = hw->back;
/*
* Clear accounting of old secondary address list,
* don't count RAR[0]
*/
- uc_addr_in_use = hw->addr_ctrl.rar_used_count - 1;
+ uc_addr_in_use = hw->addr_ctrl.rar_used_count - 1 - adapter->num_vfs;
hw->addr_ctrl.rar_used_count -= uc_addr_in_use;
hw->addr_ctrl.overflow_promisc = 0;
- /* Zero out the other receive addresses */
- hw_dbg(hw, "Clearing RAR[1-%d]\n", uc_addr_in_use + 1);
- for (i = 0; i < uc_addr_in_use; i++) {
+ /* Zero out the other receive addresses except VFs if any */
+ hw_dbg(hw, "Clearing RAR[%d-%d]\n",
+ adapter->num_vfs + 1, uc_addr_in_use + adapter->num_vfs + 1);
+ for (i = adapter->num_vfs; i < uc_addr_in_use + adapter->num_vfs; i++) {
IXGBE_WRITE_REG(hw, IXGBE_RAL(1+i), 0);
IXGBE_WRITE_REG(hw, IXGBE_RAH(1+i), 0);
}
@@ -1387,7 +1393,7 @@ s32 ixgbe_update_uc_addr_list_generic(struct ixgbe_hw *hw,
/* Add the new addresses */
netdev_for_each_uc_addr(ha, netdev) {
hw_dbg(hw, " Adding the secondary addresses:\n");
- ixgbe_add_uc_addr(hw, ha->addr, 0);
+ ixgbe_add_uc_addr(hw, ha->addr, adapter->num_vfs);
}
if (hw->addr_ctrl.overflow_promisc) {