IB/ehca: Fix printk format warnings from u64 type change

Commit fe333321 ("powerpc: Change u64/s64 to a long long integer type") changed u64 from unsigned long to unsigned long long, which means that printk formats for printing u64 values should use "ll" instead of "l" to avoid warnings. Fix all the places affected by this in ehca. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Roland Dreier <rolandd@cisco.com>

IB/ehca: Fix printk format warnings from u64 type change
Commit fe333321 ("powerpc: Change u64/s64 to a long long integer type") changed u64 from unsigned long to unsigned long long, which means that printk formats for printing u64 values should use "ll" instead of "l" to avoid warnings. Fix all the places affected by this in ehca. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Roland Dreier <rolandd@cisco.com>
Stephen Rothwell · Roland Dreier
1 parent e0b325d310
Showing 12 changed files with 130 additions and 130 deletions Side-by-side Diff
drivers/infiniband/hw/ehca/ehca_cq.c
drivers/infiniband/hw/ehca/ehca_hca.c
drivers/infiniband/hw/ehca/ehca_irq.c
drivers/infiniband/hw/ehca/ehca_main.c
drivers/infiniband/hw/ehca/ehca_mcast.c
drivers/infiniband/hw/ehca/ehca_mrmw.c
drivers/infiniband/hw/ehca/ehca_qp.c
drivers/infiniband/hw/ehca/ehca_reqs.c
drivers/infiniband/hw/ehca/ehca_sqp.c
drivers/infiniband/hw/ehca/ehca_tools.h
drivers/infiniband/hw/ehca/ehca_uverbs.c
drivers/infiniband/hw/ehca/hcp_if.c
@@ -196,7 +196,7 @@
  
 	if (h_ret != H_SUCCESS) {
 		ehca_err(device, "hipz_h_alloc_resource_cq() failed "
-			 "h_ret=%li device=%p", h_ret, device);
+			 "h_ret=%lli device=%p", h_ret, device);
 		cq = ERR_PTR(ehca2ib_return_code(h_ret));
 		goto create_cq_exit2;
 	}
@@ -232,7 +232,7 @@
  
 		if (h_ret < H_SUCCESS) {
 			ehca_err(device, "hipz_h_register_rpage_cq() failed "
-				 "ehca_cq=%p cq_num=%x h_ret=%li counter=%i "
+				 "ehca_cq=%p cq_num=%x h_ret=%lli counter=%i "
 				 "act_pages=%i", my_cq, my_cq->cq_number,
 				 h_ret, counter, param.act_pages);
 			cq = ERR_PTR(-EINVAL);
@@ -244,7 +244,7 @@
 			if ((h_ret != H_SUCCESS) || vpage) {
 				ehca_err(device, "Registration of pages not "
 					 "complete ehca_cq=%p cq_num=%x "
-					 "h_ret=%li", my_cq, my_cq->cq_number,
+					 "h_ret=%lli", my_cq, my_cq->cq_number,
 					 h_ret);
 				cq = ERR_PTR(-EAGAIN);
 				goto create_cq_exit4;
@@ -252,7 +252,7 @@
 		} else {
 			if (h_ret != H_PAGE_REGISTERED) {
 				ehca_err(device, "Registration of page failed "
-					 "ehca_cq=%p cq_num=%x h_ret=%li "
+					 "ehca_cq=%p cq_num=%x h_ret=%lli "
 					 "counter=%i act_pages=%i",
 					 my_cq, my_cq->cq_number,
 					 h_ret, counter, param.act_pages);
@@ -266,7 +266,7 @@
  
 	gal = my_cq->galpas.kernel;
 	cqx_fec = hipz_galpa_load(gal, CQTEMM_OFFSET(cqx_fec));
-	ehca_dbg(device, "ehca_cq=%p cq_num=%x CQX_FEC=%lx",
+	ehca_dbg(device, "ehca_cq=%p cq_num=%x CQX_FEC=%llx",
 		 my_cq, my_cq->cq_number, cqx_fec);
  
 	my_cq->ib_cq.cqe = my_cq->nr_of_entries =
@@ -307,7 +307,7 @@
 	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=%li", my_cq, my_cq->cq_number, h_ret);
+			 "cq_num=%x h_ret=%lli", my_cq, my_cq->cq_number, h_ret);
  
 create_cq_exit2:
 	write_lock_irqsave(&ehca_cq_idr_lock, flags);
@@ -355,7 +355,7 @@
 	h_ret = hipz_h_destroy_cq(adapter_handle, my_cq, 0);
 	if (h_ret == H_R_STATE) {
 		/* cq in err: read err data and destroy it forcibly */
-		ehca_dbg(device, "ehca_cq=%p cq_num=%x ressource=%lx in err "
+		ehca_dbg(device, "ehca_cq=%p cq_num=%x resource=%llx in err "
 			 "state. Try to delete it forcibly.",
 			 my_cq, cq_num, my_cq->ipz_cq_handle.handle);
 		ehca_error_data(shca, my_cq, my_cq->ipz_cq_handle.handle);
@@ -365,7 +365,7 @@
 				 cq_num);
 	}
 	if (h_ret != H_SUCCESS) {
-		ehca_err(device, "hipz_h_destroy_cq() failed h_ret=%li "
+		ehca_err(device, "hipz_h_destroy_cq() failed h_ret=%lli "
 			 "ehca_cq=%p cq_num=%x", h_ret, my_cq, cq_num);
 		return ehca2ib_return_code(h_ret);
 	}
@@ -393,7 +393,7 @@
 	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  h_ret=%li",
+		ehca_err(&shca->ib_device, "Modify port failed  h_ret=%lli",
 			 hret);
 		ret = -EINVAL;
 	}
@@ -99,7 +99,7 @@
 			return;
  
 		ehca_err(&shca->ib_device,
-			 "QP 0x%x (resource=%lx) has errors.",
+			 "QP 0x%x (resource=%llx) has errors.",
 			 qp->ib_qp.qp_num, resource);
 		break;
 	}
  
  
  
@@ -108,21 +108,21 @@
 		struct ehca_cq *cq = (struct ehca_cq *)data;
  
 		ehca_err(&shca->ib_device,
-			 "CQ 0x%x (resource=%lx) has errors.",
+			 "CQ 0x%x (resource=%llx) has errors.",
 			 cq->cq_number, resource);
 		break;
 	}
 	default:
 		ehca_err(&shca->ib_device,
-			 "Unknown error type: %lx on %s.",
+			 "Unknown error type: %llx on %s.",
 			 type, shca->ib_device.name);
 		break;
 	}
  
-	ehca_err(&shca->ib_device, "Error data is available: %lx.", resource);
+	ehca_err(&shca->ib_device, "Error data is available: %llx.", resource);
 	ehca_err(&shca->ib_device, "EHCA ----- error data begin "
 		 "---------------------------------------------------");
-	ehca_dmp(rblock, length, "resource=%lx", resource);
+	ehca_dmp(rblock, length, "resource=%llx", resource);
 	ehca_err(&shca->ib_device, "EHCA ----- error data end "
 		 "----------------------------------------------------");
  
@@ -152,7 +152,7 @@
  
 	if (ret == H_R_STATE)
 		ehca_err(&shca->ib_device,
-			 "No error data is available: %lx.", resource);
+			 "No error data is available: %llx.", resource);
 	else if (ret == H_SUCCESS) {
 		int length;
  
@@ -164,7 +164,7 @@
 		print_error_data(shca, data, rblock, length);
 	} else
 		ehca_err(&shca->ib_device,
-			 "Error data could not be fetched: %lx", resource);
+			 "Error data could not be fetched: %llx", resource);
  
 	ehca_free_fw_ctrlblock(rblock);
  
@@ -514,7 +514,7 @@
 	struct ehca_cq *cq;
  
 	eqe_value = eqe->entry;
-	ehca_dbg(&shca->ib_device, "eqe_value=%lx", eqe_value);
+	ehca_dbg(&shca->ib_device, "eqe_value=%llx", eqe_value);
 	if (EHCA_BMASK_GET(EQE_COMPLETION_EVENT, eqe_value)) {
 		ehca_dbg(&shca->ib_device, "Got completion event");
 		token = EHCA_BMASK_GET(EQE_CQ_TOKEN, eqe_value);
@@ -603,7 +603,7 @@
 		ret = hipz_h_eoi(eq->ist);
 		if (ret != H_SUCCESS)
 			ehca_err(&shca->ib_device,
-				 "bad return code EOI -rc = %ld\n", ret);
+				 "bad return code EOI -rc = %lld\n", ret);
 		ehca_dbg(&shca->ib_device, "deadman found %x eqe", eqe_cnt);
 	}
 	if (unlikely(eqe_cnt == EHCA_EQE_CACHE_SIZE))
@@ -304,7 +304,7 @@
  
 	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=%li",
+		ehca_gen_err("Cannot query device properties. h_ret=%lli",
 			     h_ret);
 		ret = -EPERM;
 		goto sense_attributes1;
@@ -391,7 +391,7 @@
 	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=%li",
+		ehca_gen_err("Cannot query port properties. h_ret=%lli",
 			     h_ret);
 		ret = -EPERM;
 		goto sense_attributes1;
@@ -682,7 +682,7 @@
 {
 	struct ehca_shca *shca = dev->driver_data;
  
-	return sprintf(buf, "%lx\n", shca->ipz_hca_handle.handle);
+	return sprintf(buf, "%llx\n", shca->ipz_hca_handle.handle);
  
 }
 static DEVICE_ATTR(adapter_handle, S_IRUGO, ehca_show_adapter_handle, NULL);
@@ -88,7 +88,7 @@
 	if (h_ret != H_SUCCESS)
 		ehca_err(ibqp->device,
 			 "ehca_qp=%p qp_num=%x hipz_h_attach_mcqp() failed "
-			 "h_ret=%li", my_qp, ibqp->qp_num, h_ret);
+			 "h_ret=%lli", my_qp, ibqp->qp_num, h_ret);
  
 	return ehca2ib_return_code(h_ret);
 }
@@ -125,7 +125,7 @@
 	if (h_ret != H_SUCCESS)
 		ehca_err(ibqp->device,
 			 "ehca_qp=%p qp_num=%x hipz_h_detach_mcqp() failed "
-			 "h_ret=%li", my_qp, ibqp->qp_num, h_ret);
+			 "h_ret=%lli", my_qp, ibqp->qp_num, h_ret);
  
 	return ehca2ib_return_code(h_ret);
 }
