Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue

Jeff Kirsher says:

====================
100GbE Intel Wired LAN Driver Updates 2019-08-23

This series contains updates to ice driver only.

Dave adds logic for the necessary bits to be set in the VSI context for
the PF_VSI and the TX_descriptors for control packets egressing the
PF_VSI.  Updated the logic to detect both DCBx and LLDP states in the
firmware engine to account for situations where DCBx is enabled and LLDP
is disabled.  Fixed the driver to treat the DCBx state of "NOT_STARTED"
as a valid state and should not assume "is_fw_lldp" true automatically.
Since "enable-fw-lldp" flag was confusing and cumbersome, change the
flag to "fw-lldp-agent" with a value of on or off to help clarify
whether the LLDP agent is running or not.

Brett fixes an issue where synchronize_irq() was being called from the
host of VF's, which should not be done.

Michal fixed an issue when rebuilding the DCBx configuration while in
IEEE mode versus CEE mode, so add a check before copying the
configuration value to ensure we are only in CEE mode.

Jake fixes the PF to reject any VF request to setup head writeback since
the support has been deprecated.

Mitch adds an additional check to ensure the VF is active before sending
out an error message that a message was unable to be sent to a
particular VF.

Chinh updates the driver to use "topology" mode when checking the PHY
for status, since this mode provides us the current module type that is
available.  Fixes the driver from clearing the auto_fec_enable bit which
was blocking a user from forcing non-spec compliant FEC configurations.

Amruth does a refactor on the code to first check, then assign in the
virtual channel space.

Bruce updates the driver to actually update the stats when a user runs
the ethtool command 'ethtool -S <iface>' instead of providing a snapshot
of the stats that maybe from a second ago.

Akeem fixes up the adding/removing of VSI MAC filters for VFs, so that
VFs cannot add/remove a filter from another VSI.  We now track the
number of filters added right from when the VF resources get allocated
and won't get into MAC filter mis-match issue in the switch.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 19 insertions, 51 deletions

diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
index a0d148f590c2..f3923dec32b7 100644
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -34,8 +34,6 @@ static const struct net_device_ops ice_netdev_ops;
 static void ice_rebuild(struct ice_pf *pf);
 
 static void ice_vsi_release_all(struct ice_pf *pf);
-static void ice_update_vsi_stats(struct ice_vsi *vsi);
-static void ice_update_pf_stats(struct ice_pf *pf);
 
 /**
  * ice_get_tx_pending - returns number of Tx descriptors not processed
@@ -118,10 +116,9 @@ static void ice_check_for_hang_subtask(struct ice_pf *pf)
  */
 static int ice_init_mac_fltr(struct ice_pf *pf)
 {
-        LIST_HEAD(tmp_add_list);
+        enum ice_status status;
         u8 broadcast[ETH_ALEN];
         struct ice_vsi *vsi;
-        int status;
 
         vsi = ice_find_vsi_by_type(pf, ICE_VSI_PF);
         if (!vsi)
@@ -132,8 +129,7 @@ static int ice_init_mac_fltr(struct ice_pf *pf)
          */
 
          /* Add a unicast MAC filter so the VSI can get its packets */
-        status = ice_add_mac_to_list(vsi, &tmp_add_list,
-                                     vsi->port_info->mac.perm_addr);
+        status = ice_vsi_cfg_mac_fltr(vsi, vsi->port_info->mac.perm_addr, true);
         if (status)
                 goto unregister;
 
@@ -141,18 +137,11 @@ static int ice_init_mac_fltr(struct ice_pf *pf)
          * MAC address to the list as well.
          */
         eth_broadcast_addr(broadcast);
-        status = ice_add_mac_to_list(vsi, &tmp_add_list, broadcast);
-        if (status)
-                goto free_mac_list;
-
-        /* Program MAC filters for entries in tmp_add_list */
-        status = ice_add_mac(&pf->hw, &tmp_add_list);
+        status = ice_vsi_cfg_mac_fltr(vsi, broadcast, true);
         if (status)
-                status = -ENOMEM;
-
-free_mac_list:
-        ice_free_fltr_list(&pf->pdev->dev, &tmp_add_list);
+                goto unregister;
 
+        return 0;
 unregister:
         /* We aren't useful with no MAC filters, so unregister if we
          * had an error
@@ -166,7 +155,7 @@ unregister:
                 vsi->netdev = NULL;
         }
 
-        return status;
+        return -EIO;
 }
 
 /**
@@ -2836,10 +2825,8 @@ static int ice_set_mac_address(struct net_device *netdev, void *pi)
         struct ice_hw *hw = &pf->hw;
         struct sockaddr *addr = pi;
         enum ice_status status;
-        LIST_HEAD(a_mac_list);
-        LIST_HEAD(r_mac_list);
         u8 flags = 0;
-        int err;
+        int err = 0;
         u8 *mac;
 
         mac = (u8 *)addr->sa_data;
@@ -2862,42 +2849,23 @@ static int ice_set_mac_address(struct net_device *netdev, void *pi)
         /* When we change the MAC address we also have to change the MAC address
          * based filter rules that were created previously for the old MAC
          * address. So first, we remove the old filter rule using ice_remove_mac
-         * and then create a new filter rule using ice_add_mac. Note that for
-         * both these operations, we first need to form a "list" of MAC
-         * addresses (even though in this case, we have only 1 MAC address to be
-         * added/removed) and this done using ice_add_mac_to_list. Depending on
-         * the ensuing operation this "list" of MAC addresses is either to be
-         * added or removed from the filter.
+         * and then create a new filter rule using ice_add_mac via
+         * ice_vsi_cfg_mac_fltr function call for both add and/or remove
+         * filters.
          */
-        err = ice_add_mac_to_list(vsi, &r_mac_list, netdev->dev_addr);
-        if (err) {
-                err = -EADDRNOTAVAIL;
-                goto free_lists;
-        }
-
-        status = ice_remove_mac(hw, &r_mac_list);
+        status = ice_vsi_cfg_mac_fltr(vsi, netdev->dev_addr, false);
         if (status) {
                 err = -EADDRNOTAVAIL;
-                goto free_lists;
-        }
-
-        err = ice_add_mac_to_list(vsi, &a_mac_list, mac);
-        if (err) {
-                err = -EADDRNOTAVAIL;
-                goto free_lists;
+                goto err_update_filters;
         }
 
-        status = ice_add_mac(hw, &a_mac_list);
+        status = ice_vsi_cfg_mac_fltr(vsi, mac, true);
         if (status) {
                 err = -EADDRNOTAVAIL;
-                goto free_lists;
+                goto err_update_filters;
         }
 
-free_lists:
-        /* free list entries */
-        ice_free_fltr_list(&pf->pdev->dev, &r_mac_list);
-        ice_free_fltr_list(&pf->pdev->dev, &a_mac_list);
-
+err_update_filters:
         if (err) {
                 netdev_err(netdev, "can't set MAC %pM. filter update failed\n",
                            mac);
@@ -2913,8 +2881,8 @@ free_lists:
         flags = ICE_AQC_MAN_MAC_UPDATE_LAA_WOL;
         status = ice_aq_manage_mac_write(hw, mac, flags, NULL);
         if (status) {
-                netdev_err(netdev, "can't set MAC %pM. write to firmware failed.\n",
-                           mac);
+                netdev_err(netdev, "can't set MAC %pM. write to firmware failed error %d\n",
+                           mac, status);
         }
         return 0;
 }
@@ -3254,7 +3222,7 @@ static void ice_update_vsi_ring_stats(struct ice_vsi *vsi)
  * ice_update_vsi_stats - Update VSI stats counters
  * @vsi: the VSI to be updated
  */
-static void ice_update_vsi_stats(struct ice_vsi *vsi)
+void ice_update_vsi_stats(struct ice_vsi *vsi)
 {
         struct rtnl_link_stats64 *cur_ns = &vsi->net_stats;
         struct ice_eth_stats *cur_es = &vsi->eth_stats;
@@ -3290,7 +3258,7 @@ static void ice_update_vsi_stats(struct ice_vsi *vsi)
  * ice_update_pf_stats - Update PF port stats counters
  * @pf: PF whose stats needs to be updated
  */
-static void ice_update_pf_stats(struct ice_pf *pf)
+void ice_update_pf_stats(struct ice_pf *pf)
 {
         struct ice_hw_port_stats *prev_ps, *cur_ps;
         struct ice_hw *hw = &pf->hw;