Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
bug2833
cloud-kernel
提交
767dcd42
cloud-kernel
项目概览
bug2833
/
cloud-kernel
与 Fork 源项目一致
Fork自
openanolis / cloud-kernel
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
cloud-kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
767dcd42
编写于
5月 27, 2010
作者:
R
Roland Dreier
浏览文件
操作
浏览文件
下载
差异文件
Merge branches 'misc' and 'qib' into for-next
上级
e642df6a
7145c45a
变更
4
展开全部
隐藏空白更改
内联
并排
Showing
4 changed file
with
200 addition
and
614 deletion
+200
-614
drivers/infiniband/hw/qib/qib_fs.c
drivers/infiniband/hw/qib/qib_fs.c
+15
-10
drivers/infiniband/hw/qib/qib_iba6120.c
drivers/infiniband/hw/qib/qib_iba6120.c
+0
-12
drivers/infiniband/hw/qib/qib_iba7322.c
drivers/infiniband/hw/qib/qib_iba7322.c
+179
-592
drivers/infiniband/hw/qib/qib_init.c
drivers/infiniband/hw/qib/qib_init.c
+6
-0
未找到文件。
drivers/infiniband/hw/qib/qib_fs.c
浏览文件 @
767dcd42
...
@@ -144,10 +144,11 @@ static ssize_t dev_counters_read(struct file *file, char __user *buf,
...
@@ -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,
...
@@ -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,
...
@@ -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,
...
@@ -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,
...
@@ -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
[]
=
{
...
...
drivers/infiniband/hw/qib/qib_iba6120.c
浏览文件 @
767dcd42
...
@@ -3475,14 +3475,6 @@ struct qib_devdata *qib_init_iba6120_funcs(struct pci_dev *pdev,
...
@@ -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,
...
@@ -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
"
);
...
...
drivers/infiniband/hw/qib/qib_iba7322.c
浏览文件 @
767dcd42
此差异已折叠。
点击以展开。
drivers/infiniband/hw/qib/qib_init.c
浏览文件 @
767dcd42
...
@@ -1237,7 +1237,13 @@ static int __devinit qib_init_one(struct pci_dev *pdev,
...
@@ -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
:
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录