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@xxxxxxxxxx>
GPG Key ID: 0E572FDD
Attachment:
signature.asc
Description: OpenPGP digital signature