@@ -204,7 +204,7 @@
 	}
 	if ((size == 0) ||
 	    (((u64)iova_start + size) < (u64)iova_start)) {
-		ehca_err(pd->device, "bad input values: size=%lx iova_start=%p",
+		ehca_err(pd->device, "bad input values: size=%llx iova_start=%p",
 			 size, iova_start);
 		ib_mr = ERR_PTR(-EINVAL);
 		goto reg_phys_mr_exit0;
@@ -309,8 +309,8 @@
 	}
  
 	if (length == 0 || virt + length < virt) {
-		ehca_err(pd->device, "bad input values: length=%lx "
-			 "virt_base=%lx", length, virt);
+		ehca_err(pd->device, "bad input values: length=%llx "
+			 "virt_base=%llx", length, virt);
 		ib_mr = ERR_PTR(-EINVAL);
 		goto reg_user_mr_exit0;
 	}
@@ -373,7 +373,7 @@
 			  &e_mr->ib.ib_mr.rkey);
 	if (ret == -EINVAL && pginfo.hwpage_size > PAGE_SIZE) {
 		ehca_warn(pd->device, "failed to register mr "
-			  "with hwpage_size=%lx", hwpage_size);
+			  "with hwpage_size=%llx", hwpage_size);
 		ehca_info(pd->device, "try to register mr with "
 			  "kpage_size=%lx", PAGE_SIZE);
 		/*
@@ -509,7 +509,7 @@
 			goto rereg_phys_mr_exit1;
 		if ((new_size == 0) ||
 		    (((u64)iova_start + new_size) < (u64)iova_start)) {
-			ehca_err(mr->device, "bad input values: new_size=%lx "
+			ehca_err(mr->device, "bad input values: new_size=%llx "
 				 "iova_start=%p", new_size, iova_start);
 			ret = -EINVAL;
 			goto rereg_phys_mr_exit1;
@@ -580,8 +580,8 @@
  
 	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=%li mr=%p "
-			 "hca_hndl=%lx mr_hndl=%lx lkey=%x",
+		ehca_err(mr->device, "hipz_mr_query failed, h_ret=%lli mr=%p "
+			 "hca_hndl=%llx mr_hndl=%llx lkey=%x",
 			 h_ret, mr, shca->ipz_hca_handle.handle,
 			 e_mr->ipz_mr_handle.handle, mr->lkey);
 		ret = ehca2ib_return_code(h_ret);
@@ -630,8 +630,8 @@
 	/* 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=%li shca=%p "
-			 "e_mr=%p hca_hndl=%lx mr_hndl=%lx mr->lkey=%x",
+		ehca_err(mr->device, "hipz_free_mr failed, h_ret=%lli shca=%p "
+			 "e_mr=%p hca_hndl=%llx mr_hndl=%llx mr->lkey=%x",
 			 h_ret, shca, e_mr, shca->ipz_hca_handle.handle,
 			 e_mr->ipz_mr_handle.handle, mr->lkey);
 		ret = ehca2ib_return_code(h_ret);
@@ -671,8 +671,8 @@
 	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=%li "
-			 "shca=%p hca_hndl=%lx mw=%p",
+		ehca_err(pd->device, "hipz_mw_allocate failed, h_ret=%lli "
+			 "shca=%p hca_hndl=%llx mw=%p",
 			 h_ret, shca, shca->ipz_hca_handle.handle, e_mw);
 		ib_mw = ERR_PTR(ehca2ib_return_code(h_ret));
 		goto alloc_mw_exit1;
@@ -713,8 +713,8 @@
  
 	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=%li shca=%p "
-			 "mw=%p rkey=%x hca_hndl=%lx mw_hndl=%lx",
+		ehca_err(mw->device, "hipz_free_mw failed, h_ret=%lli shca=%p "
+			 "mw=%p rkey=%x hca_hndl=%llx mw_hndl=%llx",
 			 h_ret, shca, mw, mw->rkey, shca->ipz_hca_handle.handle,
 			 e_mw->ipz_mw_handle.handle);
 		return ehca2ib_return_code(h_ret);
@@ -840,7 +840,7 @@
 		goto map_phys_fmr_exit0;
 	if (iova % e_fmr->fmr_page_size) {
 		/* only whole-numbered pages */
-		ehca_err(fmr->device, "bad iova, iova=%lx fmr_page_size=%x",
+		ehca_err(fmr->device, "bad iova, iova=%llx fmr_page_size=%x",
 			 iova, e_fmr->fmr_page_size);
 		ret = -EINVAL;
 		goto map_phys_fmr_exit0;
@@ -878,7 +878,7 @@
 map_phys_fmr_exit0:
 	if (ret)
 		ehca_err(fmr->device, "ret=%i fmr=%p page_list=%p list_len=%x "
-			 "iova=%lx", ret, fmr, page_list, list_len, iova);
+			 "iova=%llx", ret, fmr, page_list, list_len, iova);
 	return ret;
 } /* end ehca_map_phys_fmr() */
  
@@ -964,8 +964,8 @@
  
 	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=%li e_fmr=%p "
-			 "hca_hndl=%lx fmr_hndl=%lx fmr->lkey=%x",
+		ehca_err(fmr->device, "hipz_free_mr failed, h_ret=%lli e_fmr=%p "
+			 "hca_hndl=%llx fmr_hndl=%llx fmr->lkey=%x",
 			 h_ret, e_fmr, shca->ipz_hca_handle.handle,
 			 e_fmr->ipz_mr_handle.handle, fmr->lkey);
 		ret = ehca2ib_return_code(h_ret);
@@ -1007,8 +1007,8 @@
 					 (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=%li "
-			 "hca_hndl=%lx", h_ret, shca->ipz_hca_handle.handle);
+		ehca_err(&shca->ib_device, "hipz_alloc_mr failed, h_ret=%lli "
+			 "hca_hndl=%llx", h_ret, shca->ipz_hca_handle.handle);
 		ret = ehca2ib_return_code(h_ret);
 		goto ehca_reg_mr_exit0;
 	}
@@ -1033,9 +1033,9 @@
 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=%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=%i",
+		ehca_err(&shca->ib_device, "h_ret=%lli shca=%p e_mr=%p "
+			 "iova_start=%p size=%llx acl=%x e_pd=%p lkey=%x "
+			 "pginfo=%p num_kpages=%llx num_hwpages=%llx ret=%i",
 			 h_ret, shca, e_mr, iova_start, size, acl, e_pd,
 			 hipzout.lkey, pginfo, pginfo->num_kpages,
 			 pginfo->num_hwpages, ret);
@@ -1045,8 +1045,8 @@
 ehca_reg_mr_exit0:
 	if (ret)
 		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",
+			 "iova_start=%p size=%llx acl=%x e_pd=%p pginfo=%p "
+			 "num_kpages=%llx num_hwpages=%llx",
 			 ret, shca, e_mr, iova_start, size, acl, e_pd, pginfo,
 			 pginfo->num_kpages, pginfo->num_hwpages);
 	return ret;
@@ -1116,8 +1116,8 @@
 			 */
 			if (h_ret != H_SUCCESS) {
 				ehca_err(&shca->ib_device, "last "
-					 "hipz_reg_rpage_mr failed, h_ret=%li "
-					 "e_mr=%p i=%x hca_hndl=%lx mr_hndl=%lx"
+					 "hipz_reg_rpage_mr failed, h_ret=%lli "
+					 "e_mr=%p i=%x hca_hndl=%llx mr_hndl=%llx"
 					 " lkey=%x", h_ret, e_mr, i,
 					 shca->ipz_hca_handle.handle,
 					 e_mr->ipz_mr_handle.handle,
@@ -1128,8 +1128,8 @@
 				ret = 0;
 		} else if (h_ret != H_PAGE_REGISTERED) {
 			ehca_err(&shca->ib_device, "hipz_reg_rpage_mr failed, "
-				 "h_ret=%li e_mr=%p i=%x lkey=%x hca_hndl=%lx "
-				 "mr_hndl=%lx", h_ret, e_mr, i,
+				 "h_ret=%lli e_mr=%p i=%x lkey=%x hca_hndl=%llx "
+				 "mr_hndl=%llx", h_ret, e_mr, i,
 				 e_mr->ib.ib_mr.lkey,
 				 shca->ipz_hca_handle.handle,
 				 e_mr->ipz_mr_handle.handle);
@@ -1145,7 +1145,7 @@
 ehca_reg_mr_rpages_exit0:
 	if (ret)
 		ehca_err(&shca->ib_device, "ret=%i shca=%p e_mr=%p pginfo=%p "
-			 "num_kpages=%lx num_hwpages=%lx", ret, shca, e_mr,
+			 "num_kpages=%llx num_hwpages=%llx", ret, shca, e_mr,
 			 pginfo, pginfo->num_kpages, pginfo->num_hwpages);
 	return ret;
 } /* end ehca_reg_mr_rpages() */
@@ -1184,7 +1184,7 @@
 	ret = ehca_set_pagebuf(pginfo, pginfo->num_hwpages, kpage);
 	if (ret) {
 		ehca_err(&shca->ib_device, "set pagebuf failed, e_mr=%p "
-			 "pginfo=%p type=%x num_kpages=%lx num_hwpages=%lx "
+			 "pginfo=%p type=%x num_kpages=%llx num_hwpages=%llx "
 			 "kpage=%p", e_mr, pginfo, pginfo->type,
 			 pginfo->num_kpages, pginfo->num_hwpages, kpage);
 		goto ehca_rereg_mr_rereg1_exit1;
  
@@ -1205,13 +1205,13 @@
 		 * (MW bound or MR is shared)
 		 */
 		ehca_warn(&shca->ib_device, "hipz_h_reregister_pmr failed "
-			  "(Rereg1), h_ret=%li e_mr=%p", h_ret, e_mr);
+			  "(Rereg1), h_ret=%lli e_mr=%p", h_ret, e_mr);
 		*pginfo = pginfo_save;
 		ret = -EAGAIN;
 	} else if ((u64 *)hipzout.vaddr != iova_start) {
 		ehca_err(&shca->ib_device, "PHYP changed iova_start in "
-			 "rereg_pmr, iova_start=%p iova_start_out=%lx e_mr=%p "
-			 "mr_handle=%lx lkey=%x lkey_out=%x", iova_start,
+			 "rereg_pmr, iova_start=%p iova_start_out=%llx e_mr=%p "
+			 "mr_handle=%llx lkey=%x lkey_out=%x", iova_start,
 			 hipzout.vaddr, e_mr, e_mr->ipz_mr_handle.handle,
 			 e_mr->ib.ib_mr.lkey, hipzout.lkey);
 		ret = -EFAULT;
@@ -1235,7 +1235,7 @@
 ehca_rereg_mr_rereg1_exit0:
 	if ( ret && (ret != -EAGAIN) )
 		ehca_err(&shca->ib_device, "ret=%i lkey=%x rkey=%x "
-			 "pginfo=%p num_kpages=%lx num_hwpages=%lx",
+			 "pginfo=%p num_kpages=%llx num_hwpages=%llx",
 			 ret, *lkey, *rkey, pginfo, pginfo->num_kpages,
 			 pginfo->num_hwpages);
 	return ret;
@@ -1263,7 +1263,7 @@
 	    (e_mr->num_hwpages > MAX_RPAGES) ||
 	    (pginfo->num_hwpages > e_mr->num_hwpages)) {
 		ehca_dbg(&shca->ib_device, "Rereg3 case, "
-			 "pginfo->num_hwpages=%lx e_mr->num_hwpages=%x",
+			 "pginfo->num_hwpages=%llx e_mr->num_hwpages=%x",
 			 pginfo->num_hwpages, e_mr->num_hwpages);
 		rereg_1_hcall = 0;
 		rereg_3_hcall = 1;
@@ -1295,7 +1295,7 @@
 		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=%li e_mr=%p hca_hndl=%lx mr_hndl=%lx "
+				 "h_ret=%lli e_mr=%p hca_hndl=%llx mr_hndl=%llx "
 				 "mr->lkey=%x",
 				 h_ret, e_mr, shca->ipz_hca_handle.handle,
 				 e_mr->ipz_mr_handle.handle,
@@ -1328,8 +1328,8 @@
 ehca_rereg_mr_exit0:
 	if (ret)
 		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 "
+			 "iova_start=%p size=%llx acl=%x e_pd=%p pginfo=%p "
+			 "num_kpages=%llx lkey=%x rkey=%x rereg_1_hcall=%x "
 			 "rereg_3_hcall=%x", ret, shca, e_mr, iova_start, size,
 			 acl, e_pd, pginfo, pginfo->num_kpages, *lkey, *rkey,
 			 rereg_1_hcall, rereg_3_hcall);
@@ -1371,8 +1371,8 @@
 		 * FMRs are not shared and no MW bound to FMRs
 		 */
 		ehca_err(&shca->ib_device, "hipz_reregister_pmr failed "
-			 "(Rereg1), h_ret=%li e_fmr=%p hca_hndl=%lx "
-			 "mr_hndl=%lx lkey=%x lkey_out=%x",
+			 "(Rereg1), h_ret=%lli e_fmr=%p hca_hndl=%llx "
+			 "mr_hndl=%llx lkey=%x lkey_out=%x",
 			 h_ret, e_fmr, shca->ipz_hca_handle.handle,
 			 e_fmr->ipz_mr_handle.handle,
 			 e_fmr->ib.ib_fmr.lkey, hipzout.lkey);
@@ -1383,7 +1383,7 @@
 	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=%li e_fmr=%p hca_hndl=%lx mr_hndl=%lx "
+			 "h_ret=%lli e_fmr=%p hca_hndl=%llx mr_hndl=%llx "
 			 "lkey=%x",
 			 h_ret, e_fmr, shca->ipz_hca_handle.handle,
 			 e_fmr->ipz_mr_handle.handle,
  
