[PULL REQUEST] Please pull rdma.git (tag for-linus-2)

[PULL REQUEST] Please pull rdma.git (tag for-linus-2)

[Doug Ledford]

[-- Attachment #1.1: Type: text/plain, Size: 5814 bytes --]

Hi Linus,

This is another isolated pull request.  This merge window was the first
where Hauwei had to try and coordinate their patches between their net
driver and their new roce driver (similar to mlx4 and mlx5).  They
didn't do horribly, but there were some issues (and we knew that because
they simply didn't know what to do in the beginning).  As a result, I
had a set of patches that depended on some patches that normally would
have come to you via Dave's tree.  Those patches have been on netdev@
for a while, so I got Dave to give me his approval to send them to you.
As such, the other 29 patches I had behind them are also now ready to
go.  This catches the hns and hns-roce drivers up to current, and for
future patches we are working with them to get them up to speed on how
to do joint driver development so that they don't have these sorts of
cross tree dependency issues again.  BTW, Dave gave me permission to add
his Acked-by: to the patches against the net tree, but I've had this
branch through 0day (but not linux-next since it was off by itself) and
I didn't want to rebase the series just to add Dave's ack for the 8
patches in the net area, so that's why I've Cc:ed him on the pull
request.  Hope that was the right thing to do in that regard.

Here's the boilerplate:

The following changes since commit 528f1deb16e5b82e9fe161ebd8caa5983766f0f0:

  IB/hns: Add support of ACPI to the Hisilicon RoCE driver (2016-08-25
10:05:10 -0400)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma.git
tags/for-linus-2

for you to fetch changes up to 1bdab400af5954932714e68ab3df0187a92916cb:

  IB/hns: Fix for removal of redundant code (2016-10-03 11:43:15 -0400)

----------------------------------------------------------------
Updates to the hns drivers

- Small patch set for hns net driver that the roce patches depend on
- Various fixes to the hns-roce driver
- Add connection manager support to the hns-roce driver

----------------------------------------------------------------
Daode Huang (6):
      net: hns: bug fix about setting coalsecs-usecs to 0
      net: hns: add fini_process for v2 napi process
      net: hns: delete repeat read fbd num after while
      net: hns: fix the bug of forwarding table
      net: hns: bug fix about broadcast/multicast packets
      net: hns: delete redundant broadcast packet filter process

Kejian Yan (1):
      net: hns: fix port not available after testing loopback

Lijun Ou (24):
      IB/hns: Register HNS RoCE Driver get_netdev() with IB Core
      IB/hns: Add & initialize "node_guid" parameter for RDMA CM
      IB/hns: Fix the value of device_cap_flags
      IB/hns: Fix two possible bugs for rdma cm
      IB/hns: Add phy_port for computing GSI/QPN
      IB/hns: Change the logic for allocating uar registers
      IB/hns: Fix the bug of rdma cm connecting on user mode
      IB/hns: Fix two bugs for rdma cm connecting
      IB/hns: Add node_guid definition to the bindings document
      IB/hns: Remove unused parameters in some functions
      IB/hns: Remove parameters of resize cq
      IB/hns: Fix bug of using uninit refcount and free
      IB/hns: Simplify function of pd alloc and qp alloc
      IB/hns: Remove unused parameter named qp_type
      IB/hns: Modify the init of iboe lock
      IB/hns: Fix bug of memory leakage for registering user mr
      IB/hns: Return bad wr while post send failed
      IB/hns: The Ack timeout need a lower limit value
      IB/hns: Some items of qpc need to take user param
      IB/hns: Validate mtu when modified qp
      IB/hns: Cq has not been freed
      IB/hns: Update the rq head when modify qp state
      IB/hns: Fix the bug when platform_get_resource() exec fail
      IB/hns: Delete the redundant lines in hns_roce_v1_m_qp()

Salil (1):
      IB/hns: Fix for removal of redundant code

Wei Hu (Xavier) (3):
      IB/hns: Fix bug of clear hem
      IB/hns: Delete the sqp_start from the structure hns_roce_caps
      IB/hns: Optimize code of aeq and ceq interrupt handle and fix the
bug of qpn

lipeng (1):
      net: hns: fix port unavailable after hnae_reserve_buffer_map fail

 .../bindings/infiniband/hisilicon-hns-roce.txt     |   2 +
 drivers/infiniband/hw/hns/hns_roce_cq.c            |  23 +-
 drivers/infiniband/hw/hns/hns_roce_device.h        |  18 +-
 drivers/infiniband/hw/hns/hns_roce_eq.c            | 146 +++++-----
 drivers/infiniband/hw/hns/hns_roce_eq.h            |   4 +
 drivers/infiniband/hw/hns/hns_roce_hem.c           |  76 +-----
 drivers/infiniband/hw/hns/hns_roce_hem.h           |   4 +
 drivers/infiniband/hw/hns/hns_roce_hw_v1.c         | 293
+++++++++++++++------
 drivers/infiniband/hw/hns/hns_roce_hw_v1.h         |   9 +
 drivers/infiniband/hw/hns/hns_roce_main.c          |  36 ++-
 drivers/infiniband/hw/hns/hns_roce_mr.c            |   3 +
 drivers/infiniband/hw/hns/hns_roce_pd.c            |  22 +-
 drivers/infiniband/hw/hns/hns_roce_qp.c            |  67 ++---
 drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c  |  11 +-
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c  |  13 +-
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h  |   2 +
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c |  10 -
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h |   1 -
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c  |  16 ++
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h  |   4 +
 drivers/net/ethernet/hisilicon/hns/hns_enet.c      | 107 +++++---
 drivers/net/ethernet/hisilicon/hns/hns_ethtool.c   |   7 +
 22 files changed, 505 insertions(+), 369 deletions(-)


-- 
Doug Ledford <dledford-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
    GPG Key ID: 0E572FDD


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 884 bytes --]

