Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma
Pull rdma fixes from Jason Gunthorpe:
"Not much going on, just some small bug fixes:
- Typo causing a regression in mlx5 devx
- Regression in the recent hns rework causing the HW to get out of
sync
- Long-standing cxgb4 adaptor crash when destroying cm ids"
* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma:
RDMA/cxgb4: Fix adapter LE hash errors while destroying ipv6 listening server
RDMA/hns: Fix bug during CMDQ initialization
RDMA/mlx5: Fix typo in destroy_mkey inbox
+6
-4
+2
-2
drivers/infiniband/hw/cxgb4/cm.c
+2
-2
drivers/infiniband/hw/cxgb4/cm.c
···
3610
3610
ep->com.local_addr.ss_family == AF_INET) {
3611
3611
err = cxgb4_remove_server_filter(
3612
3612
ep->com.dev->rdev.lldi.ports[0], ep->stid,
3613
-
ep->com.dev->rdev.lldi.rxq_ids[0], 0);
3613
+
ep->com.dev->rdev.lldi.rxq_ids[0], false);
3614
3614
} else {
3615
3615
struct sockaddr_in6 *sin6;
3616
3616
c4iw_init_wr_wait(ep->com.wr_waitp);
3617
3617
err = cxgb4_remove_server(
3618
3618
ep->com.dev->rdev.lldi.ports[0], ep->stid,
3619
-
ep->com.dev->rdev.lldi.rxq_ids[0], 0);
3619
+
ep->com.dev->rdev.lldi.rxq_ids[0], true);
3620
3620
if (err)
3621
3621
goto done;
3622
3622
err = c4iw_wait_for_reply(&ep->com.dev->rdev, ep->com.wr_waitp,
+3
-1
drivers/infiniband/hw/hns/hns_roce_hw_v2.c
+3
-1
drivers/infiniband/hw/hns/hns_roce_hw_v2.c
···
1194
1194
upper_32_bits(dma));
1195
1195
roce_write(hr_dev, ROCEE_TX_CMQ_DEPTH_REG,
1196
1196
(u32)ring->desc_num >> HNS_ROCE_CMQ_DESC_NUM_S);
1197
-
roce_write(hr_dev, ROCEE_TX_CMQ_HEAD_REG, 0);
1197
+
1198
+
/* Make sure to write tail first and then head */
1198
1199
roce_write(hr_dev, ROCEE_TX_CMQ_TAIL_REG, 0);
1200
+
roce_write(hr_dev, ROCEE_TX_CMQ_HEAD_REG, 0);
1199
1201
} else {
1200
1202
roce_write(hr_dev, ROCEE_RX_CMQ_BASEADDR_L_REG, (u32)dma);
1201
1203
roce_write(hr_dev, ROCEE_RX_CMQ_BASEADDR_H_REG,
+1
-1
drivers/infiniband/hw/mlx5/devx.c
+1
-1
drivers/infiniband/hw/mlx5/devx.c
···
1116
1116
case MLX5_CMD_OP_CREATE_MKEY:
1117
1117
MLX5_SET(destroy_mkey_in, din, opcode,
1118
1118
MLX5_CMD_OP_DESTROY_MKEY);
1119
-
MLX5_SET(destroy_mkey_in, in, mkey_index, *obj_id);
1119
+
MLX5_SET(destroy_mkey_in, din, mkey_index, *obj_id);
1120
1120
break;
1121
1121
case MLX5_CMD_OP_CREATE_CQ:
1122
1122
MLX5_SET(destroy_cq_in, din, opcode, MLX5_CMD_OP_DESTROY_CQ);