Doug, This is a respin of [1] there were some merge problems with the last 5 in this series, thanks to Leon for notifciing. Included are some contex init/usage fixes, a couple performance tweaks, and some general code clean up. This is all confined to the hfi1 driver. I'm OK applying this to next vs the current merge window. We might want to pluck out patches 6 and 7 for -rc. They are marked as stable and I think would meet -rc criteria. Patches apply cleanly on top of: 87f0faa : IB/SA: Add OPA addr header Patches can can also be found in my GitHub repo at: https://github.com/ddalessa/kernel/tree/for-next [1] http://marc.info/?l=linux-rdma&m=149377206803082&w=2 --- Jakub Byczkowski (1): IB/hfi1: Fix checks for Offline transient state Michael J. Ruhl (9): IB/hfi1: Return an error on memory allocation failure IB/hfi1: Fix a subcontext memory leak IB/hfi1: Name function prototype parameters IB/hfi1: Use filedata rather than filepointer IB/hfi1: Search shared contexts on the opened device, not all devices IB/hfi1: Correctly clear the pkey IB/hfi1: Clean up context initialization IB/hfi1: Fix an assign/ordering issue with shared context IDs IB/hfi1: Clean up on context initialization failure Mike Marciniszyn (2): IB/hfi1,IB/rdmavt: Move r_adefered to r_lock cache line IB/hfi1: Fix yield logic in send engine Sebastian Sanchez (2): IB/hfi1: Get rid of divide when setting the tx request header IB/hfi1: Remove atomic operations for SDMA_REQ_HAVE_AHG bit Tymoteusz Kielan (1): IB/hfi1: Adjust default eager_buffer_size to 8MB drivers/infiniband/hw/hfi1/chip.c | 47 +-- drivers/infiniband/hw/hfi1/chip.h | 10 - drivers/infiniband/hw/hfi1/driver.c | 42 --- drivers/infiniband/hw/hfi1/file_ops.c | 425 +++++++++++++++-------------- drivers/infiniband/hw/hfi1/hfi.h | 107 +++---- drivers/infiniband/hw/hfi1/init.c | 33 +- drivers/infiniband/hw/hfi1/intr.c | 3 drivers/infiniband/hw/hfi1/qp.c | 4 drivers/infiniband/hw/hfi1/rc.c | 13 - drivers/infiniband/hw/hfi1/ruc.c | 80 +++-- drivers/infiniband/hw/hfi1/trace_ctxts.h | 17 + drivers/infiniband/hw/hfi1/trace_tx.h | 34 ++ drivers/infiniband/hw/hfi1/user_exp_rcv.c | 180 +++++++----- drivers/infiniband/hw/hfi1/user_exp_rcv.h | 17 + drivers/infiniband/hw/hfi1/user_sdma.c | 191 ++++++------- drivers/infiniband/hw/hfi1/user_sdma.h | 18 + drivers/infiniband/hw/hfi1/verbs.h | 5 drivers/infiniband/hw/hfi1/vnic_main.c | 8 - include/rdma/rdmavt_qp.h | 1 19 files changed, 633 insertions(+), 602 deletions(-) -- -Denny