Commit 3e9345ed authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  IB/qib: Remove DCA support until feature is finished
  IB/qib: Use a single txselect module parameter for serdes tuning
  IB/qib: Don't rely on (undefined) order of function parameter evaluation
  IB/ucm: Use memdup_user()
  IB/qib: Fix undefined symbol error when CONFIG_PCI_MSI=n
parents d28619f1 767dcd42

drivers/infiniband/core/ucm.c

+3 −8
Original line number Diff line number Diff line
@@ -706,14 +706,9 @@ static int ib_ucm_alloc_data(const void **dest, u64 src, u32 len) 
	if (!len)

		return 0;



	data = kmalloc(len, GFP_KERNEL);

	if (!data)

		return -ENOMEM;



	if (copy_from_user(data, (void __user *)(unsigned long)src, len)) {

		kfree(data);

		return -EFAULT;

	}

	data = memdup_user((void __user *)(unsigned long)src, len);

	if (IS_ERR(data))

		return PTR_ERR(data);



	*dest = data;

	return 0;

drivers/infiniband/hw/qib/qib_fs.c

+15 −10
Original line number Diff line number Diff line
@@ -144,10 +144,11 @@ static ssize_t dev_counters_read(struct file *file, char __user *buf, 
				 size_t count, loff_t *ppos)

{

	u64 *counters;

	size_t avail;

	struct qib_devdata *dd = private2dd(file);



	return simple_read_from_buffer(buf, count, ppos, counters,

		dd->f_read_cntrs(dd, *ppos, NULL, &counters));

	avail = dd->f_read_cntrs(dd, *ppos, NULL, &counters);

	return simple_read_from_buffer(buf, count, ppos, counters, avail);

}



/* read the per-device counters */
@@ -155,10 +156,11 @@ static ssize_t dev_names_read(struct file *file, char __user *buf, 
			      size_t count, loff_t *ppos)

{

	char *names;

	size_t avail;

	struct qib_devdata *dd = private2dd(file);



	return simple_read_from_buffer(buf, count, ppos, names,

		dd->f_read_cntrs(dd, *ppos, &names, NULL));

	avail = dd->f_read_cntrs(dd, *ppos, &names, NULL);

	return simple_read_from_buffer(buf, count, ppos, names, avail);

}



static const struct file_operations cntr_ops[] = {
@@ -176,10 +178,11 @@ static ssize_t portnames_read(struct file *file, char __user *buf, 
			      size_t count, loff_t *ppos)

{

	char *names;

	size_t avail;

	struct qib_devdata *dd = private2dd(file);



	return simple_read_from_buffer(buf, count, ppos, names,

		dd->f_read_portcntrs(dd, *ppos, 0, &names, NULL));

	avail = dd->f_read_portcntrs(dd, *ppos, 0, &names, NULL);

	return simple_read_from_buffer(buf, count, ppos, names, avail);

}



/* read the per-port counters for port 1 (pidx 0) */
@@ -187,10 +190,11 @@ static ssize_t portcntrs_1_read(struct file *file, char __user *buf, 
				size_t count, loff_t *ppos)

{

	u64 *counters;

	size_t avail;

	struct qib_devdata *dd = private2dd(file);



	return simple_read_from_buffer(buf, count, ppos, counters,

		dd->f_read_portcntrs(dd, *ppos, 0, NULL, &counters));

	avail = dd->f_read_portcntrs(dd, *ppos, 0, NULL, &counters);

	return simple_read_from_buffer(buf, count, ppos, counters, avail);

}



/* read the per-port counters for port 2 (pidx 1) */
@@ -198,10 +202,11 @@ static ssize_t portcntrs_2_read(struct file *file, char __user *buf, 
				size_t count, loff_t *ppos)

{

	u64 *counters;

	size_t avail;

	struct qib_devdata *dd = private2dd(file);



	return simple_read_from_buffer(buf, count, ppos, counters,

		dd->f_read_portcntrs(dd, *ppos, 1, NULL, &counters));

	avail = dd->f_read_portcntrs(dd, *ppos, 1, NULL, &counters);

	return simple_read_from_buffer(buf, count, ppos, counters, avail);

}



static const struct file_operations portcntr_ops[] = {

drivers/infiniband/hw/qib/qib_iba6120.c

+0 −12
Original line number Diff line number Diff line
@@ -3475,14 +3475,6 @@ struct qib_devdata *qib_init_iba6120_funcs(struct pci_dev *pdev, 
	struct qib_devdata *dd;

	int ret;



#ifndef CONFIG_PCI_MSI

	qib_early_err(&pdev->dev, "QLogic PCIE device 0x%x cannot "

	      "work if CONFIG_PCI_MSI is not enabled\n",

	      ent->device);

	dd = ERR_PTR(-ENODEV);

	goto bail;

#endif



	dd = qib_alloc_devdata(pdev, sizeof(struct qib_pportdata) +

			       sizeof(struct qib_chip_specific));

	if (IS_ERR(dd))
@@ -3554,10 +3546,6 @@ struct qib_devdata *qib_init_iba6120_funcs(struct pci_dev *pdev, 
	if (qib_mini_init)

		goto bail;



#ifndef CONFIG_PCI_MSI

	qib_dev_err(dd, "PCI_MSI not configured, NO interrupts\n");

#endif



	if (qib_pcie_params(dd, 8, NULL, NULL))

		qib_dev_err(dd, "Failed to setup PCIe or interrupts; "

			    "continuing anyway\n");

drivers/infiniband/hw/qib/qib_iba7322.c

+179 −592

File changed.

Preview size limit exceeded, changes collapsed.

drivers/infiniband/hw/qib/qib_init.c

+6 −0
Original line number Diff line number Diff line
@@ -1237,7 +1237,13 @@ static int __devinit qib_init_one(struct pci_dev *pdev, 
	 */

	switch (ent->device) {

	case PCI_DEVICE_ID_QLOGIC_IB_6120:

#ifdef CONFIG_PCI_MSI

		dd = qib_init_iba6120_funcs(pdev, ent);

#else

		qib_early_err(&pdev->dev, "QLogic PCIE device 0x%x cannot "

		      "work if CONFIG_PCI_MSI is not enabled\n",

		      ent->device);

#endif

		break;



	case PCI_DEVICE_ID_QLOGIC_IB_7220:

CRA Git | Maintained and supported by SUSTech CRA and CCSE