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

Commit a7607c9b authored by Joachim Fenkes's avatar Joachim Fenkes Committed by Roland Dreier
Browse files

IB/ehca: Remove mr_largepage parameter 



Always enable large page support; didn't seem to cause problems for anyone.

Signed-off-by: default avatarJoachim Fenkes <fenkes@de.ibm.com>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 4da27d6d

drivers/infiniband/hw/ehca/ehca_main.c

+3 −19
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ MODULE_VERSION(HCAD_VERSION); 
static int ehca_open_aqp1     = 0;

static int ehca_hw_level      = 0;

static int ehca_poll_all_eqs  = 1;

static int ehca_mr_largepage  = 1;



int ehca_debug_level   = 0;

int ehca_nr_ports      = 2;
@@ -79,7 +78,6 @@ module_param_named(port_act_time, ehca_port_act_time, int, S_IRUGO); 
module_param_named(poll_all_eqs,  ehca_poll_all_eqs,  int, S_IRUGO);

module_param_named(static_rate,   ehca_static_rate,   int, S_IRUGO);

module_param_named(scaling_code,  ehca_scaling_code,  int, S_IRUGO);

module_param_named(mr_largepage,  ehca_mr_largepage,  int, S_IRUGO);

module_param_named(lock_hcalls,   ehca_lock_hcalls,   bool, S_IRUGO);



MODULE_PARM_DESC(open_aqp1,
@@ -104,9 +102,6 @@ MODULE_PARM_DESC(static_rate, 
		 "set permanent static rate (default: disabled)");

MODULE_PARM_DESC(scaling_code,

		 "set scaling code (0: disabled/default, 1: enabled)");

MODULE_PARM_DESC(mr_largepage,

		 "use large page for MR (0: use PAGE_SIZE (default), "

		 "1: use large page depending on MR size");

MODULE_PARM_DESC(lock_hcalls,

		 "serialize all hCalls made by the driver "

		 "(default: autodetect)");
@@ -357,11 +352,9 @@ static int ehca_sense_attributes(struct ehca_shca *shca) 


	/* translate supported MR page sizes; always support 4K */

	shca->hca_cap_mr_pgsize = EHCA_PAGESIZE;

	if (ehca_mr_largepage) { /* support extra sizes only if enabled */

	for (i = 0; i < ARRAY_SIZE(pgsize_map); i += 2)

		if (rblock->memory_page_size_supported & pgsize_map[i])

			shca->hca_cap_mr_pgsize |= pgsize_map[i + 1];

	}



	/* query max MTU from first port -- it's the same for all ports */

	port = (struct hipz_query_port *)rblock;
@@ -663,14 +656,6 @@ static ssize_t ehca_show_adapter_handle(struct device *dev, 
}

static DEVICE_ATTR(adapter_handle, S_IRUGO, ehca_show_adapter_handle, NULL);



static ssize_t ehca_show_mr_largepage(struct device *dev,

				      struct device_attribute *attr,

				      char *buf)

{

	return sprintf(buf, "%d\n", ehca_mr_largepage);

}

static DEVICE_ATTR(mr_largepage, S_IRUGO, ehca_show_mr_largepage, NULL);



static struct attribute *ehca_dev_attrs[] = {

	&dev_attr_adapter_handle.attr,

	&dev_attr_num_ports.attr,
@@ -687,7 +672,6 @@ static struct attribute *ehca_dev_attrs[] = { 
	&dev_attr_cur_mw.attr,

	&dev_attr_max_pd.attr,

	&dev_attr_max_ah.attr,

	&dev_attr_mr_largepage.attr,

	NULL

};