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

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

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

drivers/infiniband/hw/ehca/ehca_cq.c

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


	if (h_ret != H_SUCCESS) {

		ehca_err(device, "hipz_h_alloc_resource_cq() failed "

			 "h_ret=%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 @@ struct ib_cq *ehca_create_cq(struct ib_device *device, int cqe, int comp_vector, 


		if (h_ret < H_SUCCESS) {

			ehca_err(device, "hipz_h_register_rpage_cq() failed "

				 "ehca_cq=%p cq_num=%x h_ret=%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 @@ struct ib_cq *ehca_create_cq(struct ib_device *device, int cqe, int comp_vector, 
			if ((h_ret != H_SUCCESS) || vpage) {

				ehca_err(device, "Registration of pages not "

					 "complete ehca_cq=%p cq_num=%x "

					 "h_ret=%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 @@ struct ib_cq *ehca_create_cq(struct ib_device *device, int cqe, int comp_vector, 
		} else {

			if (h_ret != H_PAGE_REGISTERED) {

				ehca_err(device, "Registration of page failed "

					 "ehca_cq=%p cq_num=%x h_ret=%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 @@ struct ib_cq *ehca_create_cq(struct ib_device *device, int cqe, int comp_vector, 


	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 @@ struct ib_cq *ehca_create_cq(struct ib_device *device, int cqe, int comp_vector, 
	h_ret = hipz_h_destroy_cq(adapter_handle, my_cq, 1);

	if (h_ret != H_SUCCESS)

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

			 "cq_num=%x h_ret=%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 @@ int ehca_destroy_cq(struct ib_cq *cq) 
	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 @@ int ehca_destroy_cq(struct ib_cq *cq) 
				 cq_num);

	}

	if (h_ret != H_SUCCESS) {

		ehca_err(device, "hipz_h_destroy_cq() failed h_ret=%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);

	}

drivers/infiniband/hw/ehca/ehca_hca.c

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

				  cap, props->init_type, port_modify_mask);

	if (hret != H_SUCCESS) {

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

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

			 hret);

		ret = -EINVAL;

	}

drivers/infiniband/hw/ehca/ehca_irq.c

+9 −9
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ static void print_error_data(struct ehca_shca *shca, void *data, 
			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 @@ static void print_error_data(struct ehca_shca *shca, void *data, 
		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 @@ int ehca_error_data(struct ehca_shca *shca, void *data, 


	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 @@ int ehca_error_data(struct ehca_shca *shca, void *data, 
		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 @@ static inline void process_eqe(struct ehca_shca *shca, struct ehca_eqe *eqe) 
	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 @@ void ehca_process_eq(struct ehca_shca *shca, int is_irq) 
		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))

drivers/infiniband/hw/ehca/ehca_main.c

+3 −3
Original line number Diff line number Diff line
@@ -304,7 +304,7 @@ static int ehca_sense_attributes(struct ehca_shca *shca) 


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

	if (h_ret != H_SUCCESS) {

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

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

			     h_ret);

		ret = -EPERM;

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

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

	if (h_ret != H_SUCCESS) {

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

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

			     h_ret);

		ret = -EPERM;

		goto sense_attributes1;
@@ -682,7 +682,7 @@ static ssize_t ehca_show_adapter_handle(struct device *dev, 
{

	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);

drivers/infiniband/hw/ehca/ehca_mcast.c

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

		ehca_err(ibqp->device,

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

			 "h_ret=%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 @@ int ehca_detach_mcast(struct ib_qp *ibqp, union ib_gid *gid, u16 lid) 
	if (h_ret != H_SUCCESS)

		ehca_err(ibqp->device,

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

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

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



	return ehca2ib_return_code(h_ret);

}