@@ -1447,9 +1447,9 @@
 				    (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=%li "
+		ehca_err(&shca->ib_device, "hipz_reg_smr failed, h_ret=%lli "
 			 "shca=%p e_origmr=%p e_newmr=%p iova_start=%p acl=%x "
-			 "e_pd=%p hca_hndl=%lx mr_hndl=%lx lkey=%x",
+			 "e_pd=%p hca_hndl=%llx mr_hndl=%llx lkey=%x",
 			 h_ret, shca, e_origmr, e_newmr, iova_start, acl, e_pd,
 			 shca->ipz_hca_handle.handle,
 			 e_origmr->ipz_mr_handle.handle,
@@ -1527,7 +1527,7 @@
 			  &e_mr->ib.ib_mr.rkey);
 	if (ret) {
 		ehca_err(&shca->ib_device, "reg of internal max MR failed, "
-			 "e_mr=%p iova_start=%p size_maxmr=%lx num_kpages=%x "
+			 "e_mr=%p iova_start=%p size_maxmr=%llx num_kpages=%x "
 			 "num_hwpages=%x", e_mr, iova_start, size_maxmr,
 			 num_kpages, num_hwpages);
 		goto ehca_reg_internal_maxmr_exit1;
@@ -1573,8 +1573,8 @@
 				    (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=%li "
-			 "e_origmr=%p hca_hndl=%lx mr_hndl=%lx lkey=%x",
+		ehca_err(&shca->ib_device, "hipz_reg_smr failed, h_ret=%lli "
+			 "e_origmr=%p hca_hndl=%llx mr_hndl=%llx lkey=%x",
 			 h_ret, e_origmr, shca->ipz_hca_handle.handle,
 			 e_origmr->ipz_mr_handle.handle,
 			 e_origmr->ib.ib_mr.lkey);
  
  
  
@@ -1651,28 +1651,28 @@
 	/* check first buffer */
 	if (((u64)iova_start & ~PAGE_MASK) != (pbuf->addr & ~PAGE_MASK)) {
 		ehca_gen_err("iova_start/addr mismatch, iova_start=%p "
-			     "pbuf->addr=%lx pbuf->size=%lx",
+			     "pbuf->addr=%llx pbuf->size=%llx",
 			     iova_start, pbuf->addr, pbuf->size);
 		return -EINVAL;
 	}
 	if (((pbuf->addr + pbuf->size) % PAGE_SIZE) &&
 	    (num_phys_buf > 1)) {
-		ehca_gen_err("addr/size mismatch in 1st buf, pbuf->addr=%lx "
-			     "pbuf->size=%lx", pbuf->addr, pbuf->size);
+		ehca_gen_err("addr/size mismatch in 1st buf, pbuf->addr=%llx "
+			     "pbuf->size=%llx", pbuf->addr, pbuf->size);
 		return -EINVAL;
 	}
  
 	for (i = 0; i < num_phys_buf; i++) {
 		if ((i > 0) && (pbuf->addr % PAGE_SIZE)) {
-			ehca_gen_err("bad address, i=%x pbuf->addr=%lx "
-				     "pbuf->size=%lx",
+			ehca_gen_err("bad address, i=%x pbuf->addr=%llx "
+				     "pbuf->size=%llx",
 				     i, pbuf->addr, pbuf->size);
 			return -EINVAL;
 		}
 		if (((i > 0) &&	/* not 1st */
 		     (i < (num_phys_buf - 1)) &&	/* not last */
 		     (pbuf->size % PAGE_SIZE)) || (pbuf->size == 0)) {
-			ehca_gen_err("bad size, i=%x pbuf->size=%lx",
+			ehca_gen_err("bad size, i=%x pbuf->size=%llx",
 				     i, pbuf->size);
 			return -EINVAL;
 		}
@@ -1705,7 +1705,7 @@
 	page = page_list;
 	for (i = 0; i < list_len; i++) {
 		if (*page % e_fmr->fmr_page_size) {
-			ehca_gen_err("bad page, i=%x *page=%lx page=%p fmr=%p "
+			ehca_gen_err("bad page, i=%x *page=%llx page=%p fmr=%p "
 				     "fmr_page_size=%x", i, *page, page, e_fmr,
 				     e_fmr->fmr_page_size);
 			return -EINVAL;
@@ -1743,9 +1743,9 @@
 					     (pginfo->next_hwpage *
 					      pginfo->hwpage_size));
 			if ( !(*kpage) ) {
-				ehca_gen_err("pgaddr=%lx "
-					     "chunk->page_list[i]=%lx "
-					     "i=%x next_hwpage=%lx",
+				ehca_gen_err("pgaddr=%llx "
+					     "chunk->page_list[i]=%llx "
+					     "i=%x next_hwpage=%llx",
 					     pgaddr, (u64)sg_dma_address(
 						     &chunk->page_list[i]),
 					     i, pginfo->next_hwpage);
  
@@ -1795,11 +1795,11 @@
 	for (t = start_idx; t <= end_idx; t++) {
 		u64 pgaddr = page_to_pfn(sg_page(&page_list[t])) << PAGE_SHIFT;
 		if (ehca_debug_level >= 3)
-			ehca_gen_dbg("chunk_page=%lx value=%016lx", pgaddr,
+			ehca_gen_dbg("chunk_page=%llx value=%016llx", pgaddr,
 				     *(u64 *)abs_to_virt(phys_to_abs(pgaddr)));
 		if (pgaddr - PAGE_SIZE != *prev_pgaddr) {
-			ehca_gen_err("uncontiguous page found pgaddr=%lx "
-				     "prev_pgaddr=%lx page_list_i=%x",
+			ehca_gen_err("uncontiguous page found pgaddr=%llx "
+				     "prev_pgaddr=%llx page_list_i=%x",
 				     pgaddr, *prev_pgaddr, t);
 			return -EINVAL;
 		}
@@ -1833,7 +1833,7 @@
 					   << PAGE_SHIFT );
 				*kpage = phys_to_abs(pgaddr);
 				if ( !(*kpage) ) {
-					ehca_gen_err("pgaddr=%lx i=%x",
+					ehca_gen_err("pgaddr=%llx i=%x",
 						     pgaddr, i);
 					ret = -EFAULT;
 					return ret;
@@ -1846,8 +1846,8 @@
 					if (pginfo->hwpage_cnt) {
 						ehca_gen_err(
 							"invalid alignment "
-							"pgaddr=%lx i=%x "
-							"mr_pgsize=%lx",
+							"pgaddr=%llx i=%x "
+							"mr_pgsize=%llx",
 							pgaddr, i,
 							pginfo->hwpage_size);
 						ret = -EFAULT;
@@ -1866,8 +1866,8 @@
 				if (ehca_debug_level >= 3) {
 					u64 val = *(u64 *)abs_to_virt(
 						phys_to_abs(pgaddr));
-					ehca_gen_dbg("kpage=%lx chunk_page=%lx "
-						     "value=%016lx",
+					ehca_gen_dbg("kpage=%llx chunk_page=%llx "
+						     "value=%016llx",
 						     *kpage, pgaddr, val);
 				}
 				prev_pgaddr = pgaddr;
@@ -1944,9 +1944,9 @@
 			if ((pginfo->kpage_cnt >= pginfo->num_kpages) ||
 			    (pginfo->hwpage_cnt >= pginfo->num_hwpages)) {
 				ehca_gen_err("kpage_cnt >= num_kpages, "
-					     "kpage_cnt=%lx num_kpages=%lx "
-					     "hwpage_cnt=%lx "
-					     "num_hwpages=%lx i=%x",
+					     "kpage_cnt=%llx num_kpages=%llx "
+					     "hwpage_cnt=%llx "
+					     "num_hwpages=%llx i=%x",
 					     pginfo->kpage_cnt,
 					     pginfo->num_kpages,
 					     pginfo->hwpage_cnt,
@@ -1957,8 +1957,8 @@
 				(pbuf->addr & ~(pginfo->hwpage_size - 1)) +
 				(pginfo->next_hwpage * pginfo->hwpage_size));
 			if ( !(*kpage) && pbuf->addr ) {
-				ehca_gen_err("pbuf->addr=%lx pbuf->size=%lx "
-					     "next_hwpage=%lx", pbuf->addr,
+				ehca_gen_err("pbuf->addr=%llx pbuf->size=%llx "
+					     "next_hwpage=%llx", pbuf->addr,
 					     pbuf->size, pginfo->next_hwpage);
 				return -EFAULT;
 			}
@@ -1996,8 +1996,8 @@
 		*kpage = phys_to_abs((*fmrlist & ~(pginfo->hwpage_size - 1)) +
 				     pginfo->next_hwpage * pginfo->hwpage_size);
 		if ( !(*kpage) ) {
-			ehca_gen_err("*fmrlist=%lx fmrlist=%p "
-				     "next_listelem=%lx next_hwpage=%lx",
+			ehca_gen_err("*fmrlist=%llx fmrlist=%p "
+				     "next_listelem=%llx next_hwpage=%llx",
 				     *fmrlist, fmrlist,
 				     pginfo->u.fmr.next_listelem,
 				     pginfo->next_hwpage);
@@ -2025,7 +2025,7 @@
 						    ~(pginfo->hwpage_size - 1));
 				if (prev + pginfo->u.fmr.fmr_pgsize != p) {
 					ehca_gen_err("uncontiguous fmr pages "
-						     "found prev=%lx p=%lx "
+						     "found prev=%llx p=%llx "
 						     "idx=%x", prev, p, i + j);
 					return -EINVAL;
 				}
@@ -331,7 +331,7 @@
 		if (cnt == (nr_q_pages - 1)) {	/* last page! */
 			if (h_ret != expected_hret) {
 				ehca_err(ib_dev, "hipz_qp_register_rpage() "
-					 "h_ret=%li", h_ret);
+					 "h_ret=%lli", h_ret);
 				ret = ehca2ib_return_code(h_ret);
 				goto init_qp_queue1;
 			}
@@ -345,7 +345,7 @@
 		} else {
 			if (h_ret != H_PAGE_REGISTERED) {
 				ehca_err(ib_dev, "hipz_qp_register_rpage() "
-					 "h_ret=%li", h_ret);
+					 "h_ret=%lli", h_ret);
 				ret = ehca2ib_return_code(h_ret);
 				goto init_qp_queue1;
 			}
@@ -709,7 +709,7 @@
  
 	h_ret = hipz_h_alloc_resource_qp(shca->ipz_hca_handle, &parms);
 	if (h_ret != H_SUCCESS) {
-		ehca_err(pd->device, "h_alloc_resource_qp() failed h_ret=%li",
+		ehca_err(pd->device, "h_alloc_resource_qp() failed h_ret=%lli",
 			 h_ret);
 		ret = ehca2ib_return_code(h_ret);
 		goto create_qp_exit1;
@@ -1010,7 +1010,7 @@
 				mqpcb, my_qp->galpas.kernel);
 	if (hret != H_SUCCESS) {
 		ehca_err(pd->device, "Could not modify SRQ to INIT "
-			 "ehca_qp=%p qp_num=%x h_ret=%li",
+			 "ehca_qp=%p qp_num=%x h_ret=%lli",
 			 my_qp, my_qp->real_qp_num, hret);
 		goto create_srq2;
 	}
@@ -1024,7 +1024,7 @@
 				mqpcb, my_qp->galpas.kernel);
 	if (hret != H_SUCCESS) {
 		ehca_err(pd->device, "Could not enable SRQ "
-			 "ehca_qp=%p qp_num=%x h_ret=%li",
+			 "ehca_qp=%p qp_num=%x h_ret=%lli",
 			 my_qp, my_qp->real_qp_num, hret);
 		goto create_srq2;
 	}
@@ -1038,7 +1038,7 @@
 				mqpcb, my_qp->galpas.kernel);
 	if (hret != H_SUCCESS) {
 		ehca_err(pd->device, "Could not modify SRQ to RTR "
-			 "ehca_qp=%p qp_num=%x h_ret=%li",
+			 "ehca_qp=%p qp_num=%x h_ret=%lli",
 			 my_qp, my_qp->real_qp_num, hret);
 		goto create_srq2;
 	}
@@ -1078,7 +1078,7 @@
 					   &bad_send_wqe_p, NULL, 2);
 	if (h_ret != H_SUCCESS) {
 		ehca_err(&shca->ib_device, "hipz_h_disable_and_get_wqe() failed"
-			 " ehca_qp=%p qp_num=%x h_ret=%li",
+			 " ehca_qp=%p qp_num=%x h_ret=%lli",
 			 my_qp, qp_num, h_ret);
 		return ehca2ib_return_code(h_ret);
 	}
@@ -1134,7 +1134,7 @@
  
 	if (ipz_queue_abs_to_offset(ipz_queue, wqe_p, &q_ofs)) {
 		ehca_gen_err("Invalid offset for calculating left cqes "
-				"wqe_p=%#lx wqe_v=%p\n", wqe_p, wqe_v);
+				"wqe_p=%#llx wqe_v=%p\n", wqe_p, wqe_v);
 		return -EFAULT;
 	}
  
@@ -1168,7 +1168,7 @@
 				&send_wqe_p, &recv_wqe_p, 4);
 		if (h_ret != H_SUCCESS) {
 			ehca_err(&shca->ib_device, "disable_and_get_wqe() "
-				 "failed ehca_qp=%p qp_num=%x h_ret=%li",
+				 "failed ehca_qp=%p qp_num=%x h_ret=%lli",
 				 my_qp, qp_num, h_ret);
 			return ehca2ib_return_code(h_ret);
 		}
@@ -1261,7 +1261,7 @@
 				mqpcb, my_qp->galpas.kernel);
 	if (h_ret != H_SUCCESS) {
 		ehca_err(ibqp->device, "hipz_h_query_qp() failed "
-			 "ehca_qp=%p qp_num=%x h_ret=%li",
+			 "ehca_qp=%p qp_num=%x h_ret=%lli",
 			 my_qp, ibqp->qp_num, h_ret);
 		ret = ehca2ib_return_code(h_ret);
 		goto modify_qp_exit1;
@@ -1690,7 +1690,7 @@
  
 	if (h_ret != H_SUCCESS) {
 		ret = ehca2ib_return_code(h_ret);
-		ehca_err(ibqp->device, "hipz_h_modify_qp() failed h_ret=%li "
+		ehca_err(ibqp->device, "hipz_h_modify_qp() failed h_ret=%lli "
 			 "ehca_qp=%p qp_num=%x", h_ret, my_qp, ibqp->qp_num);
 		goto modify_qp_exit2;
 	}
@@ -1723,7 +1723,7 @@
 			ret = ehca2ib_return_code(h_ret);
 			ehca_err(ibqp->device, "ENABLE in context of "
 				 "RESET_2_INIT failed! Maybe you didn't get "
-				 "a LID h_ret=%li ehca_qp=%p qp_num=%x",
+				 "a LID h_ret=%lli ehca_qp=%p qp_num=%x",
 				 h_ret, my_qp, ibqp->qp_num);
 			goto modify_qp_exit2;
 		}
@@ -1909,7 +1909,7 @@
 	if (h_ret != H_SUCCESS) {
 		ret = ehca2ib_return_code(h_ret);
 		ehca_err(qp->device, "hipz_h_query_qp() failed "
-			 "ehca_qp=%p qp_num=%x h_ret=%li",
+			 "ehca_qp=%p qp_num=%x h_ret=%lli",
 			 my_qp, qp->qp_num, h_ret);
 		goto query_qp_exit1;
 	}
@@ -2074,7 +2074,7 @@
  
 	if (h_ret != H_SUCCESS) {
 		ret = ehca2ib_return_code(h_ret);
-		ehca_err(ibsrq->device, "hipz_h_modify_qp() failed h_ret=%li "
+		ehca_err(ibsrq->device, "hipz_h_modify_qp() failed h_ret=%lli "
 			 "ehca_qp=%p qp_num=%x",
 			 h_ret, my_qp, my_qp->real_qp_num);
 	}
@@ -2108,7 +2108,7 @@
 	if (h_ret != H_SUCCESS) {
 		ret = ehca2ib_return_code(h_ret);
 		ehca_err(srq->device, "hipz_h_query_qp() failed "
-			 "ehca_qp=%p qp_num=%x h_ret=%li",
+			 "ehca_qp=%p qp_num=%x h_ret=%lli",
 			 my_qp, my_qp->real_qp_num, h_ret);
 		goto query_srq_exit1;
 	}
@@ -2179,7 +2179,7 @@
  
 	h_ret = hipz_h_destroy_qp(shca->ipz_hca_handle, my_qp);
 	if (h_ret != H_SUCCESS) {
-		ehca_err(dev, "hipz_h_destroy_qp() failed h_ret=%li "
+		ehca_err(dev, "hipz_h_destroy_qp() failed h_ret=%lli "
 			 "ehca_qp=%p qp_num=%x", h_ret, my_qp, qp_num);
 		return ehca2ib_return_code(h_ret);
 	}
@@ -822,7 +822,7 @@
 		offset = qmap->next_wqe_idx * ipz_queue->qe_size;
 		wqe = (struct ehca_wqe *)ipz_qeit_calc(ipz_queue, offset);
 		if (!wqe) {
-			ehca_err(cq->device, "Invalid wqe offset=%#lx on "
+			ehca_err(cq->device, "Invalid wqe offset=%#llx on "
 				 "qp_num=%#x", offset, my_qp->real_qp_num);
 			return nr;
 		}
@@ -85,7 +85,7 @@
  
 		if (ret != H_SUCCESS) {
 			ehca_err(&shca->ib_device,
-				 "Can't define AQP1 for port %x. h_ret=%li",
+				 "Can't define AQP1 for port %x. h_ret=%lli",
 				 port, ret);
 			return ret;
 		}
@@ -116,7 +116,7 @@
 		unsigned char *deb = (unsigned char *)(adr); \
 		for (x = 0; x < l; x += 16) { \
 			printk(KERN_INFO "EHCA_DMP:%s " format \
-			       " adr=%p ofs=%04x %016lx %016lx\n", \
+			       " adr=%p ofs=%04x %016llx %016llx\n", \
 			       __func__, ##args, deb, x, \
 			       *((u64 *)&deb[0]), *((u64 *)&deb[8])); \
 			deb += 16; \
@@ -114,7 +114,7 @@
  
 	physical = galpas->user.fw_handle;
 	vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
-	ehca_gen_dbg("vsize=%lx physical=%lx", vsize, physical);
+	ehca_gen_dbg("vsize=%llx physical=%llx", vsize, physical);
 	/* VM_IO | VM_RESERVED are set by remap_pfn_range() */
 	ret = remap_4k_pfn(vma, vma->vm_start, physical >> EHCA_PAGESHIFT,
 			   vma->vm_page_prot);
@@ -249,7 +249,7 @@
 	*eq_ist = (u32)outs[5];
  
 	if (ret == H_NOT_ENOUGH_RESOURCES)
-		ehca_gen_err("Not enough resource - ret=%li ", ret);
+		ehca_gen_err("Not enough resource - ret=%lli ", ret);
  
 	return ret;
 }
@@ -287,7 +287,7 @@
 		hcp_galpas_ctor(&cq->galpas, outs[5], outs[6]);
  
 	if (ret == H_NOT_ENOUGH_RESOURCES)
-		ehca_gen_err("Not enough resources. ret=%li", ret);
+		ehca_gen_err("Not enough resources. ret=%lli", ret);
  
 	return ret;
 }
@@ -362,7 +362,7 @@
 		hcp_galpas_ctor(&parms->galpas, outs[6], outs[6]);
  
 	if (ret == H_NOT_ENOUGH_RESOURCES)
-		ehca_gen_err("Not enough resources. ret=%li", ret);
+		ehca_gen_err("Not enough resources. ret=%lli", ret);
  
 	return ret;
 }
@@ -454,7 +454,7 @@
 			     const u64 count)
 {
 	if (count != 1) {
-		ehca_gen_err("Ppage counter=%lx", count);
+		ehca_gen_err("Ppage counter=%llx", count);
 		return H_PARAMETER;
 	}
 	return hipz_h_register_rpage(adapter_handle,
@@ -489,7 +489,7 @@
 			     const struct h_galpa gal)
 {
 	if (count != 1) {
-		ehca_gen_err("Page counter=%lx", count);
+		ehca_gen_err("Page counter=%llx", count);
 		return H_PARAMETER;
 	}
  
@@ -508,7 +508,7 @@
 			     const struct h_galpa galpa)
 {
 	if (count > 1) {
-		ehca_gen_err("Page counter=%lx", count);
+		ehca_gen_err("Page counter=%llx", count);
 		return H_PARAMETER;
 	}
  
@@ -557,7 +557,7 @@
 				0, 0, 0, 0, 0);
  
 	if (ret == H_NOT_ENOUGH_RESOURCES)
-		ehca_gen_err("Insufficient resources ret=%li", ret);
+		ehca_gen_err("Insufficient resources ret=%lli", ret);
  
 	return ret;
 }
@@ -593,7 +593,7 @@
 				qp->ipz_qp_handle.handle,  /* r6 */
 				0, 0, 0, 0, 0, 0);
 	if (ret == H_HARDWARE)
-		ehca_gen_err("HCA not operational. ret=%li", ret);
+		ehca_gen_err("HCA not operational. ret=%lli", ret);
  
 	ret = ehca_plpar_hcall_norets(H_FREE_RESOURCE,
 				      adapter_handle.handle,     /* r4 */
@@ -601,7 +601,7 @@
 				      0, 0, 0, 0, 0);
  
 	if (ret == H_RESOURCE)
-		ehca_gen_err("Resource still in use. ret=%li", ret);
+		ehca_gen_err("Resource still in use. ret=%lli", ret);
  
 	return ret;
 }
@@ -636,7 +636,7 @@
 	*bma_qp_nr = (u32)outs[1];
  
 	if (ret == H_ALIAS_EXIST)
-		ehca_gen_err("AQP1 already exists. ret=%li", ret);
+		ehca_gen_err("AQP1 already exists. ret=%lli", ret);
  
 	return ret;
 }
@@ -658,7 +658,7 @@
 				      0, 0);
  
 	if (ret == H_NOT_ENOUGH_RESOURCES)
-		ehca_gen_err("Not enough resources. ret=%li", ret);
+		ehca_gen_err("Not enough resources. ret=%lli", ret);
  
 	return ret;
 }
@@ -697,7 +697,7 @@
 				      0, 0, 0, 0);
  
 	if (ret == H_RESOURCE)
-		ehca_gen_err("H_FREE_RESOURCE failed ret=%li ", ret);
+		ehca_gen_err("H_FREE_RESOURCE failed ret=%lli ", ret);
  
 	return ret;
 }
@@ -719,7 +719,7 @@
 				      0, 0, 0, 0, 0);
  
 	if (ret == H_RESOURCE)
-		ehca_gen_err("Resource in use. ret=%li ", ret);
+		ehca_gen_err("Resource in use. ret=%lli ", ret);
  
 	return ret;
 }
  
@@ -774,9 +774,9 @@
  
 	if ((count > 1) && (logical_address_of_page & (EHCA_PAGESIZE-1))) {
 		ehca_gen_err("logical_address_of_page not on a 4k boundary "
-			     "adapter_handle=%lx mr=%p mr_handle=%lx "
+			     "adapter_handle=%llx mr=%p mr_handle=%llx "
 			     "pagesize=%x queue_type=%x "
-			     "logical_address_of_page=%lx count=%lx",
+			     "logical_address_of_page=%llx count=%llx",
 			     adapter_handle.handle, mr,
 			     mr->ipz_mr_handle.handle, pagesize, queue_type,
 			     logical_address_of_page, count);
...	...	@@ -196,7 +196,7 @@
196	196
197	197	if (h_ret != H_SUCCESS) {
198	198	ehca_err(device, "hipz_h_alloc_resource_cq() failed "
199		- "h_ret=%li device=%p", h_ret, device);
	199	+ "h_ret=%lli device=%p", h_ret, device);
200	200	cq = ERR_PTR(ehca2ib_return_code(h_ret));
201	201	goto create_cq_exit2;
202	202	}
...	...	@@ -232,7 +232,7 @@
232	232
233	233	if (h_ret < H_SUCCESS) {
234	234	ehca_err(device, "hipz_h_register_rpage_cq() failed "
235		- "ehca_cq=%p cq_num=%x h_ret=%li counter=%i "
	235	+ "ehca_cq=%p cq_num=%x h_ret=%lli counter=%i "
236	236	"act_pages=%i", my_cq, my_cq->cq_number,
237	237	h_ret, counter, param.act_pages);
238	238	cq = ERR_PTR(-EINVAL);
...	...	@@ -244,7 +244,7 @@
244	244	if ((h_ret != H_SUCCESS) \|\| vpage) {
245	245	ehca_err(device, "Registration of pages not "
246	246	"complete ehca_cq=%p cq_num=%x "
247		- "h_ret=%li", my_cq, my_cq->cq_number,
	247	+ "h_ret=%lli", my_cq, my_cq->cq_number,
248	248	h_ret);
249	249	cq = ERR_PTR(-EAGAIN);
250	250	goto create_cq_exit4;
...	...	@@ -252,7 +252,7 @@
252	252	} else {
253	253	if (h_ret != H_PAGE_REGISTERED) {
254	254	ehca_err(device, "Registration of page failed "
255		- "ehca_cq=%p cq_num=%x h_ret=%li "
	255	+ "ehca_cq=%p cq_num=%x h_ret=%lli "
256	256	"counter=%i act_pages=%i",
257	257	my_cq, my_cq->cq_number,
258	258	h_ret, counter, param.act_pages);
...	...	@@ -266,7 +266,7 @@
266	266
267	267	gal = my_cq->galpas.kernel;
268	268	cqx_fec = hipz_galpa_load(gal, CQTEMM_OFFSET(cqx_fec));
269		- ehca_dbg(device, "ehca_cq=%p cq_num=%x CQX_FEC=%lx",
	269	+ ehca_dbg(device, "ehca_cq=%p cq_num=%x CQX_FEC=%llx",
270	270	my_cq, my_cq->cq_number, cqx_fec);
271	271
272	272	my_cq->ib_cq.cqe = my_cq->nr_of_entries =
...	...	@@ -307,7 +307,7 @@
307	307	h_ret = hipz_h_destroy_cq(adapter_handle, my_cq, 1);
308	308	if (h_ret != H_SUCCESS)
309	309	ehca_err(device, "hipz_h_destroy_cq() failed ehca_cq=%p "
310		- "cq_num=%x h_ret=%li", my_cq, my_cq->cq_number, h_ret);
	310	+ "cq_num=%x h_ret=%lli", my_cq, my_cq->cq_number, h_ret);
311	311
312	312	create_cq_exit2:
313	313	write_lock_irqsave(&ehca_cq_idr_lock, flags);
...	...	@@ -355,7 +355,7 @@
355	355	h_ret = hipz_h_destroy_cq(adapter_handle, my_cq, 0);
356	356	if (h_ret == H_R_STATE) {
357	357	/* cq in err: read err data and destroy it forcibly */
358		- ehca_dbg(device, "ehca_cq=%p cq_num=%x ressource=%lx in err "
	358	+ ehca_dbg(device, "ehca_cq=%p cq_num=%x resource=%llx in err "
359	359	"state. Try to delete it forcibly.",
360	360	my_cq, cq_num, my_cq->ipz_cq_handle.handle);
361	361	ehca_error_data(shca, my_cq, my_cq->ipz_cq_handle.handle);
...	...	@@ -365,7 +365,7 @@
365	365	cq_num);
366	366	}
367	367	if (h_ret != H_SUCCESS) {
368		- ehca_err(device, "hipz_h_destroy_cq() failed h_ret=%li "
	368	+ ehca_err(device, "hipz_h_destroy_cq() failed h_ret=%lli "
369	369	"ehca_cq=%p cq_num=%x", h_ret, my_cq, cq_num);
370	370	return ehca2ib_return_code(h_ret);
371	371	}
...	...	@@ -393,7 +393,7 @@
393	393	hret = hipz_h_modify_port(shca->ipz_hca_handle, port,
394	394	cap, props->init_type, port_modify_mask);
395	395	if (hret != H_SUCCESS) {
396		- ehca_err(&shca->ib_device, "Modify port failed h_ret=%li",
	396	+ ehca_err(&shca->ib_device, "Modify port failed h_ret=%lli",
397	397	hret);
398	398	ret = -EINVAL;
399	399	}
...	...	@@ -99,7 +99,7 @@
99	99	return;
100	100
101	101	ehca_err(&shca->ib_device,
102		- "QP 0x%x (resource=%lx) has errors.",
	102	+ "QP 0x%x (resource=%llx) has errors.",
103	103	qp->ib_qp.qp_num, resource);
104	104	break;
105	105	}
106	106
107	107
108	108
...	...	@@ -108,21 +108,21 @@
108	108	struct ehca_cq cq = (struct ehca_cq )data;
109	109
110	110	ehca_err(&shca->ib_device,
111		- "CQ 0x%x (resource=%lx) has errors.",
	111	+ "CQ 0x%x (resource=%llx) has errors.",
112	112	cq->cq_number, resource);
113	113	break;
114	114	}
115	115	default:
116	116	ehca_err(&shca->ib_device,
117		- "Unknown error type: %lx on %s.",
	117	+ "Unknown error type: %llx on %s.",
118	118	type, shca->ib_device.name);
119	119	break;
120	120	}
121	121
122		- ehca_err(&shca->ib_device, "Error data is available: %lx.", resource);
	122	+ ehca_err(&shca->ib_device, "Error data is available: %llx.", resource);
123	123	ehca_err(&shca->ib_device, "EHCA ----- error data begin "
124	124	"---------------------------------------------------");
125		- ehca_dmp(rblock, length, "resource=%lx", resource);
	125	+ ehca_dmp(rblock, length, "resource=%llx", resource);
126	126	ehca_err(&shca->ib_device, "EHCA ----- error data end "
127	127	"----------------------------------------------------");
128	128
...	...	@@ -152,7 +152,7 @@
152	152
153	153	if (ret == H_R_STATE)
154	154	ehca_err(&shca->ib_device,
155		- "No error data is available: %lx.", resource);
	155	+ "No error data is available: %llx.", resource);
156	156	else if (ret == H_SUCCESS) {
157	157	int length;
158	158
...	...	@@ -164,7 +164,7 @@
164	164	print_error_data(shca, data, rblock, length);
165	165	} else
166	166	ehca_err(&shca->ib_device,
167		- "Error data could not be fetched: %lx", resource);
	167	+ "Error data could not be fetched: %llx", resource);
168	168
169	169	ehca_free_fw_ctrlblock(rblock);
170	170
...	...	@@ -514,7 +514,7 @@
514	514	struct ehca_cq *cq;
515	515
516	516	eqe_value = eqe->entry;
517		- ehca_dbg(&shca->ib_device, "eqe_value=%lx", eqe_value);
	517	+ ehca_dbg(&shca->ib_device, "eqe_value=%llx", eqe_value);
518	518	if (EHCA_BMASK_GET(EQE_COMPLETION_EVENT, eqe_value)) {
519	519	ehca_dbg(&shca->ib_device, "Got completion event");
520	520	token = EHCA_BMASK_GET(EQE_CQ_TOKEN, eqe_value);
...	...	@@ -603,7 +603,7 @@
603	603	ret = hipz_h_eoi(eq->ist);
604	604	if (ret != H_SUCCESS)
605	605	ehca_err(&shca->ib_device,
606		- "bad return code EOI -rc = %ld\n", ret);
	606	+ "bad return code EOI -rc = %lld\n", ret);
607	607	ehca_dbg(&shca->ib_device, "deadman found %x eqe", eqe_cnt);
608	608	}
609	609	if (unlikely(eqe_cnt == EHCA_EQE_CACHE_SIZE))
...	...	@@ -304,7 +304,7 @@
304	304
305	305	h_ret = hipz_h_query_hca(shca->ipz_hca_handle, rblock);
306	306	if (h_ret != H_SUCCESS) {
307		- ehca_gen_err("Cannot query device properties. h_ret=%li",
	307	+ ehca_gen_err("Cannot query device properties. h_ret=%lli",
308	308	h_ret);
309	309	ret = -EPERM;
310	310	goto sense_attributes1;
...	...	@@ -391,7 +391,7 @@
391	391	port = (struct hipz_query_port *)rblock;
392	392	h_ret = hipz_h_query_port(shca->ipz_hca_handle, 1, port);
393	393	if (h_ret != H_SUCCESS) {
394		- ehca_gen_err("Cannot query port properties. h_ret=%li",
	394	+ ehca_gen_err("Cannot query port properties. h_ret=%lli",
395	395	h_ret);
396	396	ret = -EPERM;
397	397	goto sense_attributes1;
...	...	@@ -682,7 +682,7 @@
682	682	{
683	683	struct ehca_shca *shca = dev->driver_data;
684	684
685		- return sprintf(buf, "%lx\n", shca->ipz_hca_handle.handle);
	685	+ return sprintf(buf, "%llx\n", shca->ipz_hca_handle.handle);
686	686
687	687	}
688	688	static DEVICE_ATTR(adapter_handle, S_IRUGO, ehca_show_adapter_handle, NULL);
...	...	@@ -88,7 +88,7 @@
88	88	if (h_ret != H_SUCCESS)
89	89	ehca_err(ibqp->device,
90	90	"ehca_qp=%p qp_num=%x hipz_h_attach_mcqp() failed "
91		- "h_ret=%li", my_qp, ibqp->qp_num, h_ret);
	91	+ "h_ret=%lli", my_qp, ibqp->qp_num, h_ret);
92	92
93	93	return ehca2ib_return_code(h_ret);
94	94	}
...	...	@@ -125,7 +125,7 @@
125	125	if (h_ret != H_SUCCESS)
126	126	ehca_err(ibqp->device,
127	127	"ehca_qp=%p qp_num=%x hipz_h_detach_mcqp() failed "
128		- "h_ret=%li", my_qp, ibqp->qp_num, h_ret);
	128	+ "h_ret=%lli", my_qp, ibqp->qp_num, h_ret);
129	129
130	130	return ehca2ib_return_code(h_ret);
131	131	}
...	...	@@ -204,7 +204,7 @@
204	204	}
205	205	if ((size == 0) \|\|
206	206	(((u64)iova_start + size) < (u64)iova_start)) {
207		- ehca_err(pd->device, "bad input values: size=%lx iova_start=%p",
	207	+ ehca_err(pd->device, "bad input values: size=%llx iova_start=%p",
208	208	size, iova_start);
209	209	ib_mr = ERR_PTR(-EINVAL);
210	210	goto reg_phys_mr_exit0;
...	...	@@ -309,8 +309,8 @@
309	309	}
310	310
311	311	if (length == 0 \|\| virt + length < virt) {
312		- ehca_err(pd->device, "bad input values: length=%lx "
313		- "virt_base=%lx", length, virt);
	312	+ ehca_err(pd->device, "bad input values: length=%llx "
	313	+ "virt_base=%llx", length, virt);
314	314	ib_mr = ERR_PTR(-EINVAL);
315	315	goto reg_user_mr_exit0;
316	316	}
...	...	@@ -373,7 +373,7 @@
373	373	&e_mr->ib.ib_mr.rkey);
374	374	if (ret == -EINVAL && pginfo.hwpage_size > PAGE_SIZE) {
375	375	ehca_warn(pd->device, "failed to register mr "
376		- "with hwpage_size=%lx", hwpage_size);
	376	+ "with hwpage_size=%llx", hwpage_size);
377	377	ehca_info(pd->device, "try to register mr with "
378	378	"kpage_size=%lx", PAGE_SIZE);
379	379	/*
...	...	@@ -509,7 +509,7 @@
509	509	goto rereg_phys_mr_exit1;
510	510	if ((new_size == 0) \|\|
511	511	(((u64)iova_start + new_size) < (u64)iova_start)) {
512		- ehca_err(mr->device, "bad input values: new_size=%lx "
	512	+ ehca_err(mr->device, "bad input values: new_size=%llx "
513	513	"iova_start=%p", new_size, iova_start);
514	514	ret = -EINVAL;
515	515	goto rereg_phys_mr_exit1;
...	...	@@ -580,8 +580,8 @@
580	580
581	581	h_ret = hipz_h_query_mr(shca->ipz_hca_handle, e_mr, &hipzout);
582	582	if (h_ret != H_SUCCESS) {
583		- ehca_err(mr->device, "hipz_mr_query failed, h_ret=%li mr=%p "
584		- "hca_hndl=%lx mr_hndl=%lx lkey=%x",
	583	+ ehca_err(mr->device, "hipz_mr_query failed, h_ret=%lli mr=%p "
	584	+ "hca_hndl=%llx mr_hndl=%llx lkey=%x",
585	585	h_ret, mr, shca->ipz_hca_handle.handle,
586	586	e_mr->ipz_mr_handle.handle, mr->lkey);
587	587	ret = ehca2ib_return_code(h_ret);
...	...	@@ -630,8 +630,8 @@
630	630	/* TODO: BUSY: MR still has bound window(s) */
631	631	h_ret = hipz_h_free_resource_mr(shca->ipz_hca_handle, e_mr);
632	632	if (h_ret != H_SUCCESS) {
633		- ehca_err(mr->device, "hipz_free_mr failed, h_ret=%li shca=%p "
634		- "e_mr=%p hca_hndl=%lx mr_hndl=%lx mr->lkey=%x",
	633	+ ehca_err(mr->device, "hipz_free_mr failed, h_ret=%lli shca=%p "
	634	+ "e_mr=%p hca_hndl=%llx mr_hndl=%llx mr->lkey=%x",
635	635	h_ret, shca, e_mr, shca->ipz_hca_handle.handle,
636	636	e_mr->ipz_mr_handle.handle, mr->lkey);
637	637	ret = ehca2ib_return_code(h_ret);
...	...	@@ -671,8 +671,8 @@
671	671	h_ret = hipz_h_alloc_resource_mw(shca->ipz_hca_handle, e_mw,
672	672	e_pd->fw_pd, &hipzout);
673	673	if (h_ret != H_SUCCESS) {
674		- ehca_err(pd->device, "hipz_mw_allocate failed, h_ret=%li "
675		- "shca=%p hca_hndl=%lx mw=%p",
	674	+ ehca_err(pd->device, "hipz_mw_allocate failed, h_ret=%lli "
	675	+ "shca=%p hca_hndl=%llx mw=%p",
676	676	h_ret, shca, shca->ipz_hca_handle.handle, e_mw);
677	677	ib_mw = ERR_PTR(ehca2ib_return_code(h_ret));
678	678	goto alloc_mw_exit1;
...	...	@@ -713,8 +713,8 @@
713	713
714	714	h_ret = hipz_h_free_resource_mw(shca->ipz_hca_handle, e_mw);
715	715	if (h_ret != H_SUCCESS) {
716		- ehca_err(mw->device, "hipz_free_mw failed, h_ret=%li shca=%p "
717		- "mw=%p rkey=%x hca_hndl=%lx mw_hndl=%lx",
	716	+ ehca_err(mw->device, "hipz_free_mw failed, h_ret=%lli shca=%p "
	717	+ "mw=%p rkey=%x hca_hndl=%llx mw_hndl=%llx",
718	718	h_ret, shca, mw, mw->rkey, shca->ipz_hca_handle.handle,
719	719	e_mw->ipz_mw_handle.handle);
720	720	return ehca2ib_return_code(h_ret);
...	...	@@ -840,7 +840,7 @@
840	840	goto map_phys_fmr_exit0;
841	841	if (iova % e_fmr->fmr_page_size) {
842	842	/* only whole-numbered pages */
843		- ehca_err(fmr->device, "bad iova, iova=%lx fmr_page_size=%x",
	843	+ ehca_err(fmr->device, "bad iova, iova=%llx fmr_page_size=%x",
844	844	iova, e_fmr->fmr_page_size);
845	845	ret = -EINVAL;
846	846	goto map_phys_fmr_exit0;
...	...	@@ -878,7 +878,7 @@
878	878	map_phys_fmr_exit0:
879	879	if (ret)
880	880	ehca_err(fmr->device, "ret=%i fmr=%p page_list=%p list_len=%x "
881		- "iova=%lx", ret, fmr, page_list, list_len, iova);
	881	+ "iova=%llx", ret, fmr, page_list, list_len, iova);
882	882	return ret;
883	883	} /* end ehca_map_phys_fmr() */
884	884
...	...	@@ -964,8 +964,8 @@
964	964
965	965	h_ret = hipz_h_free_resource_mr(shca->ipz_hca_handle, e_fmr);
966	966	if (h_ret != H_SUCCESS) {
967		- ehca_err(fmr->device, "hipz_free_mr failed, h_ret=%li e_fmr=%p "
968		- "hca_hndl=%lx fmr_hndl=%lx fmr->lkey=%x",
	967	+ ehca_err(fmr->device, "hipz_free_mr failed, h_ret=%lli e_fmr=%p "
	968	+ "hca_hndl=%llx fmr_hndl=%llx fmr->lkey=%x",
969	969	h_ret, e_fmr, shca->ipz_hca_handle.handle,
970	970	e_fmr->ipz_mr_handle.handle, fmr->lkey);
971	971	ret = ehca2ib_return_code(h_ret);
...	...	@@ -1007,8 +1007,8 @@
1007	1007	(u64)iova_start, size, hipz_acl,
1008	1008	e_pd->fw_pd, &hipzout);
1009	1009	if (h_ret != H_SUCCESS) {
1010		- ehca_err(&shca->ib_device, "hipz_alloc_mr failed, h_ret=%li "
1011		- "hca_hndl=%lx", h_ret, shca->ipz_hca_handle.handle);
	1010	+ ehca_err(&shca->ib_device, "hipz_alloc_mr failed, h_ret=%lli "
	1011	+ "hca_hndl=%llx", h_ret, shca->ipz_hca_handle.handle);
1012	1012	ret = ehca2ib_return_code(h_ret);
1013	1013	goto ehca_reg_mr_exit0;
1014	1014	}
...	...	@@ -1033,9 +1033,9 @@
1033	1033	ehca_reg_mr_exit1:
1034	1034	h_ret = hipz_h_free_resource_mr(shca->ipz_hca_handle, e_mr);
1035	1035	if (h_ret != H_SUCCESS) {
1036		- ehca_err(&shca->ib_device, "h_ret=%li shca=%p e_mr=%p "
1037		- "iova_start=%p size=%lx acl=%x e_pd=%p lkey=%x "
1038		- "pginfo=%p num_kpages=%lx num_hwpages=%lx ret=%i",
	1036	+ ehca_err(&shca->ib_device, "h_ret=%lli shca=%p e_mr=%p "
	1037	+ "iova_start=%p size=%llx acl=%x e_pd=%p lkey=%x "
	1038	+ "pginfo=%p num_kpages=%llx num_hwpages=%llx ret=%i",
1039	1039	h_ret, shca, e_mr, iova_start, size, acl, e_pd,
1040	1040	hipzout.lkey, pginfo, pginfo->num_kpages,
1041	1041	pginfo->num_hwpages, ret);
...	...	@@ -1045,8 +1045,8 @@
1045	1045	ehca_reg_mr_exit0:
1046	1046	if (ret)
1047	1047	ehca_err(&shca->ib_device, "ret=%i shca=%p e_mr=%p "
1048		- "iova_start=%p size=%lx acl=%x e_pd=%p pginfo=%p "
1049		- "num_kpages=%lx num_hwpages=%lx",
	1048	+ "iova_start=%p size=%llx acl=%x e_pd=%p pginfo=%p "
	1049	+ "num_kpages=%llx num_hwpages=%llx",
1050	1050	ret, shca, e_mr, iova_start, size, acl, e_pd, pginfo,
1051	1051	pginfo->num_kpages, pginfo->num_hwpages);
1052	1052	return ret;
...	...	@@ -1116,8 +1116,8 @@
1116	1116	*/
1117	1117	if (h_ret != H_SUCCESS) {
1118	1118	ehca_err(&shca->ib_device, "last "
1119		- "hipz_reg_rpage_mr failed, h_ret=%li "
1120		- "e_mr=%p i=%x hca_hndl=%lx mr_hndl=%lx"
	1119	+ "hipz_reg_rpage_mr failed, h_ret=%lli "
	1120	+ "e_mr=%p i=%x hca_hndl=%llx mr_hndl=%llx"
1121	1121	" lkey=%x", h_ret, e_mr, i,
1122	1122	shca->ipz_hca_handle.handle,
1123	1123	e_mr->ipz_mr_handle.handle,
...	...	@@ -1128,8 +1128,8 @@
1128	1128	ret = 0;
1129	1129	} else if (h_ret != H_PAGE_REGISTERED) {
1130	1130	ehca_err(&shca->ib_device, "hipz_reg_rpage_mr failed, "
1131		- "h_ret=%li e_mr=%p i=%x lkey=%x hca_hndl=%lx "
1132		- "mr_hndl=%lx", h_ret, e_mr, i,
	1131	+ "h_ret=%lli e_mr=%p i=%x lkey=%x hca_hndl=%llx "
	1132	+ "mr_hndl=%llx", h_ret, e_mr, i,
1133	1133	e_mr->ib.ib_mr.lkey,
1134	1134	shca->ipz_hca_handle.handle,
1135	1135	e_mr->ipz_mr_handle.handle);
...	...	@@ -1145,7 +1145,7 @@
1145	1145	ehca_reg_mr_rpages_exit0:
1146	1146	if (ret)
1147	1147	ehca_err(&shca->ib_device, "ret=%i shca=%p e_mr=%p pginfo=%p "
1148		- "num_kpages=%lx num_hwpages=%lx", ret, shca, e_mr,
	1148	+ "num_kpages=%llx num_hwpages=%llx", ret, shca, e_mr,
1149	1149	pginfo, pginfo->num_kpages, pginfo->num_hwpages);
1150	1150	return ret;
1151	1151	} /* end ehca_reg_mr_rpages() */
...	...	@@ -1184,7 +1184,7 @@
1184	1184	ret = ehca_set_pagebuf(pginfo, pginfo->num_hwpages, kpage);
1185	1185	if (ret) {
1186	1186	ehca_err(&shca->ib_device, "set pagebuf failed, e_mr=%p "
1187		- "pginfo=%p type=%x num_kpages=%lx num_hwpages=%lx "
	1187	+ "pginfo=%p type=%x num_kpages=%llx num_hwpages=%llx "
1188	1188	"kpage=%p", e_mr, pginfo, pginfo->type,
1189	1189	pginfo->num_kpages, pginfo->num_hwpages, kpage);
1190	1190	goto ehca_rereg_mr_rereg1_exit1;
1191	1191
...	...	@@ -1205,13 +1205,13 @@
1205	1205	* (MW bound or MR is shared)
1206	1206	*/
1207	1207	ehca_warn(&shca->ib_device, "hipz_h_reregister_pmr failed "
1208		- "(Rereg1), h_ret=%li e_mr=%p", h_ret, e_mr);
	1208	+ "(Rereg1), h_ret=%lli e_mr=%p", h_ret, e_mr);
1209	1209	*pginfo = pginfo_save;
1210	1210	ret = -EAGAIN;
1211	1211	} else if ((u64 *)hipzout.vaddr != iova_start) {
1212	1212	ehca_err(&shca->ib_device, "PHYP changed iova_start in "
1213		- "rereg_pmr, iova_start=%p iova_start_out=%lx e_mr=%p "
1214		- "mr_handle=%lx lkey=%x lkey_out=%x", iova_start,
	1213	+ "rereg_pmr, iova_start=%p iova_start_out=%llx e_mr=%p "
	1214	+ "mr_handle=%llx lkey=%x lkey_out=%x", iova_start,
1215	1215	hipzout.vaddr, e_mr, e_mr->ipz_mr_handle.handle,
1216	1216	e_mr->ib.ib_mr.lkey, hipzout.lkey);
1217	1217	ret = -EFAULT;
...	...	@@ -1235,7 +1235,7 @@
1235	1235	ehca_rereg_mr_rereg1_exit0:
1236	1236	if ( ret && (ret != -EAGAIN) )
1237	1237	ehca_err(&shca->ib_device, "ret=%i lkey=%x rkey=%x "
1238		- "pginfo=%p num_kpages=%lx num_hwpages=%lx",
	1238	+ "pginfo=%p num_kpages=%llx num_hwpages=%llx",
1239	1239	ret, lkey, rkey, pginfo, pginfo->num_kpages,
1240	1240	pginfo->num_hwpages);
1241	1241	return ret;
...	...	@@ -1263,7 +1263,7 @@
1263	1263	(e_mr->num_hwpages > MAX_RPAGES) \|\|
1264	1264	(pginfo->num_hwpages > e_mr->num_hwpages)) {
1265	1265	ehca_dbg(&shca->ib_device, "Rereg3 case, "
1266		- "pginfo->num_hwpages=%lx e_mr->num_hwpages=%x",
	1266	+ "pginfo->num_hwpages=%llx e_mr->num_hwpages=%x",
1267	1267	pginfo->num_hwpages, e_mr->num_hwpages);
1268	1268	rereg_1_hcall = 0;
1269	1269	rereg_3_hcall = 1;
...	...	@@ -1295,7 +1295,7 @@
1295	1295	h_ret = hipz_h_free_resource_mr(shca->ipz_hca_handle, e_mr);
1296	1296	if (h_ret != H_SUCCESS) {
1297	1297	ehca_err(&shca->ib_device, "hipz_free_mr failed, "
1298		- "h_ret=%li e_mr=%p hca_hndl=%lx mr_hndl=%lx "
	1298	+ "h_ret=%lli e_mr=%p hca_hndl=%llx mr_hndl=%llx "
1299	1299	"mr->lkey=%x",
1300	1300	h_ret, e_mr, shca->ipz_hca_handle.handle,
1301	1301	e_mr->ipz_mr_handle.handle,
...	...	@@ -1328,8 +1328,8 @@
1328	1328	ehca_rereg_mr_exit0:
1329	1329	if (ret)
1330	1330	ehca_err(&shca->ib_device, "ret=%i shca=%p e_mr=%p "
1331		- "iova_start=%p size=%lx acl=%x e_pd=%p pginfo=%p "
1332		- "num_kpages=%lx lkey=%x rkey=%x rereg_1_hcall=%x "
	1331	+ "iova_start=%p size=%llx acl=%x e_pd=%p pginfo=%p "
	1332	+ "num_kpages=%llx lkey=%x rkey=%x rereg_1_hcall=%x "
1333	1333	"rereg_3_hcall=%x", ret, shca, e_mr, iova_start, size,
1334	1334	acl, e_pd, pginfo, pginfo->num_kpages, lkey, rkey,
1335	1335	rereg_1_hcall, rereg_3_hcall);
...	...	@@ -1371,8 +1371,8 @@
1371	1371	* FMRs are not shared and no MW bound to FMRs
1372	1372	*/
1373	1373	ehca_err(&shca->ib_device, "hipz_reregister_pmr failed "
1374		- "(Rereg1), h_ret=%li e_fmr=%p hca_hndl=%lx "
1375		- "mr_hndl=%lx lkey=%x lkey_out=%x",
	1374	+ "(Rereg1), h_ret=%lli e_fmr=%p hca_hndl=%llx "
	1375	+ "mr_hndl=%llx lkey=%x lkey_out=%x",
1376	1376	h_ret, e_fmr, shca->ipz_hca_handle.handle,
1377	1377	e_fmr->ipz_mr_handle.handle,
1378	1378	e_fmr->ib.ib_fmr.lkey, hipzout.lkey);
...	...	@@ -1383,7 +1383,7 @@
1383	1383	h_ret = hipz_h_free_resource_mr(shca->ipz_hca_handle, e_fmr);
1384	1384	if (h_ret != H_SUCCESS) {
1385	1385	ehca_err(&shca->ib_device, "hipz_free_mr failed, "
1386		- "h_ret=%li e_fmr=%p hca_hndl=%lx mr_hndl=%lx "
	1386	+ "h_ret=%lli e_fmr=%p hca_hndl=%llx mr_hndl=%llx "
1387	1387	"lkey=%x",
1388	1388	h_ret, e_fmr, shca->ipz_hca_handle.handle,
1389	1389	e_fmr->ipz_mr_handle.handle,
1390	1390
...	...	@@ -1447,9 +1447,9 @@
1447	1447	(u64)iova_start, hipz_acl, e_pd->fw_pd,
1448	1448	&hipzout);
1449	1449	if (h_ret != H_SUCCESS) {
1450		- ehca_err(&shca->ib_device, "hipz_reg_smr failed, h_ret=%li "
	1450	+ ehca_err(&shca->ib_device, "hipz_reg_smr failed, h_ret=%lli "
1451	1451	"shca=%p e_origmr=%p e_newmr=%p iova_start=%p acl=%x "
1452		- "e_pd=%p hca_hndl=%lx mr_hndl=%lx lkey=%x",
	1452	+ "e_pd=%p hca_hndl=%llx mr_hndl=%llx lkey=%x",
1453	1453	h_ret, shca, e_origmr, e_newmr, iova_start, acl, e_pd,
1454	1454	shca->ipz_hca_handle.handle,
1455	1455	e_origmr->ipz_mr_handle.handle,
...	...	@@ -1527,7 +1527,7 @@
1527	1527	&e_mr->ib.ib_mr.rkey);
1528	1528	if (ret) {
1529	1529	ehca_err(&shca->ib_device, "reg of internal max MR failed, "
1530		- "e_mr=%p iova_start=%p size_maxmr=%lx num_kpages=%x "
	1530	+ "e_mr=%p iova_start=%p size_maxmr=%llx num_kpages=%x "
1531	1531	"num_hwpages=%x", e_mr, iova_start, size_maxmr,
1532	1532	num_kpages, num_hwpages);
1533	1533	goto ehca_reg_internal_maxmr_exit1;
...	...	@@ -1573,8 +1573,8 @@
1573	1573	(u64)iova_start, hipz_acl, e_pd->fw_pd,
1574	1574	&hipzout);
1575	1575	if (h_ret != H_SUCCESS) {
1576		- ehca_err(&shca->ib_device, "hipz_reg_smr failed, h_ret=%li "
1577		- "e_origmr=%p hca_hndl=%lx mr_hndl=%lx lkey=%x",
	1576	+ ehca_err(&shca->ib_device, "hipz_reg_smr failed, h_ret=%lli "
	1577	+ "e_origmr=%p hca_hndl=%llx mr_hndl=%llx lkey=%x",
1578	1578	h_ret, e_origmr, shca->ipz_hca_handle.handle,
1579	1579	e_origmr->ipz_mr_handle.handle,
1580	1580	e_origmr->ib.ib_mr.lkey);
1581	1581
1582	1582
1583	1583
...	...	@@ -1651,28 +1651,28 @@
1651	1651	/* check first buffer */
1652	1652	if (((u64)iova_start & ~PAGE_MASK) != (pbuf->addr & ~PAGE_MASK)) {
1653	1653	ehca_gen_err("iova_start/addr mismatch, iova_start=%p "
1654		- "pbuf->addr=%lx pbuf->size=%lx",
	1654	+ "pbuf->addr=%llx pbuf->size=%llx",
1655	1655	iova_start, pbuf->addr, pbuf->size);
1656	1656	return -EINVAL;
1657	1657	}
1658	1658	if (((pbuf->addr + pbuf->size) % PAGE_SIZE) &&
1659	1659	(num_phys_buf > 1)) {
1660		- ehca_gen_err("addr/size mismatch in 1st buf, pbuf->addr=%lx "
1661		- "pbuf->size=%lx", pbuf->addr, pbuf->size);
	1660	+ ehca_gen_err("addr/size mismatch in 1st buf, pbuf->addr=%llx "
	1661	+ "pbuf->size=%llx", pbuf->addr, pbuf->size);
1662	1662	return -EINVAL;
1663	1663	}
1664	1664
1665	1665	for (i = 0; i < num_phys_buf; i++) {
1666	1666	if ((i > 0) && (pbuf->addr % PAGE_SIZE)) {
1667		- ehca_gen_err("bad address, i=%x pbuf->addr=%lx "
1668		- "pbuf->size=%lx",
	1667	+ ehca_gen_err("bad address, i=%x pbuf->addr=%llx "
	1668	+ "pbuf->size=%llx",
1669	1669	i, pbuf->addr, pbuf->size);
1670	1670	return -EINVAL;
1671	1671	}
1672	1672	if (((i > 0) && /* not 1st */
1673	1673	(i < (num_phys_buf - 1)) && /* not last */
1674	1674	(pbuf->size % PAGE_SIZE)) \|\| (pbuf->size == 0)) {
1675		- ehca_gen_err("bad size, i=%x pbuf->size=%lx",
	1675	+ ehca_gen_err("bad size, i=%x pbuf->size=%llx",
1676	1676	i, pbuf->size);
1677	1677	return -EINVAL;
1678	1678	}
...	...	@@ -1705,7 +1705,7 @@
1705	1705	page = page_list;
1706	1706	for (i = 0; i < list_len; i++) {
1707	1707	if (*page % e_fmr->fmr_page_size) {
1708		- ehca_gen_err("bad page, i=%x *page=%lx page=%p fmr=%p "
	1708	+ ehca_gen_err("bad page, i=%x *page=%llx page=%p fmr=%p "
1709	1709	"fmr_page_size=%x", i, *page, page, e_fmr,
1710	1710	e_fmr->fmr_page_size);
1711	1711	return -EINVAL;
...	...	@@ -1743,9 +1743,9 @@
1743	1743	(pginfo->next_hwpage *
1744	1744	pginfo->hwpage_size));
1745	1745	if ( !(*kpage) ) {
1746		- ehca_gen_err("pgaddr=%lx "
1747		- "chunk->page_list[i]=%lx "
1748		- "i=%x next_hwpage=%lx",
	1746	+ ehca_gen_err("pgaddr=%llx "
	1747	+ "chunk->page_list[i]=%llx "
	1748	+ "i=%x next_hwpage=%llx",
1749	1749	pgaddr, (u64)sg_dma_address(
1750	1750	&chunk->page_list[i]),
1751	1751	i, pginfo->next_hwpage);
1752	1752
...	...	@@ -1795,11 +1795,11 @@
1795	1795	for (t = start_idx; t <= end_idx; t++) {
1796	1796	u64 pgaddr = page_to_pfn(sg_page(&page_list[t])) << PAGE_SHIFT;
1797	1797	if (ehca_debug_level >= 3)
1798		- ehca_gen_dbg("chunk_page=%lx value=%016lx", pgaddr,
	1798	+ ehca_gen_dbg("chunk_page=%llx value=%016llx", pgaddr,
1799	1799	(u64 )abs_to_virt(phys_to_abs(pgaddr)));
1800	1800	if (pgaddr - PAGE_SIZE != *prev_pgaddr) {
1801		- ehca_gen_err("uncontiguous page found pgaddr=%lx "
1802		- "prev_pgaddr=%lx page_list_i=%x",
	1801	+ ehca_gen_err("uncontiguous page found pgaddr=%llx "
	1802	+ "prev_pgaddr=%llx page_list_i=%x",
1803	1803	pgaddr, *prev_pgaddr, t);
1804	1804	return -EINVAL;
1805	1805	}
...	...	@@ -1833,7 +1833,7 @@
1833	1833	<< PAGE_SHIFT );
1834	1834	*kpage = phys_to_abs(pgaddr);
1835	1835	if ( !(*kpage) ) {
1836		- ehca_gen_err("pgaddr=%lx i=%x",
	1836	+ ehca_gen_err("pgaddr=%llx i=%x",
1837	1837	pgaddr, i);
1838	1838	ret = -EFAULT;
1839	1839	return ret;
...	...	@@ -1846,8 +1846,8 @@
1846	1846	if (pginfo->hwpage_cnt) {
1847	1847	ehca_gen_err(
1848	1848	"invalid alignment "
1849		- "pgaddr=%lx i=%x "
1850		- "mr_pgsize=%lx",
	1849	+ "pgaddr=%llx i=%x "
	1850	+ "mr_pgsize=%llx",
1851	1851	pgaddr, i,
1852	1852	pginfo->hwpage_size);
1853	1853	ret = -EFAULT;
...	...	@@ -1866,8 +1866,8 @@
1866	1866	if (ehca_debug_level >= 3) {
1867	1867	u64 val = (u64 )abs_to_virt(
1868	1868	phys_to_abs(pgaddr));
1869		- ehca_gen_dbg("kpage=%lx chunk_page=%lx "
1870		- "value=%016lx",
	1869	+ ehca_gen_dbg("kpage=%llx chunk_page=%llx "
	1870	+ "value=%016llx",
1871	1871	*kpage, pgaddr, val);
1872	1872	}
1873	1873	prev_pgaddr = pgaddr;
...	...	@@ -1944,9 +1944,9 @@
1944	1944	if ((pginfo->kpage_cnt >= pginfo->num_kpages) \|\|
1945	1945	(pginfo->hwpage_cnt >= pginfo->num_hwpages)) {
1946	1946	ehca_gen_err("kpage_cnt >= num_kpages, "
1947		- "kpage_cnt=%lx num_kpages=%lx "
1948		- "hwpage_cnt=%lx "
1949		- "num_hwpages=%lx i=%x",
	1947	+ "kpage_cnt=%llx num_kpages=%llx "
	1948	+ "hwpage_cnt=%llx "
	1949	+ "num_hwpages=%llx i=%x",
1950	1950	pginfo->kpage_cnt,
1951	1951	pginfo->num_kpages,
1952	1952	pginfo->hwpage_cnt,
...	...	@@ -1957,8 +1957,8 @@
1957	1957	(pbuf->addr & ~(pginfo->hwpage_size - 1)) +
1958	1958	(pginfo->next_hwpage * pginfo->hwpage_size));
1959	1959	if ( !(*kpage) && pbuf->addr ) {
1960		- ehca_gen_err("pbuf->addr=%lx pbuf->size=%lx "
1961		- "next_hwpage=%lx", pbuf->addr,
	1960	+ ehca_gen_err("pbuf->addr=%llx pbuf->size=%llx "
	1961	+ "next_hwpage=%llx", pbuf->addr,
1962	1962	pbuf->size, pginfo->next_hwpage);
1963	1963	return -EFAULT;
1964	1964	}
...	...	@@ -1996,8 +1996,8 @@
1996	1996	kpage = phys_to_abs((fmrlist & ~(pginfo->hwpage_size - 1)) +
1997	1997	pginfo->next_hwpage * pginfo->hwpage_size);
1998	1998	if ( !(*kpage) ) {
1999		- ehca_gen_err("*fmrlist=%lx fmrlist=%p "
2000		- "next_listelem=%lx next_hwpage=%lx",
	1999	+ ehca_gen_err("*fmrlist=%llx fmrlist=%p "
	2000	+ "next_listelem=%llx next_hwpage=%llx",
2001	2001	*fmrlist, fmrlist,
2002	2002	pginfo->u.fmr.next_listelem,
2003	2003	pginfo->next_hwpage);
...	...	@@ -2025,7 +2025,7 @@
2025	2025	~(pginfo->hwpage_size - 1));
2026	2026	if (prev + pginfo->u.fmr.fmr_pgsize != p) {
2027	2027	ehca_gen_err("uncontiguous fmr pages "
2028		- "found prev=%lx p=%lx "
	2028	+ "found prev=%llx p=%llx "
2029	2029	"idx=%x", prev, p, i + j);
2030	2030	return -EINVAL;
2031	2031	}
...	...	@@ -331,7 +331,7 @@
331	331	if (cnt == (nr_q_pages - 1)) { /* last page! */
332	332	if (h_ret != expected_hret) {
333	333	ehca_err(ib_dev, "hipz_qp_register_rpage() "
334		- "h_ret=%li", h_ret);
	334	+ "h_ret=%lli", h_ret);
335	335	ret = ehca2ib_return_code(h_ret);
336	336	goto init_qp_queue1;
337	337	}
...	...	@@ -345,7 +345,7 @@
345	345	} else {
346	346	if (h_ret != H_PAGE_REGISTERED) {
347	347	ehca_err(ib_dev, "hipz_qp_register_rpage() "
348		- "h_ret=%li", h_ret);
	348	+ "h_ret=%lli", h_ret);
349	349	ret = ehca2ib_return_code(h_ret);
350	350	goto init_qp_queue1;
351	351	}
...	...	@@ -709,7 +709,7 @@
709	709
710	710	h_ret = hipz_h_alloc_resource_qp(shca->ipz_hca_handle, &parms);
711	711	if (h_ret != H_SUCCESS) {
712		- ehca_err(pd->device, "h_alloc_resource_qp() failed h_ret=%li",
	712	+ ehca_err(pd->device, "h_alloc_resource_qp() failed h_ret=%lli",
713	713	h_ret);
714	714	ret = ehca2ib_return_code(h_ret);
715	715	goto create_qp_exit1;
...	...	@@ -1010,7 +1010,7 @@
1010	1010	mqpcb, my_qp->galpas.kernel);
1011	1011	if (hret != H_SUCCESS) {
1012	1012	ehca_err(pd->device, "Could not modify SRQ to INIT "
1013		- "ehca_qp=%p qp_num=%x h_ret=%li",
	1013	+ "ehca_qp=%p qp_num=%x h_ret=%lli",
1014	1014	my_qp, my_qp->real_qp_num, hret);
1015	1015	goto create_srq2;
1016	1016	}
...	...	@@ -1024,7 +1024,7 @@
1024	1024	mqpcb, my_qp->galpas.kernel);
1025	1025	if (hret != H_SUCCESS) {
1026	1026	ehca_err(pd->device, "Could not enable SRQ "
1027		- "ehca_qp=%p qp_num=%x h_ret=%li",
	1027	+ "ehca_qp=%p qp_num=%x h_ret=%lli",
1028	1028	my_qp, my_qp->real_qp_num, hret);
1029	1029	goto create_srq2;
1030	1030	}
...	...	@@ -1038,7 +1038,7 @@
1038	1038	mqpcb, my_qp->galpas.kernel);
1039	1039	if (hret != H_SUCCESS) {
1040	1040	ehca_err(pd->device, "Could not modify SRQ to RTR "
1041		- "ehca_qp=%p qp_num=%x h_ret=%li",
	1041	+ "ehca_qp=%p qp_num=%x h_ret=%lli",
1042	1042	my_qp, my_qp->real_qp_num, hret);
1043	1043	goto create_srq2;
1044	1044	}
...	...	@@ -1078,7 +1078,7 @@
1078	1078	&bad_send_wqe_p, NULL, 2);
1079	1079	if (h_ret != H_SUCCESS) {
1080	1080	ehca_err(&shca->ib_device, "hipz_h_disable_and_get_wqe() failed"
1081		- " ehca_qp=%p qp_num=%x h_ret=%li",
	1081	+ " ehca_qp=%p qp_num=%x h_ret=%lli",
1082	1082	my_qp, qp_num, h_ret);
1083	1083	return ehca2ib_return_code(h_ret);
1084	1084	}
...	...	@@ -1134,7 +1134,7 @@
1134	1134
1135	1135	if (ipz_queue_abs_to_offset(ipz_queue, wqe_p, &q_ofs)) {
1136	1136	ehca_gen_err("Invalid offset for calculating left cqes "
1137		- "wqe_p=%#lx wqe_v=%p\n", wqe_p, wqe_v);
	1137	+ "wqe_p=%#llx wqe_v=%p\n", wqe_p, wqe_v);
1138	1138	return -EFAULT;
1139	1139	}
1140	1140
...	...	@@ -1168,7 +1168,7 @@
1168	1168	&send_wqe_p, &recv_wqe_p, 4);
1169	1169	if (h_ret != H_SUCCESS) {
1170	1170	ehca_err(&shca->ib_device, "disable_and_get_wqe() "
1171		- "failed ehca_qp=%p qp_num=%x h_ret=%li",
	1171	+ "failed ehca_qp=%p qp_num=%x h_ret=%lli",
1172	1172	my_qp, qp_num, h_ret);
1173	1173	return ehca2ib_return_code(h_ret);
1174	1174	}
...	...	@@ -1261,7 +1261,7 @@
1261	1261	mqpcb, my_qp->galpas.kernel);
1262	1262	if (h_ret != H_SUCCESS) {
1263	1263	ehca_err(ibqp->device, "hipz_h_query_qp() failed "
1264		- "ehca_qp=%p qp_num=%x h_ret=%li",
	1264	+ "ehca_qp=%p qp_num=%x h_ret=%lli",
1265	1265	my_qp, ibqp->qp_num, h_ret);
1266	1266	ret = ehca2ib_return_code(h_ret);
1267	1267	goto modify_qp_exit1;
...	...	@@ -1690,7 +1690,7 @@
1690	1690
1691	1691	if (h_ret != H_SUCCESS) {
1692	1692	ret = ehca2ib_return_code(h_ret);
1693		- ehca_err(ibqp->device, "hipz_h_modify_qp() failed h_ret=%li "
	1693	+ ehca_err(ibqp->device, "hipz_h_modify_qp() failed h_ret=%lli "
1694	1694	"ehca_qp=%p qp_num=%x", h_ret, my_qp, ibqp->qp_num);
1695	1695	goto modify_qp_exit2;
1696	1696	}
...	...	@@ -1723,7 +1723,7 @@
1723	1723	ret = ehca2ib_return_code(h_ret);
1724	1724	ehca_err(ibqp->device, "ENABLE in context of "
1725	1725	"RESET_2_INIT failed! Maybe you didn't get "
1726		- "a LID h_ret=%li ehca_qp=%p qp_num=%x",
	1726	+ "a LID h_ret=%lli ehca_qp=%p qp_num=%x",
1727	1727	h_ret, my_qp, ibqp->qp_num);
1728	1728	goto modify_qp_exit2;
1729	1729	}
...	...	@@ -1909,7 +1909,7 @@
1909	1909	if (h_ret != H_SUCCESS) {
1910	1910	ret = ehca2ib_return_code(h_ret);
1911	1911	ehca_err(qp->device, "hipz_h_query_qp() failed "
1912		- "ehca_qp=%p qp_num=%x h_ret=%li",
	1912	+ "ehca_qp=%p qp_num=%x h_ret=%lli",
1913	1913	my_qp, qp->qp_num, h_ret);
1914	1914	goto query_qp_exit1;
1915	1915	}
...	...	@@ -2074,7 +2074,7 @@
2074	2074
2075	2075	if (h_ret != H_SUCCESS) {
2076	2076	ret = ehca2ib_return_code(h_ret);
2077		- ehca_err(ibsrq->device, "hipz_h_modify_qp() failed h_ret=%li "
	2077	+ ehca_err(ibsrq->device, "hipz_h_modify_qp() failed h_ret=%lli "
2078	2078	"ehca_qp=%p qp_num=%x",
2079	2079	h_ret, my_qp, my_qp->real_qp_num);
2080	2080	}
...	...	@@ -2108,7 +2108,7 @@
2108	2108	if (h_ret != H_SUCCESS) {
2109	2109	ret = ehca2ib_return_code(h_ret);
2110	2110	ehca_err(srq->device, "hipz_h_query_qp() failed "
2111		- "ehca_qp=%p qp_num=%x h_ret=%li",
	2111	+ "ehca_qp=%p qp_num=%x h_ret=%lli",
2112	2112	my_qp, my_qp->real_qp_num, h_ret);
2113	2113	goto query_srq_exit1;
2114	2114	}
...	...	@@ -2179,7 +2179,7 @@
2179	2179
2180	2180	h_ret = hipz_h_destroy_qp(shca->ipz_hca_handle, my_qp);
2181	2181	if (h_ret != H_SUCCESS) {
2182		- ehca_err(dev, "hipz_h_destroy_qp() failed h_ret=%li "
	2182	+ ehca_err(dev, "hipz_h_destroy_qp() failed h_ret=%lli "
2183	2183	"ehca_qp=%p qp_num=%x", h_ret, my_qp, qp_num);
2184	2184	return ehca2ib_return_code(h_ret);
2185	2185	}
...	...	@@ -822,7 +822,7 @@
822	822	offset = qmap->next_wqe_idx * ipz_queue->qe_size;
823	823	wqe = (struct ehca_wqe *)ipz_qeit_calc(ipz_queue, offset);
824	824	if (!wqe) {
825		- ehca_err(cq->device, "Invalid wqe offset=%#lx on "
	825	+ ehca_err(cq->device, "Invalid wqe offset=%#llx on "
826	826	"qp_num=%#x", offset, my_qp->real_qp_num);
827	827	return nr;
828	828	}
...	...	@@ -85,7 +85,7 @@
85	85
86	86	if (ret != H_SUCCESS) {
87	87	ehca_err(&shca->ib_device,
88		- "Can't define AQP1 for port %x. h_ret=%li",
	88	+ "Can't define AQP1 for port %x. h_ret=%lli",
89	89	port, ret);
90	90	return ret;
91	91	}
...	...	@@ -116,7 +116,7 @@
116	116	unsigned char deb = (unsigned char )(adr); \
117	117	for (x = 0; x < l; x += 16) { \
118	118	printk(KERN_INFO "EHCA_DMP:%s " format \
119		- " adr=%p ofs=%04x %016lx %016lx\n", \
	119	+ " adr=%p ofs=%04x %016llx %016llx\n", \
120	120	__func__, ##args, deb, x, \
121	121	((u64 )&deb[0]), ((u64 )&deb[8])); \
122	122	deb += 16; \