Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma

Pull more rdma updates from Doug Ledford:
 "Round two of 4.6 merge window patches.

  This is a monster pull request.  I held off on the hfi1 driver updates
  (the hfi1 driver is intimately tied to the qib driver and the new
  rdmavt software library that was created to help both of them) in my
  first pull request.  The hfi1/qib/rdmavt update is probably 90% of
  this pull request.  The hfi1 driver is being left in staging so that
  it can be fixed up in regards to the API that Al and yourself didn't
  like.  Intel has agreed to do the work, but in the meantime, this
  clears out 300+ patches in the backlog queue and brings my tree and
  their tree closer to sync.

  This also includes about 10 patches to the core and a few to mlx5 to
  create an infrastructure for configuring SRIOV ports on IB devices.
  That series includes one patch to the net core that we sent to netdev@
  and Dave Miller with each of the three revisions to the series.  We
  didn't get any response to the patch, so we took that as implicit
  approval.

  Finally, this series includes Intel's new iWARP driver for their x722
  cards.  It's not nearly the beast as the hfi1 driver.  It also has a
  linux-next merge issue, but that has been resolved and it now passes
  just fine.

  Summary:

   - A few minor core fixups needed for the next patch series

   - The IB SRIOV series.  This has bounced around for several versions.
     Of note is the fact that the first patch in this series effects the
     net core.  It was directed to netdev and DaveM for each iteration
     of the series (three versions total).  Dave did not object, but did
     not respond either.  I've taken this as permission to move forward
     with the series.

   - The new Intel X722 iWARP driver

   - A huge set of updates to the Intel hfi1 driver.  Of particular
     interest here is that we have left the driver in staging since it
     still has an API that people object to.  Intel is working on a fix,
     but getting these patches in now helps keep me sane as the upstream
     and Intel's trees were over 300 patches apart"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma: (362 commits)
  IB/ipoib: Allow mcast packets from other VFs
  IB/mlx5: Implement callbacks for manipulating VFs
  net/mlx5_core: Implement modify HCA vport command
  net/mlx5_core: Add VF param when querying vport counter
  IB/ipoib: Add ndo operations for configuring VFs
  IB/core: Add interfaces to control VF attributes
  IB/core: Support accessing SA in virtualized environment
  IB/core: Add subnet prefix to port info
  IB/mlx5: Fix decision on using MAD_IFC
  net/core: Add support for configuring VF GUIDs
  IB/{core, ulp} Support above 32 possible device capability flags
  IB/core: Replace setting the zero values in ib_uverbs_ex_query_device
  net/mlx5_core: Introduce offload arithmetic hardware capabilities
  net/mlx5_core: Refactor device capability function
  net/mlx5_core: Fix caching ATOMIC endian mode capability
  ib_srpt: fix a WARN_ON() message
  i40iw: Replace the obsolete crypto hash interface with shash
  IB/hfi1: Add SDMA cache eviction algorithm
  IB/hfi1: Switch to using the pin query function
  IB/hfi1: Specify mm when releasing pages
  ...

diff --cc MAINTAINERS
index 0f3063cce44cff0e957c86ef30634433e8c96b13,c62557e6893edef161242c4417c2a38d71951263..32bafda47c2fedacaf2f5b4a71347cc5889dc773
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -9215,15 -9080,17 +9225,21 @@@ S:   Maintaine
  F:    drivers/net/ethernet/rdc/r6040.c
  
  RDS - RELIABLE DATAGRAM SOCKETS
 -M:    Chien Yen <chien.yen@oracle.com>
 +M:    Santosh Shilimkar <santosh.shilimkar@oracle.com>
 +L:    netdev@vger.kernel.org
 +L:    linux-rdma@vger.kernel.org
  L:    rds-devel@oss.oracle.com (moderated for non-subscribers)
 +W:    https://oss.oracle.com/projects/rds/
  S:    Supported
  F:    net/rds/
 +F:    Documentation/networking/rds.txt
  
+ RDMAVT - RDMA verbs software
+ M:    Dennis Dalessandro <dennis.dalessandro@intel.com>
+ L:    linux-rdma@vger.kernel.org
+ S:    Supported
+ F:    drivers/infiniband/sw/rdmavt
+ 
  READ-COPY UPDATE (RCU)
  M:    "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
  M:    Josh Triplett <josh@joshtriplett.org>

diff --cc drivers/infiniband/core/sa_query.c
Simple merge

diff --cc drivers/infiniband/hw/mlx5/main.c
Simple merge

diff --cc drivers/infiniband/ulp/srpt/ib_srpt.c
Simple merge

diff --cc drivers/net/ethernet/intel/i40e/i40e.h
Simple merge

