UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branches 'misc' and 'qib' into for-next

This commit is contained in:
Roland Dreier 2010-05-27 11:05:04 -07:00
parent e642df6a0b 7145c45a06
commit 767dcd42e5
4 changed files with 200 additions and 614 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/infiniband/hw/qib/qib_fs.c
View File

@ -144,10 +144,11 @@ static ssize_t dev_counters_read(struct file *file, char __user *buf,
size_t count, loff_t *ppos) size_t count, loff_t *ppos)
{ {
u64 *counters; u64 *counters;
size_t avail;
struct qib_devdata *dd = private2dd(file); struct qib_devdata *dd = private2dd(file);
return simple_read_from_buffer(buf, count, ppos, counters, avail = dd->f_read_cntrs(dd, *ppos, NULL, &counters);
dd->f_read_cntrs(dd, *ppos, NULL, &counters)); return simple_read_from_buffer(buf, count, ppos, counters, avail);
} }
/* read the per-device counters */ /* 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) size_t count, loff_t *ppos)
{ {
char *names; char *names;
size_t avail;
struct qib_devdata *dd = private2dd(file); struct qib_devdata *dd = private2dd(file);
return simple_read_from_buffer(buf, count, ppos, names, avail = dd->f_read_cntrs(dd, *ppos, &names, NULL);
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[] = { 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) size_t count, loff_t *ppos)
{ {
char *names; char *names;
size_t avail;
struct qib_devdata *dd = private2dd(file); struct qib_devdata *dd = private2dd(file);
return simple_read_from_buffer(buf, count, ppos, names, avail = dd->f_read_portcntrs(dd, *ppos, 0, &names, NULL);
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) */ /* 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) size_t count, loff_t *ppos)
{ {
u64 *counters; u64 *counters;
size_t avail;
struct qib_devdata *dd = private2dd(file); struct qib_devdata *dd = private2dd(file);
return simple_read_from_buffer(buf, count, ppos, counters, avail = dd->f_read_portcntrs(dd, *ppos, 0, NULL, &counters);
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) */ /* 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) size_t count, loff_t *ppos)
{ {
u64 *counters; u64 *counters;
size_t avail;
struct qib_devdata *dd = private2dd(file); struct qib_devdata *dd = private2dd(file);
return simple_read_from_buffer(buf, count, ppos, counters, avail = dd->f_read_portcntrs(dd, *ppos, 1, NULL, &counters);
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[] = { static const struct file_operations portcntr_ops[] = {

12
drivers/infiniband/hw/qib/qib_iba6120.c
View File

@ -3475,14 +3475,6 @@ struct qib_devdata *qib_init_iba6120_funcs(struct pci_dev *pdev,
struct qib_devdata *dd; struct qib_devdata *dd;
int ret; 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) + dd = qib_alloc_devdata(pdev, sizeof(struct qib_pportdata) +
sizeof(struct qib_chip_specific)); sizeof(struct qib_chip_specific));
if (IS_ERR(dd)) if (IS_ERR(dd))
@ -3554,10 +3546,6 @@ struct qib_devdata *qib_init_iba6120_funcs(struct pci_dev *pdev,
if (qib_mini_init) if (qib_mini_init)
goto bail; 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)) if (qib_pcie_params(dd, 8, NULL, NULL))
qib_dev_err(dd, "Failed to setup PCIe or interrupts; " qib_dev_err(dd, "Failed to setup PCIe or interrupts; "
"continuing anyway\n"); "continuing anyway\n");

771
drivers/infiniband/hw/qib/qib_iba7322.c
View File

File diff suppressed because it is too large Load Diff

6
drivers/infiniband/hw/qib/qib_init.c
View File

@ -1237,7 +1237,13 @@ static int __devinit qib_init_one(struct pci_dev *pdev,
*/ */
switch (ent->device) { switch (ent->device) {
case PCI_DEVICE_ID_QLOGIC_IB_6120: case PCI_DEVICE_ID_QLOGIC_IB_6120:
#ifdef CONFIG_PCI_MSI
dd = qib_init_iba6120_funcs(pdev, ent); 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; break;
case PCI_DEVICE_ID_QLOGIC_IB_7220: case PCI_DEVICE_ID_QLOGIC_IB_7220: