Commit 3750f605 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Roland Dreier

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: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent e0b325d3
...@@ -196,7 +196,7 @@ struct ib_cq *ehca_create_cq(struct ib_device *device, int cqe, int comp_vector, ...@@ -196,7 +196,7 @@ struct ib_cq *ehca_create_cq(struct ib_device *device, int cqe, int comp_vector,
if (h_ret != H_SUCCESS) { if (h_ret != H_SUCCESS) {
ehca_err(device, "hipz_h_alloc_resource_cq() failed " 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)); cq = ERR_PTR(ehca2ib_return_code(h_ret));
goto create_cq_exit2; goto create_cq_exit2;
} }
...@@ -232,7 +232,7 @@ struct ib_cq *ehca_create_cq(struct ib_device *device, int cqe, int comp_vector, ...@@ -232,7 +232,7 @@ struct ib_cq *ehca_create_cq(struct ib_device *device, int cqe, int comp_vector,
if (h_ret < H_SUCCESS) { if (h_ret < H_SUCCESS) {
ehca_err(device, "hipz_h_register_rpage_cq() failed " 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, "act_pages=%i", my_cq, my_cq->cq_number,
h_ret, counter, param.act_pages); h_ret, counter, param.act_pages);
cq = ERR_PTR(-EINVAL); cq = ERR_PTR(-EINVAL);
...@@ -244,7 +244,7 @@ struct ib_cq *ehca_create_cq(struct ib_device *device, int cqe, int comp_vector, ...@@ -244,7 +244,7 @@ struct ib_cq *ehca_create_cq(struct ib_device *device, int cqe, int comp_vector,
if ((h_ret != H_SUCCESS) || vpage) { if ((h_ret != H_SUCCESS) || vpage) {
ehca_err(device, "Registration of pages not " ehca_err(device, "Registration of pages not "
"complete ehca_cq=%p cq_num=%x " "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); h_ret);
cq = ERR_PTR(-EAGAIN); cq = ERR_PTR(-EAGAIN);
goto create_cq_exit4; goto create_cq_exit4;
...@@ -252,7 +252,7 @@ struct ib_cq *ehca_create_cq(struct ib_device *device, int cqe, int comp_vector, ...@@ -252,7 +252,7 @@ struct ib_cq *ehca_create_cq(struct ib_device *device, int cqe, int comp_vector,
} else { } else {
if (h_ret != H_PAGE_REGISTERED) { if (h_ret != H_PAGE_REGISTERED) {
ehca_err(device, "Registration of page failed " 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", "counter=%i act_pages=%i",
my_cq, my_cq->cq_number, my_cq, my_cq->cq_number,
h_ret, counter, param.act_pages); h_ret, counter, param.act_pages);
...@@ -266,7 +266,7 @@ struct ib_cq *ehca_create_cq(struct ib_device *device, int cqe, int comp_vector, ...@@ -266,7 +266,7 @@ struct ib_cq *ehca_create_cq(struct ib_device *device, int cqe, int comp_vector,
gal = my_cq->galpas.kernel; gal = my_cq->galpas.kernel;
cqx_fec = hipz_galpa_load(gal, CQTEMM_OFFSET(cqx_fec)); 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, my_cq->cq_number, cqx_fec);
my_cq->ib_cq.cqe = my_cq->nr_of_entries = my_cq->ib_cq.cqe = my_cq->nr_of_entries =
...@@ -307,7 +307,7 @@ struct ib_cq *ehca_create_cq(struct ib_device *device, int cqe, int comp_vector, ...@@ -307,7 +307,7 @@ struct ib_cq *ehca_create_cq(struct ib_device *device, int cqe, int comp_vector,
h_ret = hipz_h_destroy_cq(adapter_handle, my_cq, 1); h_ret = hipz_h_destroy_cq(adapter_handle, my_cq, 1);
if (h_ret != H_SUCCESS) if (h_ret != H_SUCCESS)
ehca_err(device, "hipz_h_destroy_cq() failed ehca_cq=%p " 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: create_cq_exit2:
write_lock_irqsave(&ehca_cq_idr_lock, flags); write_lock_irqsave(&ehca_cq_idr_lock, flags);
...@@ -355,7 +355,7 @@ int ehca_destroy_cq(struct ib_cq *cq) ...@@ -355,7 +355,7 @@ int ehca_destroy_cq(struct ib_cq *cq)
h_ret = hipz_h_destroy_cq(adapter_handle, my_cq, 0); h_ret = hipz_h_destroy_cq(adapter_handle, my_cq, 0);
if (h_ret == H_R_STATE) { if (h_ret == H_R_STATE) {
/* cq in err: read err data and destroy it forcibly */ /* 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.", "state. Try to delete it forcibly.",
my_cq, cq_num, my_cq->ipz_cq_handle.handle); my_cq, cq_num, my_cq->ipz_cq_handle.handle);
ehca_error_data(shca, my_cq, my_cq->ipz_cq_handle.handle); ehca_error_data(shca, my_cq, my_cq->ipz_cq_handle.handle);
...@@ -365,7 +365,7 @@ int ehca_destroy_cq(struct ib_cq *cq) ...@@ -365,7 +365,7 @@ int ehca_destroy_cq(struct ib_cq *cq)
cq_num); cq_num);
} }
if (h_ret != H_SUCCESS) { 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); "ehca_cq=%p cq_num=%x", h_ret, my_cq, cq_num);
return ehca2ib_return_code(h_ret); return ehca2ib_return_code(h_ret);
} }
......
...@@ -393,7 +393,7 @@ int ehca_modify_port(struct ib_device *ibdev, ...@@ -393,7 +393,7 @@ int ehca_modify_port(struct ib_device *ibdev,
hret = hipz_h_modify_port(shca->ipz_hca_handle, port, hret = hipz_h_modify_port(shca->ipz_hca_handle, port,
cap, props->init_type, port_modify_mask); cap, props->init_type, port_modify_mask);
if (hret != H_SUCCESS) { 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); hret);
ret = -EINVAL; ret = -EINVAL;
} }
......
...@@ -99,7 +99,7 @@ static void print_error_data(struct ehca_shca *shca, void *data, ...@@ -99,7 +99,7 @@ static void print_error_data(struct ehca_shca *shca, void *data,
return; return;
ehca_err(&shca->ib_device, 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); qp->ib_qp.qp_num, resource);
break; break;
} }
...@@ -108,21 +108,21 @@ static void print_error_data(struct ehca_shca *shca, void *data, ...@@ -108,21 +108,21 @@ static void print_error_data(struct ehca_shca *shca, void *data,
struct ehca_cq *cq = (struct ehca_cq *)data; struct ehca_cq *cq = (struct ehca_cq *)data;
ehca_err(&shca->ib_device, ehca_err(&shca->ib_device,
"CQ 0x%x (resource=%lx) has errors.", "CQ 0x%x (resource=%llx) has errors.",
cq->cq_number, resource); cq->cq_number, resource);
break; break;
} }
default: default:
ehca_err(&shca->ib_device, ehca_err(&shca->ib_device,
"Unknown error type: %lx on %s.", "Unknown error type: %llx on %s.",
type, shca->ib_device.name); type, shca->ib_device.name);
break; 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_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 " ehca_err(&shca->ib_device, "EHCA ----- error data end "
"----------------------------------------------------"); "----------------------------------------------------");
...@@ -152,7 +152,7 @@ int ehca_error_data(struct ehca_shca *shca, void *data, ...@@ -152,7 +152,7 @@ int ehca_error_data(struct ehca_shca *shca, void *data,
if (ret == H_R_STATE) if (ret == H_R_STATE)
ehca_err(&shca->ib_device, ehca_err(&shca->ib_device,
"No error data is available: %lx.", resource); "No error data is available: %llx.", resource);
else if (ret == H_SUCCESS) { else if (ret == H_SUCCESS) {
int length; int length;
...@@ -164,7 +164,7 @@ int ehca_error_data(struct ehca_shca *shca, void *data, ...@@ -164,7 +164,7 @@ int ehca_error_data(struct ehca_shca *shca, void *data,
print_error_data(shca, data, rblock, length); print_error_data(shca, data, rblock, length);
} else } else
ehca_err(&shca->ib_device, 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); ehca_free_fw_ctrlblock(rblock);
...@@ -514,7 +514,7 @@ static inline void process_eqe(struct ehca_shca *shca, struct ehca_eqe *eqe) ...@@ -514,7 +514,7 @@ static inline void process_eqe(struct ehca_shca *shca, struct ehca_eqe *eqe)
struct ehca_cq *cq; struct ehca_cq *cq;
eqe_value = eqe->entry; 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)) { if (EHCA_BMASK_GET(EQE_COMPLETION_EVENT, eqe_value)) {
ehca_dbg(&shca->ib_device, "Got completion event"); ehca_dbg(&shca->ib_device, "Got completion event");
token = EHCA_BMASK_GET(EQE_CQ_TOKEN, eqe_value); token = EHCA_BMASK_GET(EQE_CQ_TOKEN, eqe_value);
...@@ -603,7 +603,7 @@ void ehca_process_eq(struct ehca_shca *shca, int is_irq) ...@@ -603,7 +603,7 @@ void ehca_process_eq(struct ehca_shca *shca, int is_irq)
ret = hipz_h_eoi(eq->ist); ret = hipz_h_eoi(eq->ist);
if (ret != H_SUCCESS) if (ret != H_SUCCESS)
ehca_err(&shca->ib_device, 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); ehca_dbg(&shca->ib_device, "deadman found %x eqe", eqe_cnt);
} }
if (unlikely(eqe_cnt == EHCA_EQE_CACHE_SIZE)) if (unlikely(eqe_cnt == EHCA_EQE_CACHE_SIZE))
......
...@@ -304,7 +304,7 @@ static int ehca_sense_attributes(struct ehca_shca *shca) ...@@ -304,7 +304,7 @@ static int ehca_sense_attributes(struct ehca_shca *shca)
h_ret = hipz_h_query_hca(shca->ipz_hca_handle, rblock); h_ret = hipz_h_query_hca(shca->ipz_hca_handle, rblock);
if (h_ret != H_SUCCESS) { 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); h_ret);
ret = -EPERM; ret = -EPERM;
goto sense_attributes1; goto sense_attributes1;
...@@ -391,7 +391,7 @@ static int ehca_sense_attributes(struct ehca_shca *shca) ...@@ -391,7 +391,7 @@ static int ehca_sense_attributes(struct ehca_shca *shca)
port = (struct hipz_query_port *)rblock; port = (struct hipz_query_port *)rblock;
h_ret = hipz_h_query_port(shca->ipz_hca_handle, 1, port); h_ret = hipz_h_query_port(shca->ipz_hca_handle, 1, port);
if (h_ret != H_SUCCESS) { 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); h_ret);
ret = -EPERM; ret = -EPERM;
goto sense_attributes1; goto sense_attributes1;
...@@ -682,7 +682,7 @@ static ssize_t ehca_show_adapter_handle(struct device *dev, ...@@ -682,7 +682,7 @@ static ssize_t ehca_show_adapter_handle(struct device *dev,
{ {
struct ehca_shca *shca = dev->driver_data; 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); static DEVICE_ATTR(adapter_handle, S_IRUGO, ehca_show_adapter_handle, NULL);
......
...@@ -88,7 +88,7 @@ int ehca_attach_mcast(struct ib_qp *ibqp, union ib_gid *gid, u16 lid) ...@@ -88,7 +88,7 @@ int ehca_attach_mcast(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
if (h_ret != H_SUCCESS) if (h_ret != H_SUCCESS)
ehca_err(ibqp->device, ehca_err(ibqp->device,
"ehca_qp=%p qp_num=%x hipz_h_attach_mcqp() failed " "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); return ehca2ib_return_code(h_ret);
} }
...@@ -125,7 +125,7 @@ int ehca_detach_mcast(struct ib_qp *ibqp, union ib_gid *gid, u16 lid) ...@@ -125,7 +125,7 @@ int ehca_detach_mcast(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
if (h_ret != H_SUCCESS) if (h_ret != H_SUCCESS)
ehca_err(ibqp->device, ehca_err(ibqp->device,
"ehca_qp=%p qp_num=%x hipz_h_detach_mcqp() failed " "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); return ehca2ib_return_code(h_ret);
} }
This diff is collapsed.
...@@ -331,7 +331,7 @@ static inline int init_qp_queue(struct ehca_shca *shca, ...@@ -331,7 +331,7 @@ static inline int init_qp_queue(struct ehca_shca *shca,
if (cnt == (nr_q_pages - 1)) { /* last page! */ if (cnt == (nr_q_pages - 1)) { /* last page! */
if (h_ret != expected_hret) { if (h_ret != expected_hret) {
ehca_err(ib_dev, "hipz_qp_register_rpage() " ehca_err(ib_dev, "hipz_qp_register_rpage() "
"h_ret=%li", h_ret); "h_ret=%lli", h_ret);
ret = ehca2ib_return_code(h_ret); ret = ehca2ib_return_code(h_ret);
goto init_qp_queue1; goto init_qp_queue1;
} }
...@@ -345,7 +345,7 @@ static inline int init_qp_queue(struct ehca_shca *shca, ...@@ -345,7 +345,7 @@ static inline int init_qp_queue(struct ehca_shca *shca,
} else { } else {
if (h_ret != H_PAGE_REGISTERED) { if (h_ret != H_PAGE_REGISTERED) {
ehca_err(ib_dev, "hipz_qp_register_rpage() " ehca_err(ib_dev, "hipz_qp_register_rpage() "
"h_ret=%li", h_ret); "h_ret=%lli", h_ret);
ret = ehca2ib_return_code(h_ret); ret = ehca2ib_return_code(h_ret);
goto init_qp_queue1; goto init_qp_queue1;
} }
...@@ -709,7 +709,7 @@ static struct ehca_qp *internal_create_qp( ...@@ -709,7 +709,7 @@ static struct ehca_qp *internal_create_qp(
h_ret = hipz_h_alloc_resource_qp(shca->ipz_hca_handle, &parms); h_ret = hipz_h_alloc_resource_qp(shca->ipz_hca_handle, &parms);
if (h_ret != H_SUCCESS) { 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); h_ret);
ret = ehca2ib_return_code(h_ret); ret = ehca2ib_return_code(h_ret);
goto create_qp_exit1; goto create_qp_exit1;
...@@ -1010,7 +1010,7 @@ struct ib_srq *ehca_create_srq(struct ib_pd *pd, ...@@ -1010,7 +1010,7 @@ struct ib_srq *ehca_create_srq(struct ib_pd *pd,
mqpcb, my_qp->galpas.kernel); mqpcb, my_qp->galpas.kernel);
if (hret != H_SUCCESS) { if (hret != H_SUCCESS) {
ehca_err(pd->device, "Could not modify SRQ to INIT " 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); my_qp, my_qp->real_qp_num, hret);
goto create_srq2; goto create_srq2;
} }
...@@ -1024,7 +1024,7 @@ struct ib_srq *ehca_create_srq(struct ib_pd *pd, ...@@ -1024,7 +1024,7 @@ struct ib_srq *ehca_create_srq(struct ib_pd *pd,
mqpcb, my_qp->galpas.kernel); mqpcb, my_qp->galpas.kernel);
if (hret != H_SUCCESS) { if (hret != H_SUCCESS) {
ehca_err(pd->device, "Could not enable SRQ " 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); my_qp, my_qp->real_qp_num, hret);
goto create_srq2; goto create_srq2;
} }
...@@ -1038,7 +1038,7 @@ struct ib_srq *ehca_create_srq(struct ib_pd *pd, ...@@ -1038,7 +1038,7 @@ struct ib_srq *ehca_create_srq(struct ib_pd *pd,
mqpcb, my_qp->galpas.kernel); mqpcb, my_qp->galpas.kernel);
if (hret != H_SUCCESS) { if (hret != H_SUCCESS) {
ehca_err(pd->device, "Could not modify SRQ to RTR " 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); my_qp, my_qp->real_qp_num, hret);
goto create_srq2; goto create_srq2;
} }
...@@ -1078,7 +1078,7 @@ static int prepare_sqe_rts(struct ehca_qp *my_qp, struct ehca_shca *shca, ...@@ -1078,7 +1078,7 @@ static int prepare_sqe_rts(struct ehca_qp *my_qp, struct ehca_shca *shca,
&bad_send_wqe_p, NULL, 2); &bad_send_wqe_p, NULL, 2);
if (h_ret != H_SUCCESS) { if (h_ret != H_SUCCESS) {
ehca_err(&shca->ib_device, "hipz_h_disable_and_get_wqe() failed" 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); my_qp, qp_num, h_ret);
return ehca2ib_return_code(h_ret); return ehca2ib_return_code(h_ret);
} }
...@@ -1134,7 +1134,7 @@ static int calc_left_cqes(u64 wqe_p, struct ipz_queue *ipz_queue, ...@@ -1134,7 +1134,7 @@ static int calc_left_cqes(u64 wqe_p, struct ipz_queue *ipz_queue,
if (ipz_queue_abs_to_offset(ipz_queue, wqe_p, &q_ofs)) { if (ipz_queue_abs_to_offset(ipz_queue, wqe_p, &q_ofs)) {
ehca_gen_err("Invalid offset for calculating left cqes " 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; return -EFAULT;
} }
...@@ -1168,7 +1168,7 @@ static int check_for_left_cqes(struct ehca_qp *my_qp, struct ehca_shca *shca) ...@@ -1168,7 +1168,7 @@ static int check_for_left_cqes(struct ehca_qp *my_qp, struct ehca_shca *shca)
&send_wqe_p, &recv_wqe_p, 4); &send_wqe_p, &recv_wqe_p, 4);
if (h_ret != H_SUCCESS) { if (h_ret != H_SUCCESS) {
ehca_err(&shca->ib_device, "disable_and_get_wqe() " 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); my_qp, qp_num, h_ret);
return ehca2ib_return_code(h_ret); return ehca2ib_return_code(h_ret);
} }
...@@ -1261,7 +1261,7 @@ static int internal_modify_qp(struct ib_qp *ibqp, ...@@ -1261,7 +1261,7 @@ static int internal_modify_qp(struct ib_qp *ibqp,
mqpcb, my_qp->galpas.kernel); mqpcb, my_qp->galpas.kernel);
if (h_ret != H_SUCCESS) { if (h_ret != H_SUCCESS) {
ehca_err(ibqp->device, "hipz_h_query_qp() failed " 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); my_qp, ibqp->qp_num, h_ret);
ret = ehca2ib_return_code(h_ret); ret = ehca2ib_return_code(h_ret);
goto modify_qp_exit1; goto modify_qp_exit1;
...@@ -1690,7 +1690,7 @@ static int internal_modify_qp(struct ib_qp *ibqp, ...@@ -1690,7 +1690,7 @@ static int internal_modify_qp(struct ib_qp *ibqp,
if (h_ret != H_SUCCESS) { if (h_ret != H_SUCCESS) {
ret = ehca2ib_return_code(h_ret); 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); "ehca_qp=%p qp_num=%x", h_ret, my_qp, ibqp->qp_num);
goto modify_qp_exit2; goto modify_qp_exit2;
} }
...@@ -1723,7 +1723,7 @@ static int internal_modify_qp(struct ib_qp *ibqp, ...@@ -1723,7 +1723,7 @@ static int internal_modify_qp(struct ib_qp *ibqp,
ret = ehca2ib_return_code(h_ret); ret = ehca2ib_return_code(h_ret);
ehca_err(ibqp->device, "ENABLE in context of " ehca_err(ibqp->device, "ENABLE in context of "
"RESET_2_INIT failed! Maybe you didn't get " "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); h_ret, my_qp, ibqp->qp_num);
goto modify_qp_exit2; goto modify_qp_exit2;
} }
...@@ -1909,7 +1909,7 @@ int ehca_query_qp(struct ib_qp *qp, ...@@ -1909,7 +1909,7 @@ int ehca_query_qp(struct ib_qp *qp,
if (h_ret != H_SUCCESS) { if (h_ret != H_SUCCESS) {
ret = ehca2ib_return_code(h_ret); ret = ehca2ib_return_code(h_ret);
ehca_err(qp->device, "hipz_h_query_qp() failed " 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); my_qp, qp->qp_num, h_ret);
goto query_qp_exit1; goto query_qp_exit1;
} }
...@@ -2074,7 +2074,7 @@ int ehca_modify_srq(struct ib_srq *ibsrq, struct ib_srq_attr *attr, ...@@ -2074,7 +2074,7 @@ int ehca_modify_srq(struct ib_srq *ibsrq, struct ib_srq_attr *attr,
if (h_ret != H_SUCCESS) { if (h_ret != H_SUCCESS) {
ret = ehca2ib_return_code(h_ret); 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", "ehca_qp=%p qp_num=%x",
h_ret, my_qp, my_qp->real_qp_num); h_ret, my_qp, my_qp->real_qp_num);
} }
...@@ -2108,7 +2108,7 @@ int ehca_query_srq(struct ib_srq *srq, struct ib_srq_attr *srq_attr) ...@@ -2108,7 +2108,7 @@ int ehca_query_srq(struct ib_srq *srq, struct ib_srq_attr *srq_attr)
if (h_ret != H_SUCCESS) { if (h_ret != H_SUCCESS) {
ret = ehca2ib_return_code(h_ret); ret = ehca2ib_return_code(h_ret);
ehca_err(srq->device, "hipz_h_query_qp() failed " 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); my_qp, my_qp->real_qp_num, h_ret);
goto query_srq_exit1; goto query_srq_exit1;
} }
...@@ -2179,7 +2179,7 @@ static int internal_destroy_qp(struct ib_device *dev, struct ehca_qp *my_qp, ...@@ -2179,7 +2179,7 @@ static int internal_destroy_qp(struct ib_device *dev, struct ehca_qp *my_qp,
h_ret = hipz_h_destroy_qp(shca->ipz_hca_handle, my_qp); h_ret = hipz_h_destroy_qp(shca->ipz_hca_handle, my_qp);
if (h_ret != H_SUCCESS) { 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); "ehca_qp=%p qp_num=%x", h_ret, my_qp, qp_num);
return ehca2ib_return_code(h_ret); return ehca2ib_return_code(h_ret);
} }
......
...@@ -822,7 +822,7 @@ static int generate_flush_cqes(struct ehca_qp *my_qp, struct ib_cq *cq, ...@@ -822,7 +822,7 @@ static int generate_flush_cqes(struct ehca_qp *my_qp, struct ib_cq *cq,
offset = qmap->next_wqe_idx * ipz_queue->qe_size; offset = qmap->next_wqe_idx * ipz_queue->qe_size;
wqe = (struct ehca_wqe *)ipz_qeit_calc(ipz_queue, offset); wqe = (struct ehca_wqe *)ipz_qeit_calc(ipz_queue, offset);
if (!wqe) { 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); "qp_num=%#x", offset, my_qp->real_qp_num);
return nr; return nr;
} }
......
...@@ -85,7 +85,7 @@ u64 ehca_define_sqp(struct ehca_shca *shca, ...@@ -85,7 +85,7 @@ u64 ehca_define_sqp(struct ehca_shca *shca,
if (ret != H_SUCCESS) { if (ret != H_SUCCESS) {
ehca_err(&shca->ib_device, 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); port, ret);
return ret; return ret;
} }
......
...@@ -116,7 +116,7 @@ extern int ehca_debug_level; ...@@ -116,7 +116,7 @@ extern int ehca_debug_level;
unsigned char *deb = (unsigned char *)(adr); \ unsigned char *deb = (unsigned char *)(adr); \
for (x = 0; x < l; x += 16) { \ for (x = 0; x < l; x += 16) { \
printk(KERN_INFO "EHCA_DMP:%s " format \ 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, \ __func__, ##args, deb, x, \
*((u64 *)&deb[0]), *((u64 *)&deb[8])); \ *((u64 *)&deb[0]), *((u64 *)&deb[8])); \
deb += 16; \ deb += 16; \
......
...@@ -114,7 +114,7 @@ static int ehca_mmap_fw(struct vm_area_struct *vma, struct h_galpas *galpas, ...@@ -114,7 +114,7 @@ static int ehca_mmap_fw(struct vm_area_struct *vma, struct h_galpas *galpas,
physical = galpas->user.fw_handle; physical = galpas->user.fw_handle;
vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); 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() */ /* VM_IO | VM_RESERVED are set by remap_pfn_range() */
ret = remap_4k_pfn(vma, vma->vm_start, physical >> EHCA_PAGESHIFT, ret = remap_4k_pfn(vma, vma->vm_start, physical >> EHCA_PAGESHIFT,
vma->vm_page_prot); vma->vm_page_prot);
......
...@@ -249,7 +249,7 @@ u64 hipz_h_alloc_resource_eq(const struct ipz_adapter_handle adapter_handle, ...@@ -249,7 +249,7 @@ u64 hipz_h_alloc_resource_eq(const struct ipz_adapter_handle adapter_handle,
*eq_ist = (u32)outs[5]; *eq_ist = (u32)outs[5];
if (ret == H_NOT_ENOUGH_RESOURCES) 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; return ret;
} }
...@@ -287,7 +287,7 @@ u64 hipz_h_alloc_resource_cq(const struct ipz_adapter_handle adapter_handle, ...@@ -287,7 +287,7 @@ u64 hipz_h_alloc_resource_cq(const struct ipz_adapter_handle adapter_handle,
hcp_galpas_ctor(&cq->galpas, outs[5], outs[6]); hcp_galpas_ctor(&cq->galpas, outs[5], outs[6]);
if (ret == H_NOT_ENOUGH_RESOURCES) 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; return ret;
} }
...@@ -362,7 +362,7 @@ u64 hipz_h_alloc_resource_qp(const struct ipz_adapter_handle adapter_handle, ...@@ -362,7 +362,7 @@ u64 hipz_h_alloc_resource_qp(const struct ipz_adapter_handle adapter_handle,
hcp_galpas_ctor(&parms->galpas, outs[6], outs[6]); hcp_galpas_ctor(&parms->galpas, outs[6], outs[6]);
if (ret == H_NOT_ENOUGH_RESOURCES) 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; return ret;
} }
...@@ -454,7 +454,7 @@ u64 hipz_h_register_rpage_eq(const struct ipz_adapter_handle adapter_handle, ...@@ -454,7 +454,7 @@ u64 hipz_h_register_rpage_eq(const struct ipz_adapter_handle adapter_handle,
const u64 count) const u64 count)
{ {
if (count != 1) { if (count != 1) {
ehca_gen_err("Ppage counter=%lx", count); ehca_gen_err("Ppage counter=%llx", count);
return H_PARAMETER; return H_PARAMETER;
} }
return hipz_h_register_rpage(adapter_handle, return hipz_h_register_rpage(adapter_handle,
...@@ -489,7 +489,7 @@ u64 hipz_h_register_rpage_cq(const struct ipz_adapter_handle adapter_handle, ...@@ -489,7 +489,7 @@ u64 hipz_h_register_rpage_cq(const struct ipz_adapter_handle adapter_handle,
const struct h_galpa gal) const struct h_galpa gal)
{ {
if (count != 1) { if (count != 1) {
ehca_gen_err("Page counter=%lx", count); ehca_gen_err("Page counter=%llx", count);
return H_PARAMETER; return H_PARAMETER;
} }
...@@ -508,7 +508,7 @@ u64 hipz_h_register_rpage_qp(const struct ipz_adapter_handle adapter_handle, ...@@ -508,7 +508,7 @@ u64 hipz_h_register_rpage_qp(const struct ipz_adapter_handle adapter_handle,
const struct h_galpa galpa) const struct h_galpa galpa)
{ {
if (count > 1) { if (count > 1) {
ehca_gen_err("Page counter=%lx", count); ehca_gen_err("Page counter=%llx", count);
return H_PARAMETER; return H_PARAMETER;
} }
...@@ -557,7 +557,7 @@ u64 hipz_h_modify_qp(const struct ipz_adapter_handle adapter_handle, ...@@ -557,7 +557,7 @@ u64 hipz_h_modify_qp(const struct ipz_adapter_handle adapter_handle,
0, 0, 0, 0, 0); 0, 0, 0, 0, 0);
if (ret == H_NOT_ENOUGH_RESOURCES) if (ret == H_NOT_ENOUGH_RESOURCES)
ehca_gen_err("Insufficient resources ret=%li", ret); ehca_gen_err("Insufficient resources ret=%lli", ret);
return ret; return ret;
} }
...@@ -593,7 +593,7 @@ u64 hipz_h_destroy_qp(const struct ipz_adapter_handle adapter_handle, ...@@ -593,7 +593,7 @@ u64 hipz_h_destroy_qp(const struct ipz_adapter_handle adapter_handle,
qp->ipz_qp_handle.handle, /* r6 */ qp->ipz_qp_handle.handle, /* r6 */
0, 0, 0, 0, 0, 0); 0, 0, 0, 0, 0, 0);
if (ret == H_HARDWARE) 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, ret = ehca_plpar_hcall_norets(H_FREE_RESOURCE,
adapter_handle.handle, /* r4 */ adapter_handle.handle, /* r4 */
...@@ -601,7 +601,7 @@ u64 hipz_h_destroy_qp(const struct ipz_adapter_handle adapter_handle, ...@@ -601,7 +601,7 @@ u64 hipz_h_destroy_qp(const struct ipz_adapter_handle adapter_handle,
0, 0, 0, 0, 0); 0, 0, 0, 0, 0);
if (ret == H_RESOURCE) 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; return ret;
} }
...@@ -636,7 +636,7 @@ u64 hipz_h_define_aqp1(const struct ipz_adapter_handle adapter_handle, ...@@ -636,7 +636,7 @@ u64 hipz_h_define_aqp1(const struct ipz_adapter_handle adapter_handle,
*bma_qp_nr = (u32)outs[1]; *bma_qp_nr = (u32)outs[1];
if (ret == H_ALIAS_EXIST) 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; return ret;
} }
...@@ -658,7 +658,7 @@ u64 hipz_h_attach_mcqp(const struct ipz_adapter_handle adapter_handle, ...@@ -658,7 +658,7 @@ u64 hipz_h_attach_mcqp(const struct ipz_adapter_handle adapter_handle,
0, 0); 0, 0);
if (ret == H_NOT_ENOUGH_RESOURCES) 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; return ret;
} }
...@@ -697,7 +697,7 @@ u64 hipz_h_destroy_cq(const struct ipz_adapter_handle adapter_handle, ...@@ -697,7 +697,7 @@ u64 hipz_h_destroy_cq(const struct ipz_adapter_handle adapter_handle,
0, 0, 0, 0); 0, 0, 0, 0);
if (ret == H_RESOURCE) 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; return ret;
} }
...@@ -719,7 +719,7 @@ u64 hipz_h_destroy_eq(const struct ipz_adapter_handle adapter_handle, ...@@ -719,7 +719,7 @@ u64 hipz_h_destroy_eq(const struct ipz_adapter_handle adapter_handle,
0, 0, 0, 0, 0); 0, 0, 0, 0, 0);
if (ret == H_RESOURCE) if (ret == H_RESOURCE)
ehca_gen_err("Resource in use. ret=%li ", ret); ehca_gen_err("Resource in use. ret=%lli ", ret);
return ret; return ret;
} }
...@@ -774,9 +774,9 @@ u64 hipz_h_register_rpage_mr(const struct ipz_adapter_handle adapter_handle, ...@@ -774,9 +774,9 @@ u64 hipz_h_register_rpage_mr(const struct ipz_adapter_handle adapter_handle,
if ((count > 1) && (logical_address_of_page & (EHCA_PAGESIZE-1))) { if ((count > 1) && (logical_address_of_page & (EHCA_PAGESIZE-1))) {
ehca_gen_err("logical_address_of_page not on a 4k boundary " 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 " "pagesize=%x queue_type=%x "
"logical_address_of_page=%lx count=%lx", "logical_address_of_page=%llx count=%llx",
adapter_handle.handle, mr, adapter_handle.handle, mr,
mr->ipz_mr_handle.handle, pagesize, queue_type, mr->ipz_mr_handle.handle, pagesize, queue_type,
logical_address_of_page, count); logical_address_of_page, count);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment