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

Commit b4b8d1e4 authored by Michael Ellerman's avatar Michael Ellerman Committed by Benjamin Herrenschmidt
Browse files

IB/ehca: Remove uses of virt_to_abs() and abs_to_virt() 



abs_to_virt() simply calls __va() and we'd like to get rid of it,
so replace all abs_to_virt() uses with __va().

__va() returns void *, so when assigning to a pointer there's no need
to cast.

Similarly virt_to_abs() just calls __pa().

Signed-off-by: default avatarMichael Ellerman <michael@ellerman.id.au>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 579468a9

drivers/infiniband/hw/ehca/ehca_cq.c

+1 −1
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ struct ib_cq *ehca_create_cq(struct ib_device *device, int cqe, int comp_vector, 
			cq = ERR_PTR(-EAGAIN);

			goto create_cq_exit4;

		}

		rpage = virt_to_abs(vpage);

		rpage = __pa(vpage);



		h_ret = hipz_h_register_rpage_cq(adapter_handle,

						 my_cq->ipz_cq_handle,

drivers/infiniband/hw/ehca/ehca_eq.c

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ int ehca_create_eq(struct ehca_shca *shca, 
		if (!vpage)

			goto create_eq_exit2;



		rpage = virt_to_abs(vpage);

		rpage = __pa(vpage);

		h_ret = hipz_h_register_rpage_eq(shca->ipz_hca_handle,

						 eq->ipz_eq_handle,

						 &eq->pf,

drivers/infiniband/hw/ehca/ehca_mrmw.c

+8 −8
Original line number Diff line number Diff line
@@ -1136,7 +1136,7 @@ int ehca_reg_mr_rpages(struct ehca_shca *shca, 
		}



		if (rnum > 1) {

			rpage = virt_to_abs(kpage);

			rpage = __pa(kpage);

			if (!rpage) {

				ehca_err(&shca->ib_device, "kpage=%p i=%x",

					 kpage, i);
@@ -1231,7 +1231,7 @@ inline int ehca_rereg_mr_rereg1(struct ehca_shca *shca, 
			 pginfo->num_kpages, pginfo->num_hwpages, kpage);

		goto ehca_rereg_mr_rereg1_exit1;

	}

	rpage = virt_to_abs(kpage);

	rpage = __pa(kpage);

	if (!rpage) {

		ehca_err(&shca->ib_device, "kpage=%p", kpage);

		ret = -EFAULT;
@@ -1525,7 +1525,7 @@ static inline void *ehca_calc_sectbase(int top, int dir, int idx) 
	unsigned long ret = idx;

	ret |= dir << EHCA_DIR_INDEX_SHIFT;

	ret |= top << EHCA_TOP_INDEX_SHIFT;

	return abs_to_virt(ret << SECTION_SIZE_BITS);

	return __va(ret << SECTION_SIZE_BITS);

}



#define ehca_bmap_valid(entry) \
@@ -1537,7 +1537,7 @@ static u64 ehca_reg_mr_section(int top, int dir, int idx, u64 *kpage, 
{

	u64 h_ret = 0;

	unsigned long page = 0;

	u64 rpage = virt_to_abs(kpage);

	u64 rpage = __pa(kpage);

	int page_count;



	void *sectbase = ehca_calc_sectbase(top, dir, idx);
@@ -1553,7 +1553,7 @@ static u64 ehca_reg_mr_section(int top, int dir, int idx, u64 *kpage, 
		for (rnum = 0; (rnum < MAX_RPAGES) && (page < page_count);

		     rnum++) {

			void *pg = sectbase + ((page++) * pginfo->hwpage_size);

			kpage[rnum] = virt_to_abs(pg);

			kpage[rnum] = __pa(pg);

		}



		h_ret = hipz_h_register_rpage_mr(shca->ipz_hca_handle, mr,
@@ -1926,7 +1926,7 @@ static int ehca_check_kpages_per_ate(struct scatterlist *page_list, 
		u64 pgaddr = page_to_pfn(sg_page(&page_list[t])) << PAGE_SHIFT;

		if (ehca_debug_level >= 3)

			ehca_gen_dbg("chunk_page=%llx value=%016llx", pgaddr,

				     *(u64 *)abs_to_virt(pgaddr));

				     *(u64 *)__va(pgaddr));

		if (pgaddr - PAGE_SIZE != *prev_pgaddr) {

			ehca_gen_err("uncontiguous page found pgaddr=%llx "

				     "prev_pgaddr=%llx page_list_i=%x",
@@ -1993,7 +1993,7 @@ static int ehca_set_pagebuf_user2(struct ehca_mr_pginfo *pginfo, 
						 ~(pginfo->hwpage_size - 1);

				}

				if (ehca_debug_level >= 3) {

					u64 val = *(u64 *)abs_to_virt(pgaddr);

					u64 val = *(u64 *)__va(pgaddr);

					ehca_gen_dbg("kpage=%llx chunk_page=%llx "

						     "value=%016llx",

						     *kpage, pgaddr, val);
@@ -2503,7 +2503,7 @@ static u64 ehca_map_vaddr(void *caddr) 
	if (!ehca_bmap)

		return EHCA_INVAL_ADDR;



	abs_addr = virt_to_abs(caddr);

	abs_addr = __pa(caddr);

	top = ehca_calc_index(abs_addr, EHCA_TOP_INDEX_SHIFT + EHCA_SECTSHIFT);

	if (!ehca_bmap_valid(ehca_bmap->top[top]))

		return EHCA_INVAL_ADDR;

drivers/infiniband/hw/ehca/ehca_qp.c

+3 −3
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ static inline int init_qp_queue(struct ehca_shca *shca, 
			ret = -EINVAL;

			goto init_qp_queue1;

		}

		rpage = virt_to_abs(vpage);

		rpage = __pa(vpage);



		h_ret = hipz_h_register_rpage_qp(ipz_hca_handle,

						 my_qp->ipz_qp_handle,
@@ -1094,7 +1094,7 @@ static int prepare_sqe_rts(struct ehca_qp *my_qp, struct ehca_shca *shca, 
	ehca_dbg(&shca->ib_device, "qp_num=%x bad_send_wqe_p=%p",

		 qp_num, bad_send_wqe_p);

	/* convert wqe pointer to vadr */

	bad_send_wqe_v = abs_to_virt((u64)bad_send_wqe_p);

	bad_send_wqe_v = __va((u64)bad_send_wqe_p);

	if (ehca_debug_level >= 2)

		ehca_dmp(bad_send_wqe_v, 32, "qp_num=%x bad_wqe", qp_num);

	squeue = &my_qp->ipz_squeue;
@@ -1138,7 +1138,7 @@ static int calc_left_cqes(u64 wqe_p, struct ipz_queue *ipz_queue, 
	/* convert real to abs address */

	wqe_p = wqe_p & (~(1UL << 63));



	wqe_v = abs_to_virt(wqe_p);

	wqe_v = __va(wqe_p);



	if (ipz_queue_abs_to_offset(ipz_queue, wqe_p, &q_ofs)) {

		ehca_gen_err("Invalid offset for calculating left cqes "

drivers/infiniband/hw/ehca/ehca_reqs.c

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ static void trace_send_wr_ud(const struct ib_send_wr *send_wr) 
				     mad_hdr->attr_mod);

		}

		for (j = 0; j < send_wr->num_sge; j++) {

			u8 *data = (u8 *)abs_to_virt(sge->addr);

			u8 *data = __va(sge->addr);

			ehca_gen_dbg("send_wr#%x sge#%x addr=%p length=%x "

				     "lkey=%x",

				     idx, j, data, sge->length, sge->lkey);