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, 43 insertions, 2 deletions

diff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c
index 6e34c40e7840..8d5d6635a123 100644
--- a/drivers/net/ethernet/intel/ice/ice_lib.c
+++ b/drivers/net/ethernet/intel/ice/ice_lib.c
@@ -1010,6 +1010,13 @@ static int ice_vsi_init(struct ice_vsi *vsi)
                         ICE_AQ_VSI_SEC_FLAG_ENA_MAC_ANTI_SPOOF;
         }
 
+        /* Allow control frames out of main VSI */
+        if (vsi->type == ICE_VSI_PF) {
+                ctxt->info.sec_flags |= ICE_AQ_VSI_SEC_FLAG_ALLOW_DEST_OVRD;
+                ctxt->info.valid_sections |=
+                        cpu_to_le16(ICE_AQ_VSI_PROP_SECURITY_VALID);
+        }
+
         ret = ice_add_vsi(hw, vsi->idx, ctxt, NULL);
         if (ret) {
                 dev_err(&pf->pdev->dev,
@@ -2534,7 +2541,7 @@ ice_vsi_setup(struct ice_pf *pf, struct ice_port_info *pi,
                 ice_cfg_sw_lldp(vsi, true, true);
 
                 /* Rx LLDP packets */
-                if (!test_bit(ICE_FLAG_ENABLE_FW_LLDP, pf->flags))
+                if (!test_bit(ICE_FLAG_FW_LLDP_AGENT, pf->flags))
                         ice_cfg_sw_lldp(vsi, false, true);
         }
 
@@ -2810,6 +2817,10 @@ void ice_vsi_dis_irq(struct ice_vsi *vsi)
 
         ice_flush(hw);
 
+        /* don't call synchronize_irq() for VF's from the host */
+        if (vsi->type == ICE_VSI_VF)
+                return;
+
         ice_for_each_q_vector(vsi, i)
                 synchronize_irq(pf->msix_entries[i + base].vector);
 }
@@ -2877,7 +2888,7 @@ int ice_vsi_release(struct ice_vsi *vsi)
                 /* The Rx rule will only exist to remove if the LLDP FW
                  * engine is currently stopped
                  */
-                if (!test_bit(ICE_FLAG_ENABLE_FW_LLDP, pf->flags))
+                if (!test_bit(ICE_FLAG_FW_LLDP_AGENT, pf->flags))
                         ice_cfg_sw_lldp(vsi, false, false);
         }
 
@@ -3170,3 +3181,33 @@ out:
         return ret;
 }
 #endif /* CONFIG_DCB */
+
+/**
+ * ice_vsi_cfg_mac_fltr - Add or remove a MAC address filter for a VSI
+ * @vsi: the VSI being configured MAC filter
+ * @macaddr: the MAC address to be added.
+ * @set: Add or delete a MAC filter
+ *
+ * Adds or removes MAC address filter entry for VF VSI
+ */
+enum ice_status
+ice_vsi_cfg_mac_fltr(struct ice_vsi *vsi, const u8 *macaddr, bool set)
+{
+        LIST_HEAD(tmp_add_list);
+        enum ice_status status;
+
+         /* Update MAC filter list to be added or removed for a VSI */
+        if (ice_add_mac_to_list(vsi, &tmp_add_list, macaddr)) {
+                status = ICE_ERR_NO_MEMORY;
+                goto cfg_mac_fltr_exit;
+        }
+
+        if (set)
+                status = ice_add_mac(&vsi->back->hw, &tmp_add_list);
+        else
+                status = ice_remove_mac(&vsi->back->hw, &tmp_add_list);
+
+cfg_mac_fltr_exit:
+        ice_free_fltr_list(&vsi->back->pdev->dev, &tmp_add_list);
+        return status;
+}