[PULL REQUEST] Please pull rdma.git (tag for-linus-2)

[Doug Ledford]

[-- Attachment #1.1: Type: text/plain, Size: 2940 bytes --]

Hi Linus,

I have two separate pull requests for you today.  I'll do the simple one
first.

I had originally intended to include the rxe update patches in my main
pull request.  However, on merge tests, there were conflicts against
your tree.  It was because I had forgotten that there were late rxe
driver changes in 4.8, so like the hfi1 driver, those patches needed to
be against a late 4.8-rc kernel in order to apply cleanly.  As a result,
I was forced to make a new 4.9 branch, remove the rxe patches, then
replace the rxe patches onto the for-4.9-hfi1 branch that you already
pulled.  So this first pull request is just a few rxe specific patches
tacked onto that branch.  The incremental pull looks like this:

The following changes since commit 61347fa6087884305ea4a3a04501839fdb68dc76:

  IB/rdmavt: Trivial function comment corrected. (2016-10-03 10:55:27 -0400)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma.git
tags/for-linus-2

for you to fetch changes up to e404f945a6101a6f0f2a29aade6dc32015471daa:

  IB/rxe: improved debug prints & code cleanup (2016-10-06 13:50:04 -0400)

----------------------------------------------------------------
Minor updates for rxe driver

----------------------------------------------------------------
Parav Pandit (5):
      IB/rxe: Avoid scheduling tasklet for userspace QP
      IB/rxe: Fix sending out loopback packet on netdev interface.
      IB/{rxe,core,rdmavt}: Fix kernel crash for reg MR
      IB/rxe: Properly honor max IRD value for rd/atomic.
      IB/rxe: improved debug prints & code cleanup

Stephen Bates (1):
      rdma_rxe: Ensure rdma_rxe init occurs at correct time

 drivers/infiniband/sw/rdmavt/dma.c    | 17 +++++++++++
 drivers/infiniband/sw/rxe/rxe.c       | 36 +++++------------------
 drivers/infiniband/sw/rxe/rxe.h       |  5 ++++
 drivers/infiniband/sw/rxe/rxe_av.c    |  4 +--
 drivers/infiniband/sw/rxe/rxe_comp.c  |  6 ++--
 drivers/infiniband/sw/rxe/rxe_dma.c   | 17 +++++++++++
 drivers/infiniband/sw/rxe/rxe_loc.h   |  2 +-
 drivers/infiniband/sw/rxe/rxe_mmap.c  |  2 +-
 drivers/infiniband/sw/rxe/rxe_mr.c    |  2 +-
 drivers/infiniband/sw/rxe/rxe_net.c   | 51 ++++++++++++++++++++++----------
 drivers/infiniband/sw/rxe/rxe_net.h   |  3 +-
 drivers/infiniband/sw/rxe/rxe_qp.c    | 55
+++++++++++++++++++----------------
 drivers/infiniband/sw/rxe/rxe_recv.c  |  3 +-
 drivers/infiniband/sw/rxe/rxe_req.c   | 19 ++++++------
 drivers/infiniband/sw/rxe/rxe_resp.c  | 27 +++++++++++------
 drivers/infiniband/sw/rxe/rxe_sysfs.c | 12 ++++----
 drivers/infiniband/sw/rxe/rxe_verbs.c | 50 +++++++++++++++++++------------
 include/rdma/ib_verbs.h               | 23 +++++++++++++--
 18 files changed, 210 insertions(+), 124 deletions(-)

-- 
Doug Ledford <dledford-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
    GPG Key ID: 0E572FDD


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 884 bytes --]