Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a69d1ae authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband 

* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband: (33 commits)
  IB/ipath: Fix lockdep error upon "ifconfig ibN down"
  IB/ipath: Fix races with ib_resize_cq()
  IB/ipath: Support new PCIE device, QLE7142
  IB/ipath: Set CPU affinity early
  IB/ipath: Fix EEPROM read when driver is compiled with -Os
  IB/ipath: Fix and recover TXE piobuf and PBC parity errors
  IB/ipath: Change HT CRC message to indicate how to resolve problem
  IB/ipath: Clean up module exit code
  IB/ipath: Call mtrr_del with correct arguments
  IB/ipath: Flush RWQEs if access error or invalid error seen
  IB/ipath: Improved support for PowerPC
  IB/ipath: Drop unnecessary "(void *)" casts
  IB/ipath: Support multiple simultaneous devices of different types
  IB/ipath: Fix mismatch in shifts and masks for printing debug info
  IB/ipath: Fix compiler warnings and errors on non-x86_64 systems
  IB/ipath: Print more informative parity error messages
  IB/ipath: Ensure that PD of MR matches PD of QP checking the Rkey
  IB/ipath: RC and UC should validate SLID and DLID
  IB/ipath: Only allow complete writes to flash
  IB/ipath: Count SRQs properly
  ...
parents c0341b0f 3d27b004

drivers/infiniband/hw/amso1100/c2_ae.c

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ void c2_ae_event(struct c2_dev *c2dev, u32 mq_index) 
			"resource=%x, qp_state=%s\n",

			__FUNCTION__,

			to_event_str(event_id),

			be64_to_cpu(wr->ae.ae_generic.user_context),

			(unsigned long long) be64_to_cpu(wr->ae.ae_generic.user_context),

			be32_to_cpu(wr->ae.ae_generic.resource_type),

			be32_to_cpu(wr->ae.ae_generic.resource),

			to_qp_state_str(be32_to_cpu(wr->ae.ae_generic.qp_state)));

drivers/infiniband/hw/amso1100/c2_alloc.c

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ u16 *c2_alloc_mqsp(struct c2_dev *c2dev, struct sp_chunk *head, 
			    ((unsigned long) &(head->shared_ptr[mqsp]) -

			     (unsigned long) head);

		pr_debug("%s addr %p dma_addr %llx\n", __FUNCTION__,

			 &(head->shared_ptr[mqsp]), (u64)*dma_addr);

			 &(head->shared_ptr[mqsp]), (unsigned long long) *dma_addr);

		return &(head->shared_ptr[mqsp]);

	}

	return NULL;

drivers/infiniband/hw/amso1100/c2_cm.c

+7 −8
Original line number Diff line number Diff line
@@ -302,7 +302,7 @@ int c2_llp_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *iw_param) 
	vq_req = vq_req_alloc(c2dev);

	if (!vq_req) {

		err = -ENOMEM;

		goto bail1;

		goto bail0;

	}

	vq_req->qp = qp;

	vq_req->cm_id = cm_id;
@@ -311,7 +311,7 @@ int c2_llp_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *iw_param) 
	wr = kmalloc(c2dev->req_vq.msg_size, GFP_KERNEL);

	if (!wr) {

		err = -ENOMEM;

		goto bail2;

		goto bail1;

	}



	/* Build the WR */
@@ -331,7 +331,7 @@ int c2_llp_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *iw_param) 
	/* Validate private_data length */

	if (iw_param->private_data_len > C2_MAX_PRIVATE_DATA_SIZE) {

		err = -EINVAL;

		goto bail2;

		goto bail1;

	}



	if (iw_param->private_data) {
@@ -348,19 +348,19 @@ int c2_llp_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *iw_param) 
	err = vq_send_wr(c2dev, (union c2wr *) wr);

	if (err) {

		vq_req_put(c2dev, vq_req);

		goto bail2;

		goto bail1;

	}



	/* Wait for reply from adapter */

	err = vq_wait_for_reply(c2dev, vq_req);

	if (err)

		goto bail2;

		goto bail1;



	/* Check that reply is present */

	reply = (struct c2wr_cr_accept_rep *) (unsigned long) vq_req->reply_msg;

	if (!reply) {

		err = -ENOMEM;

		goto bail2;

		goto bail1;

	}



	err = c2_errno(reply);
@@ -368,9 +368,8 @@ int c2_llp_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *iw_param) 


	if (!err)

		c2_set_qp_state(qp, C2_QP_STATE_RTS);

 bail2:

	kfree(wr);

 bail1:

	kfree(wr);

	vq_req_free(c2dev, vq_req);

 bail0:

	if (err) {

drivers/infiniband/hw/amso1100/c2_provider.c

+6 −2
Original line number Diff line number Diff line
@@ -390,14 +390,18 @@ static struct ib_mr *c2_reg_phys_mr(struct ib_pd *ib_pd, 
	}



	mr = kmalloc(sizeof(*mr), GFP_KERNEL);

	if (!mr)

	if (!mr) {

		vfree(page_list);

		return ERR_PTR(-ENOMEM);

	}



	mr->pd = to_c2pd(ib_pd);

	pr_debug("%s - page shift %d, pbl_depth %d, total_len %u, "

		"*iova_start %llx, first pa %llx, last pa %llx\n",

		__FUNCTION__, page_shift, pbl_depth, total_len,

		*iova_start, page_list[0], page_list[pbl_depth-1]);

		(unsigned long long) *iova_start,

	       	(unsigned long long) page_list[0],

	       	(unsigned long long) page_list[pbl_depth-1]);

  	err = c2_nsmr_register_phys_kern(to_c2dev(ib_pd->device), page_list,

 					 (1 << page_shift), pbl_depth,

					 total_len, 0, iova_start,

drivers/infiniband/hw/amso1100/c2_rnic.c

+2 −2
Original line number Diff line number Diff line
@@ -527,7 +527,7 @@ int c2_rnic_init(struct c2_dev *c2dev) 
				      		DMA_FROM_DEVICE);

	pci_unmap_addr_set(&c2dev->rep_vq, mapping, c2dev->rep_vq.host_dma);

	pr_debug("%s rep_vq va %p dma %llx\n", __FUNCTION__, q1_pages,

		 (u64)c2dev->rep_vq.host_dma);

		 (unsigned long long) c2dev->rep_vq.host_dma);

	c2_mq_rep_init(&c2dev->rep_vq,

		   1,

		   qsize,
@@ -550,7 +550,7 @@ int c2_rnic_init(struct c2_dev *c2dev) 
				      		DMA_FROM_DEVICE);

	pci_unmap_addr_set(&c2dev->aeq, mapping, c2dev->aeq.host_dma);

	pr_debug("%s aeq va %p dma %llx\n", __FUNCTION__, q1_pages,

		 (u64)c2dev->rep_vq.host_dma);

		 (unsigned long long) c2dev->rep_vq.host_dma);

	c2_mq_rep_init(&c2dev->aeq,

		       2,

		       qsize,