Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gsplhtlxg
clone-Linux
提交
7adce751
C
clone-Linux
项目概览
gsplhtlxg
/
clone-Linux
通知
2
Star
0
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
clone-Linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
7adce751
编写于
12月 01, 2010
作者:
R
Roland Dreier
浏览文件
操作
浏览文件
下载
差异文件
Merge branches 'misc', 'mlx4' and 'nes' into for-next
上级
91a4d157
21d60609
e3d33cb1
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
12 addition
and
9 deletion
+12
-9
MAINTAINERS
MAINTAINERS
+1
-2
drivers/infiniband/hw/mlx4/main.c
drivers/infiniband/hw/mlx4/main.c
+2
-2
drivers/infiniband/hw/mlx4/qp.c
drivers/infiniband/hw/mlx4/qp.c
+5
-5
drivers/net/mlx4/fw.c
drivers/net/mlx4/fw.c
+4
-0
未找到文件。
MAINTAINERS
浏览文件 @
7adce751
...
...
@@ -4043,9 +4043,8 @@ F: drivers/scsi/NCR_D700.*
NETEFFECT IWARP RNIC DRIVER (IW_NES)
M: Faisal Latif <faisal.latif@intel.com>
M: Chien Tung <chien.tin.tung@intel.com>
L: linux-rdma@vger.kernel.org
W: http://www.
neteffect.co
m
W: http://www.
intel.com/Products/Server/Adapters/Server-Cluster/Server-Cluster-overview.ht
m
S: Supported
F: drivers/infiniband/hw/nes/
...
...
drivers/infiniband/hw/mlx4/main.c
浏览文件 @
7adce751
...
...
@@ -219,7 +219,7 @@ static int eth_link_query_port(struct ib_device *ibdev, u8 port,
struct
net_device
*
ndev
;
enum
ib_mtu
tmp
;
props
->
active_width
=
IB_WIDTH_
4
X
;
props
->
active_width
=
IB_WIDTH_
1
X
;
props
->
active_speed
=
4
;
props
->
port_cap_flags
=
IB_PORT_CM_SUP
;
props
->
gid_tbl_len
=
to_mdev
(
ibdev
)
->
dev
->
caps
.
gid_table_len
[
port
];
...
...
@@ -242,7 +242,7 @@ static int eth_link_query_port(struct ib_device *ibdev, u8 port,
tmp
=
iboe_get_mtu
(
ndev
->
mtu
);
props
->
active_mtu
=
tmp
?
min
(
props
->
max_mtu
,
tmp
)
:
IB_MTU_256
;
props
->
state
=
netif_running
(
ndev
)
&&
netif_oper_up
(
ndev
)
?
props
->
state
=
(
netif_running
(
ndev
)
&&
netif_carrier_ok
(
ndev
)
)
?
IB_PORT_ACTIVE
:
IB_PORT_DOWN
;
props
->
phys_state
=
state_to_phys_state
(
props
->
state
);
...
...
drivers/infiniband/hw/mlx4/qp.c
浏览文件 @
7adce751
...
...
@@ -1816,6 +1816,11 @@ int mlx4_ib_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr,
ctrl
->
fence_size
=
(
wr
->
send_flags
&
IB_SEND_FENCE
?
MLX4_WQE_CTRL_FENCE
:
0
)
|
size
;
if
(
be16_to_cpu
(
vlan
)
<
0x1000
)
{
ctrl
->
ins_vlan
=
1
<<
6
;
ctrl
->
vlan_tag
=
vlan
;
}
/*
* Make sure descriptor is fully written before
* setting ownership bit (because HW can start
...
...
@@ -1831,11 +1836,6 @@ int mlx4_ib_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr,
ctrl
->
owner_opcode
=
mlx4_ib_opcode
[
wr
->
opcode
]
|
(
ind
&
qp
->
sq
.
wqe_cnt
?
cpu_to_be32
(
1
<<
31
)
:
0
)
|
blh
;
if
(
be16_to_cpu
(
vlan
)
<
0x1000
)
{
ctrl
->
ins_vlan
=
1
<<
6
;
ctrl
->
vlan_tag
=
vlan
;
}
stamp
=
ind
+
qp
->
sq_spare_wqes
;
ind
+=
DIV_ROUND_UP
(
size
*
16
,
1U
<<
qp
->
sq
.
wqe_shift
);
...
...
drivers/net/mlx4/fw.c
浏览文件 @
7adce751
...
...
@@ -289,6 +289,10 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)
MLX4_GET
(
field
,
outbox
,
QUERY_DEV_CAP_LOG_BF_REG_SZ_OFFSET
);
dev_cap
->
bf_reg_size
=
1
<<
(
field
&
0x1f
);
MLX4_GET
(
field
,
outbox
,
QUERY_DEV_CAP_LOG_MAX_BF_REGS_PER_PAGE_OFFSET
);
if
((
1
<<
(
field
&
0x3f
))
>
(
PAGE_SIZE
/
dev_cap
->
bf_reg_size
))
{
mlx4_warn
(
dev
,
"firmware bug: log2 # of blue flame regs is invalid (%d), forcing 3
\n
"
,
field
&
0x1f
);
field
=
3
;
}
dev_cap
->
bf_regs_per_page
=
1
<<
(
field
&
0x3f
);
mlx4_dbg
(
dev
,
"BlueFlame available (reg size %d, regs/page %d)
\n
"
,
dev_cap
->
bf_reg_size
,
dev_cap
->
bf_regs_per_page
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录