aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/infiniband/hw
diff options
context:
space:
mode:
authorJoachim Fenkes <fenkes@de.ibm.com>2007-09-11 09:32:22 -0400
committerRoland Dreier <rolandd@cisco.com>2007-10-09 22:59:10 -0400
commite37221928bf685d63ba5319746eafe463d61e330 (patch)
treeee74c9b24f41ab930579d51cd80b2ff4d173da09 /drivers/infiniband/hw
parent2863ad4bddf366790a733cfd71f2f480afdf36fc (diff)
IB/ehca: Print return codes as signed decimal integers
...because -12 is easier to read than FFFFFFF4. Signed-off-by: Joachim Fenkes <fenkes@de.ibm.com> Signed-off-by: Roland Dreier <rolandd@cisco.com>
Diffstat (limited to 'drivers/infiniband/hw')
-rw-r--r--drivers/infiniband/hw/ehca/ehca_cq.c14
-rw-r--r--drivers/infiniband/hw/ehca/ehca_hca.c2
-rw-r--r--drivers/infiniband/hw/ehca/ehca_main.c24
-rw-r--r--drivers/infiniband/hw/ehca/ehca_mcast.c4
-rw-r--r--drivers/infiniband/hw/ehca/ehca_mrmw.c73
-rw-r--r--drivers/infiniband/hw/ehca/ehca_qp.c42
-rw-r--r--drivers/infiniband/hw/ehca/ehca_reqs.c2
-rw-r--r--drivers/infiniband/hw/ehca/ehca_sqp.c2
-rw-r--r--drivers/infiniband/hw/ehca/ehca_uverbs.c18
-rw-r--r--drivers/infiniband/hw/ehca/hcp_if.c20
10 files changed, 100 insertions, 101 deletions
diff --git a/drivers/infiniband/hw/ehca/ehca_cq.c b/drivers/infiniband/hw/ehca/ehca_cq.c
index d68603ddfc2c..79c25f51c21e 100644
--- a/drivers/infiniband/hw/ehca/ehca_cq.c
+++ b/drivers/infiniband/hw/ehca/ehca_cq.c
@@ -190,7 +190,7 @@ struct ib_cq *ehca_create_cq(struct ib_device *device, int cqe, int comp_vector,
190 190
191 if (h_ret != H_SUCCESS) { 191 if (h_ret != H_SUCCESS) {
192 ehca_err(device, "hipz_h_alloc_resource_cq() failed " 192 ehca_err(device, "hipz_h_alloc_resource_cq() failed "
193 "h_ret=%lx device=%p", h_ret, device); 193 "h_ret=%li device=%p", h_ret, device);
194 cq = ERR_PTR(ehca2ib_return_code(h_ret)); 194 cq = ERR_PTR(ehca2ib_return_code(h_ret));
195 goto create_cq_exit2; 195 goto create_cq_exit2;
196 } 196 }
@@ -198,7 +198,7 @@ struct ib_cq *ehca_create_cq(struct ib_device *device, int cqe, int comp_vector,
198 ipz_rc = ipz_queue_ctor(NULL, &my_cq->ipz_queue, param.act_pages, 198 ipz_rc = ipz_queue_ctor(NULL, &my_cq->ipz_queue, param.act_pages,
199 EHCA_PAGESIZE, sizeof(struct ehca_cqe), 0, 0); 199 EHCA_PAGESIZE, sizeof(struct ehca_cqe), 0, 0);
200 if (!ipz_rc) { 200 if (!ipz_rc) {
201 ehca_err(device, "ipz_queue_ctor() failed ipz_rc=%x device=%p", 201 ehca_err(device, "ipz_queue_ctor() failed ipz_rc=%i device=%p",
202 ipz_rc, device); 202 ipz_rc, device);
203 cq = ERR_PTR(-EINVAL); 203 cq = ERR_PTR(-EINVAL);
204 goto create_cq_exit3; 204 goto create_cq_exit3;
@@ -226,7 +226,7 @@ struct ib_cq *ehca_create_cq(struct ib_device *device, int cqe, int comp_vector,
226 226
227 if (h_ret < H_SUCCESS) { 227 if (h_ret < H_SUCCESS) {
228 ehca_err(device, "hipz_h_register_rpage_cq() failed " 228 ehca_err(device, "hipz_h_register_rpage_cq() failed "
229 "ehca_cq=%p cq_num=%x h_ret=%lx counter=%i " 229 "ehca_cq=%p cq_num=%x h_ret=%li counter=%i "
230 "act_pages=%i", my_cq, my_cq->cq_number, 230 "act_pages=%i", my_cq, my_cq->cq_number,
231 h_ret, counter, param.act_pages); 231 h_ret, counter, param.act_pages);
232 cq = ERR_PTR(-EINVAL); 232 cq = ERR_PTR(-EINVAL);
@@ -238,7 +238,7 @@ struct ib_cq *ehca_create_cq(struct ib_device *device, int cqe, int comp_vector,
238 if ((h_ret != H_SUCCESS) || vpage) { 238 if ((h_ret != H_SUCCESS) || vpage) {
239 ehca_err(device, "Registration of pages not " 239 ehca_err(device, "Registration of pages not "
240 "complete ehca_cq=%p cq_num=%x " 240 "complete ehca_cq=%p cq_num=%x "
241 "h_ret=%lx", my_cq, my_cq->cq_number, 241 "h_ret=%li", my_cq, my_cq->cq_number,
242 h_ret); 242 h_ret);
243 cq = ERR_PTR(-EAGAIN); 243 cq = ERR_PTR(-EAGAIN);
244 goto create_cq_exit4; 244 goto create_cq_exit4;
@@ -246,7 +246,7 @@ struct ib_cq *ehca_create_cq(struct ib_device *device, int cqe, int comp_vector,
246 } else { 246 } else {
247 if (h_ret != H_PAGE_REGISTERED) { 247 if (h_ret != H_PAGE_REGISTERED) {
248 ehca_err(device, "Registration of page failed " 248 ehca_err(device, "Registration of page failed "
249 "ehca_cq=%p cq_num=%x h_ret=%lx" 249 "ehca_cq=%p cq_num=%x h_ret=%li"
250 "counter=%i act_pages=%i", 250 "counter=%i act_pages=%i",
251 my_cq, my_cq->cq_number, 251 my_cq, my_cq->cq_number,
252 h_ret, counter, param.act_pages); 252 h_ret, counter, param.act_pages);
@@ -298,7 +298,7 @@ create_cq_exit3:
298 h_ret = hipz_h_destroy_cq(adapter_handle, my_cq, 1); 298 h_ret = hipz_h_destroy_cq(adapter_handle, my_cq, 1);
299 if (h_ret != H_SUCCESS) 299 if (h_ret != H_SUCCESS)
300 ehca_err(device, "hipz_h_destroy_cq() failed ehca_cq=%p " 300 ehca_err(device, "hipz_h_destroy_cq() failed ehca_cq=%p "
301 "cq_num=%x h_ret=%lx", my_cq, my_cq->cq_number, h_ret); 301 "cq_num=%x h_ret=%li", my_cq, my_cq->cq_number, h_ret);
302 302
303create_cq_exit2: 303create_cq_exit2:
304 write_lock_irqsave(&ehca_cq_idr_lock, flags); 304 write_lock_irqsave(&ehca_cq_idr_lock, flags);
@@ -362,7 +362,7 @@ int ehca_destroy_cq(struct ib_cq *cq)
362 cq_num); 362 cq_num);
363 } 363 }
364 if (h_ret != H_SUCCESS) { 364 if (h_ret != H_SUCCESS) {
365 ehca_err(device, "hipz_h_destroy_cq() failed h_ret=%lx " 365 ehca_err(device, "hipz_h_destroy_cq() failed h_ret=%li "
366 "ehca_cq=%p cq_num=%x", h_ret, my_cq, cq_num); 366 "ehca_cq=%p cq_num=%x", h_ret, my_cq, cq_num);
367 return ehca2ib_return_code(h_ret); 367 return ehca2ib_return_code(h_ret);
368 } 368 }
diff --git a/drivers/infiniband/hw/ehca/ehca_hca.c b/drivers/infiniband/hw/ehca/ehca_hca.c
index cf22472d9414..3436c49eee06 100644
--- a/drivers/infiniband/hw/ehca/ehca_hca.c
+++ b/drivers/infiniband/hw/ehca/ehca_hca.c
@@ -352,7 +352,7 @@ int ehca_modify_port(struct ib_device *ibdev,
352 hret = hipz_h_modify_port(shca->ipz_hca_handle, port, 352 hret = hipz_h_modify_port(shca->ipz_hca_handle, port,
353 cap, props->init_type, port_modify_mask); 353 cap, props->init_type, port_modify_mask);
354 if (hret != H_SUCCESS) { 354 if (hret != H_SUCCESS) {
355 ehca_err(&shca->ib_device, "Modify port failed hret=%lx", 355 ehca_err(&shca->ib_device, "Modify port failed h_ret=%li",
356 hret); 356 hret);
357 ret = -EINVAL; 357 ret = -EINVAL;
358 } 358 }
diff --git a/drivers/infiniband/hw/ehca/ehca_main.c b/drivers/infiniband/hw/ehca/ehca_main.c
index 991690739170..0e3ffeef45d9 100644
--- a/drivers/infiniband/hw/ehca/ehca_main.c
+++ b/drivers/infiniband/hw/ehca/ehca_main.c
@@ -273,7 +273,7 @@ int ehca_sense_attributes(struct ehca_shca *shca)
273 273
274 h_ret = hipz_h_query_hca(shca->ipz_hca_handle, rblock); 274 h_ret = hipz_h_query_hca(shca->ipz_hca_handle, rblock);
275 if (h_ret != H_SUCCESS) { 275 if (h_ret != H_SUCCESS) {
276 ehca_gen_err("Cannot query device properties. h_ret=%lx", 276 ehca_gen_err("Cannot query device properties. h_ret=%li",
277 h_ret); 277 h_ret);
278 ret = -EPERM; 278 ret = -EPERM;
279 goto sense_attributes1; 279 goto sense_attributes1;
@@ -332,7 +332,7 @@ int ehca_sense_attributes(struct ehca_shca *shca)
332 port = (struct hipz_query_port *)rblock; 332 port = (struct hipz_query_port *)rblock;
333 h_ret = hipz_h_query_port(shca->ipz_hca_handle, 1, port); 333 h_ret = hipz_h_query_port(shca->ipz_hca_handle, 1, port);
334 if (h_ret != H_SUCCESS) { 334 if (h_ret != H_SUCCESS) {
335 ehca_gen_err("Cannot query port properties. h_ret=%lx", 335 ehca_gen_err("Cannot query port properties. h_ret=%li",
336 h_ret); 336 h_ret);
337 ret = -EPERM; 337 ret = -EPERM;
338 goto sense_attributes1; 338 goto sense_attributes1;
@@ -526,13 +526,13 @@ static int ehca_destroy_aqp1(struct ehca_sport *sport)
526 526
527 ret = ib_destroy_qp(sport->ibqp_aqp1); 527 ret = ib_destroy_qp(sport->ibqp_aqp1);
528 if (ret) { 528 if (ret) {
529 ehca_gen_err("Cannot destroy AQP1 QP. ret=%x", ret); 529 ehca_gen_err("Cannot destroy AQP1 QP. ret=%i", ret);
530 return ret; 530 return ret;
531 } 531 }
532 532
533 ret = ib_destroy_cq(sport->ibcq_aqp1); 533 ret = ib_destroy_cq(sport->ibcq_aqp1);
534 if (ret) 534 if (ret)
535 ehca_gen_err("Cannot destroy AQP1 CQ. ret=%x", ret); 535 ehca_gen_err("Cannot destroy AQP1 CQ. ret=%i", ret);
536 536
537 return ret; 537 return ret;
538} 538}
@@ -728,7 +728,7 @@ static int __devinit ehca_probe(struct ibmebus_dev *dev,
728 ret = ehca_reg_internal_maxmr(shca, shca->pd, &shca->maxmr); 728 ret = ehca_reg_internal_maxmr(shca, shca->pd, &shca->maxmr);
729 729
730 if (ret) { 730 if (ret) {
731 ehca_err(&shca->ib_device, "Cannot create internal MR ret=%x", 731 ehca_err(&shca->ib_device, "Cannot create internal MR ret=%i",
732 ret); 732 ret);
733 goto probe5; 733 goto probe5;
734 } 734 }
@@ -736,7 +736,7 @@ static int __devinit ehca_probe(struct ibmebus_dev *dev,
736 ret = ib_register_device(&shca->ib_device); 736 ret = ib_register_device(&shca->ib_device);
737 if (ret) { 737 if (ret) {
738 ehca_err(&shca->ib_device, 738 ehca_err(&shca->ib_device,
739 "ib_register_device() failed ret=%x", ret); 739 "ib_register_device() failed ret=%i", ret);
740 goto probe6; 740 goto probe6;
741 } 741 }
742 742
@@ -777,7 +777,7 @@ probe8:
777 ret = ehca_destroy_aqp1(&shca->sport[0]); 777 ret = ehca_destroy_aqp1(&shca->sport[0]);
778 if (ret) 778 if (ret)
779 ehca_err(&shca->ib_device, 779 ehca_err(&shca->ib_device,
780 "Cannot destroy AQP1 for port 1. ret=%x", ret); 780 "Cannot destroy AQP1 for port 1. ret=%i", ret);
781 781
782probe7: 782probe7:
783 ib_unregister_device(&shca->ib_device); 783 ib_unregister_device(&shca->ib_device);
@@ -826,7 +826,7 @@ static int __devexit ehca_remove(struct ibmebus_dev *dev)
826 if (ret) 826 if (ret)
827 ehca_err(&shca->ib_device, 827 ehca_err(&shca->ib_device,
828 "Cannot destroy AQP1 for port %x " 828 "Cannot destroy AQP1 for port %x "
829 "ret=%x", ret, i); 829 "ret=%i", ret, i);
830 } 830 }
831 } 831 }
832 832
@@ -835,20 +835,20 @@ static int __devexit ehca_remove(struct ibmebus_dev *dev)
835 ret = ehca_dereg_internal_maxmr(shca); 835 ret = ehca_dereg_internal_maxmr(shca);
836 if (ret) 836 if (ret)
837 ehca_err(&shca->ib_device, 837 ehca_err(&shca->ib_device,
838 "Cannot destroy internal MR. ret=%x", ret); 838 "Cannot destroy internal MR. ret=%i", ret);
839 839
840 ret = ehca_dealloc_pd(&shca->pd->ib_pd); 840 ret = ehca_dealloc_pd(&shca->pd->ib_pd);
841 if (ret) 841 if (ret)
842 ehca_err(&shca->ib_device, 842 ehca_err(&shca->ib_device,
843 "Cannot destroy internal PD. ret=%x", ret); 843 "Cannot destroy internal PD. ret=%i", ret);
844 844
845 ret = ehca_destroy_eq(shca, &shca->eq); 845 ret = ehca_destroy_eq(shca, &shca->eq);
846 if (ret) 846 if (ret)
847 ehca_err(&shca->ib_device, "Cannot destroy EQ. ret=%x", ret); 847 ehca_err(&shca->ib_device, "Cannot destroy EQ. ret=%i", ret);
848 848
849 ret = ehca_destroy_eq(shca, &shca->neq); 849 ret = ehca_destroy_eq(shca, &shca->neq);
850 if (ret) 850 if (ret)
851 ehca_err(&shca->ib_device, "Canot destroy NEQ. ret=%x", ret); 851 ehca_err(&shca->ib_device, "Canot destroy NEQ. ret=%i", ret);
852 852
853 ib_dealloc_device(&shca->ib_device); 853 ib_dealloc_device(&shca->ib_device);
854 854
diff --git a/drivers/infiniband/hw/ehca/ehca_mcast.c b/drivers/infiniband/hw/ehca/ehca_mcast.c
index 32a870660bfe..e3ef0264ccc6 100644
--- a/drivers/infiniband/hw/ehca/ehca_mcast.c
+++ b/drivers/infiniband/hw/ehca/ehca_mcast.c
@@ -88,7 +88,7 @@ int ehca_attach_mcast(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
88 if (h_ret != H_SUCCESS) 88 if (h_ret != H_SUCCESS)
89 ehca_err(ibqp->device, 89 ehca_err(ibqp->device,
90 "ehca_qp=%p qp_num=%x hipz_h_attach_mcqp() failed " 90 "ehca_qp=%p qp_num=%x hipz_h_attach_mcqp() failed "
91 "h_ret=%lx", my_qp, ibqp->qp_num, h_ret); 91 "h_ret=%li", my_qp, ibqp->qp_num, h_ret);
92 92
93 return ehca2ib_return_code(h_ret); 93 return ehca2ib_return_code(h_ret);
94} 94}
@@ -125,7 +125,7 @@ int ehca_detach_mcast(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
125 if (h_ret != H_SUCCESS) 125 if (h_ret != H_SUCCESS)
126 ehca_err(ibqp->device, 126 ehca_err(ibqp->device,
127 "ehca_qp=%p qp_num=%x hipz_h_detach_mcqp() failed " 127 "ehca_qp=%p qp_num=%x hipz_h_detach_mcqp() failed "
128 "h_ret=%lx", my_qp, ibqp->qp_num, h_ret); 128 "h_ret=%li", my_qp, ibqp->qp_num, h_ret);
129 129
130 return ehca2ib_return_code(h_ret); 130 return ehca2ib_return_code(h_ret);
131} 131}
diff --git a/drivers/infiniband/hw/ehca/ehca_mrmw.c b/drivers/infiniband/hw/ehca/ehca_mrmw.c
index dc4c84040aad..e925e84c9bc7 100644
--- a/drivers/infiniband/hw/ehca/ehca_mrmw.c
+++ b/drivers/infiniband/hw/ehca/ehca_mrmw.c
@@ -159,7 +159,7 @@ struct ib_mr *ehca_get_dma_mr(struct ib_pd *pd, int mr_access_flags)
159 159
160get_dma_mr_exit0: 160get_dma_mr_exit0:
161 if (IS_ERR(ib_mr)) 161 if (IS_ERR(ib_mr))
162 ehca_err(&shca->ib_device, "rc=%lx pd=%p mr_access_flags=%x ", 162 ehca_err(&shca->ib_device, "h_ret=%li pd=%p mr_access_flags=%x",
163 PTR_ERR(ib_mr), pd, mr_access_flags); 163 PTR_ERR(ib_mr), pd, mr_access_flags);
164 return ib_mr; 164 return ib_mr;
165} /* end ehca_get_dma_mr() */ 165} /* end ehca_get_dma_mr() */
@@ -271,7 +271,7 @@ reg_phys_mr_exit1:
271 ehca_mr_delete(e_mr); 271 ehca_mr_delete(e_mr);
272reg_phys_mr_exit0: 272reg_phys_mr_exit0:
273 if (IS_ERR(ib_mr)) 273 if (IS_ERR(ib_mr))
274 ehca_err(pd->device, "rc=%lx pd=%p phys_buf_array=%p " 274 ehca_err(pd->device, "h_ret=%li pd=%p phys_buf_array=%p "
275 "num_phys_buf=%x mr_access_flags=%x iova_start=%p", 275 "num_phys_buf=%x mr_access_flags=%x iova_start=%p",
276 PTR_ERR(ib_mr), pd, phys_buf_array, 276 PTR_ERR(ib_mr), pd, phys_buf_array,
277 num_phys_buf, mr_access_flags, iova_start); 277 num_phys_buf, mr_access_flags, iova_start);
@@ -403,8 +403,7 @@ reg_user_mr_exit1:
403 ehca_mr_delete(e_mr); 403 ehca_mr_delete(e_mr);
404reg_user_mr_exit0: 404reg_user_mr_exit0:
405 if (IS_ERR(ib_mr)) 405 if (IS_ERR(ib_mr))
406 ehca_err(pd->device, "rc=%lx pd=%p mr_access_flags=%x" 406 ehca_err(pd->device, "rc=%li pd=%p mr_access_flags=%x udata=%p",
407 " udata=%p",
408 PTR_ERR(ib_mr), pd, mr_access_flags, udata); 407 PTR_ERR(ib_mr), pd, mr_access_flags, udata);
409 return ib_mr; 408 return ib_mr;
410} /* end ehca_reg_user_mr() */ 409} /* end ehca_reg_user_mr() */
@@ -565,7 +564,7 @@ rereg_phys_mr_exit1:
565 spin_unlock_irqrestore(&e_mr->mrlock, sl_flags); 564 spin_unlock_irqrestore(&e_mr->mrlock, sl_flags);
566rereg_phys_mr_exit0: 565rereg_phys_mr_exit0:
567 if (ret) 566 if (ret)
568 ehca_err(mr->device, "ret=%x mr=%p mr_rereg_mask=%x pd=%p " 567 ehca_err(mr->device, "ret=%i mr=%p mr_rereg_mask=%x pd=%p "
569 "phys_buf_array=%p num_phys_buf=%x mr_access_flags=%x " 568 "phys_buf_array=%p num_phys_buf=%x mr_access_flags=%x "
570 "iova_start=%p", 569 "iova_start=%p",
571 ret, mr, mr_rereg_mask, pd, phys_buf_array, 570 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)
607 606
608 h_ret = hipz_h_query_mr(shca->ipz_hca_handle, e_mr, &hipzout); 607 h_ret = hipz_h_query_mr(shca->ipz_hca_handle, e_mr, &hipzout);
609 if (h_ret != H_SUCCESS) { 608 if (h_ret != H_SUCCESS) {
610 ehca_err(mr->device, "hipz_mr_query failed, h_ret=%lx mr=%p " 609 ehca_err(mr->device, "hipz_mr_query failed, h_ret=%li mr=%p "
611 "hca_hndl=%lx mr_hndl=%lx lkey=%x", 610 "hca_hndl=%lx mr_hndl=%lx lkey=%x",
612 h_ret, mr, shca->ipz_hca_handle.handle, 611 h_ret, mr, shca->ipz_hca_handle.handle,
613 e_mr->ipz_mr_handle.handle, mr->lkey); 612 e_mr->ipz_mr_handle.handle, mr->lkey);
@@ -625,7 +624,7 @@ query_mr_exit1:
625 spin_unlock_irqrestore(&e_mr->mrlock, sl_flags); 624 spin_unlock_irqrestore(&e_mr->mrlock, sl_flags);
626query_mr_exit0: 625query_mr_exit0:
627 if (ret) 626 if (ret)
628 ehca_err(mr->device, "ret=%x mr=%p mr_attr=%p", 627 ehca_err(mr->device, "ret=%i mr=%p mr_attr=%p",
629 ret, mr, mr_attr); 628 ret, mr, mr_attr);
630 return ret; 629 return ret;
631} /* end ehca_query_mr() */ 630} /* end ehca_query_mr() */
@@ -667,7 +666,7 @@ int ehca_dereg_mr(struct ib_mr *mr)
667 /* TODO: BUSY: MR still has bound window(s) */ 666 /* TODO: BUSY: MR still has bound window(s) */
668 h_ret = hipz_h_free_resource_mr(shca->ipz_hca_handle, e_mr); 667 h_ret = hipz_h_free_resource_mr(shca->ipz_hca_handle, e_mr);
669 if (h_ret != H_SUCCESS) { 668 if (h_ret != H_SUCCESS) {
670 ehca_err(mr->device, "hipz_free_mr failed, h_ret=%lx shca=%p " 669 ehca_err(mr->device, "hipz_free_mr failed, h_ret=%li shca=%p "
671 "e_mr=%p hca_hndl=%lx mr_hndl=%lx mr->lkey=%x", 670 "e_mr=%p hca_hndl=%lx mr_hndl=%lx mr->lkey=%x",
672 h_ret, shca, e_mr, shca->ipz_hca_handle.handle, 671 h_ret, shca, e_mr, shca->ipz_hca_handle.handle,
673 e_mr->ipz_mr_handle.handle, mr->lkey); 672 e_mr->ipz_mr_handle.handle, mr->lkey);
@@ -683,7 +682,7 @@ int ehca_dereg_mr(struct ib_mr *mr)
683 682
684dereg_mr_exit0: 683dereg_mr_exit0:
685 if (ret) 684 if (ret)
686 ehca_err(mr->device, "ret=%x mr=%p", ret, mr); 685 ehca_err(mr->device, "ret=%i mr=%p", ret, mr);
687 return ret; 686 return ret;
688} /* end ehca_dereg_mr() */ 687} /* end ehca_dereg_mr() */
689 688
@@ -708,7 +707,7 @@ struct ib_mw *ehca_alloc_mw(struct ib_pd *pd)
708 h_ret = hipz_h_alloc_resource_mw(shca->ipz_hca_handle, e_mw, 707 h_ret = hipz_h_alloc_resource_mw(shca->ipz_hca_handle, e_mw,
709 e_pd->fw_pd, &hipzout); 708 e_pd->fw_pd, &hipzout);
710 if (h_ret != H_SUCCESS) { 709 if (h_ret != H_SUCCESS) {
711 ehca_err(pd->device, "hipz_mw_allocate failed, h_ret=%lx " 710 ehca_err(pd->device, "hipz_mw_allocate failed, h_ret=%li "
712 "shca=%p hca_hndl=%lx mw=%p", 711 "shca=%p hca_hndl=%lx mw=%p",
713 h_ret, shca, shca->ipz_hca_handle.handle, e_mw); 712 h_ret, shca, shca->ipz_hca_handle.handle, e_mw);
714 ib_mw = ERR_PTR(ehca2ib_return_code(h_ret)); 713 ib_mw = ERR_PTR(ehca2ib_return_code(h_ret));
@@ -723,7 +722,7 @@ alloc_mw_exit1:
723 ehca_mw_delete(e_mw); 722 ehca_mw_delete(e_mw);
724alloc_mw_exit0: 723alloc_mw_exit0:
725 if (IS_ERR(ib_mw)) 724 if (IS_ERR(ib_mw))
726 ehca_err(pd->device, "rc=%lx pd=%p", PTR_ERR(ib_mw), pd); 725 ehca_err(pd->device, "h_ret=%li pd=%p", PTR_ERR(ib_mw), pd);
727 return ib_mw; 726 return ib_mw;
728} /* end ehca_alloc_mw() */ 727} /* end ehca_alloc_mw() */
729 728
@@ -750,7 +749,7 @@ int ehca_dealloc_mw(struct ib_mw *mw)
750 749
751 h_ret = hipz_h_free_resource_mw(shca->ipz_hca_handle, e_mw); 750 h_ret = hipz_h_free_resource_mw(shca->ipz_hca_handle, e_mw);
752 if (h_ret != H_SUCCESS) { 751 if (h_ret != H_SUCCESS) {
753 ehca_err(mw->device, "hipz_free_mw failed, h_ret=%lx shca=%p " 752 ehca_err(mw->device, "hipz_free_mw failed, h_ret=%li shca=%p "
754 "mw=%p rkey=%x hca_hndl=%lx mw_hndl=%lx", 753 "mw=%p rkey=%x hca_hndl=%lx mw_hndl=%lx",
755 h_ret, shca, mw, mw->rkey, shca->ipz_hca_handle.handle, 754 h_ret, shca, mw, mw->rkey, shca->ipz_hca_handle.handle,
756 e_mw->ipz_mw_handle.handle); 755 e_mw->ipz_mw_handle.handle);
@@ -912,7 +911,7 @@ int ehca_map_phys_fmr(struct ib_fmr *fmr,
912 911
913map_phys_fmr_exit0: 912map_phys_fmr_exit0:
914 if (ret) 913 if (ret)
915 ehca_err(fmr->device, "ret=%x fmr=%p page_list=%p list_len=%x " 914 ehca_err(fmr->device, "ret=%i fmr=%p page_list=%p list_len=%x "
916 "iova=%lx", ret, fmr, page_list, list_len, iova); 915 "iova=%lx", ret, fmr, page_list, list_len, iova);
917 return ret; 916 return ret;
918} /* end ehca_map_phys_fmr() */ 917} /* end ehca_map_phys_fmr() */
@@ -975,7 +974,7 @@ int ehca_unmap_fmr(struct list_head *fmr_list)
975 974
976unmap_fmr_exit0: 975unmap_fmr_exit0:
977 if (ret) 976 if (ret)
978 ehca_gen_err("ret=%x fmr_list=%p num_fmr=%x unmap_fmr_cnt=%x", 977 ehca_gen_err("ret=%i fmr_list=%p num_fmr=%x unmap_fmr_cnt=%x",
979 ret, fmr_list, num_fmr, unmap_fmr_cnt); 978 ret, fmr_list, num_fmr, unmap_fmr_cnt);
980 return ret; 979 return ret;
981} /* end ehca_unmap_fmr() */ 980} /* end ehca_unmap_fmr() */
@@ -999,7 +998,7 @@ int ehca_dealloc_fmr(struct ib_fmr *fmr)
999 998
1000 h_ret = hipz_h_free_resource_mr(shca->ipz_hca_handle, e_fmr); 999 h_ret = hipz_h_free_resource_mr(shca->ipz_hca_handle, e_fmr);
1001 if (h_ret != H_SUCCESS) { 1000 if (h_ret != H_SUCCESS) {
1002 ehca_err(fmr->device, "hipz_free_mr failed, h_ret=%lx e_fmr=%p " 1001 ehca_err(fmr->device, "hipz_free_mr failed, h_ret=%li e_fmr=%p "
1003 "hca_hndl=%lx fmr_hndl=%lx fmr->lkey=%x", 1002 "hca_hndl=%lx fmr_hndl=%lx fmr->lkey=%x",
1004 h_ret, e_fmr, shca->ipz_hca_handle.handle, 1003 h_ret, e_fmr, shca->ipz_hca_handle.handle,
1005 e_fmr->ipz_mr_handle.handle, fmr->lkey); 1004 e_fmr->ipz_mr_handle.handle, fmr->lkey);
@@ -1012,7 +1011,7 @@ int ehca_dealloc_fmr(struct ib_fmr *fmr)
1012 1011
1013free_fmr_exit0: 1012free_fmr_exit0:
1014 if (ret) 1013 if (ret)
1015 ehca_err(&shca->ib_device, "ret=%x fmr=%p", ret, fmr); 1014 ehca_err(&shca->ib_device, "ret=%i fmr=%p", ret, fmr);
1016 return ret; 1015 return ret;
1017} /* end ehca_dealloc_fmr() */ 1016} /* end ehca_dealloc_fmr() */
1018 1017
@@ -1042,7 +1041,7 @@ int ehca_reg_mr(struct ehca_shca *shca,
1042 (u64)iova_start, size, hipz_acl, 1041 (u64)iova_start, size, hipz_acl,
1043 e_pd->fw_pd, &hipzout); 1042 e_pd->fw_pd, &hipzout);
1044 if (h_ret != H_SUCCESS) { 1043 if (h_ret != H_SUCCESS) {
1045 ehca_err(&shca->ib_device, "hipz_alloc_mr failed, h_ret=%lx " 1044 ehca_err(&shca->ib_device, "hipz_alloc_mr failed, h_ret=%li "
1046 "hca_hndl=%lx", h_ret, shca->ipz_hca_handle.handle); 1045 "hca_hndl=%lx", h_ret, shca->ipz_hca_handle.handle);
1047 ret = ehca2ib_return_code(h_ret); 1046 ret = ehca2ib_return_code(h_ret);
1048 goto ehca_reg_mr_exit0; 1047 goto ehca_reg_mr_exit0;
@@ -1068,9 +1067,9 @@ int ehca_reg_mr(struct ehca_shca *shca,
1068ehca_reg_mr_exit1: 1067ehca_reg_mr_exit1:
1069 h_ret = hipz_h_free_resource_mr(shca->ipz_hca_handle, e_mr); 1068 h_ret = hipz_h_free_resource_mr(shca->ipz_hca_handle, e_mr);
1070 if (h_ret != H_SUCCESS) { 1069 if (h_ret != H_SUCCESS) {
1071 ehca_err(&shca->ib_device, "h_ret=%lx shca=%p e_mr=%p " 1070 ehca_err(&shca->ib_device, "h_ret=%li shca=%p e_mr=%p "
1072 "iova_start=%p size=%lx acl=%x e_pd=%p lkey=%x " 1071 "iova_start=%p size=%lx acl=%x e_pd=%p lkey=%x "
1073 "pginfo=%p num_kpages=%lx num_hwpages=%lx ret=%x", 1072 "pginfo=%p num_kpages=%lx num_hwpages=%lx ret=%i",
1074 h_ret, shca, e_mr, iova_start, size, acl, e_pd, 1073 h_ret, shca, e_mr, iova_start, size, acl, e_pd,
1075 hipzout.lkey, pginfo, pginfo->num_kpages, 1074 hipzout.lkey, pginfo, pginfo->num_kpages,
1076 pginfo->num_hwpages, ret); 1075 pginfo->num_hwpages, ret);
@@ -1079,7 +1078,7 @@ ehca_reg_mr_exit1:
1079 } 1078 }
1080ehca_reg_mr_exit0: 1079ehca_reg_mr_exit0:
1081 if (ret) 1080 if (ret)
1082 ehca_err(&shca->ib_device, "ret=%x shca=%p e_mr=%p " 1081 ehca_err(&shca->ib_device, "ret=%i shca=%p e_mr=%p "
1083 "iova_start=%p size=%lx acl=%x e_pd=%p pginfo=%p " 1082 "iova_start=%p size=%lx acl=%x e_pd=%p pginfo=%p "
1084 "num_kpages=%lx num_hwpages=%lx", 1083 "num_kpages=%lx num_hwpages=%lx",
1085 ret, shca, e_mr, iova_start, size, acl, e_pd, pginfo, 1084 ret, shca, e_mr, iova_start, size, acl, e_pd, pginfo,
@@ -1123,7 +1122,7 @@ int ehca_reg_mr_rpages(struct ehca_shca *shca,
1123 ret = ehca_set_pagebuf(pginfo, rnum, kpage); 1122 ret = ehca_set_pagebuf(pginfo, rnum, kpage);
1124 if (ret) { 1123 if (ret) {
1125 ehca_err(&shca->ib_device, "ehca_set_pagebuf " 1124 ehca_err(&shca->ib_device, "ehca_set_pagebuf "
1126 "bad rc, ret=%x rnum=%x kpage=%p", 1125 "bad rc, ret=%i rnum=%x kpage=%p",
1127 ret, rnum, kpage); 1126 ret, rnum, kpage);
1128 goto ehca_reg_mr_rpages_exit1; 1127 goto ehca_reg_mr_rpages_exit1;
1129 } 1128 }
@@ -1151,7 +1150,7 @@ int ehca_reg_mr_rpages(struct ehca_shca *shca,
1151 */ 1150 */
1152 if (h_ret != H_SUCCESS) { 1151 if (h_ret != H_SUCCESS) {
1153 ehca_err(&shca->ib_device, "last " 1152 ehca_err(&shca->ib_device, "last "
1154 "hipz_reg_rpage_mr failed, h_ret=%lx " 1153 "hipz_reg_rpage_mr failed, h_ret=%li "
1155 "e_mr=%p i=%x hca_hndl=%lx mr_hndl=%lx" 1154 "e_mr=%p i=%x hca_hndl=%lx mr_hndl=%lx"
1156 " lkey=%x", h_ret, e_mr, i, 1155 " lkey=%x", h_ret, e_mr, i,
1157 shca->ipz_hca_handle.handle, 1156 shca->ipz_hca_handle.handle,
@@ -1163,7 +1162,7 @@ int ehca_reg_mr_rpages(struct ehca_shca *shca,
1163 ret = 0; 1162 ret = 0;
1164 } else if (h_ret != H_PAGE_REGISTERED) { 1163 } else if (h_ret != H_PAGE_REGISTERED) {
1165 ehca_err(&shca->ib_device, "hipz_reg_rpage_mr failed, " 1164 ehca_err(&shca->ib_device, "hipz_reg_rpage_mr failed, "
1166 "h_ret=%lx e_mr=%p i=%x lkey=%x hca_hndl=%lx " 1165 "h_ret=%li e_mr=%p i=%x lkey=%x hca_hndl=%lx "
1167 "mr_hndl=%lx", h_ret, e_mr, i, 1166 "mr_hndl=%lx", h_ret, e_mr, i,
1168 e_mr->ib.ib_mr.lkey, 1167 e_mr->ib.ib_mr.lkey,
1169 shca->ipz_hca_handle.handle, 1168 shca->ipz_hca_handle.handle,
@@ -1179,7 +1178,7 @@ ehca_reg_mr_rpages_exit1:
1179 ehca_free_fw_ctrlblock(kpage); 1178 ehca_free_fw_ctrlblock(kpage);
1180ehca_reg_mr_rpages_exit0: 1179ehca_reg_mr_rpages_exit0:
1181 if (ret) 1180 if (ret)
1182 ehca_err(&shca->ib_device, "ret=%x shca=%p e_mr=%p pginfo=%p " 1181 ehca_err(&shca->ib_device, "ret=%i shca=%p e_mr=%p pginfo=%p "
1183 "num_kpages=%lx num_hwpages=%lx", ret, shca, e_mr, 1182 "num_kpages=%lx num_hwpages=%lx", ret, shca, e_mr,
1184 pginfo, pginfo->num_kpages, pginfo->num_hwpages); 1183 pginfo, pginfo->num_kpages, pginfo->num_hwpages);
1185 return ret; 1184 return ret;
@@ -1240,7 +1239,7 @@ inline int ehca_rereg_mr_rereg1(struct ehca_shca *shca,
1240 * (MW bound or MR is shared) 1239 * (MW bound or MR is shared)
1241 */ 1240 */
1242 ehca_warn(&shca->ib_device, "hipz_h_reregister_pmr failed " 1241 ehca_warn(&shca->ib_device, "hipz_h_reregister_pmr failed "
1243 "(Rereg1), h_ret=%lx e_mr=%p", h_ret, e_mr); 1242 "(Rereg1), h_ret=%li e_mr=%p", h_ret, e_mr);
1244 *pginfo = pginfo_save; 1243 *pginfo = pginfo_save;
1245 ret = -EAGAIN; 1244 ret = -EAGAIN;
1246 } else if ((u64 *)hipzout.vaddr != iova_start) { 1245 } else if ((u64 *)hipzout.vaddr != iova_start) {
@@ -1269,7 +1268,7 @@ ehca_rereg_mr_rereg1_exit1:
1269 ehca_free_fw_ctrlblock(kpage); 1268 ehca_free_fw_ctrlblock(kpage);
1270ehca_rereg_mr_rereg1_exit0: 1269ehca_rereg_mr_rereg1_exit0:
1271 if ( ret && (ret != -EAGAIN) ) 1270 if ( ret && (ret != -EAGAIN) )
1272 ehca_err(&shca->ib_device, "ret=%x lkey=%x rkey=%x " 1271 ehca_err(&shca->ib_device, "ret=%i lkey=%x rkey=%x "
1273 "pginfo=%p num_kpages=%lx num_hwpages=%lx", 1272 "pginfo=%p num_kpages=%lx num_hwpages=%lx",
1274 ret, *lkey, *rkey, pginfo, pginfo->num_kpages, 1273 ret, *lkey, *rkey, pginfo, pginfo->num_kpages,
1275 pginfo->num_hwpages); 1274 pginfo->num_hwpages);
@@ -1330,7 +1329,7 @@ int ehca_rereg_mr(struct ehca_shca *shca,
1330 h_ret = hipz_h_free_resource_mr(shca->ipz_hca_handle, e_mr); 1329 h_ret = hipz_h_free_resource_mr(shca->ipz_hca_handle, e_mr);
1331 if (h_ret != H_SUCCESS) { 1330 if (h_ret != H_SUCCESS) {
1332 ehca_err(&shca->ib_device, "hipz_free_mr failed, " 1331 ehca_err(&shca->ib_device, "hipz_free_mr failed, "
1333 "h_ret=%lx e_mr=%p hca_hndl=%lx mr_hndl=%lx " 1332 "h_ret=%li e_mr=%p hca_hndl=%lx mr_hndl=%lx "
1334 "mr->lkey=%x", 1333 "mr->lkey=%x",
1335 h_ret, e_mr, shca->ipz_hca_handle.handle, 1334 h_ret, e_mr, shca->ipz_hca_handle.handle,
1336 e_mr->ipz_mr_handle.handle, 1335 e_mr->ipz_mr_handle.handle,
@@ -1362,7 +1361,7 @@ int ehca_rereg_mr(struct ehca_shca *shca,
1362 1361
1363ehca_rereg_mr_exit0: 1362ehca_rereg_mr_exit0:
1364 if (ret) 1363 if (ret)
1365 ehca_err(&shca->ib_device, "ret=%x shca=%p e_mr=%p " 1364 ehca_err(&shca->ib_device, "ret=%i shca=%p e_mr=%p "
1366 "iova_start=%p size=%lx acl=%x e_pd=%p pginfo=%p " 1365 "iova_start=%p size=%lx acl=%x e_pd=%p pginfo=%p "
1367 "num_kpages=%lx lkey=%x rkey=%x rereg_1_hcall=%x " 1366 "num_kpages=%lx lkey=%x rkey=%x rereg_1_hcall=%x "
1368 "rereg_3_hcall=%x", ret, shca, e_mr, iova_start, size, 1367 "rereg_3_hcall=%x", ret, shca, e_mr, iova_start, size,
@@ -1406,7 +1405,7 @@ int ehca_unmap_one_fmr(struct ehca_shca *shca,
1406 * FMRs are not shared and no MW bound to FMRs 1405 * FMRs are not shared and no MW bound to FMRs
1407 */ 1406 */
1408 ehca_err(&shca->ib_device, "hipz_reregister_pmr failed " 1407 ehca_err(&shca->ib_device, "hipz_reregister_pmr failed "
1409 "(Rereg1), h_ret=%lx e_fmr=%p hca_hndl=%lx " 1408 "(Rereg1), h_ret=%li e_fmr=%p hca_hndl=%lx "
1410 "mr_hndl=%lx lkey=%x lkey_out=%x", 1409 "mr_hndl=%lx lkey=%x lkey_out=%x",
1411 h_ret, e_fmr, shca->ipz_hca_handle.handle, 1410 h_ret, e_fmr, shca->ipz_hca_handle.handle,
1412 e_fmr->ipz_mr_handle.handle, 1411 e_fmr->ipz_mr_handle.handle,
@@ -1418,7 +1417,7 @@ int ehca_unmap_one_fmr(struct ehca_shca *shca,
1418 h_ret = hipz_h_free_resource_mr(shca->ipz_hca_handle, e_fmr); 1417 h_ret = hipz_h_free_resource_mr(shca->ipz_hca_handle, e_fmr);
1419 if (h_ret != H_SUCCESS) { 1418 if (h_ret != H_SUCCESS) {
1420 ehca_err(&shca->ib_device, "hipz_free_mr failed, " 1419 ehca_err(&shca->ib_device, "hipz_free_mr failed, "
1421 "h_ret=%lx e_fmr=%p hca_hndl=%lx mr_hndl=%lx " 1420 "h_ret=%li e_fmr=%p hca_hndl=%lx mr_hndl=%lx "
1422 "lkey=%x", 1421 "lkey=%x",
1423 h_ret, e_fmr, shca->ipz_hca_handle.handle, 1422 h_ret, e_fmr, shca->ipz_hca_handle.handle,
1424 e_fmr->ipz_mr_handle.handle, 1423 e_fmr->ipz_mr_handle.handle,
@@ -1453,7 +1452,7 @@ int ehca_unmap_one_fmr(struct ehca_shca *shca,
1453 1452
1454ehca_unmap_one_fmr_exit0: 1453ehca_unmap_one_fmr_exit0:
1455 if (ret) 1454 if (ret)
1456 ehca_err(&shca->ib_device, "ret=%x tmp_lkey=%x tmp_rkey=%x " 1455 ehca_err(&shca->ib_device, "ret=%i tmp_lkey=%x tmp_rkey=%x "
1457 "fmr_max_pages=%x", 1456 "fmr_max_pages=%x",
1458 ret, tmp_lkey, tmp_rkey, e_fmr->fmr_max_pages); 1457 ret, tmp_lkey, tmp_rkey, e_fmr->fmr_max_pages);
1459 return ret; 1458 return ret;
@@ -1482,7 +1481,7 @@ int ehca_reg_smr(struct ehca_shca *shca,
1482 (u64)iova_start, hipz_acl, e_pd->fw_pd, 1481 (u64)iova_start, hipz_acl, e_pd->fw_pd,
1483 &hipzout); 1482 &hipzout);
1484 if (h_ret != H_SUCCESS) { 1483 if (h_ret != H_SUCCESS) {
1485 ehca_err(&shca->ib_device, "hipz_reg_smr failed, h_ret=%lx " 1484 ehca_err(&shca->ib_device, "hipz_reg_smr failed, h_ret=%li "
1486 "shca=%p e_origmr=%p e_newmr=%p iova_start=%p acl=%x " 1485 "shca=%p e_origmr=%p e_newmr=%p iova_start=%p acl=%x "
1487 "e_pd=%p hca_hndl=%lx mr_hndl=%lx lkey=%x", 1486 "e_pd=%p hca_hndl=%lx mr_hndl=%lx lkey=%x",
1488 h_ret, shca, e_origmr, e_newmr, iova_start, acl, e_pd, 1487 h_ret, shca, e_origmr, e_newmr, iova_start, acl, e_pd,
@@ -1506,7 +1505,7 @@ int ehca_reg_smr(struct ehca_shca *shca,
1506 1505
1507ehca_reg_smr_exit0: 1506ehca_reg_smr_exit0:
1508 if (ret) 1507 if (ret)
1509 ehca_err(&shca->ib_device, "ret=%x shca=%p e_origmr=%p " 1508 ehca_err(&shca->ib_device, "ret=%i shca=%p e_origmr=%p "
1510 "e_newmr=%p iova_start=%p acl=%x e_pd=%p", 1509 "e_newmr=%p iova_start=%p acl=%x e_pd=%p",
1511 ret, shca, e_origmr, e_newmr, iova_start, acl, e_pd); 1510 ret, shca, e_origmr, e_newmr, iova_start, acl, e_pd);
1512 return ret; 1511 return ret;
@@ -1581,7 +1580,7 @@ ehca_reg_internal_maxmr_exit1:
1581 ehca_mr_delete(e_mr); 1580 ehca_mr_delete(e_mr);
1582ehca_reg_internal_maxmr_exit0: 1581ehca_reg_internal_maxmr_exit0:
1583 if (ret) 1582 if (ret)
1584 ehca_err(&shca->ib_device, "ret=%x shca=%p e_pd=%p e_maxmr=%p", 1583 ehca_err(&shca->ib_device, "ret=%i shca=%p e_pd=%p e_maxmr=%p",
1585 ret, shca, e_pd, e_maxmr); 1584 ret, shca, e_pd, e_maxmr);
1586 return ret; 1585 return ret;
1587} /* end ehca_reg_internal_maxmr() */ 1586} /* end ehca_reg_internal_maxmr() */
@@ -1608,7 +1607,7 @@ int ehca_reg_maxmr(struct ehca_shca *shca,
1608 (u64)iova_start, hipz_acl, e_pd->fw_pd, 1607 (u64)iova_start, hipz_acl, e_pd->fw_pd,
1609 &hipzout); 1608 &hipzout);
1610 if (h_ret != H_SUCCESS) { 1609 if (h_ret != H_SUCCESS) {
1611 ehca_err(&shca->ib_device, "hipz_reg_smr failed, h_ret=%lx " 1610 ehca_err(&shca->ib_device, "hipz_reg_smr failed, h_ret=%li "
1612 "e_origmr=%p hca_hndl=%lx mr_hndl=%lx lkey=%x", 1611 "e_origmr=%p hca_hndl=%lx mr_hndl=%lx lkey=%x",
1613 h_ret, e_origmr, shca->ipz_hca_handle.handle, 1612 h_ret, e_origmr, shca->ipz_hca_handle.handle,
1614 e_origmr->ipz_mr_handle.handle, 1613 e_origmr->ipz_mr_handle.handle,
@@ -1649,7 +1648,7 @@ int ehca_dereg_internal_maxmr(struct ehca_shca *shca)
1649 ret = ehca_dereg_mr(&e_maxmr->ib.ib_mr); 1648 ret = ehca_dereg_mr(&e_maxmr->ib.ib_mr);
1650 if (ret) { 1649 if (ret) {
1651 ehca_err(&shca->ib_device, "dereg internal max-MR failed, " 1650 ehca_err(&shca->ib_device, "dereg internal max-MR failed, "
1652 "ret=%x e_maxmr=%p shca=%p lkey=%x", 1651 "ret=%i e_maxmr=%p shca=%p lkey=%x",
1653 ret, e_maxmr, shca, e_maxmr->ib.ib_mr.lkey); 1652 ret, e_maxmr, shca, e_maxmr->ib.ib_mr.lkey);
1654 shca->maxmr = e_maxmr; 1653 shca->maxmr = e_maxmr;
1655 goto ehca_dereg_internal_maxmr_exit0; 1654 goto ehca_dereg_internal_maxmr_exit0;
@@ -1659,7 +1658,7 @@ int ehca_dereg_internal_maxmr(struct ehca_shca *shca)
1659 1658
1660ehca_dereg_internal_maxmr_exit0: 1659ehca_dereg_internal_maxmr_exit0:
1661 if (ret) 1660 if (ret)
1662 ehca_err(&shca->ib_device, "ret=%x shca=%p shca->maxmr=%p", 1661 ehca_err(&shca->ib_device, "ret=%i shca=%p shca->maxmr=%p",
1663 ret, shca, shca->maxmr); 1662 ret, shca, shca->maxmr);
1664 return ret; 1663 return ret;
1665} /* end ehca_dereg_internal_maxmr() */ 1664} /* end ehca_dereg_internal_maxmr() */
diff --git a/drivers/infiniband/hw/ehca/ehca_qp.c b/drivers/infiniband/hw/ehca/ehca_qp.c
index e89fdca7fa19..88d7dd946033 100644
--- a/drivers/infiniband/hw/ehca/ehca_qp.c
+++ b/drivers/infiniband/hw/ehca/ehca_qp.c
@@ -310,7 +310,7 @@ static inline int init_qp_queue(struct ehca_shca *shca,
310 } 310 }
311 311
312 if (!ipz_rc) { 312 if (!ipz_rc) {
313 ehca_err(ib_dev, "Cannot allocate page for queue. ipz_rc=%x", 313 ehca_err(ib_dev, "Cannot allocate page for queue. ipz_rc=%i",
314 ipz_rc); 314 ipz_rc);
315 return -EBUSY; 315 return -EBUSY;
316 } 316 }
@@ -334,7 +334,7 @@ static inline int init_qp_queue(struct ehca_shca *shca,
334 if (cnt == (nr_q_pages - 1)) { /* last page! */ 334 if (cnt == (nr_q_pages - 1)) { /* last page! */
335 if (h_ret != expected_hret) { 335 if (h_ret != expected_hret) {
336 ehca_err(ib_dev, "hipz_qp_register_rpage() " 336 ehca_err(ib_dev, "hipz_qp_register_rpage() "
337 "h_ret= %lx ", h_ret); 337 "h_ret=%li", h_ret);
338 ret = ehca2ib_return_code(h_ret); 338 ret = ehca2ib_return_code(h_ret);
339 goto init_qp_queue1; 339 goto init_qp_queue1;
340 } 340 }
@@ -348,7 +348,7 @@ static inline int init_qp_queue(struct ehca_shca *shca,
348 } else { 348 } else {
349 if (h_ret != H_PAGE_REGISTERED) { 349 if (h_ret != H_PAGE_REGISTERED) {
350 ehca_err(ib_dev, "hipz_qp_register_rpage() " 350 ehca_err(ib_dev, "hipz_qp_register_rpage() "
351 "h_ret= %lx ", h_ret); 351 "h_ret=%li", h_ret);
352 ret = ehca2ib_return_code(h_ret); 352 ret = ehca2ib_return_code(h_ret);
353 goto init_qp_queue1; 353 goto init_qp_queue1;
354 } 354 }
@@ -617,7 +617,7 @@ static struct ehca_qp *internal_create_qp(
617 617
618 h_ret = hipz_h_alloc_resource_qp(shca->ipz_hca_handle, &parms); 618 h_ret = hipz_h_alloc_resource_qp(shca->ipz_hca_handle, &parms);
619 if (h_ret != H_SUCCESS) { 619 if (h_ret != H_SUCCESS) {
620 ehca_err(pd->device, "h_alloc_resource_qp() failed h_ret=%lx", 620 ehca_err(pd->device, "h_alloc_resource_qp() failed h_ret=%li",
621 h_ret); 621 h_ret);
622 ret = ehca2ib_return_code(h_ret); 622 ret = ehca2ib_return_code(h_ret);
623 goto create_qp_exit1; 623 goto create_qp_exit1;
@@ -671,7 +671,7 @@ static struct ehca_qp *internal_create_qp(
671 &parms.squeue, swqe_size); 671 &parms.squeue, swqe_size);
672 if (ret) { 672 if (ret) {
673 ehca_err(pd->device, "Couldn't initialize squeue " 673 ehca_err(pd->device, "Couldn't initialize squeue "
674 "and pages ret=%x", ret); 674 "and pages ret=%i", ret);
675 goto create_qp_exit2; 675 goto create_qp_exit2;
676 } 676 }
677 } 677 }
@@ -682,7 +682,7 @@ static struct ehca_qp *internal_create_qp(
682 H_SUCCESS, &parms.rqueue, rwqe_size); 682 H_SUCCESS, &parms.rqueue, rwqe_size);
683 if (ret) { 683 if (ret) {
684 ehca_err(pd->device, "Couldn't initialize rqueue " 684 ehca_err(pd->device, "Couldn't initialize rqueue "
685 "and pages ret=%x", ret); 685 "and pages ret=%i", ret);
686 goto create_qp_exit3; 686 goto create_qp_exit3;
687 } 687 }
688 } 688 }
@@ -728,7 +728,7 @@ static struct ehca_qp *internal_create_qp(
728 ret = ehca_cq_assign_qp(my_qp->send_cq, my_qp); 728 ret = ehca_cq_assign_qp(my_qp->send_cq, my_qp);
729 if (ret) { 729 if (ret) {
730 ehca_err(pd->device, 730 ehca_err(pd->device,
731 "Couldn't assign qp to send_cq ret=%x", ret); 731 "Couldn't assign qp to send_cq ret=%i", ret);
732 goto create_qp_exit4; 732 goto create_qp_exit4;
733 } 733 }
734 } 734 }
@@ -845,7 +845,7 @@ struct ib_srq *ehca_create_srq(struct ib_pd *pd,
845 mqpcb, my_qp->galpas.kernel); 845 mqpcb, my_qp->galpas.kernel);
846 if (hret != H_SUCCESS) { 846 if (hret != H_SUCCESS) {
847 ehca_err(pd->device, "Could not modify SRQ to INIT" 847 ehca_err(pd->device, "Could not modify SRQ to INIT"
848 "ehca_qp=%p qp_num=%x hret=%lx", 848 "ehca_qp=%p qp_num=%x h_ret=%li",
849 my_qp, my_qp->real_qp_num, hret); 849 my_qp, my_qp->real_qp_num, hret);
850 goto create_srq2; 850 goto create_srq2;
851 } 851 }
@@ -859,7 +859,7 @@ struct ib_srq *ehca_create_srq(struct ib_pd *pd,
859 mqpcb, my_qp->galpas.kernel); 859 mqpcb, my_qp->galpas.kernel);
860 if (hret != H_SUCCESS) { 860 if (hret != H_SUCCESS) {
861 ehca_err(pd->device, "Could not enable SRQ" 861 ehca_err(pd->device, "Could not enable SRQ"
862 "ehca_qp=%p qp_num=%x hret=%lx", 862 "ehca_qp=%p qp_num=%x h_ret=%li",
863 my_qp, my_qp->real_qp_num, hret); 863 my_qp, my_qp->real_qp_num, hret);
864 goto create_srq2; 864 goto create_srq2;
865 } 865 }
@@ -873,7 +873,7 @@ struct ib_srq *ehca_create_srq(struct ib_pd *pd,
873 mqpcb, my_qp->galpas.kernel); 873 mqpcb, my_qp->galpas.kernel);
874 if (hret != H_SUCCESS) { 874 if (hret != H_SUCCESS) {
875 ehca_err(pd->device, "Could not modify SRQ to RTR" 875 ehca_err(pd->device, "Could not modify SRQ to RTR"
876 "ehca_qp=%p qp_num=%x hret=%lx", 876 "ehca_qp=%p qp_num=%x h_ret=%li",
877 my_qp, my_qp->real_qp_num, hret); 877 my_qp, my_qp->real_qp_num, hret);
878 goto create_srq2; 878 goto create_srq2;
879 } 879 }
@@ -911,7 +911,7 @@ static int prepare_sqe_rts(struct ehca_qp *my_qp, struct ehca_shca *shca,
911 &bad_send_wqe_p, NULL, 2); 911 &bad_send_wqe_p, NULL, 2);
912 if (h_ret != H_SUCCESS) { 912 if (h_ret != H_SUCCESS) {
913 ehca_err(&shca->ib_device, "hipz_h_disable_and_get_wqe() failed" 913 ehca_err(&shca->ib_device, "hipz_h_disable_and_get_wqe() failed"
914 " ehca_qp=%p qp_num=%x h_ret=%lx", 914 " ehca_qp=%p qp_num=%x h_ret=%li",
915 my_qp, qp_num, h_ret); 915 my_qp, qp_num, h_ret);
916 return ehca2ib_return_code(h_ret); 916 return ehca2ib_return_code(h_ret);
917 } 917 }
@@ -989,7 +989,7 @@ static int internal_modify_qp(struct ib_qp *ibqp,
989 mqpcb, my_qp->galpas.kernel); 989 mqpcb, my_qp->galpas.kernel);
990 if (h_ret != H_SUCCESS) { 990 if (h_ret != H_SUCCESS) {
991 ehca_err(ibqp->device, "hipz_h_query_qp() failed " 991 ehca_err(ibqp->device, "hipz_h_query_qp() failed "
992 "ehca_qp=%p qp_num=%x h_ret=%lx", 992 "ehca_qp=%p qp_num=%x h_ret=%li",
993 my_qp, ibqp->qp_num, h_ret); 993 my_qp, ibqp->qp_num, h_ret);
994 ret = ehca2ib_return_code(h_ret); 994 ret = ehca2ib_return_code(h_ret);
995 goto modify_qp_exit1; 995 goto modify_qp_exit1;
@@ -1025,7 +1025,7 @@ static int internal_modify_qp(struct ib_qp *ibqp,
1025 ibqp, &smiqp_attr, smiqp_attr_mask, 1); 1025 ibqp, &smiqp_attr, smiqp_attr_mask, 1);
1026 if (smirc) { 1026 if (smirc) {
1027 ehca_err(ibqp->device, "SMI RESET -> INIT failed. " 1027 ehca_err(ibqp->device, "SMI RESET -> INIT failed. "
1028 "ehca_modify_qp() rc=%x", smirc); 1028 "ehca_modify_qp() rc=%i", smirc);
1029 ret = H_PARAMETER; 1029 ret = H_PARAMETER;
1030 goto modify_qp_exit1; 1030 goto modify_qp_exit1;
1031 } 1031 }
@@ -1127,7 +1127,7 @@ static int internal_modify_qp(struct ib_qp *ibqp,
1127 ret = prepare_sqe_rts(my_qp, shca, &bad_wqe_cnt); 1127 ret = prepare_sqe_rts(my_qp, shca, &bad_wqe_cnt);
1128 if (ret) { 1128 if (ret) {
1129 ehca_err(ibqp->device, "prepare_sqe_rts() failed " 1129 ehca_err(ibqp->device, "prepare_sqe_rts() failed "
1130 "ehca_qp=%p qp_num=%x ret=%x", 1130 "ehca_qp=%p qp_num=%x ret=%i",
1131 my_qp, ibqp->qp_num, ret); 1131 my_qp, ibqp->qp_num, ret);
1132 goto modify_qp_exit2; 1132 goto modify_qp_exit2;
1133 } 1133 }
@@ -1352,7 +1352,7 @@ static int internal_modify_qp(struct ib_qp *ibqp,
1352 1352
1353 if (h_ret != H_SUCCESS) { 1353 if (h_ret != H_SUCCESS) {
1354 ret = ehca2ib_return_code(h_ret); 1354 ret = ehca2ib_return_code(h_ret);
1355 ehca_err(ibqp->device, "hipz_h_modify_qp() failed rc=%lx " 1355 ehca_err(ibqp->device, "hipz_h_modify_qp() failed h_ret=%li "
1356 "ehca_qp=%p qp_num=%x", h_ret, my_qp, ibqp->qp_num); 1356 "ehca_qp=%p qp_num=%x", h_ret, my_qp, ibqp->qp_num);
1357 goto modify_qp_exit2; 1357 goto modify_qp_exit2;
1358 } 1358 }
@@ -1385,7 +1385,7 @@ static int internal_modify_qp(struct ib_qp *ibqp,
1385 ret = ehca2ib_return_code(h_ret); 1385 ret = ehca2ib_return_code(h_ret);
1386 ehca_err(ibqp->device, "ENABLE in context of " 1386 ehca_err(ibqp->device, "ENABLE in context of "
1387 "RESET_2_INIT failed! Maybe you didn't get " 1387 "RESET_2_INIT failed! Maybe you didn't get "
1388 "a LID h_ret=%lx ehca_qp=%p qp_num=%x", 1388 "a LID h_ret=%li ehca_qp=%p qp_num=%x",
1389 h_ret, my_qp, ibqp->qp_num); 1389 h_ret, my_qp, ibqp->qp_num);
1390 goto modify_qp_exit2; 1390 goto modify_qp_exit2;
1391 } 1391 }
@@ -1473,7 +1473,7 @@ int ehca_query_qp(struct ib_qp *qp,
1473 if (h_ret != H_SUCCESS) { 1473 if (h_ret != H_SUCCESS) {
1474 ret = ehca2ib_return_code(h_ret); 1474 ret = ehca2ib_return_code(h_ret);
1475 ehca_err(qp->device, "hipz_h_query_qp() failed " 1475 ehca_err(qp->device, "hipz_h_query_qp() failed "
1476 "ehca_qp=%p qp_num=%x h_ret=%lx", 1476 "ehca_qp=%p qp_num=%x h_ret=%li",
1477 my_qp, qp->qp_num, h_ret); 1477 my_qp, qp->qp_num, h_ret);
1478 goto query_qp_exit1; 1478 goto query_qp_exit1;
1479 } 1479 }
@@ -1648,7 +1648,7 @@ int ehca_modify_srq(struct ib_srq *ibsrq, struct ib_srq_attr *attr,
1648 1648
1649 if (h_ret != H_SUCCESS) { 1649 if (h_ret != H_SUCCESS) {
1650 ret = ehca2ib_return_code(h_ret); 1650 ret = ehca2ib_return_code(h_ret);
1651 ehca_err(ibsrq->device, "hipz_h_modify_qp() failed rc=%lx " 1651 ehca_err(ibsrq->device, "hipz_h_modify_qp() failed h_ret=%li "
1652 "ehca_qp=%p qp_num=%x", 1652 "ehca_qp=%p qp_num=%x",
1653 h_ret, my_qp, my_qp->real_qp_num); 1653 h_ret, my_qp, my_qp->real_qp_num);
1654 } 1654 }
@@ -1691,7 +1691,7 @@ int ehca_query_srq(struct ib_srq *srq, struct ib_srq_attr *srq_attr)
1691 if (h_ret != H_SUCCESS) { 1691 if (h_ret != H_SUCCESS) {
1692 ret = ehca2ib_return_code(h_ret); 1692 ret = ehca2ib_return_code(h_ret);
1693 ehca_err(srq->device, "hipz_h_query_qp() failed " 1693 ehca_err(srq->device, "hipz_h_query_qp() failed "
1694 "ehca_qp=%p qp_num=%x h_ret=%lx", 1694 "ehca_qp=%p qp_num=%x h_ret=%li",
1695 my_qp, my_qp->real_qp_num, h_ret); 1695 my_qp, my_qp->real_qp_num, h_ret);
1696 goto query_srq_exit1; 1696 goto query_srq_exit1;
1697 } 1697 }
@@ -1741,7 +1741,7 @@ static int internal_destroy_qp(struct ib_device *dev, struct ehca_qp *my_qp,
1741 ret = ehca_cq_unassign_qp(my_qp->send_cq, qp_num); 1741 ret = ehca_cq_unassign_qp(my_qp->send_cq, qp_num);
1742 if (ret) { 1742 if (ret) {
1743 ehca_err(dev, "Couldn't unassign qp from " 1743 ehca_err(dev, "Couldn't unassign qp from "
1744 "send_cq ret=%x qp_num=%x cq_num=%x", ret, 1744 "send_cq ret=%i qp_num=%x cq_num=%x", ret,
1745 qp_num, my_qp->send_cq->cq_number); 1745 qp_num, my_qp->send_cq->cq_number);
1746 return ret; 1746 return ret;
1747 } 1747 }
@@ -1753,7 +1753,7 @@ static int internal_destroy_qp(struct ib_device *dev, struct ehca_qp *my_qp,
1753 1753
1754 h_ret = hipz_h_destroy_qp(shca->ipz_hca_handle, my_qp); 1754 h_ret = hipz_h_destroy_qp(shca->ipz_hca_handle, my_qp);
1755 if (h_ret != H_SUCCESS) { 1755 if (h_ret != H_SUCCESS) {
1756 ehca_err(dev, "hipz_h_destroy_qp() failed rc=%lx " 1756 ehca_err(dev, "hipz_h_destroy_qp() failed h_ret=%li "
1757 "ehca_qp=%p qp_num=%x", h_ret, my_qp, qp_num); 1757 "ehca_qp=%p qp_num=%x", h_ret, my_qp, qp_num);
1758 return ehca2ib_return_code(h_ret); 1758 return ehca2ib_return_code(h_ret);
1759 } 1759 }
diff --git a/drivers/infiniband/hw/ehca/ehca_reqs.c b/drivers/infiniband/hw/ehca/ehca_reqs.c
index 94eed70fedf5..ea91360835d3 100644
--- a/drivers/infiniband/hw/ehca/ehca_reqs.c
+++ b/drivers/infiniband/hw/ehca/ehca_reqs.c
@@ -526,7 +526,7 @@ poll_cq_one_read_cqe:
526 if (!cqe) { 526 if (!cqe) {
527 ret = -EAGAIN; 527 ret = -EAGAIN;
528 ehca_dbg(cq->device, "Completion queue is empty ehca_cq=%p " 528 ehca_dbg(cq->device, "Completion queue is empty ehca_cq=%p "
529 "cq_num=%x ret=%x", my_cq, my_cq->cq_number, ret); 529 "cq_num=%x ret=%i", my_cq, my_cq->cq_number, ret);
530 goto poll_cq_one_exit0; 530 goto poll_cq_one_exit0;
531 } 531 }
532 532
diff --git a/drivers/infiniband/hw/ehca/ehca_sqp.c b/drivers/infiniband/hw/ehca/ehca_sqp.c
index 9f16e9c79394..f0792e5fbd02 100644
--- a/drivers/infiniband/hw/ehca/ehca_sqp.c
+++ b/drivers/infiniband/hw/ehca/ehca_sqp.c
@@ -82,7 +82,7 @@ u64 ehca_define_sqp(struct ehca_shca *shca,
82 82
83 if (ret != H_SUCCESS) { 83 if (ret != H_SUCCESS) {
84 ehca_err(&shca->ib_device, 84 ehca_err(&shca->ib_device,
85 "Can't define AQP1 for port %x. rc=%lx", 85 "Can't define AQP1 for port %x. h_ret=%li",
86 port, ret); 86 port, ret);
87 return ret; 87 return ret;
88 } 88 }
diff --git a/drivers/infiniband/hw/ehca/ehca_uverbs.c b/drivers/infiniband/hw/ehca/ehca_uverbs.c
index 84a16bcfd536..5234d6c15c49 100644
--- a/drivers/infiniband/hw/ehca/ehca_uverbs.c
+++ b/drivers/infiniband/hw/ehca/ehca_uverbs.c
@@ -121,7 +121,7 @@ static int ehca_mmap_fw(struct vm_area_struct *vma, struct h_galpas *galpas,
121 ret = remap_4k_pfn(vma, vma->vm_start, physical >> EHCA_PAGESHIFT, 121 ret = remap_4k_pfn(vma, vma->vm_start, physical >> EHCA_PAGESHIFT,
122 vma->vm_page_prot); 122 vma->vm_page_prot);
123 if (unlikely(ret)) { 123 if (unlikely(ret)) {
124 ehca_gen_err("remap_pfn_range() failed ret=%x", ret); 124 ehca_gen_err("remap_pfn_range() failed ret=%i", ret);
125 return -ENOMEM; 125 return -ENOMEM;
126 } 126 }
127 127
@@ -146,7 +146,7 @@ static int ehca_mmap_queue(struct vm_area_struct *vma, struct ipz_queue *queue,
146 page = virt_to_page(virt_addr); 146 page = virt_to_page(virt_addr);
147 ret = vm_insert_page(vma, start, page); 147 ret = vm_insert_page(vma, start, page);
148 if (unlikely(ret)) { 148 if (unlikely(ret)) {
149 ehca_gen_err("vm_insert_page() failed rc=%x", ret); 149 ehca_gen_err("vm_insert_page() failed rc=%i", ret);
150 return ret; 150 return ret;
151 } 151 }
152 start += PAGE_SIZE; 152 start += PAGE_SIZE;
@@ -169,7 +169,7 @@ static int ehca_mmap_cq(struct vm_area_struct *vma, struct ehca_cq *cq,
169 ret = ehca_mmap_fw(vma, &cq->galpas, &cq->mm_count_galpa); 169 ret = ehca_mmap_fw(vma, &cq->galpas, &cq->mm_count_galpa);
170 if (unlikely(ret)) { 170 if (unlikely(ret)) {
171 ehca_err(cq->ib_cq.device, 171 ehca_err(cq->ib_cq.device,
172 "ehca_mmap_fw() failed rc=%x cq_num=%x", 172 "ehca_mmap_fw() failed rc=%i cq_num=%x",
173 ret, cq->cq_number); 173 ret, cq->cq_number);
174 return ret; 174 return ret;
175 } 175 }
@@ -180,7 +180,7 @@ static int ehca_mmap_cq(struct vm_area_struct *vma, struct ehca_cq *cq,
180 ret = ehca_mmap_queue(vma, &cq->ipz_queue, &cq->mm_count_queue); 180 ret = ehca_mmap_queue(vma, &cq->ipz_queue, &cq->mm_count_queue);
181 if (unlikely(ret)) { 181 if (unlikely(ret)) {
182 ehca_err(cq->ib_cq.device, 182 ehca_err(cq->ib_cq.device,
183 "ehca_mmap_queue() failed rc=%x cq_num=%x", 183 "ehca_mmap_queue() failed rc=%i cq_num=%x",
184 ret, cq->cq_number); 184 ret, cq->cq_number);
185 return ret; 185 return ret;
186 } 186 }
@@ -206,7 +206,7 @@ static int ehca_mmap_qp(struct vm_area_struct *vma, struct ehca_qp *qp,
206 ret = ehca_mmap_fw(vma, &qp->galpas, &qp->mm_count_galpa); 206 ret = ehca_mmap_fw(vma, &qp->galpas, &qp->mm_count_galpa);
207 if (unlikely(ret)) { 207 if (unlikely(ret)) {
208 ehca_err(qp->ib_qp.device, 208 ehca_err(qp->ib_qp.device,
209 "remap_pfn_range() failed ret=%x qp_num=%x", 209 "remap_pfn_range() failed ret=%i qp_num=%x",
210 ret, qp->ib_qp.qp_num); 210 ret, qp->ib_qp.qp_num);
211 return -ENOMEM; 211 return -ENOMEM;
212 } 212 }
@@ -219,7 +219,7 @@ static int ehca_mmap_qp(struct vm_area_struct *vma, struct ehca_qp *qp,
219 &qp->mm_count_rqueue); 219 &qp->mm_count_rqueue);
220 if (unlikely(ret)) { 220 if (unlikely(ret)) {
221 ehca_err(qp->ib_qp.device, 221 ehca_err(qp->ib_qp.device,
222 "ehca_mmap_queue(rq) failed rc=%x qp_num=%x", 222 "ehca_mmap_queue(rq) failed rc=%i qp_num=%x",
223 ret, qp->ib_qp.qp_num); 223 ret, qp->ib_qp.qp_num);
224 return ret; 224 return ret;
225 } 225 }
@@ -232,7 +232,7 @@ static int ehca_mmap_qp(struct vm_area_struct *vma, struct ehca_qp *qp,
232 &qp->mm_count_squeue); 232 &qp->mm_count_squeue);
233 if (unlikely(ret)) { 233 if (unlikely(ret)) {
234 ehca_err(qp->ib_qp.device, 234 ehca_err(qp->ib_qp.device,
235 "ehca_mmap_queue(sq) failed rc=%x qp_num=%x", 235 "ehca_mmap_queue(sq) failed rc=%i qp_num=%x",
236 ret, qp->ib_qp.qp_num); 236 ret, qp->ib_qp.qp_num);
237 return ret; 237 return ret;
238 } 238 }
@@ -283,7 +283,7 @@ int ehca_mmap(struct ib_ucontext *context, struct vm_area_struct *vma)
283 ret = ehca_mmap_cq(vma, cq, rsrc_type); 283 ret = ehca_mmap_cq(vma, cq, rsrc_type);
284 if (unlikely(ret)) { 284 if (unlikely(ret)) {
285 ehca_err(cq->ib_cq.device, 285 ehca_err(cq->ib_cq.device,
286 "ehca_mmap_cq() failed rc=%x cq_num=%x", 286 "ehca_mmap_cq() failed rc=%i cq_num=%x",
287 ret, cq->cq_number); 287 ret, cq->cq_number);
288 return ret; 288 return ret;
289 } 289 }
@@ -313,7 +313,7 @@ int ehca_mmap(struct ib_ucontext *context, struct vm_area_struct *vma)
313 ret = ehca_mmap_qp(vma, qp, rsrc_type); 313 ret = ehca_mmap_qp(vma, qp, rsrc_type);
314 if (unlikely(ret)) { 314 if (unlikely(ret)) {
315 ehca_err(qp->ib_qp.device, 315 ehca_err(qp->ib_qp.device,
316 "ehca_mmap_qp() failed rc=%x qp_num=%x", 316 "ehca_mmap_qp() failed rc=%i qp_num=%x",
317 ret, qp->ib_qp.qp_num); 317 ret, qp->ib_qp.qp_num);
318 return ret; 318 return ret;
319 } 319 }
diff --git a/drivers/infiniband/hw/ehca/hcp_if.c b/drivers/infiniband/hw/ehca/hcp_if.c
index a762cc7e0165..3d68f6536f9c 100644
--- a/drivers/infiniband/hw/ehca/hcp_if.c
+++ b/drivers/infiniband/hw/ehca/hcp_if.c
@@ -238,7 +238,7 @@ u64 hipz_h_alloc_resource_eq(const struct ipz_adapter_handle adapter_handle,
238 *eq_ist = (u32)outs[5]; 238 *eq_ist = (u32)outs[5];
239 239
240 if (ret == H_NOT_ENOUGH_RESOURCES) 240 if (ret == H_NOT_ENOUGH_RESOURCES)
241 ehca_gen_err("Not enough resource - ret=%lx ", ret); 241 ehca_gen_err("Not enough resource - ret=%li ", ret);
242 242
243 return ret; 243 return ret;
244} 244}
@@ -276,7 +276,7 @@ u64 hipz_h_alloc_resource_cq(const struct ipz_adapter_handle adapter_handle,
276 hcp_galpas_ctor(&cq->galpas, outs[5], outs[6]); 276 hcp_galpas_ctor(&cq->galpas, outs[5], outs[6]);
277 277
278 if (ret == H_NOT_ENOUGH_RESOURCES) 278 if (ret == H_NOT_ENOUGH_RESOURCES)
279 ehca_gen_err("Not enough resources. ret=%lx", ret); 279 ehca_gen_err("Not enough resources. ret=%li", ret);
280 280
281 return ret; 281 return ret;
282} 282}
@@ -351,7 +351,7 @@ u64 hipz_h_alloc_resource_qp(const struct ipz_adapter_handle adapter_handle,
351 hcp_galpas_ctor(&parms->galpas, outs[6], outs[6]); 351 hcp_galpas_ctor(&parms->galpas, outs[6], outs[6]);
352 352
353 if (ret == H_NOT_ENOUGH_RESOURCES) 353 if (ret == H_NOT_ENOUGH_RESOURCES)
354 ehca_gen_err("Not enough resources. ret=%lx", ret); 354 ehca_gen_err("Not enough resources. ret=%li", ret);
355 355
356 return ret; 356 return ret;
357} 357}
@@ -546,7 +546,7 @@ u64 hipz_h_modify_qp(const struct ipz_adapter_handle adapter_handle,
546 0, 0, 0, 0, 0); 546 0, 0, 0, 0, 0);
547 547
548 if (ret == H_NOT_ENOUGH_RESOURCES) 548 if (ret == H_NOT_ENOUGH_RESOURCES)
549 ehca_gen_err("Insufficient resources ret=%lx", ret); 549 ehca_gen_err("Insufficient resources ret=%li", ret);
550 550
551 return ret; 551 return ret;
552} 552}
@@ -582,7 +582,7 @@ u64 hipz_h_destroy_qp(const struct ipz_adapter_handle adapter_handle,
582 qp->ipz_qp_handle.handle, /* r6 */ 582 qp->ipz_qp_handle.handle, /* r6 */
583 0, 0, 0, 0, 0, 0); 583 0, 0, 0, 0, 0, 0);
584 if (ret == H_HARDWARE) 584 if (ret == H_HARDWARE)
585 ehca_gen_err("HCA not operational. ret=%lx", ret); 585 ehca_gen_err("HCA not operational. ret=%li", ret);
586 586
587 ret = ehca_plpar_hcall_norets(H_FREE_RESOURCE, 587 ret = ehca_plpar_hcall_norets(H_FREE_RESOURCE,
588 adapter_handle.handle, /* r4 */ 588 adapter_handle.handle, /* r4 */
@@ -590,7 +590,7 @@ u64 hipz_h_destroy_qp(const struct ipz_adapter_handle adapter_handle,
590 0, 0, 0, 0, 0); 590 0, 0, 0, 0, 0);
591 591
592 if (ret == H_RESOURCE) 592 if (ret == H_RESOURCE)
593 ehca_gen_err("Resource still in use. ret=%lx", ret); 593 ehca_gen_err("Resource still in use. ret=%li", ret);
594 594
595 return ret; 595 return ret;
596} 596}
@@ -625,7 +625,7 @@ u64 hipz_h_define_aqp1(const struct ipz_adapter_handle adapter_handle,
625 *bma_qp_nr = (u32)outs[1]; 625 *bma_qp_nr = (u32)outs[1];
626 626
627 if (ret == H_ALIAS_EXIST) 627 if (ret == H_ALIAS_EXIST)
628 ehca_gen_err("AQP1 already exists. ret=%lx", ret); 628 ehca_gen_err("AQP1 already exists. ret=%li", ret);
629 629
630 return ret; 630 return ret;
631} 631}
@@ -647,7 +647,7 @@ u64 hipz_h_attach_mcqp(const struct ipz_adapter_handle adapter_handle,
647 0, 0); 647 0, 0);
648 648
649 if (ret == H_NOT_ENOUGH_RESOURCES) 649 if (ret == H_NOT_ENOUGH_RESOURCES)
650 ehca_gen_err("Not enough resources. ret=%lx", ret); 650 ehca_gen_err("Not enough resources. ret=%li", ret);
651 651
652 return ret; 652 return ret;
653} 653}
@@ -686,7 +686,7 @@ u64 hipz_h_destroy_cq(const struct ipz_adapter_handle adapter_handle,
686 0, 0, 0, 0); 686 0, 0, 0, 0);
687 687
688 if (ret == H_RESOURCE) 688 if (ret == H_RESOURCE)
689 ehca_gen_err("H_FREE_RESOURCE failed ret=%lx ", ret); 689 ehca_gen_err("H_FREE_RESOURCE failed ret=%li ", ret);
690 690
691 return ret; 691 return ret;
692} 692}
@@ -708,7 +708,7 @@ u64 hipz_h_destroy_eq(const struct ipz_adapter_handle adapter_handle,
708 0, 0, 0, 0, 0); 708 0, 0, 0, 0, 0);
709 709
710 if (ret == H_RESOURCE) 710 if (ret == H_RESOURCE)
711 ehca_gen_err("Resource in use. ret=%lx ", ret); 711 ehca_gen_err("Resource in use. ret=%li ", ret);
712 712
713 return ret; 713 return ret;
714} 714}
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-26 20:40:04 -0400