Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

Pull networking updates from David Miller:
 "Here is my initial pull request for the networking subsystem during
  this merge window:

   1) Support for ESN in AH (RFC 4302) from Fan Du.

   2) Add full kernel doc for ethtool command structures, from Ben
      Hutchings.

   3) Add BCM7xxx PHY driver, from Florian Fainelli.

   4) Export computed TCP rate information in netlink socket dumps, from
      Eric Dumazet.

   5) Allow IPSEC SA to be dumped partially using a filter, from Nicolas
      Dichtel.

   6) Convert many drivers to pci_enable_msix_range(), from Alexander
      Gordeev.

   7) Record SKB timestamps more efficiently, from Eric Dumazet.

   8) Switch to microsecond resolution for TCP round trip times, also
      from Eric Dumazet.

   9) Clean up and fix 6lowpan fragmentation handling by making use of
      the existing inet_frag api for it's implementation.

  10) Add TX grant mapping to xen-netback driver, from Zoltan Kiss.

  11) Auto size SKB lengths when composing netlink messages based upon
      past message sizes used, from Eric Dumazet.

  12) qdisc dumps can take a long time, add a cond_resched(), From Eric
      Dumazet.

  13) Sanitize netpoll core and drivers wrt.  SKB handling semantics.
      Get rid of never-used-in-tree netpoll RX handling.  From Eric W
      Biederman.

  14) Support inter-address-family and namespace changing in VTI tunnel
      driver(s).  From Steffen Klassert.

  15) Add Altera TSE driver, from Vince Bridgers.

  16) Optimizing csum_replace2() so that it doesn't adjust the checksum
      by checksumming the entire header, from Eric Dumazet.

  17) Expand BPF internal implementation for faster interpreting, more
      direct translations into JIT'd code, and much cleaner uses of BPF
      filtering in non-socket ocntexts.  From Daniel Borkmann and Alexei
      Starovoitov"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1976 commits)
  netpoll: Use skb_irq_freeable to make zap_completion_queue safe.
  net: Add a test to see if a skb is freeable in irq context
  qlcnic: Fix build failure due to undefined reference to `vxlan_get_rx_port'
  net: ptp: move PTP classifier in its own file
  net: sxgbe: make "core_ops" static
  net: sxgbe: fix logical vs bitwise operation
  net: sxgbe: sxgbe_mdio_register() frees the bus
  Call efx_set_channels() before efx->type->dimension_resources()
  xen-netback: disable rogue vif in kthread context
  net/mlx4: Set proper build dependancy with vxlan
  be2net: fix build dependency on VxLAN
  mac802154: make csma/cca parameters per-wpan
  mac802154: allow only one WPAN to be up at any given time
  net: filter: minor: fix kdoc in __sk_run_filter
  netlink: don't compare the nul-termination in nla_strcmp
  can: c_can: Avoid led toggling for every packet.
  can: c_can: Simplify TX interrupt cleanup
  can: c_can: Store dlc private
  can: c_can: Reduce register access
  can: c_can: Make the code readable
  ...

1 files changed, 104 insertions, 31 deletions

diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
index b9d1c1c8ca5a..02c11a7f7d29 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
@@ -69,7 +69,7 @@ static inline bool i40e_vc_isvalid_vector_id(struct i40e_vf *vf, u8 vector_id)
 {
         struct i40e_pf *pf = vf->pf;
 
-        return vector_id <= pf->hw.func_caps.num_msix_vectors_vf;
+        return vector_id < pf->hw.func_caps.num_msix_vectors_vf;
 }
 
 /***********************vf resource mgmt routines*****************/
@@ -126,8 +126,8 @@ static void i40e_config_irq_link_list(struct i40e_vf *vf, u16 vsi_idx,
                 reg_idx = I40E_VPINT_LNKLST0(vf->vf_id);
         else
                 reg_idx = I40E_VPINT_LNKLSTN(
-                                           (pf->hw.func_caps.num_msix_vectors_vf
-                                              * vf->vf_id) + (vector_id - 1));
+                     ((pf->hw.func_caps.num_msix_vectors_vf - 1) * vf->vf_id) +
+                     (vector_id - 1));
 
         if (vecmap->rxq_map == 0 && vecmap->txq_map == 0) {
                 /* Special case - No queues mapped on this vector */
@@ -230,6 +230,9 @@ static int i40e_config_vsi_tx_queue(struct i40e_vf *vf, u16 vsi_idx,
         tx_ctx.qlen = info->ring_len;
         tx_ctx.rdylist = le16_to_cpu(pf->vsi[vsi_idx]->info.qs_handle[0]);
         tx_ctx.rdylist_act = 0;
+        tx_ctx.head_wb_ena = 1;
+        tx_ctx.head_wb_addr = info->dma_ring_addr +
+                              (info->ring_len * sizeof(struct i40e_tx_desc));
 
         /* clear the context in the HMC */
         ret = i40e_clear_lan_tx_queue_context(hw, pf_queue_id);
@@ -408,18 +411,10 @@ static int i40e_alloc_vsi_res(struct i40e_vf *vf, enum i40e_vsi_type type)
                                  "Could not allocate VF broadcast filter\n");
         }
 
-        if (!f) {
-                dev_err(&pf->pdev->dev, "Unable to add ucast filter\n");
-                ret = -ENOMEM;
-                goto error_alloc_vsi_res;
-        }
-
         /* program mac filter */
         ret = i40e_sync_vsi_filters(vsi);
-        if (ret) {
+        if (ret)
                 dev_err(&pf->pdev->dev, "Unable to program ucast filters\n");
-                goto error_alloc_vsi_res;
-        }
 
 error_alloc_vsi_res:
         return ret;
@@ -514,7 +509,8 @@ static void i40e_free_vf_res(struct i40e_vf *vf)
                 vf->lan_vsi_index = 0;
                 vf->lan_vsi_id = 0;
         }
-        msix_vf = pf->hw.func_caps.num_msix_vectors_vf + 1;
+        msix_vf = pf->hw.func_caps.num_msix_vectors_vf;
+
         /* disable interrupts so the VF starts in a known state */
         for (i = 0; i < msix_vf; i++) {
                 /* format is same for both registers */
@@ -679,9 +675,9 @@ void i40e_reset_vf(struct i40e_vf *vf, bool flr)
 complete_reset:
         /* reallocate vf resources to reset the VSI state */
         i40e_free_vf_res(vf);
-        mdelay(10);
         i40e_alloc_vf_res(vf);
         i40e_enable_vf_mappings(vf);
+        set_bit(I40E_VF_STAT_ACTIVE, &vf->vf_states);
 
         /* tell the VF the reset is done */
         wr32(hw, I40E_VFGEN_RSTAT1(vf->vf_id), I40E_VFR_VFACTIVE);
@@ -847,7 +843,7 @@ void i40e_free_vfs(struct i40e_pf *pf)
  *
  * allocate vf resources
  **/
-static int i40e_alloc_vfs(struct i40e_pf *pf, u16 num_alloc_vfs)
+int i40e_alloc_vfs(struct i40e_pf *pf, u16 num_alloc_vfs)
 {
         struct i40e_vf *vfs;
         int i, ret = 0;
@@ -855,16 +851,18 @@ static int i40e_alloc_vfs(struct i40e_pf *pf, u16 num_alloc_vfs)
         /* Disable interrupt 0 so we don't try to handle the VFLR. */
         i40e_irq_dynamic_disable_icr0(pf);
 
-        ret = pci_enable_sriov(pf->pdev, num_alloc_vfs);
-        if (ret) {
-                dev_err(&pf->pdev->dev,
-                        "pci_enable_sriov failed with error %d!\n", ret);
-                pf->num_alloc_vfs = 0;
-                goto err_iov;
+        /* Check to see if we're just allocating resources for extant VFs */
+        if (pci_num_vf(pf->pdev) != num_alloc_vfs) {
+                ret = pci_enable_sriov(pf->pdev, num_alloc_vfs);
+                if (ret) {
+                        dev_err(&pf->pdev->dev,
+                                "Failed to enable SR-IOV, error %d.\n", ret);
+                        pf->num_alloc_vfs = 0;
+                        goto err_iov;
+                }
         }
-
         /* allocate memory */
-        vfs = kzalloc(num_alloc_vfs * sizeof(struct i40e_vf), GFP_KERNEL);
+        vfs = kcalloc(num_alloc_vfs, sizeof(struct i40e_vf), GFP_KERNEL);
         if (!vfs) {
                 ret = -ENOMEM;
                 goto err_alloc;
@@ -1776,7 +1774,7 @@ int i40e_vc_process_vf_msg(struct i40e_pf *pf, u16 vf_id, u32 v_opcode,
                            u32 v_retval, u8 *msg, u16 msglen)
 {
         struct i40e_hw *hw = &pf->hw;
-        int local_vf_id = vf_id - hw->func_caps.vf_base_id;
+        unsigned int local_vf_id = vf_id - hw->func_caps.vf_base_id;
         struct i40e_vf *vf;
         int ret;
 
@@ -1873,7 +1871,8 @@ int i40e_vc_process_vflr_event(struct i40e_pf *pf)
                         /* clear the bit in GLGEN_VFLRSTAT */
                         wr32(hw, I40E_GLGEN_VFLRSTAT(reg_idx), (1 << bit_idx));
 
-                        i40e_reset_vf(vf, true);
+                        if (!test_bit(__I40E_DOWN, &pf->state))
+                                i40e_reset_vf(vf, true);
                 }
         }
 
@@ -1924,15 +1923,28 @@ static void i40e_vc_vf_broadcast(struct i40e_pf *pf,
 void i40e_vc_notify_link_state(struct i40e_pf *pf)
 {
         struct i40e_virtchnl_pf_event pfe;
+        struct i40e_hw *hw = &pf->hw;
+        struct i40e_vf *vf = pf->vf;
+        struct i40e_link_status *ls = &pf->hw.phy.link_info;
+        int i;
 
         pfe.event = I40E_VIRTCHNL_EVENT_LINK_CHANGE;
         pfe.severity = I40E_PF_EVENT_SEVERITY_INFO;
-        pfe.event_data.link_event.link_status =
-            pf->hw.phy.link_info.link_info & I40E_AQ_LINK_UP;
-        pfe.event_data.link_event.link_speed = pf->hw.phy.link_info.link_speed;
-
-        i40e_vc_vf_broadcast(pf, I40E_VIRTCHNL_OP_EVENT, I40E_SUCCESS,
-                             (u8 *)&pfe, sizeof(struct i40e_virtchnl_pf_event));
+        for (i = 0; i < pf->num_alloc_vfs; i++) {
+                if (vf->link_forced) {
+                        pfe.event_data.link_event.link_status = vf->link_up;
+                        pfe.event_data.link_event.link_speed =
+                                (vf->link_up ? I40E_LINK_SPEED_40GB : 0);
+                } else {
+                        pfe.event_data.link_event.link_status =
+                                ls->link_info & I40E_AQ_LINK_UP;
+                        pfe.event_data.link_event.link_speed = ls->link_speed;
+                }
+                i40e_aq_send_msg_to_vf(hw, vf->vf_id, I40E_VIRTCHNL_OP_EVENT,
+                                       0, (u8 *)&pfe, sizeof(pfe),
+                                       NULL);
+                vf++;
+        }
 }
 
 /**
@@ -2197,3 +2209,64 @@ int i40e_ndo_get_vf_config(struct net_device *netdev,
 error_param:
         return ret;
 }
+
+/**
+ * i40e_ndo_set_vf_link_state
+ * @netdev: network interface device structure
+ * @vf_id: vf identifier
+ * @link: required link state
+ *
+ * Set the link state of a specified VF, regardless of physical link state
+ **/
+int i40e_ndo_set_vf_link_state(struct net_device *netdev, int vf_id, int link)
+{
+        struct i40e_netdev_priv *np = netdev_priv(netdev);
+        struct i40e_pf *pf = np->vsi->back;
+        struct i40e_virtchnl_pf_event pfe;
+        struct i40e_hw *hw = &pf->hw;
+        struct i40e_vf *vf;
+        int ret = 0;
+
+        /* validate the request */
+        if (vf_id >= pf->num_alloc_vfs) {
+                dev_err(&pf->pdev->dev, "Invalid VF Identifier %d\n", vf_id);
+                ret = -EINVAL;
+                goto error_out;
+        }
+
+        vf = &pf->vf[vf_id];
+
+        pfe.event = I40E_VIRTCHNL_EVENT_LINK_CHANGE;
+        pfe.severity = I40E_PF_EVENT_SEVERITY_INFO;
+
+        switch (link) {
+        case IFLA_VF_LINK_STATE_AUTO:
+                vf->link_forced = false;
+                pfe.event_data.link_event.link_status =
+                        pf->hw.phy.link_info.link_info & I40E_AQ_LINK_UP;
+                pfe.event_data.link_event.link_speed =
+                        pf->hw.phy.link_info.link_speed;
+                break;
+        case IFLA_VF_LINK_STATE_ENABLE:
+                vf->link_forced = true;
+                vf->link_up = true;
+                pfe.event_data.link_event.link_status = true;
+                pfe.event_data.link_event.link_speed = I40E_LINK_SPEED_40GB;
+                break;
+        case IFLA_VF_LINK_STATE_DISABLE:
+                vf->link_forced = true;
+                vf->link_up = false;
+                pfe.event_data.link_event.link_status = false;
+                pfe.event_data.link_event.link_speed = 0;
+                break;
+        default:
+                ret = -EINVAL;
+                goto error_out;
+        }
+        /* Notify the VF of its new link state */
+        i40e_aq_send_msg_to_vf(hw, vf->vf_id, I40E_VIRTCHNL_OP_EVENT,
+                               0, (u8 *)&pfe, sizeof(pfe), NULL);
+
+error_out:
+        return ret;
+}