Commit 2ba9bea2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 58e4b9de 3408be14

drivers/infiniband/hw/cxgb4/cm.c

+2 −2
Original line number Diff line number Diff line
@@ -3610,13 +3610,13 @@ int c4iw_destroy_listen(struct iw_cm_id *cm_id) 
	    ep->com.local_addr.ss_family == AF_INET) {

		err = cxgb4_remove_server_filter(

			ep->com.dev->rdev.lldi.ports[0], ep->stid,

			ep->com.dev->rdev.lldi.rxq_ids[0], 0);

			ep->com.dev->rdev.lldi.rxq_ids[0], false);

	} else {

		struct sockaddr_in6 *sin6;

		c4iw_init_wr_wait(ep->com.wr_waitp);

		err = cxgb4_remove_server(

				ep->com.dev->rdev.lldi.ports[0], ep->stid,

				ep->com.dev->rdev.lldi.rxq_ids[0], 0);

				ep->com.dev->rdev.lldi.rxq_ids[0], true);

		if (err)

			goto done;

		err = c4iw_wait_for_reply(&ep->com.dev->rdev, ep->com.wr_waitp,

drivers/infiniband/hw/hns/hns_roce_hw_v2.c

+3 −1
Original line number Diff line number Diff line
@@ -1194,8 +1194,10 @@ static void hns_roce_cmq_init_regs(struct hns_roce_dev *hr_dev, bool ring_type) 
			   upper_32_bits(dma));

		roce_write(hr_dev, ROCEE_TX_CMQ_DEPTH_REG,

			   (u32)ring->desc_num >> HNS_ROCE_CMQ_DESC_NUM_S);

		roce_write(hr_dev, ROCEE_TX_CMQ_HEAD_REG, 0);



		/* Make sure to write tail first and then head */

		roce_write(hr_dev, ROCEE_TX_CMQ_TAIL_REG, 0);

		roce_write(hr_dev, ROCEE_TX_CMQ_HEAD_REG, 0);

	} else {

		roce_write(hr_dev, ROCEE_RX_CMQ_BASEADDR_L_REG, (u32)dma);

		roce_write(hr_dev, ROCEE_RX_CMQ_BASEADDR_H_REG,

drivers/infiniband/hw/mlx5/devx.c

+1 −1
Original line number Diff line number Diff line
@@ -1116,7 +1116,7 @@ static void devx_obj_build_destroy_cmd(void *in, void *out, void *din, 
	case MLX5_CMD_OP_CREATE_MKEY:

		MLX5_SET(destroy_mkey_in, din, opcode,

			 MLX5_CMD_OP_DESTROY_MKEY);

		MLX5_SET(destroy_mkey_in, in, mkey_index, *obj_id);

		MLX5_SET(destroy_mkey_in, din, mkey_index, *obj_id);

		break;

	case MLX5_CMD_OP_CREATE_CQ:

		MLX5_SET(destroy_cq_in, din, opcode, MLX5_CMD_OP_DESTROY_CQ);