diff --cc drivers/net/ethernet/intel/i40e/i40e_main.c
index 70d9605a0d9e712f1bb89a38da053c8b07ee9a83,1df2629d37059b88502fca4cae95f0c06bf3764d..67006431726aa03c41f38c5e54bf9009e3bf9aa2
--- 1/drivers/net/ethernet/intel/i40e/i40e_main.c
--- 2/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@@ -5375,10 -5368,11 +5395,12 @@@ int i40e_open(struct net_device *netdev
        vxlan_get_rx_port(netdev);
  #endif
  #ifdef CONFIG_I40E_GENEVE
 -      geneve_get_rx_port(netdev);
 +      if (pf->flags & I40E_FLAG_GENEVE_OFFLOAD_CAPABLE)
 +              geneve_get_rx_port(netdev);
  #endif
  
+       i40e_notify_client_of_netdev_open(vsi);
+ 
        return 0;
  }
  
@@@ -11245,9 -11234,16 +11339,16 @@@ static void i40e_remove(struct pci_dev 
        if (pf->vsi[pf->lan_vsi])
                i40e_vsi_release(pf->vsi[pf->lan_vsi]);
  
+       /* remove attached clients */
+       ret_code = i40e_lan_del_device(pf);
+       if (ret_code) {
+               dev_warn(&pdev->dev, "Failed to delete client device: %d\n",
+                        ret_code);
+       }
+ 
        /* shutdown and destroy the HMC */
 -      if (pf->hw.hmc.hmc_obj) {
 -              ret_code = i40e_shutdown_lan_hmc(&pf->hw);
 +      if (hw->hmc.hmc_obj) {
 +              ret_code = i40e_shutdown_lan_hmc(hw);
                if (ret_code)
                        dev_warn(&pdev->dev,
                                 "Failed to destroy the HMC resources: %d\n",

diff --cc drivers/net/ethernet/intel/i40e/i40e_type.h
Simple merge

diff --cc drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
Simple merge

diff --cc drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/cmd.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/main.c
Simple merge

diff --cc drivers/staging/rdma/hfi1/chip.c
Simple merge

diff --cc drivers/staging/rdma/hfi1/diag.c
Simple merge

diff --cc drivers/staging/rdma/hfi1/driver.c
Simple merge

diff --cc drivers/staging/rdma/hfi1/efivar.c
Simple merge

diff --cc drivers/staging/rdma/hfi1/file_ops.c
Simple merge

diff --cc drivers/staging/rdma/hfi1/init.c
Simple merge

diff --cc drivers/staging/rdma/hfi1/mad.c
index 77700b818e3d89fecf428756bba1886b7ce8ce28,0ec748e7e7b649419732351fc2e61b7ba7813355..d1e7f4d7cf6fdf3fb32d699af45348201511b38d
--- 1/drivers/staging/rdma/hfi1/mad.c
--- 2/drivers/staging/rdma/hfi1/mad.c
+++ b/drivers/staging/rdma/hfi1/mad.c
@@@ -2737,49 -2845,21 +2845,21 @@@ static int pma_get_opa_porterrors(struc
        ppd = ppd_from_ibp(ibp);
  
        memset(rsp, 0, sizeof(*rsp));
-       rsp->port_number = (u8)port_num;
+       rsp->port_number = port_num;
+ 
+       pma_get_opa_port_ectrs(ibdev, rsp, port_num);
  
-       rsp->port_rcv_constraint_errors =
-               cpu_to_be64(read_port_cntr(ppd, C_SW_RCV_CSTR_ERR,
-                                          CNTR_INVALID_VL));
-       /* port_rcv_switch_relay_errors is 0 for HFIs */
-       rsp->port_xmit_discards =
-               cpu_to_be64(read_port_cntr(ppd, C_SW_XMIT_DSCD,
-                                               CNTR_INVALID_VL));
        rsp->port_rcv_remote_physical_errors =
                cpu_to_be64(read_dev_cntr(dd, C_DC_RMT_PHY_ERR,
-                                               CNTR_INVALID_VL));
-       tmp = read_dev_cntr(dd, C_DC_RX_REPLAY, CNTR_INVALID_VL);
-       tmp2 = tmp + read_dev_cntr(dd, C_DC_TX_REPLAY, CNTR_INVALID_VL);
-       if (tmp2 < tmp) {
-               /* overflow/wrapped */
-               rsp->local_link_integrity_errors = cpu_to_be64(~0);
-       } else {
-               rsp->local_link_integrity_errors = cpu_to_be64(tmp2);
-       }
-       tmp = read_dev_cntr(dd, C_DC_SEQ_CRC_CNT, CNTR_INVALID_VL);
-       tmp2 = tmp + read_dev_cntr(dd, C_DC_REINIT_FROM_PEER_CNT,
-                                       CNTR_INVALID_VL);
-       if (tmp2 > (u32)UINT_MAX || tmp2 < tmp) {
-               /* overflow/wrapped */
-               rsp->link_error_recovery = cpu_to_be32(~0);
-       } else {
-               rsp->link_error_recovery = cpu_to_be32(tmp2);
-       }
-       rsp->port_xmit_constraint_errors =
-               cpu_to_be64(read_port_cntr(ppd, C_SW_XMIT_CSTR_ERR,
-                                          CNTR_INVALID_VL));
-       rsp->excessive_buffer_overruns =
-               cpu_to_be64(read_dev_cntr(dd, C_RCV_OVF, CNTR_INVALID_VL));
+                                         CNTR_INVALID_VL));
        rsp->fm_config_errors =
                cpu_to_be64(read_dev_cntr(dd, C_DC_FM_CFG_ERR,
-                                               CNTR_INVALID_VL));
-       rsp->link_downed = cpu_to_be32(read_port_cntr(ppd, C_SW_LINK_DOWN,
-                                               CNTR_INVALID_VL));
+                                         CNTR_INVALID_VL));
        tmp = read_dev_cntr(dd, C_DC_UNC_ERR, CNTR_INVALID_VL);
+ 
        rsp->uncorrectable_errors = tmp < 0x100 ? (tmp & 0xff) : 0xff;
  
 -      vlinfo = (struct _vls_ectrs *)&rsp->vls[0];
 +      vlinfo = &rsp->vls[0];
        vfi = 0;
        vl_select_mask = be32_to_cpu(req->vl_select_mask);
        for_each_set_bit(vl, (unsigned long *)&(vl_select_mask),

diff --cc drivers/staging/rdma/hfi1/pcie.c
Simple merge

diff --cc drivers/staging/rdma/hfi1/pio_copy.c
index 64bef6c266539f75349300812f84ace27cff492e,228e9fb76e08045d85ee15ab23ea2089e2fc6b69..8c25e1b58849a17a22a96d6ca8c4f54de4992098
--- 1/drivers/staging/rdma/hfi1/pio_copy.c
--- 2/drivers/staging/rdma/hfi1/pio_copy.c
+++ b/drivers/staging/rdma/hfi1/pio_copy.c
@@@ -562,10 -565,12 +565,12 @@@ static void mid_copy_mix(struct pio_bu
                void __iomem *send;             /* SOP end */
                void __iomem *xend;
  
-               /* calculate the end of data or end of block, whichever
-                  comes first */
+               /*
+                * calculate the end of data or end of block, whichever
+                * comes first
+                */
                send = pbuf->start + PIO_BLOCK_SIZE;
 -              xend = send < dend ? send : dend;
 +              xend = min(send, dend);
  
                /* shift up to SOP=1 space */
                dest += SOP_DISTANCE;
@@@ -656,10 -661,12 +661,12 @@@ static void mid_copy_straight(struct pi
                void __iomem *send;             /* SOP end */
                void __iomem *xend;
  
-               /* calculate the end of data or end of block, whichever
-                  comes first */
+               /*
+                * calculate the end of data or end of block, whichever
+                * comes first
+                */
                send = pbuf->start + PIO_BLOCK_SIZE;
 -              xend = send < dend ? send : dend;
 +              xend = min(send, dend);
  
                /* shift up to SOP=1 space */
                dest += SOP_DISTANCE;

diff --cc drivers/staging/rdma/hfi1/user_sdma.c
Simple merge

diff --cc include/linux/mlx5/device.h
Simple merge

diff --cc include/linux/mlx5/driver.h
Simple merge

diff --cc include/linux/mlx5/mlx5_ifc.h
Simple merge

diff --cc include/linux/netdevice.h
Simple merge

diff --cc include/uapi/linux/if_link.h
Simple merge

diff --cc net/core/rtnetlink.c
index d2d9e5ebf58ea827f8e0b5aaa85cea23cd3b77dd,4b6f3db9f8afb8589be7ec4363911d6770abae2c..167883e0931735a58d823a4efc46776b9c50a071
--- 1/net/core/rtnetlink.c
--- 2/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@@ -1389,8 -1387,19 +1389,10 @@@ static const struct nla_policy ifla_vf_
        [IFLA_VF_RSS_QUERY_EN]  = { .len = sizeof(struct ifla_vf_rss_query_en) },
        [IFLA_VF_STATS]         = { .type = NLA_NESTED },
        [IFLA_VF_TRUST]         = { .len = sizeof(struct ifla_vf_trust) },
+       [IFLA_VF_IB_NODE_GUID]  = { .len = sizeof(struct ifla_vf_guid) },
+       [IFLA_VF_IB_PORT_GUID]  = { .len = sizeof(struct ifla_vf_guid) },
  };
  
 -static const struct nla_policy ifla_vf_stats_policy[IFLA_VF_STATS_MAX + 1] = {
 -      [IFLA_VF_STATS_RX_PACKETS]      = { .type = NLA_U64 },
 -      [IFLA_VF_STATS_TX_PACKETS]      = { .type = NLA_U64 },
 -      [IFLA_VF_STATS_RX_BYTES]        = { .type = NLA_U64 },
 -      [IFLA_VF_STATS_TX_BYTES]        = { .type = NLA_U64 },
 -      [IFLA_VF_STATS_BROADCAST]       = { .type = NLA_U64 },
 -      [IFLA_VF_STATS_MULTICAST]       = { .type = NLA_U64 },
 -};
 -
  static const struct nla_policy ifla_port_policy[IFLA_PORT_MAX+1] = {
        [IFLA_PORT_VF]          = { .type = NLA_U32 },
        [IFLA_PORT_PROFILE]     = { .type = NLA_STRING,