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

Commit 625fbd3a authored by Sonny Rao's avatar Sonny Rao Committed by Roland Dreier
Browse files

IB/ehca: Fix driver on relocatable kernel 



the eHCA driver registers a MR for all of kernel memory, but makes the
assumption that valid memory exists at KERNELBASE.  This assumption
may not be true in the case of a relocatable kernel, so use KERNELBASE
+ PHYSICAL_START to get the true beginning of usable kernel memory.

cc: Joachim Fenkes <fenkes@de.ibm.com>
cc: Christoph Raisch <raisch@de.ibm.com>
cc: Hoan-Ham Hguyen <hnguyen@de.ibm.com>
Signed-off-by: default avatarSonny Rao <sonnyrao@us.ibm.com>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 252a52aa

drivers/infiniband/hw/ehca/ehca_mrmw.c

+3 −3
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ struct ib_mr *ehca_get_dma_mr(struct ib_pd *pd, int mr_access_flags) 
		}



		ret = ehca_reg_maxmr(shca, e_maxmr,

				     (void *)ehca_map_vaddr((void *)KERNELBASE),

				     (void *)ehca_map_vaddr((void *)(KERNELBASE + PHYSICAL_START)),

				     mr_access_flags, e_pd,

				     &e_maxmr->ib.ib_mr.lkey,

				     &e_maxmr->ib.ib_mr.rkey);
@@ -1636,7 +1636,7 @@ int ehca_reg_internal_maxmr( 


	/* register internal max-MR on HCA */

	size_maxmr = ehca_mr_len;

	iova_start = (u64 *)ehca_map_vaddr((void *)KERNELBASE);

	iova_start = (u64 *)ehca_map_vaddr((void *)(KERNELBASE + PHYSICAL_START));

	ib_pbuf.addr = 0;

	ib_pbuf.size = size_maxmr;

	num_kpages = NUM_CHUNKS(((u64)iova_start % PAGE_SIZE) + size_maxmr,
@@ -2209,7 +2209,7 @@ int ehca_mr_is_maxmr(u64 size, 
{

	/* a MR is treated as max-MR only if it fits following: */

	if ((size == ehca_mr_len) &&

	    (iova_start == (void *)ehca_map_vaddr((void *)KERNELBASE))) {

	    (iova_start == (void *)ehca_map_vaddr((void *)(KERNELBASE + PHYSICAL_START)))) {

		ehca_gen_dbg("this is a max-MR");

		return 1;

	} else