fm10k: fix "failed to kill vid" message for VF

[platform/kernel/linux-starfive.git] / drivers / net / ethernet / intel / fm10k / fm10k_netdev.c

diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c
index adc62fb..e85e0b0 100644 (file)
--- a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c
@@ -934,8 +934,12 @@ static int fm10k_update_vid(struct net_device *netdev, u16 vid, bool set)
        if (vid >= VLAN_N_VID)
                return -EINVAL;
 
-       /* Verify we have permission to add VLANs */
-       if (hw->mac.vlan_override)
+       /* Verify that we have permission to add VLANs. If this is a request
+        * to remove a VLAN, we still want to allow the user to remove the
+        * VLAN device. In that case, we need to clear the bit in the
+        * active_vlans bitmask.
+        */
+       if (set && hw->mac.vlan_override)
                return -EACCES;
 
        /* update active_vlans bitmask */
@@ -954,6 +958,12 @@ static int fm10k_update_vid(struct net_device *netdev, u16 vid, bool set)
                        rx_ring->vid &= ~FM10K_VLAN_CLEAR;
        }
 
+       /* If our VLAN has been overridden, there is no reason to send VLAN
+        * removal requests as they will be silently ignored.
+        */
+       if (hw->mac.vlan_override)
+               return 0;
+
        /* Do not remove default VLAN ID related entries from VLAN and MAC
         * tables
         */
@@ -1182,9 +1192,10 @@ static void fm10k_set_rx_mode(struct net_device *dev)
 
 void fm10k_restore_rx_state(struct fm10k_intfc *interface)
 {
+       struct fm10k_l2_accel *l2_accel = interface->l2_accel;
        struct net_device *netdev = interface->netdev;
        struct fm10k_hw *hw = &interface->hw;
-       int xcast_mode;
+       int xcast_mode, i;
        u16 vid, glort;
 
        /* record glort for this interface */
@@ -1234,6 +1245,24 @@ void fm10k_restore_rx_state(struct fm10k_intfc *interface)
        __dev_uc_sync(netdev, fm10k_uc_sync, fm10k_uc_unsync);
        __dev_mc_sync(netdev, fm10k_mc_sync, fm10k_mc_unsync);
 
+       /* synchronize macvlan addresses */
+       if (l2_accel) {
+               for (i = 0; i < l2_accel->size; i++) {
+                       struct net_device *sdev = l2_accel->macvlan[i];
+
+                       if (!sdev)
+                               continue;
+
+                       glort = l2_accel->dglort + 1 + i;
+
+                       hw->mac.ops.update_xcast_mode(hw, glort,
+                                                     FM10K_XCAST_MODE_MULTI);
+                       fm10k_queue_mac_request(interface, glort,
+                                               sdev->dev_addr,
+                                               hw->mac.default_vid, true);
+               }
+       }
+
        fm10k_mbx_unlock(interface);
 
        /* record updated xcast mode state */
@@ -1490,7 +1519,7 @@ static void *fm10k_dfwd_add_station(struct net_device *dev,
                hw->mac.ops.update_xcast_mode(hw, glort,
                                              FM10K_XCAST_MODE_MULTI);
                fm10k_queue_mac_request(interface, glort, sdev->dev_addr,
-                                       0, true);
+                                       hw->mac.default_vid, true);
        }
 
        fm10k_mbx_unlock(interface);
@@ -1530,7 +1559,7 @@ static void fm10k_dfwd_del_station(struct net_device *dev, void *priv)
                hw->mac.ops.update_xcast_mode(hw, glort,
                                              FM10K_XCAST_MODE_NONE);
                fm10k_queue_mac_request(interface, glort, sdev->dev_addr,
-                                       0, false);
+                                       hw->mac.default_vid, false);
        }
 
        fm10k_mbx_unlock(interface);