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

Commit e3722192 authored by Joachim Fenkes's avatar Joachim Fenkes Committed by Roland Dreier
Browse files

IB/ehca: Print return codes as signed decimal integers 



...because -12 is easier to read than FFFFFFF4.

Signed-off-by: default avatarJoachim Fenkes <fenkes@de.ibm.com>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 2863ad4b

drivers/infiniband/hw/ehca/ehca_cq.c

+7 −7
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ struct ib_cq *ehca_create_cq(struct ib_device *device, int cqe, int comp_vector, 


	if (h_ret != H_SUCCESS) {

		ehca_err(device, "hipz_h_alloc_resource_cq() failed "

			 "h_ret=%lx device=%p", h_ret, device);

			 "h_ret=%li device=%p", h_ret, device);

		cq = ERR_PTR(ehca2ib_return_code(h_ret));

		goto create_cq_exit2;

	}
@@ -198,7 +198,7 @@ struct ib_cq *ehca_create_cq(struct ib_device *device, int cqe, int comp_vector, 
	ipz_rc = ipz_queue_ctor(NULL, &my_cq->ipz_queue, param.act_pages,

				EHCA_PAGESIZE, sizeof(struct ehca_cqe), 0, 0);

	if (!ipz_rc) {

		ehca_err(device, "ipz_queue_ctor() failed ipz_rc=%x device=%p",

		ehca_err(device, "ipz_queue_ctor() failed ipz_rc=%i device=%p",

			 ipz_rc, device);

		cq = ERR_PTR(-EINVAL);

		goto create_cq_exit3;
@@ -226,7 +226,7 @@ struct ib_cq *ehca_create_cq(struct ib_device *device, int cqe, int comp_vector, 


		if (h_ret < H_SUCCESS) {

			ehca_err(device, "hipz_h_register_rpage_cq() failed "

				 "ehca_cq=%p cq_num=%x h_ret=%lx counter=%i "

				 "ehca_cq=%p cq_num=%x h_ret=%li counter=%i "

				 "act_pages=%i", my_cq, my_cq->cq_number,

				 h_ret, counter, param.act_pages);

			cq = ERR_PTR(-EINVAL);
@@ -238,7 +238,7 @@ struct ib_cq *ehca_create_cq(struct ib_device *device, int cqe, int comp_vector, 
			if ((h_ret != H_SUCCESS) || vpage) {

				ehca_err(device, "Registration of pages not "

					 "complete ehca_cq=%p cq_num=%x "

					 "h_ret=%lx", my_cq, my_cq->cq_number,

					 "h_ret=%li", my_cq, my_cq->cq_number,

					 h_ret);

				cq = ERR_PTR(-EAGAIN);

				goto create_cq_exit4;
@@ -246,7 +246,7 @@ struct ib_cq *ehca_create_cq(struct ib_device *device, int cqe, int comp_vector, 
		} else {

			if (h_ret != H_PAGE_REGISTERED) {

				ehca_err(device, "Registration of page failed "

					 "ehca_cq=%p cq_num=%x h_ret=%lx"

					 "ehca_cq=%p cq_num=%x h_ret=%li"

					 "counter=%i act_pages=%i",

					 my_cq, my_cq->cq_number,

					 h_ret, counter, param.act_pages);
@@ -298,7 +298,7 @@ struct ib_cq *ehca_create_cq(struct ib_device *device, int cqe, int comp_vector, 
	h_ret = hipz_h_destroy_cq(adapter_handle, my_cq, 1);

	if (h_ret != H_SUCCESS)

		ehca_err(device, "hipz_h_destroy_cq() failed ehca_cq=%p "

			 "cq_num=%x h_ret=%lx", my_cq, my_cq->cq_number, h_ret);

			 "cq_num=%x h_ret=%li", my_cq, my_cq->cq_number, h_ret);



create_cq_exit2:

	write_lock_irqsave(&ehca_cq_idr_lock, flags);
@@ -362,7 +362,7 @@ int ehca_destroy_cq(struct ib_cq *cq) 
				 cq_num);

	}

	if (h_ret != H_SUCCESS) {

		ehca_err(device, "hipz_h_destroy_cq() failed h_ret=%lx "

		ehca_err(device, "hipz_h_destroy_cq() failed h_ret=%li "

			 "ehca_cq=%p cq_num=%x", h_ret, my_cq, cq_num);

		return ehca2ib_return_code(h_ret);

	}

drivers/infiniband/hw/ehca/ehca_hca.c

+1 −1
Original line number Diff line number Diff line
@@ -352,7 +352,7 @@ int ehca_modify_port(struct ib_device *ibdev, 
	hret = hipz_h_modify_port(shca->ipz_hca_handle, port,

				  cap, props->init_type, port_modify_mask);

	if (hret != H_SUCCESS) {

		ehca_err(&shca->ib_device, "Modify port failed  hret=%lx",

		ehca_err(&shca->ib_device, "Modify port failed  h_ret=%li",

			 hret);

		ret = -EINVAL;

	}

drivers/infiniband/hw/ehca/ehca_main.c

+12 −12
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ int ehca_sense_attributes(struct ehca_shca *shca) 


	h_ret = hipz_h_query_hca(shca->ipz_hca_handle, rblock);

	if (h_ret != H_SUCCESS) {

		ehca_gen_err("Cannot query device properties. h_ret=%lx",

		ehca_gen_err("Cannot query device properties. h_ret=%li",

			     h_ret);

		ret = -EPERM;

		goto sense_attributes1;
@@ -332,7 +332,7 @@ int ehca_sense_attributes(struct ehca_shca *shca) 
	port = (struct hipz_query_port *)rblock;

	h_ret = hipz_h_query_port(shca->ipz_hca_handle, 1, port);

	if (h_ret != H_SUCCESS) {

		ehca_gen_err("Cannot query port properties. h_ret=%lx",

		ehca_gen_err("Cannot query port properties. h_ret=%li",

			     h_ret);

		ret = -EPERM;

		goto sense_attributes1;
@@ -526,13 +526,13 @@ static int ehca_destroy_aqp1(struct ehca_sport *sport) 


	ret = ib_destroy_qp(sport->ibqp_aqp1);

	if (ret) {

		ehca_gen_err("Cannot destroy AQP1 QP. ret=%x", ret);

		ehca_gen_err("Cannot destroy AQP1 QP. ret=%i", ret);

		return ret;

	}



	ret = ib_destroy_cq(sport->ibcq_aqp1);

	if (ret)

		ehca_gen_err("Cannot destroy AQP1 CQ. ret=%x", ret);

		ehca_gen_err("Cannot destroy AQP1 CQ. ret=%i", ret);



	return ret;

}
@@ -728,7 +728,7 @@ static int __devinit ehca_probe(struct ibmebus_dev *dev, 
	ret = ehca_reg_internal_maxmr(shca, shca->pd, &shca->maxmr);



	if (ret) {

		ehca_err(&shca->ib_device, "Cannot create internal MR ret=%x",

		ehca_err(&shca->ib_device, "Cannot create internal MR ret=%i",

			 ret);

		goto probe5;

	}
@@ -736,7 +736,7 @@ static int __devinit ehca_probe(struct ibmebus_dev *dev, 
	ret = ib_register_device(&shca->ib_device);

	if (ret) {

		ehca_err(&shca->ib_device,

			 "ib_register_device() failed ret=%x", ret);

			 "ib_register_device() failed ret=%i", ret);

		goto probe6;

	}
@@ -777,7 +777,7 @@ static int __devinit ehca_probe(struct ibmebus_dev *dev, 
	ret = ehca_destroy_aqp1(&shca->sport[0]);

	if (ret)

		ehca_err(&shca->ib_device,

			 "Cannot destroy AQP1 for port 1. ret=%x", ret);

			 "Cannot destroy AQP1 for port 1. ret=%i", ret);



probe7:

	ib_unregister_device(&shca->ib_device);
@@ -826,7 +826,7 @@ static int __devexit ehca_remove(struct ibmebus_dev *dev) 
			if (ret)

				ehca_err(&shca->ib_device,

					 "Cannot destroy AQP1 for port %x "

					 "ret=%x", ret, i);

					 "ret=%i", ret, i);

		}

	}
@@ -835,20 +835,20 @@ static int __devexit ehca_remove(struct ibmebus_dev *dev) 
	ret = ehca_dereg_internal_maxmr(shca);

	if (ret)

		ehca_err(&shca->ib_device,

			 "Cannot destroy internal MR. ret=%x", ret);

			 "Cannot destroy internal MR. ret=%i", ret);



	ret = ehca_dealloc_pd(&shca->pd->ib_pd);

	if (ret)

		ehca_err(&shca->ib_device,

			 "Cannot destroy internal PD. ret=%x", ret);

			 "Cannot destroy internal PD. ret=%i", ret);



	ret = ehca_destroy_eq(shca, &shca->eq);

	if (ret)

		ehca_err(&shca->ib_device, "Cannot destroy EQ. ret=%x", ret);

		ehca_err(&shca->ib_device, "Cannot destroy EQ. ret=%i", ret);



	ret = ehca_destroy_eq(shca, &shca->neq);

	if (ret)

		ehca_err(&shca->ib_device, "Canot destroy NEQ. ret=%x", ret);

		ehca_err(&shca->ib_device, "Canot destroy NEQ. ret=%i", ret);



	ib_dealloc_device(&shca->ib_device);

drivers/infiniband/hw/ehca/ehca_mcast.c

+2 −2
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ int ehca_attach_mcast(struct ib_qp *ibqp, union ib_gid *gid, u16 lid) 
	if (h_ret != H_SUCCESS)

		ehca_err(ibqp->device,

			 "ehca_qp=%p qp_num=%x hipz_h_attach_mcqp() failed "

			 "h_ret=%lx", my_qp, ibqp->qp_num, h_ret);

			 "h_ret=%li", my_qp, ibqp->qp_num, h_ret);



	return ehca2ib_return_code(h_ret);

}
@@ -125,7 +125,7 @@ int ehca_detach_mcast(struct ib_qp *ibqp, union ib_gid *gid, u16 lid) 
	if (h_ret != H_SUCCESS)

		ehca_err(ibqp->device,

			 "ehca_qp=%p qp_num=%x hipz_h_detach_mcqp() failed "

			 "h_ret=%lx", my_qp, ibqp->qp_num, h_ret);

			 "h_ret=%li", my_qp, ibqp->qp_num, h_ret);



	return ehca2ib_return_code(h_ret);

}

drivers/infiniband/hw/ehca/ehca_mrmw.c

+36 −37
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ struct ib_mr *ehca_get_dma_mr(struct ib_pd *pd, int mr_access_flags) 


get_dma_mr_exit0:

	if (IS_ERR(ib_mr))

		ehca_err(&shca->ib_device, "rc=%lx pd=%p mr_access_flags=%x ",

		ehca_err(&shca->ib_device, "h_ret=%li pd=%p mr_access_flags=%x",

			 PTR_ERR(ib_mr), pd, mr_access_flags);

	return ib_mr;

} /* end ehca_get_dma_mr() */
@@ -271,7 +271,7 @@ struct ib_mr *ehca_reg_phys_mr(struct ib_pd *pd, 
	ehca_mr_delete(e_mr);

reg_phys_mr_exit0:

	if (IS_ERR(ib_mr))

		ehca_err(pd->device, "rc=%lx pd=%p phys_buf_array=%p "

		ehca_err(pd->device, "h_ret=%li pd=%p phys_buf_array=%p "

			 "num_phys_buf=%x mr_access_flags=%x iova_start=%p",

			 PTR_ERR(ib_mr), pd, phys_buf_array,

			 num_phys_buf, mr_access_flags, iova_start);
@@ -403,8 +403,7 @@ struct ib_mr *ehca_reg_user_mr(struct ib_pd *pd, u64 start, u64 length, 
	ehca_mr_delete(e_mr);

reg_user_mr_exit0:

	if (IS_ERR(ib_mr))

		ehca_err(pd->device, "rc=%lx pd=%p mr_access_flags=%x"

			 " udata=%p",

		ehca_err(pd->device, "rc=%li pd=%p mr_access_flags=%x udata=%p",

			 PTR_ERR(ib_mr), pd, mr_access_flags, udata);

	return ib_mr;

} /* end ehca_reg_user_mr() */
@@ -565,7 +564,7 @@ int ehca_rereg_phys_mr(struct ib_mr *mr, 
	spin_unlock_irqrestore(&e_mr->mrlock, sl_flags);

rereg_phys_mr_exit0:

	if (ret)

		ehca_err(mr->device, "ret=%x mr=%p mr_rereg_mask=%x pd=%p "

		ehca_err(mr->device, "ret=%i mr=%p mr_rereg_mask=%x pd=%p "

			 "phys_buf_array=%p num_phys_buf=%x mr_access_flags=%x "

			 "iova_start=%p",

			 ret, mr, mr_rereg_mask, pd, phys_buf_array,
@@ -607,7 +606,7 @@ int ehca_query_mr(struct ib_mr *mr, struct ib_mr_attr *mr_attr) 


	h_ret = hipz_h_query_mr(shca->ipz_hca_handle, e_mr, &hipzout);

	if (h_ret != H_SUCCESS) {

		ehca_err(mr->device, "hipz_mr_query failed, h_ret=%lx mr=%p "

		ehca_err(mr->device, "hipz_mr_query failed, h_ret=%li mr=%p "

			 "hca_hndl=%lx mr_hndl=%lx lkey=%x",

			 h_ret, mr, shca->ipz_hca_handle.handle,

			 e_mr->ipz_mr_handle.handle, mr->lkey);
@@ -625,7 +624,7 @@ int ehca_query_mr(struct ib_mr *mr, struct ib_mr_attr *mr_attr) 
	spin_unlock_irqrestore(&e_mr->mrlock, sl_flags);

query_mr_exit0:

	if (ret)

		ehca_err(mr->device, "ret=%x mr=%p mr_attr=%p",

		ehca_err(mr->device, "ret=%i mr=%p mr_attr=%p",

			 ret, mr, mr_attr);

	return ret;

} /* end ehca_query_mr() */
@@ -667,7 +666,7 @@ int ehca_dereg_mr(struct ib_mr *mr) 
	/* TODO: BUSY: MR still has bound window(s) */

	h_ret = hipz_h_free_resource_mr(shca->ipz_hca_handle, e_mr);

	if (h_ret != H_SUCCESS) {

		ehca_err(mr->device, "hipz_free_mr failed, h_ret=%lx shca=%p "

		ehca_err(mr->device, "hipz_free_mr failed, h_ret=%li shca=%p "

			 "e_mr=%p hca_hndl=%lx mr_hndl=%lx mr->lkey=%x",

			 h_ret, shca, e_mr, shca->ipz_hca_handle.handle,

			 e_mr->ipz_mr_handle.handle, mr->lkey);
@@ -683,7 +682,7 @@ int ehca_dereg_mr(struct ib_mr *mr) 


dereg_mr_exit0:

	if (ret)

		ehca_err(mr->device, "ret=%x mr=%p", ret, mr);

		ehca_err(mr->device, "ret=%i mr=%p", ret, mr);

	return ret;

} /* end ehca_dereg_mr() */
@@ -708,7 +707,7 @@ struct ib_mw *ehca_alloc_mw(struct ib_pd *pd) 
	h_ret = hipz_h_alloc_resource_mw(shca->ipz_hca_handle, e_mw,

					 e_pd->fw_pd, &hipzout);

	if (h_ret != H_SUCCESS) {

		ehca_err(pd->device, "hipz_mw_allocate failed, h_ret=%lx "

		ehca_err(pd->device, "hipz_mw_allocate failed, h_ret=%li "

			 "shca=%p hca_hndl=%lx mw=%p",

			 h_ret, shca, shca->ipz_hca_handle.handle, e_mw);

		ib_mw = ERR_PTR(ehca2ib_return_code(h_ret));
@@ -723,7 +722,7 @@ struct ib_mw *ehca_alloc_mw(struct ib_pd *pd) 
	ehca_mw_delete(e_mw);

alloc_mw_exit0:

	if (IS_ERR(ib_mw))

		ehca_err(pd->device, "rc=%lx pd=%p", PTR_ERR(ib_mw), pd);

		ehca_err(pd->device, "h_ret=%li pd=%p", PTR_ERR(ib_mw), pd);

	return ib_mw;

} /* end ehca_alloc_mw() */
@@ -750,7 +749,7 @@ int ehca_dealloc_mw(struct ib_mw *mw) 


	h_ret = hipz_h_free_resource_mw(shca->ipz_hca_handle, e_mw);

	if (h_ret != H_SUCCESS) {

		ehca_err(mw->device, "hipz_free_mw failed, h_ret=%lx shca=%p "

		ehca_err(mw->device, "hipz_free_mw failed, h_ret=%li shca=%p "

			 "mw=%p rkey=%x hca_hndl=%lx mw_hndl=%lx",

			 h_ret, shca, mw, mw->rkey, shca->ipz_hca_handle.handle,

			 e_mw->ipz_mw_handle.handle);
@@ -912,7 +911,7 @@ int ehca_map_phys_fmr(struct ib_fmr *fmr, 


map_phys_fmr_exit0:

	if (ret)

		ehca_err(fmr->device, "ret=%x fmr=%p page_list=%p list_len=%x "

		ehca_err(fmr->device, "ret=%i fmr=%p page_list=%p list_len=%x "

			 "iova=%lx", ret, fmr, page_list, list_len, iova);

	return ret;

} /* end ehca_map_phys_fmr() */
@@ -975,7 +974,7 @@ int ehca_unmap_fmr(struct list_head *fmr_list) 


unmap_fmr_exit0:

	if (ret)

		ehca_gen_err("ret=%x fmr_list=%p num_fmr=%x unmap_fmr_cnt=%x",

		ehca_gen_err("ret=%i fmr_list=%p num_fmr=%x unmap_fmr_cnt=%x",

			     ret, fmr_list, num_fmr, unmap_fmr_cnt);

	return ret;

} /* end ehca_unmap_fmr() */
@@ -999,7 +998,7 @@ int ehca_dealloc_fmr(struct ib_fmr *fmr) 


	h_ret = hipz_h_free_resource_mr(shca->ipz_hca_handle, e_fmr);

	if (h_ret != H_SUCCESS) {

		ehca_err(fmr->device, "hipz_free_mr failed, h_ret=%lx e_fmr=%p "

		ehca_err(fmr->device, "hipz_free_mr failed, h_ret=%li e_fmr=%p "

			 "hca_hndl=%lx fmr_hndl=%lx fmr->lkey=%x",

			 h_ret, e_fmr, shca->ipz_hca_handle.handle,

			 e_fmr->ipz_mr_handle.handle, fmr->lkey);
@@ -1012,7 +1011,7 @@ int ehca_dealloc_fmr(struct ib_fmr *fmr) 


free_fmr_exit0:

	if (ret)

		ehca_err(&shca->ib_device, "ret=%x fmr=%p", ret, fmr);

		ehca_err(&shca->ib_device, "ret=%i fmr=%p", ret, fmr);

	return ret;

} /* end ehca_dealloc_fmr() */
@@ -1042,7 +1041,7 @@ int ehca_reg_mr(struct ehca_shca *shca, 
					 (u64)iova_start, size, hipz_acl,

					 e_pd->fw_pd, &hipzout);

	if (h_ret != H_SUCCESS) {

		ehca_err(&shca->ib_device, "hipz_alloc_mr failed, h_ret=%lx "

		ehca_err(&shca->ib_device, "hipz_alloc_mr failed, h_ret=%li "

			 "hca_hndl=%lx", h_ret, shca->ipz_hca_handle.handle);

		ret = ehca2ib_return_code(h_ret);

		goto ehca_reg_mr_exit0;
@@ -1068,9 +1067,9 @@ int ehca_reg_mr(struct ehca_shca *shca, 
ehca_reg_mr_exit1:

	h_ret = hipz_h_free_resource_mr(shca->ipz_hca_handle, e_mr);

	if (h_ret != H_SUCCESS) {

		ehca_err(&shca->ib_device, "h_ret=%lx shca=%p e_mr=%p "

		ehca_err(&shca->ib_device, "h_ret=%li shca=%p e_mr=%p "

			 "iova_start=%p size=%lx acl=%x e_pd=%p lkey=%x "

			 "pginfo=%p num_kpages=%lx num_hwpages=%lx ret=%x",

			 "pginfo=%p num_kpages=%lx num_hwpages=%lx ret=%i",

			 h_ret, shca, e_mr, iova_start, size, acl, e_pd,

			 hipzout.lkey, pginfo, pginfo->num_kpages,

			 pginfo->num_hwpages, ret);
@@ -1079,7 +1078,7 @@ int ehca_reg_mr(struct ehca_shca *shca, 
	}

ehca_reg_mr_exit0:

	if (ret)

		ehca_err(&shca->ib_device, "ret=%x shca=%p e_mr=%p "

		ehca_err(&shca->ib_device, "ret=%i shca=%p e_mr=%p "

			 "iova_start=%p size=%lx acl=%x e_pd=%p pginfo=%p "

			 "num_kpages=%lx num_hwpages=%lx",

			 ret, shca, e_mr, iova_start, size, acl, e_pd, pginfo,
@@ -1123,7 +1122,7 @@ int ehca_reg_mr_rpages(struct ehca_shca *shca, 
		ret = ehca_set_pagebuf(pginfo, rnum, kpage);

		if (ret) {

			ehca_err(&shca->ib_device, "ehca_set_pagebuf "

				 "bad rc, ret=%x rnum=%x kpage=%p",

				 "bad rc, ret=%i rnum=%x kpage=%p",

				 ret, rnum, kpage);

			goto ehca_reg_mr_rpages_exit1;

		}
@@ -1151,7 +1150,7 @@ int ehca_reg_mr_rpages(struct ehca_shca *shca, 
			 */

			if (h_ret != H_SUCCESS) {

				ehca_err(&shca->ib_device, "last "

					 "hipz_reg_rpage_mr failed, h_ret=%lx "

					 "hipz_reg_rpage_mr failed, h_ret=%li "

					 "e_mr=%p i=%x hca_hndl=%lx mr_hndl=%lx"

					 " lkey=%x", h_ret, e_mr, i,

					 shca->ipz_hca_handle.handle,
@@ -1163,7 +1162,7 @@ int ehca_reg_mr_rpages(struct ehca_shca *shca, 
				ret = 0;

		} else if (h_ret != H_PAGE_REGISTERED) {

			ehca_err(&shca->ib_device, "hipz_reg_rpage_mr failed, "

				 "h_ret=%lx e_mr=%p i=%x lkey=%x hca_hndl=%lx "

				 "h_ret=%li e_mr=%p i=%x lkey=%x hca_hndl=%lx "

				 "mr_hndl=%lx", h_ret, e_mr, i,

				 e_mr->ib.ib_mr.lkey,

				 shca->ipz_hca_handle.handle,
@@ -1179,7 +1178,7 @@ int ehca_reg_mr_rpages(struct ehca_shca *shca, 
	ehca_free_fw_ctrlblock(kpage);

ehca_reg_mr_rpages_exit0:

	if (ret)

		ehca_err(&shca->ib_device, "ret=%x shca=%p e_mr=%p pginfo=%p "

		ehca_err(&shca->ib_device, "ret=%i shca=%p e_mr=%p pginfo=%p "

			 "num_kpages=%lx num_hwpages=%lx", ret, shca, e_mr,

			 pginfo, pginfo->num_kpages, pginfo->num_hwpages);

	return ret;
@@ -1240,7 +1239,7 @@ inline int ehca_rereg_mr_rereg1(struct ehca_shca *shca, 
		 * (MW bound or MR is shared)

		 */

		ehca_warn(&shca->ib_device, "hipz_h_reregister_pmr failed "

			  "(Rereg1), h_ret=%lx e_mr=%p", h_ret, e_mr);

			  "(Rereg1), h_ret=%li e_mr=%p", h_ret, e_mr);

		*pginfo = pginfo_save;

		ret = -EAGAIN;

	} else if ((u64 *)hipzout.vaddr != iova_start) {
@@ -1269,7 +1268,7 @@ inline int ehca_rereg_mr_rereg1(struct ehca_shca *shca, 
	ehca_free_fw_ctrlblock(kpage);

ehca_rereg_mr_rereg1_exit0:

	if ( ret && (ret != -EAGAIN) )

		ehca_err(&shca->ib_device, "ret=%x lkey=%x rkey=%x "

		ehca_err(&shca->ib_device, "ret=%i lkey=%x rkey=%x "

			 "pginfo=%p num_kpages=%lx num_hwpages=%lx",

			 ret, *lkey, *rkey, pginfo, pginfo->num_kpages,

			 pginfo->num_hwpages);
@@ -1330,7 +1329,7 @@ int ehca_rereg_mr(struct ehca_shca *shca, 
		h_ret = hipz_h_free_resource_mr(shca->ipz_hca_handle, e_mr);

		if (h_ret != H_SUCCESS) {

			ehca_err(&shca->ib_device, "hipz_free_mr failed, "

				 "h_ret=%lx e_mr=%p hca_hndl=%lx mr_hndl=%lx "

				 "h_ret=%li e_mr=%p hca_hndl=%lx mr_hndl=%lx "

				 "mr->lkey=%x",

				 h_ret, e_mr, shca->ipz_hca_handle.handle,

				 e_mr->ipz_mr_handle.handle,
@@ -1362,7 +1361,7 @@ int ehca_rereg_mr(struct ehca_shca *shca, 


ehca_rereg_mr_exit0:

	if (ret)

		ehca_err(&shca->ib_device, "ret=%x shca=%p e_mr=%p "

		ehca_err(&shca->ib_device, "ret=%i shca=%p e_mr=%p "

			 "iova_start=%p size=%lx acl=%x e_pd=%p pginfo=%p "

			 "num_kpages=%lx lkey=%x rkey=%x rereg_1_hcall=%x "

			 "rereg_3_hcall=%x", ret, shca, e_mr, iova_start, size,
@@ -1406,7 +1405,7 @@ int ehca_unmap_one_fmr(struct ehca_shca *shca, 
		 * FMRs are not shared and no MW bound to FMRs

		 */

		ehca_err(&shca->ib_device, "hipz_reregister_pmr failed "

			 "(Rereg1), h_ret=%lx e_fmr=%p hca_hndl=%lx "

			 "(Rereg1), h_ret=%li e_fmr=%p hca_hndl=%lx "

			 "mr_hndl=%lx lkey=%x lkey_out=%x",

			 h_ret, e_fmr, shca->ipz_hca_handle.handle,

			 e_fmr->ipz_mr_handle.handle,
@@ -1418,7 +1417,7 @@ int ehca_unmap_one_fmr(struct ehca_shca *shca, 
	h_ret = hipz_h_free_resource_mr(shca->ipz_hca_handle, e_fmr);

	if (h_ret != H_SUCCESS) {

		ehca_err(&shca->ib_device, "hipz_free_mr failed, "

			 "h_ret=%lx e_fmr=%p hca_hndl=%lx mr_hndl=%lx "

			 "h_ret=%li e_fmr=%p hca_hndl=%lx mr_hndl=%lx "

			 "lkey=%x",

			 h_ret, e_fmr, shca->ipz_hca_handle.handle,

			 e_fmr->ipz_mr_handle.handle,
@@ -1453,7 +1452,7 @@ int ehca_unmap_one_fmr(struct ehca_shca *shca, 


ehca_unmap_one_fmr_exit0:

	if (ret)

		ehca_err(&shca->ib_device, "ret=%x tmp_lkey=%x tmp_rkey=%x "

		ehca_err(&shca->ib_device, "ret=%i tmp_lkey=%x tmp_rkey=%x "

			 "fmr_max_pages=%x",

			 ret, tmp_lkey, tmp_rkey, e_fmr->fmr_max_pages);

	return ret;
@@ -1482,7 +1481,7 @@ int ehca_reg_smr(struct ehca_shca *shca, 
				    (u64)iova_start, hipz_acl, e_pd->fw_pd,

				    &hipzout);

	if (h_ret != H_SUCCESS) {

		ehca_err(&shca->ib_device, "hipz_reg_smr failed, h_ret=%lx "

		ehca_err(&shca->ib_device, "hipz_reg_smr failed, h_ret=%li "

			 "shca=%p e_origmr=%p e_newmr=%p iova_start=%p acl=%x "

			 "e_pd=%p hca_hndl=%lx mr_hndl=%lx lkey=%x",

			 h_ret, shca, e_origmr, e_newmr, iova_start, acl, e_pd,
@@ -1506,7 +1505,7 @@ int ehca_reg_smr(struct ehca_shca *shca, 


ehca_reg_smr_exit0:

	if (ret)

		ehca_err(&shca->ib_device, "ret=%x shca=%p e_origmr=%p "

		ehca_err(&shca->ib_device, "ret=%i shca=%p e_origmr=%p "

			 "e_newmr=%p iova_start=%p acl=%x e_pd=%p",

			 ret, shca, e_origmr, e_newmr, iova_start, acl, e_pd);

	return ret;
@@ -1581,7 +1580,7 @@ int ehca_reg_internal_maxmr( 
	ehca_mr_delete(e_mr);

ehca_reg_internal_maxmr_exit0:

	if (ret)

		ehca_err(&shca->ib_device, "ret=%x shca=%p e_pd=%p e_maxmr=%p",

		ehca_err(&shca->ib_device, "ret=%i shca=%p e_pd=%p e_maxmr=%p",

			 ret, shca, e_pd, e_maxmr);

	return ret;

} /* end ehca_reg_internal_maxmr() */
@@ -1608,7 +1607,7 @@ int ehca_reg_maxmr(struct ehca_shca *shca, 
				    (u64)iova_start, hipz_acl, e_pd->fw_pd,

				    &hipzout);

	if (h_ret != H_SUCCESS) {

		ehca_err(&shca->ib_device, "hipz_reg_smr failed, h_ret=%lx "

		ehca_err(&shca->ib_device, "hipz_reg_smr failed, h_ret=%li "

			 "e_origmr=%p hca_hndl=%lx mr_hndl=%lx lkey=%x",

			 h_ret, e_origmr, shca->ipz_hca_handle.handle,

			 e_origmr->ipz_mr_handle.handle,
@@ -1649,7 +1648,7 @@ int ehca_dereg_internal_maxmr(struct ehca_shca *shca) 
	ret = ehca_dereg_mr(&e_maxmr->ib.ib_mr);

	if (ret) {

		ehca_err(&shca->ib_device, "dereg internal max-MR failed, "

			 "ret=%x e_maxmr=%p shca=%p lkey=%x",

			 "ret=%i e_maxmr=%p shca=%p lkey=%x",

			 ret, e_maxmr, shca, e_maxmr->ib.ib_mr.lkey);

		shca->maxmr = e_maxmr;

		goto ehca_dereg_internal_maxmr_exit0;
@@ -1659,7 +1658,7 @@ int ehca_dereg_internal_maxmr(struct ehca_shca *shca) 


ehca_dereg_internal_maxmr_exit0:

	if (ret)

		ehca_err(&shca->ib_device, "ret=%x shca=%p shca->maxmr=%p",

		ehca_err(&shca->ib_device, "ret=%i shca=%p shca->maxmr=%p",

			 ret, shca, shca->maxmr);

	return ret;

} /* end ehca_dereg_internal_maxmr() */